X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=726db0a754a6002d9b110726e80120895e958899;hb=ec54b303c5fd25ff95e6a819db2693acc6218b40;hp=7324840a0e3acb4d1183246dd673416f27e9a960;hpb=eea355ae3b3d0c9a47fa6153f3a73b4b29cd81ac;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index 7324840a0e..726db0a754 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -39,58 +39,61 @@ function message_init(App $a)
 	$tabs = '';
 
 	if (DI::args()->getArgc() > 1 && is_numeric(DI::args()->getArgv()[1])) {
-		$tabs = render_messages(get_messages(local_user(), 0, 5), 'mail_list.tpl');
+		$tabs = render_messages(get_messages(DI::userSession()->getLocalUserId(), 0, 5), 'mail_list.tpl');
 	}
 
 	$new = [
-		'label' => DI::l10n()->t('New Message'),
-		'url' => 'message/new',
-		'sel' => DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'new',
+		'label'     => DI::l10n()->t('New Message'),
+		'url'       => 'message/new',
+		'sel'       => DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'new',
 		'accesskey' => 'm',
 	];
 
 	$tpl = Renderer::getMarkupTemplate('message_side.tpl');
 	DI::page()['aside'] = Renderer::replaceMacros($tpl, [
 		'$tabs' => $tabs,
-		'$new' => $new,
+		'$new'  => $new,
 	]);
 	$base = DI::baseUrl();
 
 	$head_tpl = Renderer::getMarkupTemplate('message-head.tpl');
 	DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
 		'$baseurl' => DI::baseUrl()->get(true),
