From d197bf4c2b6889c9e52feb720a7abd6d8c5d3017 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Wed, 24 Oct 2018 20:09:36 +0200
Subject: [PATCH] Bugfix - Replacing goaway()

---
 blackout/blackout.php   | 2 +-
 impressum/impressum.php | 2 +-
 notifyall/notifyall.php | 2 +-
 startpage/startpage.php | 2 +-
 statusnet/statusnet.php | 6 +++---
 twitter/twitter.php     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/blackout/blackout.php b/blackout/blackout.php
index 28e5567f..9b2d5b62 100644
--- 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 74d87180..90775116 100644
--- 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 824e306b..852972c3 100644
--- 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 14b8abbb..b955161b 100644
--- 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 42c31d75..6cdc2372 100644
--- 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 d3440d53..597278ca 100644
--- 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