replace session return url by static pages

diff --git a/mod/contacts.php b/mod/contacts.php
index 1604f0b6605ec43d6f0e936972ad2394a45c11f2..fb57ce6aee47e8faf5fcae2da01579266a7a8319 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -168,11 +168,7 @@ function contacts_batch_actions(App $a)
                info(L10n::tt("%d contact edited.", "%d contacts edited.", $count_actions));
        }
 
-       if (x($_SESSION, 'return_url')) {
-               goaway('' . $_SESSION['return_url']);
-       } else {
-               goaway('contacts');
-       }
+       goaway('contacts');
 }
 
 function contacts_post(App $a)
@@ -476,20 +472,13 @@ function contacts_content(App $a, $update = 0)
                        }
                        // Now check how the user responded to the confirmation query
                        if (x($_REQUEST, 'canceled')) {
-                               if (x($_SESSION, 'return_url')) {
-                                       goaway('' . $_SESSION['return_url']);
-                               } else {
-                                       goaway('contacts');
-                               }
+                               goaway('contacts');
                        }
 
                        _contact_drop($orig_record);
                        info(L10n::t('Contact has been removed.') . EOL);
-                       if (x($_SESSION, 'return_url')) {
-                               goaway('' . $_SESSION['return_url']);
-                       } else {
-                               goaway('contacts');
-                       }
+                       
+                       goaway('contacts');
                        return; // NOTREACHED
                }
                if ($cmd === 'posts') {

diff --git a/mod/follow.php b/mod/follow.php
index f70a8610e4d19a30e2d124a516f0b0d35e6f35af..04c279c5b6ab707f5995aa0c229e412613082d50 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -20,7 +20,7 @@ function follow_post(App $a)
        }
 
        if (isset($_REQUEST['cancel'])) {
-               goaway($_SESSION['return_url']);
+               goaway('contacts');
        }
 
        $uid = local_user();

diff --git a/mod/message.php b/mod/message.php
index d0a583967b047c3a61a6261f5dd10f9f6657693c..e2380fdb5c5c7d5504588fba97b86f937c2d5a80 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -160,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];
@@ -169,8 +169,7 @@ 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]),
@@ -184,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' );
                }
        }