X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=06542bbaf24708f507448f88f817cc9c6aa4c755;hb=7789ea25079801ee1425368e9bf2f7ce80d16d88;hp=f04bdaecd72dfb4284ce5cd7e68169655e93da7b;hpb=fc2340d4afe6466c58e35afd64fe9010bf185b04;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index f04bdaecd7..06542bbaf2 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -29,7 +29,6 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Mail;
-use Friendica\Model\Notify\Type;
 use Friendica\Module\Security\Login;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
@@ -74,7 +73,7 @@ function message_post(App $a)
 	$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['messageto']) ? intval($_REQUEST['messageto'])                  : 0;
+	$recipient = !empty($_REQUEST['recipient']) ? intval($_REQUEST['recipient'])                  : 0;
 
 	$ret = Mail::send($recipient, $body, $subject, $replyto);
 	$norecip = false;
@@ -141,36 +140,6 @@ function message_content(App $a)
 			return;
 		}
 
-		// Check if we should do HTML-based delete confirmation
-		if (!empty($_REQUEST['confirm'])) {
-			// <form> can't take arguments in its "action" parameter
-			// so add any arguments as hidden inputs
-			$query = explode_querystring(DI::args()->getQueryString());
-			$inputs = [];
-			foreach ($query['args'] as $arg) {
-				if (strpos($arg, 'confirm=') === false) {
-					$arg_parts = explode('=', $arg);
-					$inputs[] = ['name' => $arg_parts[0], 'value' => $arg_parts[1]];
-				}
-			}
-
-			//DI::page()['aside'] = '';
-			return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
-				'$method' => 'get',
-				'$message' => DI::l10n()->t('Do you really want to delete this message?'),
-				'$extra_inputs' => $inputs,
-				'$confirm' => DI::l10n()->t('Yes'),
-				'$confirm_url' => $query['base'],
-				'$confirm_name' => 'confirmed',
-				'$cancel' => DI::l10n()->t('Cancel'),
-			]);
-		}
-
-		// Now check how the user responded to the confirmation query
-		if (!empty($_REQUEST['canceled'])) {
-			DI::baseUrl()->redirect('message');
-		}
-
 		$cmd = $a->argv[1];
 		if ($cmd === 'drop') {
 			$message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
@@ -215,50 +184,14 @@ function message_content(App $a)
 			'$linkurl' => DI::l10n()->t('Please enter a link URL:')
 		]);
 
-		$preselect = isset($a->argv[2]) ? [$a->argv[2]] : [];
-
-		$prename = $preurl = $preid = '';
-
-		if ($preselect) {
-			$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `id` = %d LIMIT 1",
-				intval(local_user()),
-				intval($a->argv[2])
-			);
-			if (!DBA::isResult($r)) {
-				$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
-					intval(local_user()),
-					DBA::escape(Strings::normaliseLink(base64_decode($a->argv[2])))
-				);
-			}
-
-			if (!DBA::isResult($r)) {
-				$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
-					intval(local_user()),
-					DBA::escape(base64_decode($a->argv[2]))
-				);
-			}
+		$recipientId = $a->argv[2] ?? null;
 
-			if (DBA::isResult($r)) {
-				$prename = $r[0]['name'];
-				$preid = $r[0]['id'];
-				$preselect = [$preid];
-			} else {
-				$preselect = [];
-			}
-		}
-
-		$prefill = $preselect ? $prename : '';
-
-		// the ugly select box
-		$select = ACL::getMessageContactSelectHTML('messageto', 'message-to-select', $preselect, 4, 10);
+		$select = ACL::getMessageContactSelectHTML($recipientId);
 
 		$tpl = Renderer::getMarkupTemplate('prv_message.tpl');
 		$o .= Renderer::replaceMacros($tpl, [
 			'$header'     => DI::l10n()->t('Send Private Message'),
 			'$to'         => DI::l10n()->t('To:'),
-			'$showinputs' => 'true',
-			'$prefill'    => $prefill,
-			'$preid'      => $preid,
 			'$subject'    => DI::l10n()->t('Subject:'),
 			'$subjtxt'    => $_REQUEST['subject'] ?? '',
 			'$text'       => $_REQUEST['body'] ?? '',
@@ -348,7 +281,6 @@ 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('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['id'], 'uid' => local_user()]);
 		} else {
 			$messages = false;
 		}
@@ -399,7 +331,7 @@ function message_content(App $a)
 				'id' => $message['id'],
 				'from_name' => $from_name_e,
 				'from_url' => $from_url,
-				'from_addr' => $contact['addr'],
+				'from_addr' => $contact['addr'] ?? $from_url,
 				'sparkle' => $sparkle,
 				'from_photo' => $from_photo,
 				'subject' => $subject_e,
@@ -413,7 +345,7 @@ function message_content(App $a)
 			$seen = $message['seen'];
 		}
 
-		$select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
+		$select = $message['name'] . '<input type="hidden" name="recipient" value="' . $contact_id . '" />';
 		$parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
 
 		$tpl = Renderer::getMarkupTemplate('mail_display.tpl');
@@ -429,7 +361,6 @@ function message_content(App $a)
 			// reply
 			'$header' => DI::l10n()->t('Send Reply'),
 			'$to' => DI::l10n()->t('To:'),
-			'$showinputs' => '',
 			'$subject' => DI::l10n()->t('Subject:'),
 			'$subjtxt' => $message['title'],
 			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
@@ -453,7 +384,7 @@ function message_content(App $a)
  * @param int $limit
  * @return array
  */
-function get_messages($uid, $start, $limit)
+function get_messages(int $uid, int $start, int $limit)
 {
 	return DBA::toArray(DBA::p('SELECT
 			m.`id`,
@@ -520,6 +451,11 @@ function render_messages(array $msg, $t)
 		$body_e = $rr['body'];
 		$to_name_e = $rr['name'];
 
+		if (is_null($rr['url'])) {
+			// contact-id is pointing to a non existing contact
+			continue;
+		}
+
 		$contact = Contact::getByURL($rr['url'], false, ['thumb', 'addr', 'id', 'avatar']);
 		$from_photo = Contact::getThumb($contact, $rr['thumb'] ?: $rr['from-photo']);