Merge pull request #6020 from nupplaphil/friendica-5996

Bugfixing redirects

mod/randprof.php

@@ -14,12 +14,7 @@ function randprof_init(App $a)
 
 	if ($x) {
 		$link = Contact::magicLink($x);
-		// @TODO making the return of magicLink save to use either externalRedirect or internalRedirect
-		if (filter_var($link, FILTER_VALIDATE_URL)) {
-			System::externalRedirect($link);
-		} else {
-			$a->internalRedirect($link);
-		}
+		$a->redirect($link);
 	}
 
 	$a->internalRedirect('profile');

mod/redir.php

@@ -36,7 +36,7 @@ function redir_init(App $a) {
 			|| (!local_user() && !remote_user()) // Visitors (not logged in or not remotes) can't authenticate.
 			|| (!empty($a->contact['id']) && $a->contact['id'] == $cid)) // Local user is already authenticated.
 		{
-			System::externalRedirect(defaults($url, $contact_url));
+			$a->redirect(defaults($url, $contact_url));
 		}
 
 		if ($contact['uid'] == 0 && local_user()) {
@@ -52,7 +52,7 @@ function redir_init(App $a) {
 				// Local user is already authenticated.
 				$target_url = defaults($url, $contact_url);
 				logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
-				System::externalRedirect($target_url);
+				$a->redirect($target_url);
 			}
 		}
 
@@ -73,7 +73,7 @@ function redir_init(App $a) {
 						// Remote user is already authenticated.
 						$target_url = defaults($url, $contact_url);
 						logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
-						System::externalRedirect($target_url);
+						$a->redirect($target_url);
 					}
 				}
 			}
@@ -121,7 +121,7 @@ function redir_init(App $a) {
 		}
 
 		logger('redirecting to ' . $url, LOGGER_DEBUG);
-		System::externalRedirect($url);
+		$a->redirect($url);
 	}
 
 	notice(L10n::t('Contact not found.'));

src/App.php

@@ -2006,4 +2006,20 @@ class App
 		$redirectTo = $this->getBaseURL($ssl) . '/' . ltrim($toUrl, '/');
 		Core\System::externalRedirect($redirectTo);
 	}
+
+	/**
+	 * Automatically redirects to relative or absolute URL
+	 * Should only be used if it isn't clear if the URL is either internal or external
+	 *
+	 * @param string $toUrl The target URL
+	 *
+	 */
+	public function redirect($toUrl)
+	{
+		if (filter_var($toUrl, FILTER_VALIDATE_URL)) {
+			Core\System::externalRedirect($toUrl);
+		} else {
+			$this->internalRedirect($toUrl);
+		}
+	}
 }

src/Module/Magic.php

@@ -43,11 +43,7 @@ class Magic extends BaseModule
 		if (!$cid) {
 			logger('No contact record found: ' . print_r($_REQUEST, true), LOGGER_DEBUG);
 			// @TODO Finding a more elegant possibility to redirect to either internal or external URL
-			if (filter_var($dest, FILTER_VALIDATE_URL)) {
-				System::externalRedirect($dest);
-			} else {
-				$a->internalRedirect($dest);
-			}
+			$a->redirect($dest);
 		}
 		$contact = DBA::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
 
@@ -117,10 +113,6 @@ class Magic extends BaseModule
 		}
 
 		// @TODO Finding a more elegant possibility to redirect to either internal or external URL
-		if (filter_var($dest, FILTER_VALIDATE_URL)) {
-			System::externalRedirect($dest);
-		} else {
-			$a->internalRedirect($dest);
-		}
+		$a->redirect($dest);
 	}
 }