From 508032cf9a01eeb4e2347db16d52b65ad3a32ed3 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 13 Oct 2018 18:32:14 +0200
Subject: [PATCH 1/2] Move Module AcctLink

---
 mod/acctlink.php        | 16 ----------------
 src/Module/AcctLink.php | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 16 deletions(-)
 delete mode 100644 mod/acctlink.php
 create mode 100644 src/Module/AcctLink.php

diff --git a/mod/acctlink.php b/mod/acctlink.php
deleted file mode 100644
index fb8cfd400..000000000
--- a/mod/acctlink.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-use Friendica\App;
-use Friendica\Network\Probe;
-
-function acctlink_init()
-{
-	if (x($_GET, 'addr')) {
-		$addr = trim($_GET['addr']);
-		$res = Probe::uri($addr);
-		if ($res['url']) {
-			goaway($res['url']);
-			killme();
-		}
-	}
-}
diff --git a/src/Module/AcctLink.php b/src/Module/AcctLink.php
new file mode 100644
index 000000000..2ddc2785b
--- /dev/null
+++ b/src/Module/AcctLink.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Network\Probe;
+
+/**
+ * Redirects to another URL based on the parameter 'addr'
+ */
+class AcctLink extends BaseModule
+{
+	public static function content()
+	{
+		$addr = defaults($_REQUEST, 'addr', false);
+
+		if ($addr) {
+			$url = defaults(Probe::uri($addr), 'url', false);
+
+			if ($url) {
+				goaway($url);
+				killme();
+			}
+		}
+	}
+}

From 3f729df2585b65e41fa2037ca0e8fc79c3344533 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sat, 13 Oct 2018 19:00:44 +0200
Subject: [PATCH 2/2] Renamed AcctLink to Acctlink

---
 src/Module/{AcctLink.php => Acctlink.php} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename src/Module/{AcctLink.php => Acctlink.php} (88%)

diff --git a/src/Module/AcctLink.php b/src/Module/Acctlink.php
similarity index 88%
rename from src/Module/AcctLink.php
rename to src/Module/Acctlink.php
index 2ddc2785b..f14905277 100644
--- a/src/Module/AcctLink.php
+++ b/src/Module/Acctlink.php
@@ -8,7 +8,7 @@ use Friendica\Network\Probe;
 /**
  * Redirects to another URL based on the parameter 'addr'
  */
-class AcctLink extends BaseModule
+class Acctlink extends BaseModule
 {
 	public static function content()
 	{
@@ -19,7 +19,7 @@ class AcctLink extends BaseModule
 
 			if ($url) {
 				goaway($url);
-				killme();
+				exit();
 			}
 		}
 	}