-		'$base' => $base
+		'$base'    => $base
 	]);
 }
 
 function message_post(App $a)
 {
-	if (!local_user()) {
-		notice(DI::l10n()->t('Permission denied.'));
+	if (!DI::userSession()->getLocalUserId()) {
+		DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
 		return;
 	}
 
-	$replyto   = !empty($_REQUEST['replyto'])   ? Strings::escapeTags(trim($_REQUEST['replyto'])) : '';
-	$subject   = !empty($_REQUEST['subject'])   ? Strings::escapeTags(trim($_REQUEST['subject'])) : '';
-	$body      = !empty($_REQUEST['body'])      ? Strings::escapeHtml(trim($_REQUEST['body']))    : '';
-	$recipient = !empty($_REQUEST['recipient']) ? intval($_REQUEST['recipient'])                  : 0;
+	$replyto   = !empty($_REQUEST['replyto'])   ? trim($_REQUEST['replyto'])                   : '';
+	$subject   = !empty($_REQUEST['subject'])   ? trim($_REQUEST['subject'])                   : '';
+	$body      = !empty($_REQUEST['body'])      ? Strings::escapeHtml(trim($_REQUEST['body'])) : '';
+	$recipient = !empty($_REQUEST['recipient']) ? intval($_REQUEST['recipient'])               : 0;
 
 	$ret = Mail::send($recipient, $body, $subject, $replyto);
 	$norecip = false;
 
 	switch ($ret) {
 		case -1:
-			notice(DI::l10n()->t('No recipient selected.'));
+			DI::sysmsg()->addNotice(DI::l10n()->t('No recipient selected.'));
 			$norecip = true;
 			break;
+
 		case -2:
-			notice(DI::l10n()->t('Unable to locate contact information.'));
+			DI::sysmsg()->addNotice(DI::l10n()->t('Unable to locate contact information.'));
 			break;
+
 		case -3:
-			notice(DI::l10n()->t('Message could not be sent.'));
+			DI::sysmsg()->addNotice(DI::l10n()->t('Message could not be sent.'));
 			break;
+
 		case -4:
-			notice(DI::l10n()->t('Message collection failure.'));
+			DI::sysmsg()->addNotice(DI::l10n()->t('Message collection failure.'));
 			break;
 	}
 
@@ -107,8 +110,8 @@ function message_content(App $a)
 	$o = '';
 	Nav::setSelected('messages');
 
-	if (!local_user()) {
-		notice(DI::l10n()->t('Permission denied.'));
+	if (!DI::userSession()->getLocalUserId()) {
+		DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
 		return Login::form();
 	}
 
@@ -118,20 +121,20 @@ function message_content(App $a)
 	if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'new') {
 		$button = [
 			'label' => DI::l10n()->t('Discard'),
-			'url' => '/message',
-			'sel' => 'close',
+			'url'   => '/message',
+			'sel'   => 'close',
 		];
 	} else {
 		$button = [
-			'label' => DI::l10n()->t('New Message'),
-			'url' => '/message/new',
-			'sel' => 'new',
+			'label'     => DI::l10n()->t('New Message'),
+			'url'       => '/message/new',
+			'sel'       => 'new',
 			'accesskey' => 'm',
 		];
 	}
 	$header = Renderer::replaceMacros($tpl, [
 		'$messages' => DI::l10n()->t('Messages'),
-		'$button' => $button,
+		'$button'   => $button,
 	]);
 
 	if ((DI::args()->getArgc() == 3) && (DI::args()->getArgv()[1] === 'drop' || DI::args()->getArgv()[1] === 'dropconv')) {
@@ -141,29 +144,29 @@ function message_content(App $a)
 
 		$cmd = DI::args()->getArgv()[1];
 		if ($cmd === 'drop') {
-			$message = DBA::selectFirst('mail', ['convid'], ['id' => DI::args()->getArgv()[2], 'uid' => local_user()]);
+			$message = DBA::selectFirst('mail', ['convid'], ['id' => DI::args()->getArgv()[2], 'uid' => DI::userSession()->getLocalUserId()]);
 			if(!DBA::isResult($message)){
-				notice(DI::l10n()->t('Conversation not found.'));
+				DI::sysmsg()->addNotice(DI::l10n()->t('Conversation not found.'));
 				DI::baseUrl()->redirect('message');
 			}
 
-			if (!DBA::delete('mail', ['id' => DI::args()->getArgv()[2], 'uid' => local_user()])) {
-				notice(DI::l10n()->t('Message was not deleted.'));
+			if (!DBA::delete('mail', ['id' => DI::args()->getArgv()[2], 'uid' => DI::userSession()->getLocalUserId()])) {
+				DI::sysmsg()->addNotice(DI::l10n()->t('Message was not deleted.'));
 			}
 
-			$conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]);
+			$conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => DI::userSession()->getLocalUserId()]);
 			if(!DBA::isResult($conversation)){
 				DI::baseUrl()->redirect('message');
 			}
 
 			DI::baseUrl()->redirect('message/' . $conversation['id'] );
 		} else {
-			$parentmail = DBA::selectFirst('mail', ['parent-uri'], ['id' => DI::args()->getArgv()[2], 'uid' => local_user()]);
+			$parentmail = DBA::selectFirst('mail', ['parent-uri'], ['id' => DI::args()->getArgv()[2], 'uid' => DI::userSession()->getLocalUserId()]);
 			if (DBA::isResult($parentmail)) {
 				$parent = $parentmail['parent-uri'];
 
-				if (!DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
-					notice(DI::l10n()->t('Conversation was not removed.'));
+				if (!DBA::delete('mail', ['parent-uri' => $parent, 'uid' => DI::userSession()->getLocalUserId()])) {
+					DI::sysmsg()->addNotice(DI::l10n()->t('Conversation was not removed.'));
 				}
 			}
 			DI::baseUrl()->redirect('message');
@@ -186,19 +189,19 @@ function message_content(App $a)
 
 		$tpl = Renderer::getMarkupTemplate('prv_message.tpl');
 		$o .= Renderer::replaceMacros($tpl, [
-			'$header'     => DI::l10n()->t('Send Private Message'),
-			'$to'         => DI::l10n()->t('To:'),
-			'$subject'    => DI::l10n()->t('Subject:'),
-			'$subjtxt'    => $_REQUEST['subject'] ?? '',
-			'$text'       => $_REQUEST['body'] ?? '',
-			'$readonly'   => '',
-			'$yourmessage'=> DI::l10n()->t('Your message:'),
-			'$select'     => $select,
-			'$parent'     => '',
-			'$upload'     => DI::l10n()->t('Upload photo'),
-			'$insert'     => DI::l10n()->t('Insert web link'),
-			'$wait'       => DI::l10n()->t('Please wait'),
-			'$submit'     => DI::l10n()->t('Submit')
+			'$header'      => DI::l10n()->t('Send Private Message'),
+			'$to'          => DI::l10n()->t('To:'),
+			'$subject'     => DI::l10n()->t('Subject:'),
+			'$subjtxt'     => $_REQUEST['subject'] ?? '',
+			'$text'        => $_REQUEST['body'] ?? '',
+			'$readonly'    => '',
+			'$yourmessage' => DI::l10n()->t('Your message:'),
+			'$select'      => $select,
+			'$parent'      => '',
+			'$upload'      => DI::l10n()->t('Upload photo'),
+			'$insert'      => DI::l10n()->t('Insert web link'),
+			'$wait'        => DI::l10n()->t('Please wait'),
+			'$submit'      => DI::l10n()->t('Submit')
 		]);
 		return $o;
 	}
@@ -212,21 +215,14 @@ function message_content(App $a)
 
 		$o .= $header;
 
-		$total = 0;
-		$r = q("SELECT count(*) AS `total`, ANY_VALUE(`created`) AS `created` FROM `mail`
-			WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
-			intval(local_user())
-		);
-		if (DBA::isResult($r)) {
-			$total = $r[0]['total'];
-		}
+		$total = DBA::count('mail', ['uid' => DI::userSession()->getLocalUserId()], ['distinct' => true, 'expression' => 'parent-uri']);
 
 		$pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
-		$r = get_messages(local_user(), $pager->getStart(), $pager->getItemsPerPage());
+		$r = get_messages(DI::userSession()->getLocalUserId(), $pager->getStart(), $pager->getItemsPerPage());
 
 		if (!DBA::isResult($r)) {
-			notice(DI::l10n()->t('No messages.'));
+			DI::sysmsg()->addNotice(DI::l10n()->t('No messages.'));
 			return $o;
 		}
 
@@ -247,14 +243,14 @@ function message_content(App $a)
 			LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
 			WHERE `mail`.`uid` = ? AND `mail`.`id` = ?
 			LIMIT 1",
-			local_user(),
+			DI::userSession()->getLocalUserId(),
 			DI::args()->getArgv()[1]
 		);
 		if (DBA::isResult($message)) {
 			$contact_id = $message['contact-id'];
 
 			$params = [
-				local_user(),
+				DI::userSession()->getLocalUserId(),
 				$message['parent-uri']
 			];
 
@@ -276,13 +272,13 @@ function message_content(App $a)
 
 			$messages = DBA::toArray($messages_stmt);
 
-			DBA::update('mail', ['seen' => 1], ['parent-uri' => $message['parent-uri'], 'uid' => local_user()]);
+			DBA::update('mail', ['seen' => 1], ['parent-uri' => $message['parent-uri'], 'uid' => DI::userSession()->getLocalUserId()]);
 		} else {
 			$messages = false;
 		}
 
 		if (!DBA::isResult($messages)) {
-			notice(DI::l10n()->t('Message not available.'));
+			DI::sysmsg()->addNotice(DI::l10n()->t('Message not available.'));
 			return $o;
 		}
 
