no more googlegroups

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index 814bd06a4ce2501e97da19ac542b8c56eddd6f0a..b87b159eb68ff040b9c324216eab3083c9df6310 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once('include/email.php');
+
 function notification($params) {
 
        logger('notification: entry', LOGGER_DEBUG);
@@ -54,12 +56,13 @@ function notification($params) {
 
                $parent_id = $params['parent'];
 
-               // Check to see if there was already a tag notify for this post.
+               // Check to see if there was already a tag notify or comment notify for this post.
                // If so don't create a second notification
                
                $p = null;
-               $p = q("select id from notify where type = %d and link = '%s' and uid = %d limit 1",
+               $p = q("select id from notify where ( type = %d or type = %d ) and link = '%s' and uid = %d limit 1",
                        intval(NOTIFY_TAGSELF),
+                       intval(NOTIFY_COMMENT),
                        dbesc($params['link']),
                        intval($params['uid'])
                );
@@ -147,6 +150,24 @@ function notification($params) {
                $itemlink =  $params['link'];
        }
 
+       if($params['type'] == NOTIFY_POKE) {
+
+               $subject =      sprintf( t('[Friendica:Notify] %1$s poked you') , $params['source_name']);
+               $preamble = sprintf( t('%1$s poked you at %2$s') , $params['source_name'], $sitename);
+               $epreamble = sprintf( t('%1$s [url=%2$s]poked you[/url].') , 
+                                                               '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]',
+                                                               $params['link']); 
+
+               $subject = str_replace('poked', t($params['activity']), $subject);
+               $preamble = str_replace('poked', t($params['activity']), $preamble);
+               $epreamble = str_replace('poked', t($params['activity']), $epreamble);
+
+               $sitelink = t('Please visit %s to view and/or reply to the conversation.');
+               $tsitelink = sprintf( $sitelink, $siteurl );
+               $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
+               $itemlink =  $params['link'];
+       }
+
        if($params['type'] == NOTIFY_TAGSHARE) {
                $subject =      sprintf( t('[Friendica:Notify] %s tagged your post') , $params['source_name']);
                $preamble = sprintf( t('%1$s tagged your post at %2$s') , $params['source_name'], $sitename);
@@ -279,6 +300,38 @@ function notification($params) {
                return;
        }
 
+       // we seem to have a lot of duplicate comment notifications due to race conditions, mostly from forums
+       // After we've stored everything, look again to see if there are any duplicates and if so remove them
+
+       $p = null;
+       $p = q("select id from notify where ( type = %d or type = %d ) and link = '%s' and uid = %d order by id",
+               intval(NOTIFY_TAGSELF),
+               intval(NOTIFY_COMMENT),
+               dbesc($params['link']),
+               intval($params['uid'])
+       );
+       if($p && (count($p) > 1)) {
+               for ($d = 1; $d < count($p); $d ++) {
+                       q("delete from notify where id = %d limit 1",
+                               intval($p[$d]['id'])
+                       );
+               }
+
+               // only continue on if we stored the first one
+
+               if($notify_id != $p[0]['id']) {
+                       pop_lang();
+                       return;
+               }
+       }
+
+
+
+
+
+
+
+
        $itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id;
        $msg = replace_macros($epreamble,array('$itemlink' => $itemlink));
        $r = q("update notify set msg = '%s' where id = %d and uid = %d limit 1",
@@ -290,7 +343,7 @@ function notification($params) {
 
        // send email notification if notification preferences permit
 
-       require_once('bbcode.php');
+       require_once('include/bbcode.php');
        if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) {
 
                logger('notification: sending notification email');
@@ -306,7 +359,7 @@ function notification($params) {
                // If so, create the record of it and use a message-id smtp header.
 
                if(!$r) {
-                       logger("norify_id:" . intval($notify_id). ", parent: " . intval($params['parent']) . "uid: " . 
+                       logger("notify_id:" . intval($notify_id). ", parent: " . intval($params['parent']) . "uid: " . 
 intval($params['uid']), LOGGER_DEBUG);
                        $r = q("insert into `notify-threads` (`notify-id`, `master-parent-item`, `receiver-uid`, `parent-item`)
                                values(%d,%d,%d,%d)",
@@ -451,8 +504,8 @@ class enotify {
                // generate a multipart/alternative message header
                $messageHeader =
                        $params['additionalMailHeader'] .
-                       "From: {$params['fromName']} <{$params['fromEmail']}>\n" . 
-                       "Reply-To: {$params['fromName']} <{$params['replyTo']}>\n" .
+                       "From: $fromName <{$params['fromEmail']}>\n" . 
+                       "Reply-To: $fromName <{$params['replyTo']}>\n" .
                        "MIME-Version: 1.0\n" .
                        "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\"";
 
@@ -473,10 +526,11 @@ class enotify {
                // send the message
                $res = mail(
                        $params['toEmail'],                                                                             // send to address
-                       $params['messageSubject'],                                                              // subject
+                       $messageSubject,                                                                // subject
                        $multipartMessageBody,                                                  // message body
                        $messageHeader                                                                  // message headers
                );
+               logger("notification: enotify::send header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG);
                logger("notification: enotify::send returns " . $res, LOGGER_DEBUG);
        }
 }