aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/pubsub.php2
-rw-r--r--mod/salmon.php52
-rw-r--r--mod/xrd.php3
3 files changed, 55 insertions, 2 deletions
diff --git a/mod/pubsub.php b/mod/pubsub.php
index 1feb80031..7dea2afb1 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -87,7 +87,7 @@ function pubsub_post(&$a) {
$debugging = get_config('system','debugging');
if($debugging)
- file_put_contents('pubsub.out',$xml);
+ file_put_contents('pubsub.out',$xml,FILE_APPEND);
$nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
$contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
diff --git a/mod/salmon.php b/mod/salmon.php
new file mode 100644
index 000000000..d68c74658
--- /dev/null
+++ b/mod/salmon.php
@@ -0,0 +1,52 @@
+<?php
+
+function salmon_return($val) {
+
+ if($val >= 500)
+ $err = 'Error';
+ if($val == 200)
+ $err = 'OK';
+
+ header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err);
+ killme();
+
+}
+
+function salmon_post(&$a) {
+
+ $xml = file_get_contents('php://input');
+
+ $debugging = get_config('system','debugging');
+ if($debugging)
+ file_put_contents('salmon.out',$xml,FILE_APPEND);
+
+ $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
+ $mentions = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false);
+
+ $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+ dbesc($nick)
+ );
+ if(! count($r))
+ salmon_return(500);
+
+ $importer = $r[0];
+
+ require_once('include/items.php');
+
+ // Create a fake feed wrapper so simplepie doesn't choke
+
+ $tpl = load_view_file('view/atom_feed.tpl');
+
+ $base = substr($xml,strpos($xml,'<entry'));
+
+ $xml = $tpl . $base . '</feed>';
+
+salmon_return(500); // until the handler is finished
+
+// consume_salmon($xml,$importer);
+
+ salmon_return(200);
+}
+
+
+
diff --git a/mod/xrd.php b/mod/xrd.php
index e60fda48d..d36b47519 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -21,7 +21,8 @@ function xrd_content(&$a) {
$o = replace_macros($tpl, array(
'$accturi' => $uri,
'$profile_url' => $a->get_baseurl() . '/profile/' . $r[0]['nickname'],
- '$photo' => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid']
+ '$photo' => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid'],
+ '$salmon' => $a->get_baseurl() . '/salmon/' . $r[0]['nickname'] . '/mention'
));
echo $o;