@@ -315,22 +311,22 @@ function message_content(App $a)
 			$body_e = BBCode::convertForUriId($message['uri-id'], $message['body']);
 			$to_name_e = $message['name'];
 
-			$contact = Contact::getByURL($message['from-url'], false, ['thumb', 'addr', 'id', 'avatar']);
+			$contact = Contact::getByURL($message['from-url'], false, ['thumb', 'addr', 'id', 'avatar', 'url']);
 			$from_photo = Contact::getThumb($contact);
 
 			$mails[] = [
-				'id' => $message['id'],
-				'from_name' => $from_name_e,
-				'from_url' => $from_url,
-				'from_addr' => $contact['addr'] ?? $from_url,
-				'sparkle' => $sparkle,
+				'id'         => $message['id'],
+				'from_name'  => $from_name_e,
+				'from_url'   => $from_url,
+				'from_addr'  => $contact['addr'] ?? $from_url,
+				'sparkle'    => $sparkle,
 				'from_photo' => $from_photo,
-				'subject' => $subject_e,
-				'body' => $body_e,
-				'delete' => DI::l10n()->t('Delete message'),
-				'to_name' => $to_name_e,
-				'date' => DateTimeFormat::local($message['created'], DI::l10n()->t('D, d M Y - g:i A')),
-				'ago' => Temporal::getRelativeDate($message['created']),
+				'subject'    => $subject_e,
+				'body'       => $body_e,
+				'delete'     => DI::l10n()->t('Delete message'),
+				'to_name'    => $to_name_e,
+				'date'       => DateTimeFormat::local($message['created'], DI::l10n()->t('D, d M Y - g:i A')),
+				'ago'        => Temporal::getRelativeDate($message['created']),
 			];
 
 			$seen = $message['seen'];
