X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fmessage.php;h=85ede744b9c62b2e81b90816ab855f53fc7bc9e6;hb=e9b05bd13f1bf3f74c63202f6f9f9fa2f65f19f1;hp=b812f5cdd5c3a130c4fc1e7f6d57db5a75739646;hpb=acaee626f5f23f4c1dc19c31896a0797a251b58f;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index b812f5cdd5..85ede744b9 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -245,22 +245,22 @@ function message_content(App $a)
 
 		$tpl = Renderer::getMarkupTemplate('prv_message.tpl');
 		$o .= Renderer::replaceMacros($tpl, [
-			'$header' => L10n::t('Send Private Message'),
-			'$to' => L10n::t('To:'),
+			'$header'     => L10n::t('Send Private Message'),
+			'$to'         => L10n::t('To:'),
 			'$showinputs' => 'true',
-			'$prefill' => $prefill,
-			'$preid' => $preid,
-			'$subject' => L10n::t('Subject:'),
-			'$subjtxt' => !empty($_REQUEST['subject']) ? strip_tags($_REQUEST['subject']) : '',
-			'$text' => !empty($_REQUEST['body']) ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : '',
-			'$readonly' => '',
-			'$yourmessage' => L10n::t('Your message:'),
-			'$select' => $select,
-			'$parent' => '',
-			'$upload' => L10n::t('Upload photo'),
-			'$insert' => L10n::t('Insert web link'),
-			'$wait' => L10n::t('Please wait'),
-			'$submit' => L10n::t('Submit')
+			'$prefill'    => $prefill,
+			'$preid'      => $preid,
+			'$subject'    => L10n::t('Subject:'),
+			'$subjtxt'    => defaults($_REQUEST, 'subject', ''),
+			'$text'       => defaults($_REQUEST, 'body', ''),
+			'$readonly'   => '',
+			'$yourmessage'=> L10n::t('Your message:'),
+			'$select'     => $select,
+			'$parent'     => '',
+			'$upload'     => L10n::t('Upload photo'),
+			'$insert'     => L10n::t('Insert web link'),
+			'$wait'       => L10n::t('Please wait'),
+			'$submit'     => L10n::t('Submit')
 		]);
 		return $o;
 	}
@@ -303,41 +303,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 +367,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 = '';
@@ -499,7 +518,6 @@ function render_messages(array $msg, $t)
 			$participants = L10n::t("%s and You", $rr['from-name']);
 		}
 
-		$subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
 		$body_e = $rr['body'];
 		$to_name_e = $rr['name'];
 
@@ -517,7 +535,7 @@ function render_messages(array $msg, $t)
 			'$from_addr' => defaults($contact, 'addr', ''),
 			'$sparkle' => ' sparkle',
 			'$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
-			'$subject' => $subject_e,
+			'$subject' => $rr['title'],
 			'$delete' => L10n::t('Delete conversation'),
 			'$body' => $body_e,
 			'$to_name' => $to_name_e,