X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=3ff84a1e6684478b2200d2c552451aad2d2401c3;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=f36b3ffa3b9f5363aeab1c92f40a873fc6151eeb;hpb=d838e6d0ecf2af14735da11f6e16a8831af01269;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index f36b3ffa3b..3ff84a1e66 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -185,7 +185,6 @@ function message_content(App $a)
 			);
 			if (DBA::isResult($r)) {
 				$parent = $r[0]['parent-uri'];
-				$convid = $r[0]['convid'];
 
 				if (DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
 					info(L10n::t('Conversation removed.') . EOL);
@@ -230,7 +229,6 @@ function message_content(App $a)
 
 			if (DBA::isResult($r)) {
 				$prename = $r[0]['name'];
-				$preurl = $r[0]['url'];
 				$preid = $r[0]['id'];
 				$preselect = [$preid];
 			} else {
@@ -303,41 +301,58 @@ function message_content(App $a)
 
 		$o .= $header;
 
-		$r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb`
-			FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
-			WHERE `mail`.`uid` = %d AND `mail`.`id` = %d LIMIT 1",
-			intval(local_user()),
-			intval($a->argv[1])
+		$message = DBA::fetchFirst("
+			SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb`
+			FROM `mail`
+			LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
+			WHERE `mail`.`uid` = ? AND `mail`.`id` = ?
+			LIMIT 1",
+			local_user(),
+			$a->argv[1]
 		);
-		if (DBA::isResult($r)) {
-			$contact_id = $r[0]['contact-id'];
-			$convid = $r[0]['convid'];
-
-			$sql_extra = sprintf(" and `mail`.`parent-uri` = '%s' ", DBA::escape($r[0]['parent-uri']));
-			if ($convid)
-				$sql_extra = sprintf(" and ( `mail`.`parent-uri` = '%s' OR `mail`.`convid` = '%d' ) ",
-					DBA::escape($r[0]['parent-uri']),
-					intval($convid)
-				);
+		if (DBA::isResult($message)) {
+			$contact_id = $message['contact-id'];
 
-			$messages = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb`
-				FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
-				WHERE `mail`.`uid` = %d $sql_extra ORDER BY `mail`.`created` ASC",
-				intval(local_user())
+			$params = [
+				local_user(),
+				$message['parent-uri']
+			];
+
+			if ($message['convid']) {
+				$sql_extra = "AND (`mail`.`parent-uri` = ? OR `mail`.`convid` = ?)";
+				$params[] = $message['convid'];
+			} else {
+				$sql_extra = "AND `mail`.`parent-uri` = ?";
+			}
+			$messages_stmt = DBA::p("
+				SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb`
+				FROM `mail`
+				LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
+				WHERE `mail`.`uid` = ?
+				$sql_extra
+				ORDER BY `mail`.`created` ASC",
+				...$params
 			);
+
+			$messages = DBA::toArray($messages_stmt);
+
+			DBA::update('mail', ['seen' => 1], ['parent-uri' => $message['parent-uri'], 'uid' => local_user()]);
+
+			if ($message['convid']) {
+				// Clear Diaspora private message notifications
+				DBA::update('notify', ['seen' => 1], ['type' => NOTIFY_MAIL, 'parent' => $message['convid'], 'uid' => local_user()]);
+			}
+			// Clear DFRN private message notifications
+			DBA::update('notify', ['seen' => 1], ['type' => NOTIFY_MAIL, 'parent' => $message['parent-uri'], 'uid' => local_user()]);
 		} else {
 			$messages = false;
 		}
+
 		if (!DBA::isResult($messages)) {
 			notice(L10n::t('Message not available.') . EOL);
 			return $o;
 		}
 
-		$r = q("UPDATE `mail` SET `seen` = 1 WHERE `parent-uri` = '%s' AND `uid` = %d",
-			DBA::escape($r[0]['parent-uri']),
-			intval(local_user())
-		);
-
 		$tpl = Renderer::getMarkupTemplate('msg-header.tpl');
 		$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
 			'$baseurl' => System::baseUrl(true),
@@ -350,8 +365,10 @@ function message_content(App $a)
 		$unknown = false;
 
 		foreach ($messages as $message) {
-			if ($message['unknown'])
+			if ($message['unknown']) {
 				$unknown = true;
+			}
+
 			if ($message['from-url'] == $myprofile) {
 				$from_url = $myprofile;
 				$sparkle = '';
@@ -483,7 +500,7 @@ function get_messages($uid, $start, $limit)
 
 function render_messages(array $msg, $t)
 {
-	$a = get_app();
+	$a = \get_app();
 
 	$tpl = Renderer::getMarkupTemplate($t);
 	$rslt = '';