@@ -341,28 +337,27 @@ function message_content(App $a)
 
 		$tpl = Renderer::getMarkupTemplate('mail_display.tpl');
 		$o = Renderer::replaceMacros($tpl, [
-			'$thread_id' => DI::args()->getArgv()[1],
+			'$thread_id'      => DI::args()->getArgv()[1],
 			'$thread_subject' => $message['title'],
-			'$thread_seen' => $seen,
-			'$delete' => DI::l10n()->t('Delete conversation'),
-			'$canreply' => (($unknown) ? false : '1'),
-			'$unknown_text' => DI::l10n()->t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),
-			'$mails' => $mails,
-
+			'$thread_seen'    => $seen,
+			'$delete'         => DI::l10n()->t('Delete conversation'),
+			'$canreply'       => (($unknown) ? false : '1'),
+			'$unknown_text'   => DI::l10n()->t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),
+			'$mails'          => $mails,
 			// reply
-			'$header' => DI::l10n()->t('Send Reply'),
-			'$to' => DI::l10n()->t('To:'),
-			'$subject' => DI::l10n()->t('Subject:'),
-			'$subjtxt' => $message['title'],
-			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
-			'$yourmessage' => DI::l10n()->t('Your message:'),
-			'$text' => '',
-			'$select' => $select,
-			'$parent' => $parent,
-			'$upload' => DI::l10n()->t('Upload photo'),
-			'$insert' => DI::l10n()->t('Insert web link'),
-			'$submit' => DI::l10n()->t('Submit'),
-			'$wait' => DI::l10n()->t('Please wait')
+			'$header'         => DI::l10n()->t('Send Reply'),
+			'$to'             => DI::l10n()->t('To:'),
+			'$subject'        => DI::l10n()->t('Subject:'),
+			'$subjtxt'        => $message['title'],
+			'$readonly'       => ' readonly="readonly" style="background: #BBBBBB;" ',
+			'$yourmessage'    => DI::l10n()->t('Your message:'),
+			'$text'           => '',
+			'$select'         => $select,
+			'$parent'         => $parent,
+			'$upload'         => DI::l10n()->t('Upload photo'),
+			'$insert'         => DI::l10n()->t('Insert web link'),
+			'$submit'         => DI::l10n()->t('Submit'),
+			'$wait'           => DI::l10n()->t('Please wait')
 		]);
 
 		return $o;
@@ -375,7 +370,7 @@ function message_content(App $a)
  * @param int $limit
  * @return array
  */
