calculate form return_url for post and message instead of using SESSION var

diff --git a/mod/editpost.php b/mod/editpost.php
index 258585ef1c3b95cba2e9e1914bcde84014e19100..61dfcf911d2d7e07dc0c95a2d463fe925a92c002 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -21,12 +21,18 @@ function editpost_content(App $a)
        }
 
        $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
+       $return_url = (($a->argc > 1) ? base64_decode($a->argv[2]) : '');
 
        if (!$post_id) {
                notice(L10n::t('Item not found') . EOL);
                return;
        }
 
+       // Fallback to SESSION return_path
+       if (empty($return_url)) {
+               $return_url = $_SESSION['return_path'];
+       }
+
        $fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
                'type', 'body', 'title', 'file', 'wall', 'post-type'];
 
@@ -95,7 +101,7 @@ function editpost_content(App $a)
 
        $o .= replace_macros($tpl, [
                '$is_edit' => true,
-               '$return_path' => $_SESSION['return_url'],
+               '$return_path' => $return_url,
                '$action' => 'item',
                '$share' => L10n::t('Save'),
                '$upload' => L10n::t('Upload photo'),

diff --git a/mod/message.php b/mod/message.php
index 8c9aa657dfb4a54385c341a9c8034288e35e383d..9ac0ddbc0b6be40aab74fb5fe17947b3780aba8a 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -92,7 +92,7 @@ function message_post(App $a)
                $a->argc = 2;
                $a->argv[1] = 'new';
        } else {
-               goaway($_SESSION['return_url']);
+               goaway(System::baseUrl() . '/' . $a->cmd . '/' . $ret);
        }
 }
 

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 038ca270d79dddc35bce9158ebc404e631502e1a..c52078e521ef046150abb72fcb96782bb2ef0603 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -157,7 +157,7 @@ class Post extends BaseObject
                        if ($item["event-id"] != 0) {
                                $edpost = ["events/event/" . $item['event-id'], L10n::t("Edit")];
                        } else {
-                               $edpost = ["editpost/" . $item['id'], L10n::t("Edit")];
+                               $edpost = ["editpost/" . $item['id'] . "/" . base64_encode($a->cmd), L10n::t("Edit")];
                        }
                        $dropping = in_array($item['uid'], [0, local_user()]);
                } else {