Cleanups: isResult() more used, readability improved (#5608)

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index ccdb377b2f2a6f8c67098d8ff016c0044fd5da7a..8c9aa657dfb4a54385c341a9c8034288e35e383d 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -10,11 +10,11 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Mail;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
 
 require_once 'include/conversation.php';
@@ -109,8 +109,23 @@ function message_content(App $a)
        $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname'];
 
        $tpl = get_markup_template('mail_head.tpl');
+       if ($a->argc > 1 && $a->argv[1] == 'new') {
+               $button = [
+                       'label' => L10n::t('Discard'),
+                       'url' => '/message',
+                       'sel' => 'close',
+               ];
+       } else {
+               $button = [
+                       'label' => L10n::t('New Message'),
+                       'url' => '/message/new',
+                       'sel' => 'new',
+                       'accesskey' => 'm',
+               ];
+       }
        $header = replace_macros($tpl, [
                '$messages' => L10n::t('Messages'),
+               '$button' => $button,
        ]);
 
        if (($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) {
@@ -150,7 +165,7 @@ function message_content(App $a)
 
                $cmd = $a->argv[1];
                if ($cmd === 'drop') {
-                       if (dba::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
+                       if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
                                info(L10n::t('Message deleted.') . EOL);
                        }
 
@@ -161,11 +176,11 @@ function message_content(App $a)
                                intval($a->argv[2]),
                                intval(local_user())
                        );
-                       if (DBM::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                $parent = $r[0]['parent-uri'];
                                $convid = $r[0]['convid'];
 
-                               if (dba::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
+                               if (DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
                                        info(L10n::t('Conversation removed.') . EOL);
                                }
                        }
@@ -200,21 +215,21 @@ function message_content(App $a)
                                intval(local_user()),
                                intval($a->argv[2])
                        );
-                       if (!DBM::is_result($r)) {
+                       if (!DBA::isResult($r)) {
                                $r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
                                        intval(local_user()),
-                                       dbesc(normalise_link(base64_decode($a->argv[2])))
+                                       DBA::escape(normalise_link(base64_decode($a->argv[2])))
                                );
                        }
 
-                       if (!DBM::is_result($r)) {
+                       if (!DBA::isResult($r)) {
                                $r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
                                        intval(local_user()),
-                                       dbesc(base64_decode($a->argv[2]))
+                                       DBA::escape(base64_decode($a->argv[2]))
                                );
                        }
 
-                       if (DBM::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                $prename = $r[0]['name'];
                                $preurl = $r[0]['url'];
                                $preid = $r[0]['id'];
@@ -265,13 +280,13 @@ function message_content(App $a)
                        intval(local_user())
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        $a->set_pager_total($r[0]['total']);
                }
 
                $r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
 
-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        info(L10n::t('No messages.') . EOL);
                        return $o;
                }
@@ -293,14 +308,14 @@ function message_content(App $a)
                        intval(local_user()),
                        intval($a->argv[1])
                );
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        $contact_id = $r[0]['contact-id'];
                        $convid = $r[0]['convid'];
 
-                       $sql_extra = sprintf(" and `mail`.`parent-uri` = '%s' ", dbesc($r[0]['parent-uri']));
+                       $sql_extra = sprintf(" and `mail`.`parent-uri` = '%s' ", DBA::escape($r[0]['parent-uri']));
                        if ($convid)
                                $sql_extra = sprintf(" and ( `mail`.`parent-uri` = '%s' OR `mail`.`convid` = '%d' ) ",
-                                       dbesc($r[0]['parent-uri']),
+                                       DBA::escape($r[0]['parent-uri']),
                                        intval($convid)
                                );
 
@@ -312,13 +327,13 @@ function message_content(App $a)
                } else {
                        $messages = false;
                }
-               if (!DBM::is_result($messages)) {
+               if (!DBA::isResult($messages)) {
                        notice(L10n::t('Message not available.') . EOL);
                        return $o;
                }
 
                $r = q("UPDATE `mail` SET `seen` = 1 WHERE `parent-uri` = '%s' AND `uid` = %d",
-                       dbesc($r[0]['parent-uri']),
+                       DBA::escape($r[0]['parent-uri']),
                        intval(local_user())
                );
 
@@ -374,7 +389,7 @@ function message_content(App $a)
                                'from_url' => $from_url,
                                'from_addr' => $contact['addr'],
                                'sparkle' => $sparkle,
-                               'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
+                               'from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
                                'subject' => $subject_e,
                                'body' => $body_e,
                                'delete' => L10n::t('Delete message'),
@@ -475,7 +490,7 @@ function render_messages(array $msg, $t)
                        '$from_url' => Contact::magicLink($rr['url']),
                        '$from_addr' => $contact['addr'],
                        '$sparkle' => ' sparkle',
-                       '$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
+                       '$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
                        '$subject' => $subject_e,
                        '$delete' => L10n::t('Delete conversation'),
                        '$body' => $body_e,