-function get_messages(int $uid, int $start, int $limit)
+function get_messages(int $uid, int $start, int $limit): array
 {
 	return DBA::toArray(DBA::p('SELECT
 			m.`id`,
@@ -399,21 +394,21 @@ function get_messages(int $uid, int $start, int $limit)
 			c.`url`,
 			c.`thumb`,
 			c.`network`,
-       		m2.`count`,
-       		m2.`mailcreated`,
-       		m2.`mailseen`
-       	FROM `mail` m
-       	JOIN (
-       		SELECT
-       			`parent-uri`,
-       		    MIN(`id`)      AS `id`,
-       		    COUNT(*)       AS `count`,
-       		    MAX(`created`) AS `mailcreated`,
-       		    MIN(`seen`)    AS `mailseen`
-       		FROM `mail`
-       		WHERE `uid` = ?
-       		GROUP BY `parent-uri`
-       	) m2 ON m.`parent-uri` = m2.`parent-uri` AND m.`id` = m2.`id`
+			m2.`count`,
+			m2.`mailcreated`,
+			m2.`mailseen`
+		FROM `mail` m
+		JOIN (
+			SELECT
+				`parent-uri`,
+				MIN(`id`)      AS `id`,
+				COUNT(*)       AS `count`,
+				MAX(`created`) AS `mailcreated`,
+				MIN(`seen`)    AS `mailseen`
+			FROM `mail`
+			WHERE `uid` = ?
+			GROUP BY `parent-uri`
+		) m2 ON m.`parent-uri` = m2.`parent-uri` AND m.`id` = m2.`id`
 		LEFT JOIN `contact` c ON m.`contact-id` = c.`id`
 		WHERE m.`uid` = ?
 		ORDER BY m2.`mailcreated` DESC
@@ -421,7 +416,7 @@ function get_messages(int $uid, int $start, int $limit)
 		, $uid, $uid, $start, $limit));
 }
 
-function render_messages(array $msg, $t)
+function render_messages(array $msg, string $t): string
 {
 	$a = DI::app();
 
@@ -447,24 +442,24 @@ function render_messages(array $msg, $t)
 			continue;
 		}
 
-		$contact = Contact::getByURL($rr['url'], false, ['thumb', 'addr', 'id', 'avatar']);
+		$contact = Contact::getByURL($rr['url'], false, ['thumb', 'addr', 'id', 'avatar', 'url']);
 		$from_photo = Contact::getThumb($contact);
 
 		$rslt .= Renderer::replaceMacros($tpl, [
-			'$id' => $rr['id'],
-			'$from_name' => $participants,
-			'$from_url' => Contact::magicLink($rr['url']),
-			'$from_addr' => $contact['addr'] ?? '',
-			'$sparkle' => ' sparkle',
+			'$id'         => $rr['id'],
+			'$from_name'  => $participants,
+			'$from_url'   => Contact::magicLink($rr['url']),
+			'$from_addr'  => $contact['addr'] ?? '',
+			'$sparkle'    => ' sparkle',
 			'$from_photo' => $from_photo,
-			'$subject' => $rr['title'],
-			'$delete' => DI::l10n()->t('Delete conversation'),
-			'$body' => $body_e,
-			'$to_name' => $to_name_e,
-			'$date' => DateTimeFormat::local($rr['mailcreated'], DI::l10n()->t('D, d M Y - g:i A')),
-			'$ago' => Temporal::getRelativeDate($rr['mailcreated']),
-			'$seen' => $rr['mailseen'],
-			'$count' => DI::l10n()->tt('%d message', '%d messages', $rr['count']),
+			'$subject'    => $rr['title'],
+			'$delete'     => DI::l10n()->t('Delete conversation'),
+			'$body'       => $body_e,
+			'$to_name'    => $to_name_e,
+			'$date'       => DateTimeFormat::local($rr['mailcreated'], DI::l10n()->t('D, d M Y - g:i A')),
+			'$ago'        => Temporal::getRelativeDate($rr['mailcreated']),
+			'$seen'       => $rr['mailseen'],
+			'$count'      => DI::l10n()->tt('%d message', '%d messages', $rr['count']),
 		]);
 	}