X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=70abce584547ea3986a25b2d6f89029dc0c99408;hb=99244d33f504349e4e11e5d3a6d0a3c505f12fee;hp=39c739a2bb591732fabf63e287bc73f1ed2309bf;hpb=4a22710b3bd82143ab4e012e84d995d3768f7c50;p=friendica.git

diff --git a/include/enotify.php b/include/enotify.php
index 39c739a2bb..70abce5845 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -27,6 +27,25 @@ function notification($params)
 {
 	$a = get_app();
 
+	// Temporary logging for finding the origin
+	if (!isset($params['language']) || !isset($params['uid'])) {
+		logger('Missing parameters.' . System::callstack());
+	}
+
+	// Ensure that the important fields are set at any time
+	$fields = ['notify-flags', 'language', 'username', 'email'];
+	$user = DBA::selectFirst('user', $fields, ['uid' => $params['uid']]);
+
+	if (!DBA::isResult($user)) {
+		logger('Unknown user ' . $params['uid']);
+		return;
+	}
+
+	$params['notify_flags'] = defaults($params, 'notify_flags', $user['notify-flags']);
+	$params['language'] = defaults($params, 'language', $user['language']);
+	$params['to_name'] = defaults($params, 'to_name', $user['username']);
+	$params['to_email'] = defaults($params, 'to_email', $user['email']);
+
 	// from here on everything is in the recipients language
 	L10n::pushLang($params['language']);
 
@@ -57,8 +76,10 @@ function notification($params)
 		if (!DBA::isResult($user) || in_array($user["page-flags"], [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP])) {
 			return;
 		}
+		$nickname = $user["nickname"];
+	} else {
+		$nickname = '';
 	}
-	$nickname = $user["nickname"];
 
 	// with $params['show_in_notification_page'] == false, the notification isn't inserted into
 	// the database, and an email is sent if applicable.
@@ -93,8 +114,11 @@ function notification($params)
 		$parent_id = 0;
 	}
 
+	$epreamble = '';
+
 	if ($params['type'] == NOTIFY_MAIL) {
 		$itemlink = $siteurl.'/message/'.$params['item']['id'];
+		$params["link"] = $itemlink;
 
 		$subject = L10n::t('[Friendica:Notify] New mail received at %s', $sitename);
 
@@ -107,7 +131,7 @@ function notification($params)
 	}
 
 	if ($params['type'] == NOTIFY_COMMENT) {
-		$thread = DBA::selectFirst('thread', ['ignored'], ['iid' => $parent_id]);
+		$thread = Item::selectFirstThreadForUser($params['uid'] ,['ignored'], ['iid' => $parent_id]);
 		if (DBA::isResult($thread) && $thread["ignored"]) {
 			logger("Thread ".$parent_id." will be ignored", LOGGER_DEBUG);
 			return;
@@ -115,14 +139,9 @@ function notification($params)
 
 		// 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 = q("SELECT `id` FROM `notify` WHERE `type` IN (%d, %d, %d) AND `link` = '%s' AND `uid` = %d LIMIT 1",
-			intval(NOTIFY_TAGSELF),
-			intval(NOTIFY_COMMENT),
-			intval(NOTIFY_SHARE),
-			DBA::escape($params['link']),
-			intval($params['uid'])
-		);
-		if ($p && count($p)) {
+		$condition = ['type' => [NOTIFY_TAGSELF, NOTIFY_COMMENT, NOTIFY_SHARE],
+			'link' => $params['link'], 'uid' => $params['uid']];
+		if (DBA::exists('notify', $condition)) {
 			L10n::popLang();
 			return;
 		}
@@ -436,9 +455,7 @@ function notification($params)
 		do {
 			$dups = false;
 			$hash = random_string();
-			$r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1",
-				DBA::escape($hash));
-			if (DBA::isResult($r)) {
+			if (DBA::exists('notify', ['hash' => $hash])) {
 				$dups = true;
 			}
 		} while ($dups == true);
@@ -468,33 +485,14 @@ function notification($params)
 		}
 
 		// create notification entry in DB
-		q("INSERT INTO `notify` (`hash`, `name`, `url`, `photo`, `date`, `uid`, `link`, `iid`, `parent`, `type`, `verb`, `otype`, `name_cache`)
-			values('%s', '%s', '%s', '%s', '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s')",
-			DBA::escape($datarray['hash']),
-			DBA::escape($datarray['name']),
-			DBA::escape($datarray['url']),
-			DBA::escape($datarray['photo']),
-			DBA::escape($datarray['date']),
-			intval($datarray['uid']),
-			DBA::escape($datarray['link']),
-			intval($datarray['iid']),
-			intval($datarray['parent']),
-			intval($datarray['type']),
-			DBA::escape($datarray['verb']),
-			DBA::escape($datarray['otype']),
-			DBA::escape($datarray["name_cache"])
-		);
+		$fields = ['hash' => $datarray['hash'], 'name' => $datarray['name'], 'url' => $datarray['url'],
+			'photo' => $datarray['photo'], 'date' => $datarray['date'], 'uid' => $datarray['uid'],
+			'link' => $datarray['link'], 'iid' => $datarray['iid'], 'parent' => $datarray['parent'],
+			'type' => $datarray['type'], 'verb' => $datarray['verb'], 'otype' => $datarray['otype'],
+			'name_cache' => $datarray["name_cache"]];
+		DBA::insert('notify', $fields);
 
-		$r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' AND `uid` = %d LIMIT 1",
-			DBA::escape($hash),
-			intval($params['uid'])
-		);
-		if ($r) {
-			$notify_id = $r[0]['id'];
-		} else {
-			L10n::popLang();
-			return False;
-		}
+		$notify_id = DBA::lastInsertId();
 
 		// 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
