<?php
-require_once('simplepie/simplepie.inc');
+require_once('library/simplepie/simplepie.inc');
require_once('include/items.php');
+require_once('include/event.php');
+
+
function dfrn_notify_post(&$a) {
$dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : '');
}
// Consume notification feed. This may differ from consuming a public feed in several ways
- // - might contain email
+ // - might contain email or friend suggestions
// - might contain remote followup to our message
// - in which case we need to accept it and then notify other conversants
// - we may need to send various email notifications
$feed->enable_order_by_date(false);
$feed->init();
+ $reloc = $feed->get_feed_tags( NAMESPACE_DFRN, 'relocate' );
+ if(isset($reloc[0]['child'][NAMESPACE_DFRN])) {
+ $base = $reloc[0]['child'][NAMESPACE_DFRN];
+ $newloc = array();
+ $newloc['uid'] = $importer['importer_uid'];
+ $newloc['cid'] = $importer['id'];
+ $newloc['name'] = notags(unxmlify($base['name'][0]['data']));
+ $newloc['photo'] = notags(unxmlify($base['photo'][0]['data']));
+ $newloc['url'] = notags(unxmlify($base['url'][0]['data']));
+ $newloc['request'] = notags(unxmlify($base['request'][0]['data']));
+ $newloc['confirm'] = notags(unxmlify($base['confirm'][0]['data']));
+ $newloc['notify'] = notags(unxmlify($base['notify'][0]['data']));
+ $newloc['poll'] = notags(unxmlify($base['poll'][0]['data']));
+ $newloc['site-pubkey'] = notags(unxmlify($base['site-pubkey'][0]['data']));
+ $newloc['pubkey'] = notags(unxmlify($base['pubkey'][0]['data']));
+ $newloc['prvkey'] = notags(unxmlify($base['prvkey'][0]['data']));
+
+ // TODO
+ // merge with current record, current contents have priority
+ // update record, set url-updated
+ // update profile photos
+ // schedule a scan?
+
+ }
+
+ // handle friend suggestion notification
+
+ $sugg = $feed->get_feed_tags( NAMESPACE_DFRN, 'suggest' );
+ if(isset($sugg[0]['child'][NAMESPACE_DFRN])) {
+ $base = $sugg[0]['child'][NAMESPACE_DFRN];
+ $fsugg = array();
+ $fsugg['uid'] = $importer['importer_uid'];
+ $fsugg['cid'] = $importer['id'];
+ $fsugg['name'] = notags(unxmlify($base['name'][0]['data']));
+ $fsugg['photo'] = notags(unxmlify($base['photo'][0]['data']));
+ $fsugg['url'] = notags(unxmlify($base['url'][0]['data']));
+ $fsugg['request'] = notags(unxmlify($base['request'][0]['data']));
+ $fsugg['body'] = escape_tags(unxmlify($base['note'][0]['data']));
+
+ // Does our member already have a friend matching this description?
+
+ $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `url` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($fsugg['name']),
+ dbesc($fsugg['url']),
+ intval($fsugg['uid'])
+ );
+ if(count($r))
+ xml_status(0);
+
+ // Do we already have an fcontact record for this person?
+
+ $fid = 0;
+ $r = q("SELECT * FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
+ dbesc($fsugg['url']),
+ dbesc($fsugg['name']),
+ dbesc($fsugg['request'])
+ );
+ if(count($r)) {
+ $fid = $r[0]['id'];
+ }
+ if(! $fid)
+ $r = q("INSERT INTO `fcontact` ( `name`,`url`,`photo`,`request` ) VALUES ( '%s', '%s', '%s', '%s' ) ",
+ dbesc($fsugg['name']),
+ dbesc($fsugg['url']),
+ dbesc($fsugg['photo']),
+ dbesc($fsugg['request'])
+ );
+ $r = q("SELECT * FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
+ dbesc($fsugg['url']),
+ dbesc($fsugg['name']),
+ dbesc($fsugg['request'])
+ );
+ if(count($r)) {
+ $fid = $r[0]['id'];
+ }
+ // database record did not get created. Quietly give up.
+ else
+ xml_status(0);
+
+ $hash = random_string();
+
+ $r = q("INSERT INTO `intro` ( `uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked` )
+ VALUES( %d, %d, %d, '%s', '%s', '%s', %d )",
+ intval($fsugg['uid']),
+ intval($fid),
+ intval($fsugg['cid']),
+ dbesc($fsugg['body']),
+ dbesc($hash),
+ dbesc(datetime_convert()),
+ intval(0)
+ );
+
+ // TODO - send email notify (which may require a new notification preference)
+
+ xml_status(0);
+ }
+
$ismail = false;
$rawmail = $feed->get_feed_tags( NAMESPACE_DFRN, 'mail' );
require_once('bbcode.php');
if($importer['notify-flags'] & NOTIFY_MAIL) {
+ push_lang($importer['language']);
+
// name of the automated email sender
$msg['notificationfromname'] = t('Administrator');
// noreply address to send from
// load the template for private message notifications
$tpl = get_intltext_template('mail_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array(
- '$siteName' => $a->config['sitename'], // name of this site
- '$siteurl' => $a->get_baseurl(), // descriptive url of this site
- '$thumb' => $importer['thumb'], // thumbnail url for sender icon
- '$email' => $importer['email'], // email address to send to
- '$url' => $importer['url'], // full url for the site
- '$from' => $msg['from-name'], // name of the person sending the message
+ '$username' => $importer['username'],
+ '$siteName' => $a->config['sitename'], // name of this site
+ '$siteurl' => $a->get_baseurl(), // descriptive url of this site
+ '$thumb' => $importer['thumb'], // thumbnail url for sender icon
+ '$email' => $importer['email'], // email address to send to
+ '$url' => $importer['url'], // full url for the site
+ '$from' => $msg['from-name'], // name of the person sending the message
'$title' => stripslashes($msg['title']), // subject of the message
'$htmlversion' => $msg['htmlversion'], // html version of the message
'$mimeboundary' => $msg['mimeboundary'], // mime message divider
- '$hostname' => $a->get_hostname() // name of this host
+ '$hostname' => $a->get_hostname() // name of this host
));
// load the template for private message notifications
$tpl = get_intltext_template('mail_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array(
- '$siteName' => $a->config['sitename'], // name of this site
- '$siteurl' => $a->get_baseurl(), // descriptive url of this site
- '$thumb' => $importer['thumb'], // thumbnail url for sender icon
- '$email' => $importer['email'], // email address to send to
- '$url' => $importer['url'], // full url for the site
- '$from' => $msg['from-name'], // name of the person sending the message
+ '$username' => $importer['username'],
+ '$siteName' => $a->config['sitename'], // name of this site
+ '$siteurl' => $a->get_baseurl(), // descriptive url of this site
+ '$thumb' => $importer['thumb'], // thumbnail url for sender icon
+ '$email' => $importer['email'], // email address to send to
+ '$url' => $importer['url'], // full url for the site
+ '$from' => $msg['from-name'], // name of the person sending the message
'$title' => stripslashes($msg['title']), // subject of the message
'$textversion' => $msg['textversion'], // text version of the message
'$mimeboundary' => $msg['mimeboundary'], // mime message divider
- '$hostname' => $a->get_hostname() // name of this host
+ '$hostname' => $a->get_hostname() // name of this host
));
// use the EmailNotification library to send the message
$email_html_body_tpl,
$email_text_body_tpl
);
+
+ pop_lang();
}
xml_status(0);
// NOTREACHED
proc_run('php',"include/notifier.php","comment-import","$posted_id");
if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) {
+ push_lang($importer['language']);
require_once('bbcode.php');
$from = stripslashes($datarray['author-name']);
// load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array(
- '$sitename' => $a->config['sitename'], // name of this site
- '$siteurl' => $a->get_baseurl(), // descriptive url of this site
+ '$username' => $importer['username'],
+ '$sitename' => $a->config['sitename'], // name of this site
+ '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon
- '$email' => $importer['email'], // email address to send to
+ '$email' => $importer['email'], // email address to send to
'$url' => $datarray['author-link'], // full url for the site
- '$from' => $from, // name of the person sending the message
- '$body' => 'q1' .$msg['htmlversion'], // html version of the message
- '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r,
+ '$from' => $from, // name of the person sending the message
+ '$body' => $msg['htmlversion'], // html version of the message
+ '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
));
// load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array(
- '$sitename' => $a->config['sitename'], // name of this site
- '$siteurl' => $a->get_baseurl(), // descriptive url of this site
+ '$username' => $importer['username'],
+ '$sitename' => $a->config['sitename'], // name of this site
+ '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon
- '$email' => $importer['email'], // email address to send to
+ '$email' => $importer['email'], // email address to send to
'$url' => $datarray['author-link'], // full url for the site
- '$from' => $from, // name of the person sending the message
- '$body' => $msg['textversion'], // text version of the message
- '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r,
+ '$from' => $from, // name of the person sending the message
+ '$body' => $msg['textversion'], // text version of the message
+ '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
));
// use the EmailNotification library to send the message
require_once("include/EmailNotification.php");
EmailNotification::sendTextHtmlEmail(
$msg['notificationfromname'],
- t("Administrator@") . $a->get_hostname(),
+ t("Administrator") . '@' . $a->get_hostname(),
t("noreply") . '@' . $a->get_hostname(),
$importer['email'],
- $from . t(" commented on an item at ") . $a->config['sitename'],
+ sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
$email_html_body_tpl,
$email_text_body_tpl
);
-
+ pop_lang();
}
}
xml_status(0);
$datarray['type'] = 'activity';
$datarray['gravity'] = GRAVITY_LIKE;
}
- $r = item_store($datarray);
+ $posted_id = item_store($datarray);
// find out if our user is involved in this conversation and wants to be notified.
foreach($myconv as $conv) {
if(! link_compare($conv['author-link'],$importer_url))
continue;
+
+ push_lang($importer['language']);
require_once('bbcode.php');
$from = stripslashes($datarray['author-name']);
// load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array(
+ '$username' => $importer['username'],
'$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site
- '$thumb' => $conv['author-avatar'], // thumbnail url for sender icon
- '$url' => $conv['author-link'], // full url for the site
- '$from' => $from, // name of the person sending the message
+ '$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon
+ '$url' => $datarray['author-link'], // full url for the site
+ '$from' => $from, // name of the person sending the message
'$body' => $msg['htmlversion'], // html version of the message
- '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r,
+ '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
));
// load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array(
+ '$username' => $importer['username'],
'$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site
- '$thumb' => $conv['author-avatar'], // thumbnail url for sender icon
- '$url' => $conv['author-link'], // full url for the site
- '$from' => $from, // name of the person sending the message
+ '$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon
+ '$url' => $datarray['author-link'], // full url for the site
+ '$from' => $from, // name of the person sending the message
'$body' => $msg['textversion'], // text version of the message
- '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r,
+ '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
));
// use the EmailNotification library to send the message
t("Administrator@") . $a->get_hostname(),
t("noreply") . '@' . $a->get_hostname(),
$importer['email'],
- $from . t(" commented on an item at ") . $a->config['sitename'],
+ sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
$email_html_body_tpl,
$email_text_body_tpl
);
-
+ pop_lang();
break;
}
}
$item_id = $item->get_id();
$datarray = get_atom_elements($feed,$item);
+ if((x($datarray,'object-type')) && ($datarray['object-type'] === ACTIVITY_OBJ_EVENT)) {
+ $ev = bbtoevent($datarray['body']);
+ if(x($ev,'desc') && x($ev,'start')) {
+ $ev['cid'] = $importer['id'];
+ $ev['uid'] = $importer['uid'];
+ $ev['uri'] = $item_id;
+ $ev['edited'] = $datarray['edited'];
+
+ $r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($item_id),
+ intval($importer['uid'])
+ );
+ if(count($r))
+ $ev['id'] = $r[0]['id'];
+ $xyz = event_store($ev);
+ continue;
+ }
+ }
+
$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id),
intval($importer['importer_uid'])
continue;
}
+ // This is my contact on another system, but it's really me.
+ // Turn this into a wall post.
+
+ if($contact['remote_self'])
+ $datarray['wall'] = 1;
+
$datarray['parent-uri'] = $item_id;
$datarray['uid'] = $importer['importer_uid'];
$datarray['contact-id'] = $importer['id'];
projects / friendica.git / blobdiff