X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fredir.php;h=701b85953ca1e63683103ba54bc0810566d08fa3;hb=b42760b0e6b243a9ab6306a1f1440e1a2effb74e;hp=5ba8276ee7ca3adf7dbee4d26ae551b300b60f75;hpb=920ffab43948d4a3081d248eb2e9f6dd5b1398e6;p=friendica.git

diff --git a/mod/redir.php b/mod/redir.php
index 5ba8276ee7..701b85953c 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -2,11 +2,13 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Util\Strings;
 
 function redir_init(App $a) {
 
@@ -41,7 +43,7 @@ function redir_init(App $a) {
 
 		if ($contact['uid'] == 0 && local_user()) {
 			// Let's have a look if there is an established connection
-			// between the puplic contact we have found and the local user.
+			// between the public contact we have found and the local user.
 			$contact = DBA::selectFirst('contact', $fields, ['nurl' => $contact['nurl'], 'uid' => local_user()]);
 
 			if (DBA::isResult($contact)) {
@@ -51,7 +53,7 @@ function redir_init(App $a) {
 			if (!empty($a->contact['id']) && $a->contact['id'] == $cid) {
 				// Local user is already authenticated.
 				$target_url = defaults($url, $contact_url);
-				logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
+				Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
 				$a->redirect($target_url);
 			}
 		}
@@ -72,7 +74,7 @@ function redir_init(App $a) {
 					if ($v['uid'] == $_SESSION['visitor_visiting'] && $v['cid'] == $_SESSION['visitor_id']) {
 						// Remote user is already authenticated.
 						$target_url = defaults($url, $contact_url);
-						logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
+						Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
 						$a->redirect($target_url);
 					}
 				}
@@ -92,13 +94,13 @@ function redir_init(App $a) {
 				$dfrn_id = '0:' . $orig_id;
 			}
 
-			$sec = random_string();
+			$sec = Strings::getRandomHex();
 
 			$fields = ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id,
 				'sec' => $sec, 'expire' => time() + 45];
 			DBA::insert('profile_check', $fields);
 
-			logger('mod_redir: ' . $contact['name'] . ' ' . $sec, LOGGER_DEBUG);
+			Logger::log('mod_redir: ' . $contact['name'] . ' ' . $sec, Logger::DEBUG);
 
 			$dest = (!empty($url) ? '&destination_url=' . $url : '');
 
@@ -114,13 +116,13 @@ function redir_init(App $a) {
 	if (!empty($url)) {
 		$my_profile = Profile::getMyURL();
 
-		if (!empty($my_profile) && !link_compare($my_profile, $url)) {
+		if (!empty($my_profile) && !Strings::compareLink($my_profile, $url)) {
 			$separator = strpos($url, '?') ? '&' : '?';
 
 			$url .= $separator . 'zrl=' . urlencode($my_profile);
 		}
 
-		logger('redirecting to ' . $url, LOGGER_DEBUG);
+		Logger::log('redirecting to ' . $url, Logger::DEBUG);
 		$a->redirect($url);
 	}