X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=5f7ffb2b7067f75d737848916b10a1d710d21aaf;hb=f32ea03911e81ccb1ce9f6553f8fc3bdaa815ffb;hp=fc9fafceb449b71cd64ac3b7ebfe8db2d56ffc7c;hpb=2ef81108b37a85642e1f3380044a03cb1cd8719a;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index fc9fafceb4..5f7ffb2b70 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -5,6 +5,7 @@
 
 use Friendica\App;
 use Friendica\Content\Nav;
+use Friendica\Content\Pager;
 use Friendica\Content\Smilies;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\ACL;
@@ -13,10 +14,10 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Mail;
+use Friendica\Module\Login;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
-use Friendica\Module\Login;
 
 require_once 'include/conversation.php';
 
@@ -87,7 +88,7 @@ function message_post(App $a)
 		$a->argc = 2;
 		$a->argv[1] = 'new';
 	} else {
-		$a->redirect($a->cmd . '/' . $ret);
+		$a->internalRedirect($a->cmd . '/' . $ret);
 	}
 }
 
@@ -155,7 +156,7 @@ function message_content(App $a)
 
 		// Now check how the user responded to the confirmation query
 		if (!empty($_REQUEST['canceled'])) {
-			$a->redirect('message');
+			$a->internalRedirect('message');
 		}
 
 		$cmd = $a->argv[1];
@@ -163,7 +164,7 @@ function message_content(App $a)
 			$message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
 			if(!DBA::isResult($message)){
 				info(L10n::t('Conversation not found.') . EOL);
-				$a->redirect('message');
+				$a->internalRedirect('message');
 			}
 
 			if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
@@ -173,10 +174,10 @@ function message_content(App $a)
 			$conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]);
 			if(!DBA::isResult($conversation)){
 				info(L10n::t('Conversation removed.') . EOL);
-				$a->redirect('message');
+				$a->internalRedirect('message');
 			}
 
-			$a->redirect('message/' . $conversation['id'] );
+			$a->internalRedirect('message/' . $conversation['id'] );
 		} else {
 			$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($a->argv[2]),
@@ -190,7 +191,7 @@ function message_content(App $a)
 					info(L10n::t('Conversation removed.') . EOL);
 				}
 			}
-			$a->redirect('message');
+			$a->internalRedirect('message');
 		}
 	}
 
@@ -265,7 +266,7 @@ function message_content(App $a)
 	}
 
 
-	$_SESSION['return_url'] = $a->query_string;
+	$_SESSION['return_path'] = $a->query_string;
 
 	if ($a->argc == 1) {
 
@@ -273,16 +274,18 @@ 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)) {
-			$a->setPagerTotal($r[0]['total']);
+			$total = $r[0]['total'];
 		}
 
-		$r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
+		$pager = new Pager($a->query_string);
+
+		$r = get_messages(local_user(), $pager->getStart(), $pager->getItemsPerPage());
 
 		if (!DBA::isResult($r)) {
 			info(L10n::t('No messages.') . EOL);
@@ -291,7 +294,7 @@ function message_content(App $a)
 
 		$o .= render_messages($r, 'mail_list.tpl');
 
-		$o .= paginate($a);
+		$o .= $pager->renderFull($total);
 
 		return $o;
 	}