Updated messages.po

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 4b6f5b31b81006b12a707966ccab2cf3f9e70e05..d75fb240f01025ba23a40547c2e837b222d0bd76 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -39,7 +39,7 @@ 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 = [
@@ -54,28 +54,27 @@ function message_init(App $a)
                '$tabs' => $tabs,
                '$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' => (string)DI::baseUrl()
        ]);
 }
 
 function message_post(App $a)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
+       $sender_id = DI::userSession()->getLocalUserId();
        $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);
+       $ret = Mail::send($sender_id, $recipient, $body, $subject, $replyto);
        $norecip = false;
 
        switch ($ret) {
@@ -110,7 +109,7 @@ function message_content(App $a)
        $o = '';
        Nav::setSelected('messages');
 
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                return Login::form();
        }
@@ -144,28 +143,28 @@ 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)){
                                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()])) {
+                       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()])) {
+                               if (!DBA::delete('mail', ['parent-uri' => $parent, 'uid' => DI::userSession()->getLocalUserId()])) {
                                        DI::sysmsg()->addNotice(DI::l10n()->t('Conversation was not removed.'));
                                }
                        }
@@ -178,7 +177,6 @@ function message_content(App $a)
 
                $tpl = Renderer::getMarkupTemplate('msg-header.tpl');
                DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
-                       '$baseurl' => DI::baseUrl()->get(true),
                        '$nickname' => $a->getLoggedInUserNickname(),
                        '$linkurl' => DI::l10n()->t('Please enter a link URL:')
                ]);
@@ -215,11 +213,11 @@ function message_content(App $a)
 
                $o .= $header;
 
-               $total = DBA::count('mail', ['uid' => local_user()], ['distinct' => true, 'expression' => 'parent-uri']);
+               $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)) {
                        DI::sysmsg()->addNotice(DI::l10n()->t('No messages.'));
@@ -243,14 +241,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']
                        ];
 
@@ -272,7 +270,7 @@ 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;
                }
@@ -284,7 +282,6 @@ function message_content(App $a)
 
                $tpl = Renderer::getMarkupTemplate('msg-header.tpl');
                DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
-                       '$baseurl' => DI::baseUrl()->get(true),
                        '$nickname' => $a->getLoggedInUserNickname(),
                        '$linkurl' => DI::l10n()->t('Please enter a link URL:')
                ]);
@@ -438,7 +435,7 @@ function render_messages(array $msg, string $t): string
                $to_name_e = $rr['name'];
 
                if (is_null($rr['url'])) {
-                       // contact-id is pointing to a non existing contact
+                       // contact-id is pointing to a nonexistent contact
                        continue;
                }