diff --git a/include/dba.php b/include/dba.php
index 3cc41ebdd5..09d07322c0 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -131,8 +131,8 @@ function dbesc_array_cb(&$item, $key) {
if(! function_exists('dbesc_array')) {
-function dbesc_array(&$a) {
- if(is_array($a) && count($a)) {
- array_walk($a,'dbesc_array_cb');
+function dbesc_array(&$arr) {
+ if(is_array($arr) && count($arr)) {
+ array_walk($arr,'dbesc_array_cb');
}
}}
\ No newline at end of file
diff --git a/include/notifier.php b/include/notifier.php
index a28f6364bd..4d114a4e33 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -115,10 +115,10 @@ if($argc < 3)
$atom .= replace_macros($feed_template, array(
'$feed_id' => xmlify($baseurl),
'$feed_title' => xmlify($owner['name']),
- '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , 'Y-m-d\Th:i:s\Z')) ,
+ '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , 'Y-m-d\TH:i:s\Z')) ,
'$name' => xmlify($owner['name']),
'$profile_page' => xmlify($owner['url']),
- '$thumb' => xmlify($owner['thumb'])
+ '$photo' => xmlify($owner['photo'])
));
if($followup) {
@@ -126,19 +126,21 @@ if($argc < 3)
'$name' => xmlify($contact['name']),
'$profile_page' => xmlify($contact['url']),
'$thumb' => xmlify($contact['thumb']),
- '$item_id' => xmlify("urn:X-dfrn:{$item['hash']}"),
+ '$item_id' => xmlify("urn:X-dfrn:$baseurl:{$owner['uid']}:{$item['hash']}"),
'$title' => xmlify($item['title']),
- '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\Th:i:s\Z')),
+ '$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
+ '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
'$content' =>xmlify($item['body']),
- '$parent_id' => xmlify("{$items[0]['remote-id']}")
+ '$parent_id' => xmlify("{$items[0]['remote-id']}"),
+ '$comment_allow' => 0
));
}
else {
foreach($items as $item) {
if($item['deleted']) {
$atom .= replace_macros($tomb_template, array(
- '$id' => xmlify("urn:X-dfrn:{$item['hash']}"),
- '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\Th:i:s\Z'))
+ '$id' => xmlify("urn:X-dfrn:$baseurl:{$owner['uid']}:{$item['hash']}"),
+ '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z'))
));
}
else {
@@ -149,10 +151,12 @@ if($argc < 3)
'$name' => xmlify($contact['name']),
'$profile_page' => xmlify($contact['url']),
'$thumb' => xmlify($contact['thumb']),
- '$item_id' => xmlify("urn:X-dfrn:{$item['hash']}"),
- '$title' => xmlify($item['title']),
- '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\Th:i:s\Z')),
- '$content' =>xmlify($item['body'])
+ '$item_id' => xmlify("urn:X-dfrn:$baseurl:{$owner['uid']}:{$item['hash']}"),
+ '$title' => xmlify($contact['name']),
+ '$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
+ '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
+ '$content' =>xmlify($item['body']),
+ '$comment_allow' => (($item['last-child'] && strlen($contact['dfrn-id'] && (! $contact['blocked']))) ? 1 : 0)
));
}
else {
@@ -160,11 +164,14 @@ if($argc < 3)
'$name' => xmlify($contact['name']),
'$profile_page' => xmlify($contact['url']),
'$thumb' => xmlify($contact['thumb']),
- '$item_id' => xmlify("urn:X-dfrn:{$item['hash']}"),
+ '$item_id' => xmlify("urn:X-dfrn:$baseurl:{$owner['uid']}:{$item['hash']}"),
'$title' => xmlify($item['title']),
- '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\Th:i:s\Z')),
+ '$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
+
+ '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
'$content' =>xmlify($item['body']),
- '$parent_id' => xmlify("urn:X-dfrn:{$items[0]['hash']}")
+ '$parent_id' => xmlify("urn:X-dfrn:$baseurl:{$owner['uid']}:{$items[0]['hash']}"),
+ '$comment_allow' => (($item['last-child']) ? 1 : 0)
));
}
}
@@ -172,7 +179,11 @@ if($argc < 3)
}
}
}
- $atom .= "";
+ $atom .= "\r\n";
+
+ // create a separate feed with comments disabled and send to those who can't respond.
+
+ $atom_nowrite = str_replace('1','0',$atom);
print_r($atom);
@@ -228,7 +239,10 @@ echo "pubkey:" . $rr['pubkey'] . "\r\n";
openssl_public_decrypt($challenge,$postvars['challenge'],$rr['pubkey']);
- $postvars['data'] = $atom;
+ if(strlen($rr['dfrn-id']) && (! $rr['blocked']))
+ $postvars['data'] = $atom;
+ else
+ $postvars['data'] = $atom_nowrite;
print_r($postvars);
$xml = post_url($url,$postvars);
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 301beaf2f9..5011471426 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -3,13 +3,100 @@
require_once('simplepie/simplepie.inc');
+function get_atom_elements($item) {
+
+ $res = array();
+
+ $author = $item->get_author();
+ $res['remote-name'] = $author->get_name();
+ $res['remote-link'] = $author->get_link();
+ $res['remote-avatar'] = $author->get_avatar();
+ $res['remote-id'] = $item->get_id();
+ $res['title'] = $item->get_title();
+ $res['body'] = $item->get_content();
+
+ if(strlen($res['body']) > 100000)
+ $res['body'] = substr($res['body'],0,10000) . "\r\n[Extremely large post truncated.]\r\n" ;
+
+ $allow = $item->get_item_tags('http://purl.org/macgirvin/dfrn/1.0','comment-allow');
+ if($allow && $allow[0]['data'] == 1)
+ $res['last-child'] = 1;
+ else
+ $res['last-child'] = 0;
+
+ $rawcreated = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'published');
+ if($rawcreated)
+ $res['created'] = $rawcreated[0]['data'];
+
+ $rawedited = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'updated');
+ if($rawedited)
+ $res['edited'] = $rawcreated[0]['data'];
+
+
+
+ return $res;
+
+}
+
+function post_remote($arr) {
+
+ $arr['hash'] = random_string();
+ $arr['type'] = 'remote';
+ $arr['remote-name'] = notags(trim($arr['remote-name']));
+ $arr['remote-link'] = notags(trim($arr['remote-link']));
+ $arr['remote-avatar'] = notags(trim($arr['remote-avatar']));
+ if(! strlen($arr['remote-avatar']))
+ $arr['remote-avatar'] = $a->get_baseurl() . '/images/default-profile-sm.jpg';
+ $arr['created'] = datetime_convert('UTC','UTC',$arr['created'],'Y-m-d H:i:s');
+ $arr['edited'] = datetime_convert('UTC','UTC',$arr['edited'],'Y-m-d H:i:s');
+ $arr['title'] = notags(trim($arr['title']));
+ $arr['body'] = escape_tags(trim($arr['body']));
+ $arr['last-child'] = intval($arr['last_child']);
+ $arr['visible'] = 1;
+ $arr['deleted'] = 0;
+
+ $parent = $arr['parent_urn'];
+
+ unset($arr['parent_urn']);
+
+ $parent_id = 0;
+
+ dbesc_array($arr);
+
+ $r = q("INSERT INTO `item` (`"
+ . implode("`, `", array_keys($arr))
+ . "`) VALUES ('"
+ . implode("', '", array_values($arr))
+ . "')" );
+
+
+ $r = q("SELECT `id` FROM `item` WHERE `remote-id` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($parent),
+ intval($arr['uid'])
+ );
+ if(count($r))
+ $parent_id = $r[0]['id'];
+
+
+ $r = q("SELECT `id` FROM `item` WHERE `remote-id` = '%s' AND `uid` = %d LIMIT 1",
+ $arr['remote-id'],
+ intval($arr['uid'])
+ );
+ if(count($r))
+ $current_post = $r[0]['id'];
+
+ $r = q("UPDATE `item` SET `parent` = %d WHERE `id` = %d LIMIT 1",
+ intval($parent_id),
+ intval($current_post)
+ );
+
+}
function dfrn_notify_post(&$a) {
-
+dbg(3);
$dfrn_id = notags(trim($_POST['dfrn_id']));
$challenge = notags(trim($_POST['challenge']));
$data = $_POST['data'];
-
$r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1",
dbesc($dfrn_id),
dbesc($challenge)
@@ -22,16 +109,102 @@ function dfrn_notify_post(&$a) {
dbesc($challenge)
);
+ // find the local user who owns this relationship.
+
+ $r = q("SELECT `id`, `uid` FROM `contact` WHERE `issued-id` = '%s' LIMIT 1",
+ dbesc($dfrn_id)
+ );
+ if(! count($r))
+ xml_status(3);
+
+
+ $importer = $r[0];
+
$feed = new SimplePie();
$feed->set_raw_data($data);
+ $feed->enable_order_by_date(false);
$feed->init();
- echo "Feed title:" . $feed->get_title();
+ foreach($feed->get_items() as $item) {
- foreach ($feed->get_items() as $item) {
+ $rawdelete = $item->get_item_tags("http://purl.org/atompub/tombstones/1.0", 'deleted-entry');
+ print_r($rawdelete);
+ if($deleted) {
+ // pick out ref and when from attribs
+ // check hasn't happened already, verify ownership and then process it
- echo $item->get_permalink();
- echo $item->get_content();
+
+ continue;
+ }
+
+ $is_reply = false;
+ $item_id = $item->get_id();
+ $rawthread = $item->get_item_tags("http://purl.org/syndication/thread/1.0",'in-reply-to');
+ if(isset($rawthread[0]['attribs']['']['ref'])) {
+ $is_reply = true;
+ $parent_urn = $rawthread[0]['attribs']['']['ref'];
+ }
+
+
+ if($is_reply) {
+ if($x == ($total_items - 1)) {
+ // remote reply to our post. Import and then notify everybody else.
+ }
+ else {
+ // regular comment that is part of this total conversation. Have we seen it? If not, import it.
+
+ $item_id = $item->get_id();
+
+ $r = q("SELECT `uid`, `last-child` FROM `item` WHERE `remote-id` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($item_id),
+ intval($importer['uid'])
+ );
+ if(count($r)) {
+ $allow = $item->get_item_tags('http://purl.org/macgirvin/dfrn/1.0','comment-allow');
+ if($allow && $allow[0]['data'] != $r[0]['last-child']) {
+ $r = q("UPDATE `item` SET `last-child` = %d WHERE `remote-id` = '%s' AND `uid` = %d LIMIT 1",
+ intval($allow[0]['data']),
+ dbesc($item_id)
+ );
+ }
+ continue;
+ }
+ $datarray = get_atom_elements($item);
+ $datarray['parent_urn'] = $parent_urn;
+ $datarray['uid'] = $importer['uid'];
+ $datarray['contact-id'] = $importer['id'];
+ $r = post_remote($datarray);
+ continue;
+ }
+ }
+ else {
+ // Head post of a conversation. Have we seen it? If not, import it.
+
+ $item_id = $item->get_id();
+ $r = q("SELECT `uid` FROM `item` WHERE `remote-id` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($item_id),
+ intval($importer['uid'])
+ );
+ if(count($r)) {
+ $allow = $item->get_item_tags('http://purl.org/macgirvin/dfrn/1.0','comment-allow');
+ if($allow && $allow[0]['data'] != $r[0]['last-child']) {
+ $r = q("UPDATE `item` SET `last-child` = %d WHERE `remote-id` = '%s' AND `uid` = %d LIMIT 1",
+ intval($allow[0]['data']),
+ dbesc($item_id)
+ );
+ }
+ continue;
+ }
+
+
+ $datarray = get_atom_elements($item);
+ $datarray['parent_urn'] = $item_id;
+ $datarray['uid'] = $importer['uid'];
+ $datarray['contact-id'] = $importer['id'];
+ $r = post_remote($datarray);
+ continue;
+
+ }
}
@@ -49,8 +222,6 @@ function dfrn_notify_post(&$a) {
-
-
function dfrn_notify_content(&$a) {
if(x($_GET,'dfrn_id')) {
diff --git a/update.sql b/update.sql
index 65fc69f789..64f338c51f 100644
--- a/update.sql
+++ b/update.sql
@@ -4,4 +4,7 @@ CHANGE `deny_uid` `deny_cid` MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_general_
ALTER TABLE `item` CHANGE `last-child` `last-child` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '1';
alter table `item` insert `remote-id` char( 255 ) character set utf-8 collate utf8_general_ci NOT NULL;
-
\ No newline at end of file
+
+ALTER TABLE `item` ADD `remote-name` CHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `remote-id` ,
+ADD `remote-link` CHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `remote-name` ,
+ADD `remote-avatar` CHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `remote-link` ;
\ No newline at end of file
diff --git a/view/atom_cmnt.tpl b/view/atom_cmnt.tpl
index fb96fd918e..1d00fd1581 100644
--- a/view/atom_cmnt.tpl
+++ b/view/atom_cmnt.tpl
@@ -8,6 +8,7 @@
$item_id
$title
+ $published
$updated
$content
$comment_allow