]> git.mxchange.org Git - friendica.git/blobdiff - mod/dfrn_notify.php
configurable format for date input selectors
[friendica.git] / mod / dfrn_notify.php
index 5f91f1b1be33de4d5085d350e813dd2c763a24d8..0dc96f8a7647e725931bce33b1ce10e169d50336 100644 (file)
@@ -1,7 +1,10 @@
 <?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']))   : '');
@@ -10,6 +13,12 @@ function dfrn_notify_post(&$a) {
        $data         = ((x($_POST,'data'))         ? $_POST['data']                    : '');
        $key          = ((x($_POST,'key'))          ? $_POST['key']                     : '');
        $dissolve     = ((x($_POST,'dissolve'))     ? intval($_POST['dissolve'])        :  0);
+       $perm         = ((x($_POST,'perm'))         ? notags(trim($_POST['perm']))      : 'r');
+
+       $writable = (-1);
+       if($dfrn_version >= 2.21) {
+               $writable = (($perm === 'rw') ? 1 : 0);
+       }
 
        $direction = (-1);
        if(strpos($dfrn_id,':') == 1) {
@@ -74,6 +83,14 @@ function dfrn_notify_post(&$a) {
 
        $importer = $r[0];
 
+       if(($writable != (-1)) && ($writable != $importer['writable'])) {
+               q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
+                       intval($writable),
+                       intval($importer['id'])
+               );
+               $importer['writable'] = $writable;
+       }
+
        logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
        logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
 
@@ -118,8 +135,6 @@ function dfrn_notify_post(&$a) {
        }
 
 
-
-
        if($importer['readonly']) {
                // We aren't receiving stuff from this person. But we will quietly ignore them
                // rather than a blatant "go away" message.
@@ -129,7 +144,7 @@ function dfrn_notify_post(&$a) {
        }
 
        // 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
@@ -139,6 +154,103 @@ function dfrn_notify_post(&$a) {
        $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' );
@@ -173,22 +285,12 @@ function dfrn_notify_post(&$a) {
                require_once('bbcode.php');
                if($importer['notify-flags'] & NOTIFY_MAIL) {
 
-                       // generate a mime boundary
-                       $msg['mimeboundary']   =rand(0,9)."-"
-                               .rand(10000000000,9999999999)."-"
-                               .rand(10000000000,9999999999)."=:"
-                               .rand(10000,99999);
+                       push_lang($importer['language']);
 
                        // name of the automated email sender
                        $msg['notificationfromname']    = t('Administrator');
                        // noreply address to send from
                        $msg['notificationfromemail']   = t('noreply') . '@' . $a->get_hostname();                              
-                       // message headers
-                       $msg['headers'] =
-                               "From: {$msg['notificationfromname']} <{$msg['notificationfromemail']}>\n" . 
-                               "Reply-To: {$msg['notificationfromemail']}\n" .
-                               "MIME-Version: 1.0\n" .
-                               "Content-Type: multipart/alternative; boundary=\"{$msg['mimeboundary']}\"";
 
                        // text version
                        // process the message body to display properly in text mode
@@ -208,36 +310,52 @@ function dfrn_notify_post(&$a) {
                        //              4) decode any encoded html tags
                        $msg['htmlversion']     
                                = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$msg['body']))));
-                       
+
                        // load the template for private message notifications
-                       $tpl = load_view_file('view/mail_received_eml.tpl');
-                       
-                       // import the data into the template                    
-                       $email_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
+                       $tpl = get_intltext_template('mail_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'                => $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
                                '$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
                        ));
                        
-                       logger("message headers: " . $msg['headers']);
-                       logger("message body: " . $mail_tpl);
-                       
-                       
-                       // send the message
-                       $res = mail(
-                               $importer['email'],                                                                     // send to address
-                               t('New mail received at ') . $a->config['sitename'],    // subject
-                               $email_tpl,                                                                                     // message body
-                               $msg['headers']                                                                                 // message headers
+                       // 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(
+                               '$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
+                       ));
+
+                       // use the EmailNotification library to send the message
+                       require_once("include/EmailNotification.php");
+                       EmailNotification::sendTextHtmlEmail(
+                               $msg['notificationfromname'],
+                               $msg['notificationfromemail'],
+                               $msg['notificationfromemail'],
+                               $importer['email'],
+                               t('New mail received at ') . $a->config['sitename'],
+                               $email_html_body_tpl,
+                               $email_text_body_tpl
                        );
+
+                       pop_lang();
                }
                xml_status(0);
                // NOTREACHED
