Fix fatal error because of unknown function "fetchUrl"

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index bba530ca5ddf269553343f29a0279f6e562f6831..204b136f9bb93a5c4f92601bab5ad5e90e8ee29c 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -1,6 +1,22 @@
 <?php
 /**
- * @file mod/message.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
@@ -52,7 +68,7 @@ function message_init(App $a)
 function message_post(App $a)
 {
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -66,20 +82,18 @@ function message_post(App $a)
 
        switch ($ret) {
                case -1:
-                       notice(DI::l10n()->t('No recipient selected.') . EOL);
+                       notice(DI::l10n()->t('No recipient selected.'));
                        $norecip = true;
                        break;
                case -2:
-                       notice(DI::l10n()->t('Unable to locate contact information.') . EOL);
+                       notice(DI::l10n()->t('Unable to locate contact information.'));
                        break;
                case -3:
-                       notice(DI::l10n()->t('Message could not be sent.') . EOL);
+                       notice(DI::l10n()->t('Message could not be sent.'));
                        break;
                case -4:
-                       notice(DI::l10n()->t('Message collection failure.') . EOL);
+                       notice(DI::l10n()->t('Message collection failure.'));
                        break;
-               default:
-                       info(DI::l10n()->t('Message sent.') . EOL);
        }
 
        // fake it to go back to the input form if no recipient listed
@@ -97,7 +111,7 @@ function message_content(App $a)
        Nav::setSelected('messages');
 
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return Login::form();
        }
 
@@ -162,17 +176,16 @@ function message_content(App $a)
                if ($cmd === 'drop') {
                        $message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
                        if(!DBA::isResult($message)){
-                               info(DI::l10n()->t('Conversation not found.') . EOL);
+                               notice(DI::l10n()->t('Conversation not found.'));
                                DI::baseUrl()->redirect('message');
                        }
 
-                       if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
-                               info(DI::l10n()->t('Message deleted.') . EOL);
+                       if (!DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
+                               notice(DI::l10n()->t('Message was not deleted.'));
                        }
 
                        $conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]);
                        if(!DBA::isResult($conversation)){
-                               info(DI::l10n()->t('Conversation removed.') . EOL);
                                DI::baseUrl()->redirect('message');
                        }
 
@@ -185,8 +198,8 @@ function message_content(App $a)
                        if (DBA::isResult($r)) {
                                $parent = $r[0]['parent-uri'];
 
-                               if (DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
-                                       info(DI::l10n()->t('Conversation removed.') . EOL);
+                               if (!DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
+                                       notice(DI::l10n()->t('Conversation was not removed.'));
                                }
                        }
                        DI::baseUrl()->redirect('message');
@@ -280,12 +293,12 @@ function message_content(App $a)
                        $total = $r[0]['total'];
                }
 
-               $pager = new Pager(DI::args()->getQueryString());
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
                $r = get_messages(local_user(), $pager->getStart(), $pager->getItemsPerPage());
 
                if (!DBA::isResult($r)) {
-                       info(DI::l10n()->t('No messages.') . EOL);
+                       notice(DI::l10n()->t('No messages.'));
                        return $o;
                }
 
@@ -336,19 +349,13 @@ function message_content(App $a)
                        $messages = DBA::toArray($messages_stmt);
 
                        DBA::update('mail', ['seen' => 1], ['parent-uri' => $message['parent-uri'], 'uid' => local_user()]);
-
-                       if ($message['convid']) {
-                               // Clear Diaspora private message notifications
-                               DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['convid'], 'uid' => local_user()]);
-                       }
-                       // Clear DFRN private message notifications
-                       DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['parent-uri'], 'uid' => local_user()]);
+                       DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['id'], 'uid' => local_user()]);
                } else {
                        $messages = false;
                }
 
                if (!DBA::isResult($messages)) {
-                       notice(DI::l10n()->t('Message not available.') . EOL);
+                       notice(DI::l10n()->t('Message not available.'));
                        return $o;
                }
 
@@ -386,7 +393,7 @@ function message_content(App $a)
                        $body_e = BBCode::convert($message['body']);
                        $to_name_e = $message['name'];
 
-                       $contact = Contact::getDetailsByURL($message['from-url']);
+                       $contact = Contact::getByURL($message['from-url'], false, ['thumb', 'addr']);
                        if (isset($contact["thumb"])) {
                                $from_photo = $contact["thumb"];
                        } else {
@@ -518,7 +525,7 @@ function render_messages(array $msg, $t)
                $body_e = $rr['body'];
                $to_name_e = $rr['name'];
 
-               $contact = Contact::getDetailsByURL($rr['url']);
+               $contact = Contact::getByURL($rr['url'], false, ['thumb', 'addr']);
                if (isset($contact["thumb"])) {
                        $from_photo = $contact["thumb"];
                } else {