X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=b87b159eb68ff040b9c324216eab3083c9df6310;hb=39d8fec290613cac87c2821b9f7b20fa94d319ca;hp=51099147623dfafe89ee539394ab8d775d73235d;hpb=a54278649f73f1562a89c8e57e9018d9dcf4d9db;p=friendica.git

diff --git a/include/enotify.php b/include/enotify.php
index 5109914762..b87b159eb6 100644
--- 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'])
 		);
@@ -297,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",
@@ -308,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');
@@ -324,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)",
@@ -469,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}\"";
 
@@ -491,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);
 	}
 }