From 99db3452e31b05621f4cde02a94d0c0058b82bd0 Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin@philipp.info>
Date: Mon, 16 Dec 2019 00:28:30 +0100
Subject: [PATCH] Refactor deprecated App::internalRedirect() to
 DI::baseUrl()->redirect()

---
 impressum/impressum.php | 4 ++--
 notifyall/notifyall.php | 3 ++-
 statusnet/statusnet.php | 7 ++++---
 twitter/twitter.php     | 3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/impressum/impressum.php b/impressum/impressum.php
index dc5d3552..b943fd9f 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -13,6 +13,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
@@ -34,8 +35,7 @@ function impressum_uninstall() {
 function impressum_module() {
 }
 function impressum_content() {
-    $a = \get_app();
-    $a->internalRedirect('friendica/');
+    DI::baseUrl()->redirect('friendica/');
 }
 
 function obfuscate_email ($s) {
diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index af52e668..8205e200 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -15,6 +15,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\DI;
 use Friendica\Util\Emailer;
 
 function notifyall_install()
@@ -96,7 +97,7 @@ function notifyall_post(App $a)
 	}
 
 	notice(L10n::t('Emails sent'));
-	$a->internalRedirect('admin');
+	DI::baseUrl()->redirect('admin');
 }
 
 function notifyall_content(&$a)
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index fee8fd82..baba236a 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -50,6 +50,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
@@ -167,7 +168,7 @@ function statusnet_settings_post(App $a, $post)
 					}
 				}
 			}
-			$a->internalRedirect('settings/connectors');
+			DI::baseUrl()->redirect('settings/connectors');
 		} else {
 			if (isset($_POST['statusnet-consumersecret'])) {
 				//  check if we can reach the API of the GNU Social server
@@ -195,7 +196,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);
 					}
 				}
-				$a->internalRedirect('settings/connectors');
+				DI::baseUrl()->redirect('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
@@ -213,7 +214,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
-					$a->internalRedirect('settings/connectors');
+					DI::baseUrl()->redirect('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 6cc11f9b..54d90948 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -78,6 +78,7 @@ use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\Group;
@@ -263,7 +264,7 @@ function twitter_settings_post(App $a)
 				info($e->getMessage());
 			}
 			//  reload the Addon Settings page, if we don't do it see Bug #42
-			$a->internalRedirect('settings/connectors');
+			DI::baseUrl()->redirect('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
-- 
2.39.5