X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=dff0531032171f46535739bfb42a4114246dd137;hb=3972fe62fe8afb3791e9d6526e7665501a577b81;hp=ff4998992dc20b03cc768cfded1857e56255fefd;hpb=07d2dfcd6015dfb0ba65b71cd8c304f83cb39dbb;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index ff4998992d..dff0531032 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -38,14 +38,14 @@ function message_init(App $a)
 {
 	$tabs = '';
 
-	if ($a->argc > 1 && is_numeric($a->argv[1])) {
+	if (DI::args()->getArgc() > 1 && is_numeric(DI::args()->getArgv()[1])) {
 		$tabs = render_messages(get_messages(local_user(), 0, 5), 'mail_list.tpl');
 	}
 
 	$new = [
 		'label' => DI::l10n()->t('New Message'),
 		'url' => 'message/new',
-		'sel' => $a->argc > 1 && $a->argv[1] == 'new',
+		'sel' => DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'new',
 		'accesskey' => 'm',
 	];
 
@@ -96,8 +96,7 @@ function message_post(App $a)
 
 	// fake it to go back to the input form if no recipient listed
 	if ($norecip) {
-		$a->argc = 2;
-		$a->argv[1] = 'new';
+		DI::args()->setArgv(['message', 'new']);
 	} else {
 		DI::baseUrl()->redirect(DI::args()->getCommand() . '/' . $ret);
 	}
@@ -113,10 +112,10 @@ function message_content(App $a)
 		return Login::form();
 	}
 
-	$myprofile = DI::baseUrl() . '/profile/' . $a->user['nickname'];
+	$myprofile = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
 
 	$tpl = Renderer::getMarkupTemplate('mail_head.tpl');
-	if ($a->argc > 1 && $a->argv[1] == 'new') {
+	if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'new') {
 		$button = [
 			'label' => DI::l10n()->t('Discard'),
 			'url' => '/message',
@@ -135,20 +134,20 @@ function message_content(App $a)
 		'$button' => $button,
 	]);
 
-	if (($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) {
-		if (!intval($a->argv[2])) {
+	if ((DI::args()->getArgc() == 3) && (DI::args()->getArgv()[1] === 'drop' || DI::args()->getArgv()[1] === 'dropconv')) {
+		if (!intval(DI::args()->getArgv()[2])) {
 			return;
 		}
 
-		$cmd = $a->argv[1];
+		$cmd = DI::args()->getArgv()[1];
 		if ($cmd === 'drop') {
-			$message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
+			$message = DBA::selectFirst('mail', ['convid'], ['id' => DI::args()->getArgv()[2], 'uid' => local_user()]);
 			if(!DBA::isResult($message)){
 				notice(DI::l10n()->t('Conversation not found.'));
 				DI::baseUrl()->redirect('message');
 			}
 
-			if (!DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
+			if (!DBA::delete('mail', ['id' => DI::args()->getArgv()[2], 'uid' => local_user()])) {
 				notice(DI::l10n()->t('Message was not deleted.'));
 			}
 
@@ -159,12 +158,9 @@ function message_content(App $a)
 
 			DI::baseUrl()->redirect('message/' . $conversation['id'] );
 		} else {
-			$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-				intval($a->argv[2]),
-				intval(local_user())
-			);
-			if (DBA::isResult($r)) {
-				$parent = $r[0]['parent-uri'];
+			$parentmail = DBA::selectFirst('mail', ['parent-uri'], ['id' => DI::args()->getArgv()[2], 'uid' => local_user()]);
+			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.'));
@@ -174,17 +170,17 @@ function message_content(App $a)
 		}
 	}
 
-	if (($a->argc > 1) && ($a->argv[1] === 'new')) {
+	if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'new')) {
 		$o .= $header;
 
 		$tpl = Renderer::getMarkupTemplate('msg-header.tpl');
 		DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
 			'$baseurl' => DI::baseUrl()->get(true),
-			'$nickname' => $a->user['nickname'],
+			'$nickname' => $a->getLoggedInUserNickname(),
 			'$linkurl' => DI::l10n()->t('Please enter a link URL:')
 		]);
 
-		$recipientId = $a->argv[2] ?? null;
+		$recipientId = DI::args()->getArgv()[2] ?? null;
 
 		$select = ACL::getMessageContactSelectHTML($recipientId);
 
@@ -210,19 +206,19 @@ function message_content(App $a)
 
 	$_SESSION['return_path'] = DI::args()->getQueryString();
 
-	if ($a->argc == 1) {
+	if (DI::args()->getArgc() == 1) {
 
 		// List messages
 
 		$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())
+		$r = DBA::fetchFirst("SELECT count(*) AS `total`, ANY_VALUE(`created`) AS `created` FROM `mail`
+			WHERE `mail`.`uid` = ? GROUP BY `parent-uri` ORDER BY `created` DESC",
+			local_user()
 		);
 		if (DBA::isResult($r)) {
-			$total = $r[0]['total'];
+			$total = $r['total'];
 		}
 
 		$pager = new Pager(DI::l10n(), DI::args()->getQueryString());
@@ -241,7 +237,7 @@ function message_content(App $a)
 		return $o;
 	}
 
-	if (($a->argc > 1) && (intval($a->argv[1]))) {
+	if ((DI::args()->getArgc() > 1) && (intval(DI::args()->getArgv()[1]))) {
 
 		$o .= $header;
 
@@ -252,7 +248,7 @@ function message_content(App $a)
 			WHERE `mail`.`uid` = ? AND `mail`.`id` = ?
 			LIMIT 1",
 			local_user(),
-			$a->argv[1]
+			DI::args()->getArgv()[1]
 		);
 		if (DBA::isResult($message)) {
 			$contact_id = $message['contact-id'];
@@ -293,7 +289,7 @@ function message_content(App $a)
 		$tpl = Renderer::getMarkupTemplate('msg-header.tpl');
 		DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
 			'$baseurl' => DI::baseUrl()->get(true),
-			'$nickname' => $a->user['nickname'],
+			'$nickname' => $a->getLoggedInUserNickname(),
 			'$linkurl' => DI::l10n()->t('Please enter a link URL:')
 		]);
 
@@ -345,7 +341,7 @@ function message_content(App $a)
 
 		$tpl = Renderer::getMarkupTemplate('mail_display.tpl');
 		$o = Renderer::replaceMacros($tpl, [
-			'$thread_id' => $a->argv[1],
+			'$thread_id' => DI::args()->getArgv()[1],
 			'$thread_subject' => $message['title'],
 			'$thread_seen' => $seen,
 			'$delete' => DI::l10n()->t('Delete conversation'),
@@ -432,7 +428,7 @@ function render_messages(array $msg, $t)
 	$tpl = Renderer::getMarkupTemplate($t);
 	$rslt = '';
 
-	$myprofile = DI::baseUrl() . '/profile/' . $a->user['nickname'];
+	$myprofile = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
 
 	foreach ($msg as $rr) {
 		if ($rr['unknown']) {