@@ -262,10 +380,13 @@ function dfrn_notify_post(&$a) {
                                        $when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
                        }
                        if($deleted) {
-                               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+
+                               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `contact-id` = %d LIMIT 1",
                                        dbesc($uri),
-                                       intval($importer['importer_uid'])
+                                       intval($importer['importer_uid']),
+                                       intval($importer['id'])
                                );
+
                                if(count($r)) {
                                        $item = $r[0];
 
@@ -369,26 +490,68 @@ function dfrn_notify_post(&$a) {
 
                                        if($posted_id && $parent) {
                                
-                                               $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-
-                                               proc_run($php_path,"include/notifier.php","comment-import","$posted_id");
+                                               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']);
-                                                       $tpl = load_view_file('view/cmnt_received_eml.tpl');                    
-                                                       $email_tpl = replace_macros($tpl, array(
-                                                               '$sitename' => $a->config['sitename'],
-                                                               '$siteurl' =>  $a->get_baseurl(),
-                                                               '$username' => $importer['username'],
-                                                               '$email' => $importer['email'],
-                                                               '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, 
-                                                               '$from' => $from,
-                                                               '$body' => strip_tags(bbcode(stripslashes($datarray['body'])))
+
+                                                       // name of the automated email sender
+                                                       $msg['notificationfromname']    = stripslashes($datarray['author-name']);;
+                                                       // noreply address to send from
+                                                       $msg['notificationfromemail']   = t('noreply') . '@' . $a->get_hostname();                              
+
+                                                       // text version
+                                                       // process the message body to display properly in text mode
+                                                       $msg['textversion']
+                                                               = html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8');
+                               
+                                                       // html version
+                                                       // process the message body to display properly in text mode
+                                                       $msg['htmlversion']     
+                                                               = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body']))));
+
+                                                       // 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'                => $datarray['author-avatar'],                  // thumbnail url for sender icon
+                                                               '$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['htmlversion'],                 // html version of the message
+                                                               '$display'              => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
                                                        ));
-       
-                                                       $res = mail($importer['email'], $from . t(' commented on an item at ') . $a->config['sitename'],
-                                                               $email_tpl, "From: " . t('Administrator') . '@' . $a->get_hostname() );
+                       
+                                                       // 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'                => $datarray['author-avatar'],                  // thumbnail url for sender icon
+                                                               '$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'] . '/' . $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("noreply") . '@' . $a->get_hostname(),
+                                                               $importer['email'],
+                                                               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);
@@ -396,19 +559,39 @@ function dfrn_notify_post(&$a) {
                                }
                        }
                        else {
+
                                // regular comment that is part of this total conversation. Have we seen it? If not, import it.
 
-                               $item_id = $item->get_id();
+                               $item_id  = $item->get_id();
+                               $datarray = get_atom_elements($feed,$item);
 
-                               $r = q("SELECT `uid`, `last-child`, `edited` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                               $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'])
                                );
-                               // FIXME update content if 'updated' changes
+
+                               // Update content if 'updated' changes
+
                                if(count($r)) {
+                                       if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+                                               $r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                                       dbesc($datarray['body']),
+                                                       dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
+                                                       dbesc($item_id),
+                                                       intval($importer['importer_uid'])
+                                               );
+                                       }
+
+                                       // update last-child if it changes
+
                                        $allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
-                                       if($allow && $allow[0]['data'] != $r[0]['last-child']) {
-                                               $r = q("UPDATE `item` SET `last-child` = %d, `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                       if(($allow) && ($allow[0]['data'] != $r[0]['last-child'])) {
+                                               $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
+                                                       dbesc(datetime_convert()),
+                                                       dbesc($parent_uri),
+                                                       intval($importer['importer_uid'])
+                                               );
+                                               $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s'  WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
                                                        intval($allow[0]['data']),
                                                        dbesc(datetime_convert()),
                                                        dbesc($item_id),
@@ -417,7 +600,7 @@ function dfrn_notify_post(&$a) {
                                        }
                                        continue;
                                }
