Issue 11566: More detailled notification configuration

[friendica.git] / src / Module / Acctlink.php

diff --git a/src/Module/Acctlink.php b/src/Module/Acctlink.php
index a3577da320b541952438d2ec4c152b18df019f3b..3fa679ebc3ff629fa9ee2788dcb6f70825afbd20 100644 (file)
--- a/src/Module/Acctlink.php
+++ b/src/Module/Acctlink.php
@@ -1,27 +1,48 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Network\Probe;
 use Friendica\Core\System;
+use Friendica\Model\Contact;
+use Friendica\Network\HTTPException\NotFoundException;
 
 /**
  * Redirects to another URL based on the parameter 'addr'
  */
 class Acctlink extends BaseModule
 {
-       public static function content(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
                $addr = trim($_GET['addr'] ?? '');
+               if (!$addr) {
+                       throw new NotFoundException('Parameter "addr" is missing or empty');
+               }
 
-               if ($addr) {
-                       $url = Probe::uri($addr)['url'] ?? '';
-
-                       if ($url) {
-                               System::externalRedirect($url);
-                               exit();
-                       }
+               $contact = Contact::getByURL($addr, null, ['url']) ?? '';
+               if (!$contact) {
+                       throw new NotFoundException('Contact not found');
                }
+
+               System::externalRedirect($contact['url']);
        }
 }