Bugfix - Replacing goaway()

diff --git a/blackout/blackout.php b/blackout/blackout.php
index 28e5567f75243f1fa509b283fd3be4b8d4809010..9b2d5b625ead63358d9eb5b39109a91b64a34ea2 100644 (file)
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -85,7 +85,7 @@ function blackout_redirect ($a, $b) {
     }
     if (( $date1 <= $now ) && ( $now <= $date2 )) {
         logger('redirecting user to blackout page');
-        goaway($myurl);
+        System::externalRedirect($myurl);
     }
 }
 

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 74d87180985a1c1769b3dddad1585ba9f338f05f..907751165e09ceef925eea5fd894dfd7716c2376 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -31,7 +31,7 @@ function impressum_module() {
 }
 function impressum_content() {
     $a = get_app();
-    goaway('friendica/');
+    $a->internalRedirect('friendica/');
 }
 
 function obfuscate_email ($s) {

diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 824e306b92cd90b56776b4406a6fd69be00d49dc..852972c37ba78afc26d938c6e846283efe753b12 100644 (file)
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -93,7 +93,7 @@ function notifyall_post(App $a)
        }
 
        notice(L10n::t('Emails sent'));
-       goaway('admin');
+       $a->internalRedirect('admin');
 }
 
 function notifyall_content(&$a)

diff --git a/startpage/startpage.php b/startpage/startpage.php
index 14b8abbb7aa72fcf1307d15168e94960969102d9..b955161ba5f0824f7bf2fbdad3ca2d230b865055 100644 (file)
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -31,7 +31,7 @@ function startpage_home_init($a, $b)
 
        $page = PConfig::get(local_user(), 'startpage', 'startpage');
        if (strlen($page)) {
-               goaway($page);
+               $a->internalRedirect($page);
        }
        return;
 }

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 42c31d7581e403e4f529b5abb33f91a08338a477..6cdc2372cdfff6c6139e0eed98418b2b647b56b7 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -160,7 +160,7 @@ function statusnet_settings_post(App $a, $post)
                                        }
                                }
                        }
-                       goaway('settings/connectors');
+                       $a->internalRedirect('settings/connectors');
                } else {
                        if (isset($_POST['statusnet-consumersecret'])) {
                                //  check if we can reach the API of the GNU Social server
@@ -188,7 +188,7 @@ function statusnet_settings_post(App $a, $post)
                                                notice(L10n::t('We could not contact the GNU Social API with the Path you entered.') . EOL);
                                        }
                                }
-                               goaway('settings/connectors');
+                               $a->internalRedirect('settings/connectors');
                        } else {
                                if (isset($_POST['statusnet-pin'])) {
                                        //  if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
@@ -206,7 +206,7 @@ function statusnet_settings_post(App $a, $post)
                                        PConfig::set(local_user(), 'statusnet', 'post', 1);
                                        PConfig::set(local_user(), 'statusnet', 'post_taglinks', 1);
                                        //  reload the Addon Settings page, if we don't do it see Bug #42
-                                       goaway('settings/connectors');
+                                       $a->internalRedirect('settings/connectors');
                                } else {
                                        //  if no PIN is supplied in the POST variables, the user has changed the setting
                                        //  to post a dent for every new __public__ posting to the wall

diff --git a/twitter/twitter.php b/twitter/twitter.php
index d3440d53bf72f6caec8ece171303375183f350af..597278ca2060fca11d971b677bce041ff25be955 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -258,7 +258,7 @@ function twitter_settings_post(App $a)
                                info($e->getMessage());
                        }
                        //  reload the Addon Settings page, if we don't do it see Bug #42
-                       goaway('settings/connectors');
+                       $a->internalRedirect('settings/connectors');
                } else {
                        //  if no PIN is supplied in the POST variables, the user has changed the setting
                        //  to post a tweet for every new __public__ posting to the wall