-                               $datarray = get_atom_elements($feed,$item);
+
                                $datarray['parent-uri'] = $parent_uri;
                                $datarray['uid'] = $importer['importer_uid'];
                                $datarray['contact-id'] = $importer['id'];
@@ -425,13 +608,13 @@ function dfrn_notify_post(&$a) {
                                        $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.
                        
                                if(($datarray['type'] != 'activity') && ($importer['notify-flags'] & NOTIFY_COMMENT)) {
 
-                                       $myconv = q("SELECT `author-link` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+                                       $myconv = q("SELECT `author-link`, `author-avatar` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
                                                dbesc($parent_uri),
                                                intval($importer['importer_uid'])
                                        );
@@ -440,22 +623,64 @@ function dfrn_notify_post(&$a) {
                                                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']);
-                                                       $tpl = load_view_file('view/cmnt_received_eml.tpl');    
-                                                       $email_tpl = replace_macros($tpl, array(
-                                                               '$sitename' => $a->config['sitename'],
-                                                               '$siteurl' =>  $a->get_baseurl(),
-                                                               '$username' => $importer['username'],
-                                                               '$email' => $importer['email'],
-                                                               '$from' => $from,
-                                                               '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r,
-                                                               '$body' => strip_tags(bbcode(stripslashes($datarray['body'])))
+                                                       
+                                                       // name of the automated email sender
+                                                       $msg['notificationfromname']    = stripslashes($datarray['author-name']);;
+                                                       // noreply address to send from
+                                                       $msg['notificationfromemail']   = t('noreply') . '@' . $a->get_hostname();                              
+
+                                                       // text version
+                                                       // process the message body to display properly in text mode
+                                                       $msg['textversion']
+                                                               = html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8');
+                               
+                                                       // html version
+                                                       // process the message body to display properly in text mode
+                                                       $msg['htmlversion']     
+                                                               = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body']))));
+
+                                                       // 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'                => $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'] . '/' . $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'                => $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'] . '/' . $posted_id,
                                                        ));
 
-                                                       $res = mail($importer['email'], $from . t(" commented on an item at ") 
-                                                               . $a->config['sitename'],
-                                                               $email_tpl,t("From: Administrator@") . $a->get_hostname() );
+                                                       // use the EmailNotification library to send the message
+                                                       require_once("include/EmailNotification.php");
+                                                       EmailNotification::sendTextHtmlEmail(
+                                                               $msg['notificationfromname'],
+                                                               t("Administrator@") . $a->get_hostname(),
+                                                               t("noreply") . '@' . $a->get_hostname(),
+                                                               $importer['email'],
+                                                               sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
+                                                               $email_html_body_tpl,
+                                                               $email_text_body_tpl
+                                                       );
+                                                       pop_lang();
                                                        break;
                                                }
                                        }
@@ -463,18 +688,56 @@ function dfrn_notify_post(&$a) {
                                continue;
                        }
                }
+
                else {
+
                        // Head post of a conversation. Have we seen it? If not, import it.
 
-                       $item_id = $item->get_id();
-                       $r = q("SELECT `uid`, `last-child`, `edited` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+
+                       $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'])
                        );
+
+                       // Update content if 'updated' changes
+
                        if(count($r)) {
+                               if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+                                       $r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                               dbesc($datarray['body']),
+                                               dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
+                                               dbesc($item_id),
+                                               intval($importer['importer_uid'])
+                                       );
+                               }
+
+                               // update last-child if it changes
+
                                $allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
                                if($allow && $allow[0]['data'] != $r[0]['last-child']) {
-                                       $r = q("UPDATE `item` SET `last-child` = %d, `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                       $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
                                                intval($allow[0]['data']),
                                                dbesc(datetime_convert()),
                                                dbesc($item_id),
@@ -484,8 +747,12 @@ function dfrn_notify_post(&$a) {
                                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 = get_atom_elements($feed,$item);
                        $datarray['parent-uri'] = $item_id;
                        $datarray['uid'] = $importer['importer_uid'];
                        $datarray['contact-id'] = $importer['id'];