replace session return url by static pages

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index e2e13835897bf89b854d99fa5f06048106d3db05..e2380fdb5c5c7d5504588fba97b86f937c2d5a80 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -14,6 +14,7 @@ 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';
@@ -91,7 +92,7 @@ function message_post(App $a)
                $a->argc = 2;
                $a->argv[1] = 'new';
        } else {
-               goaway($_SESSION['return_url']);
+               goaway($a->cmd . '/' . $ret);
        }
 }
 
@@ -159,7 +160,7 @@ function message_content(App $a)
 
                // Now check how the user responded to the confirmation query
                if (!empty($_REQUEST['canceled'])) {
-                       goaway($_SESSION['return_url']);
+                       goaway('/message');
                }
 
                $cmd = $a->argv[1];
@@ -168,14 +169,13 @@ function message_content(App $a)
                                info(L10n::t('Message deleted.') . EOL);
                        }
 
-                       //goaway(System::baseUrl(true) . '/message' );
-                       goaway($_SESSION['return_url']);
+                       goaway('/message' );
                } 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::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                $parent = $r[0]['parent-uri'];
                                $convid = $r[0]['convid'];
 
@@ -183,8 +183,7 @@ function message_content(App $a)
                                        info(L10n::t('Conversation removed.') . EOL);
                                }
                        }
-                       //goaway(System::baseUrl(true) . '/message' );
-                       goaway($_SESSION['return_url']);
+                       goaway('/message' );
                }
        }
 
@@ -214,21 +213,21 @@ function message_content(App $a)
                                intval(local_user()),
                                intval($a->argv[2])
                        );
-                       if (!DBA::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 (!DBA::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 (DBA::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                $prename = $r[0]['name'];
                                $preurl = $r[0]['url'];
                                $preid = $r[0]['id'];
@@ -279,13 +278,13 @@ function message_content(App $a)
                        intval(local_user())
                );
 
-               if (DBA::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 (!DBA::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        info(L10n::t('No messages.') . EOL);
                        return $o;
                }
@@ -307,14 +306,14 @@ function message_content(App $a)
                        intval(local_user()),
                        intval($a->argv[1])
                );
-               if (DBA::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)
                                );
 
@@ -326,13 +325,13 @@ function message_content(App $a)
                } else {
                        $messages = false;
                }
-               if (!DBA::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())
                );
 
@@ -388,7 +387,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'),
@@ -487,9 +486,9 @@ function render_messages(array $msg, $t)
                        '$id' => $rr['id'],
                        '$from_name' => $participants,
                        '$from_url' => Contact::magicLink($rr['url']),
-                       '$from_addr' => $contact['addr'],
+                       '$from_addr' => defaults($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,