@@ -519,12 +517,10 @@ function notification($params)
 		$itemlink = System::baseUrl().'/notify/view/'.$notify_id;
 		$msg = replace_macros($epreamble, ['$itemlink' => $itemlink]);
 		$msg_cache = format_notification_message($datarray['name_cache'], strip_tags(BBCode::convert($msg)));
-		q("UPDATE `notify` SET `msg` = '%s', `msg_cache` = '%s' WHERE `id` = %d AND `uid` = %d",
-			DBA::escape($msg),
-			DBA::escape($msg_cache),
-			intval($notify_id),
-			intval($params['uid'])
-		);
+
+		$fields = ['msg' => $msg, 'msg_cache' => $msg_cache];
+		$condition = ['id' => $notify_id, 'uid' => $params['uid']];
+		DBA::update('notify', $fields, $condition);
 	}
 
 	// send email notification if notification preferences permit
@@ -538,21 +534,12 @@ function notification($params)
 			$id_for_parent = $params['parent']."@".$hostname;
 
 			// Is this the first email notification for this parent item and user?
-
-			$r = q("SELECT `id` FROM `notify-threads` WHERE `master-parent-item` = %d AND `receiver-uid` = %d LIMIT 1",
-				intval($params['parent']),
-				intval($params['uid']));
-
-			// If so, create the record of it and use a message-id smtp header.
-
-			if (!$r) {
+			if (!DBA::exists('notify-threads', ['master-parent-item' => $params['parent'], 'receiver-uid' => $params['uid']])) {
 				logger("notify_id:".intval($notify_id).", parent: ".intval($params['parent'])."uid: ".intval($params['uid']), LOGGER_DEBUG);
-				q("INSERT INTO `notify-threads` (`notify-id`, `master-parent-item`, `receiver-uid`, `parent-item`)
-					values(%d, %d, %d, %d)",
-					intval($notify_id),
-					intval($params['parent']),
-					intval($params['uid']),
-					0);
+
+				$fields = ['notify-id' => $notify_id, 'master-parent-item' => $params['parent'],
+					'receiver-uid' => $params['uid'], 'parent-item' => 0];
+				DBA::insert('notify-threads', $fields);
 
 				$additional_mail_header .= "Message-ID: <${id_for_parent}>\n";
 				$log_msg = "include/enotify: No previous notification found for this parent:\n".
@@ -561,7 +548,7 @@ function notification($params)
 			} else {
 				// If not, just "follow" the thread.
 				$additional_mail_header .= "References: <${id_for_parent}>\nIn-Reply-To: <${id_for_parent}>\n";
-				logger("There's already a notification for this parent:\n".print_r($r, true), LOGGER_DEBUG);
+				logger("There's already a notification for this parent.", LOGGER_DEBUG);
 			}
 		}
 
@@ -576,11 +563,11 @@ function notification($params)
 		$datarray['siteurl'] = $siteurl;
 		$datarray['type'] = $params['type'];
 		$datarray['parent'] = $parent_id;
-		$datarray['source_name'] = $params['source_name'];
-		$datarray['source_link'] = $params['source_link'];
-		$datarray['source_photo'] = $params['source_photo'];
+		$datarray['source_name'] = defaults($params, 'source_name', '');
+		$datarray['source_link'] = defaults($params, 'source_link', '');
+		$datarray['source_photo'] = defaults($params, 'source_photo', '');
 		$datarray['uid'] = $params['uid'];
-		$datarray['username'] = $params['to_name'];
+		$datarray['username'] = defaults($params, 'to_name', '');
 		$datarray['hsitelink'] = $hsitelink;
 		$datarray['tsitelink'] = $tsitelink;
 		$datarray['hitemlink'] = '<a href="'.$itemlink.'">'.$itemlink.'</a>';
@@ -688,7 +675,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 
 	$profiles = $notification_data["profiles"];
 
-	$fields = ['notify-flags', 'language', 'username', 'email', 'nickname'];
+	$fields = ['nickname'];
 	$user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
 	if (!DBA::isResult($user)) {
 		return false;
@@ -735,8 +722,6 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 		$contacts[] = $contact['id'];
 	}
 
-	$contact_list = implode(',', $contacts);
-
 	DBA::close($ret);
 
 	// Only act if it is a "real" post
@@ -753,10 +738,6 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 	// Generate the notification array
 	$params = [];
 	$params["uid"] = $uid;
-	$params["notify_flags"] = $user["notify-flags"];
-	$params["language"] = $user["language"];
-	$params["to_name"] = $user["username"];
-	$params["to_email"] = $user["email"];
 	$params["item"] = $item;
 	$params["parent"] = $item["parent"];
 	$params["link"] = System::baseUrl().'/display/'.urlencode($item["guid"]);
@@ -803,20 +784,26 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 		$params["verb"] = ACTIVITY_TAG;
 	}
 
-	// Is it a post that the user had started or where he interacted?
-	$parent = q("SELECT `thread`.`iid` FROM `thread` INNER JOIN `item` ON `item`.`parent` = `thread`.`iid`
-			WHERE `thread`.`iid` = %d AND NOT `thread`.`ignored` AND
-				(`thread`.`mention` OR `item`.`author-id` IN ($contact_list))
-			LIMIT 1",
-			intval($item["parent"]));
+	// Is it a post that the user had started?
+	$fields = ['ignored', 'mention'];
+	$thread = Item::selectFirstThreadForUser($params['uid'], $fields, ['iid' => $item["parent"]]);
+
+	if ($thread['mention'] && !$thread['ignored'] && !isset($params["type"])) {
+		$params["type"] = NOTIFY_COMMENT;
+		$params["verb"] = ACTIVITY_POST;
+	}
+
+	// And now we check for participation of one of our contacts in the thread
+	$condition = ['parent' => $item["parent"], 'author-id' => $contacts];
 
-	if ($parent && !isset($params["type"])) {
+	if (!$thread['ignored'] && !isset($params["type"]) && Item::exists($condition)) {
 		$params["type"] = NOTIFY_COMMENT;
 		$params["verb"] = ACTIVITY_POST;
 	}
 
-	if (isset($params["type"]))
+	if (isset($params["type"])) {
 		notification($params);
+	}
 }
 
 /**