X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fredir.php;h=366c398867682def7fe2dd0a3694eee81eedd539;hb=7034d6efbd988e7481ac6f5d6413a8925221ed6b;hp=632c39578696807b3dfd20e6f6658df50656cc99;hpb=3c97a6703cd5a743fc9339f52996bcb1eb436ef0;p=friendica.git

diff --git a/mod/redir.php b/mod/redir.php
index 632c395786..366c398867 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,6 +1,8 @@
 <?php
 
-function redir_init(&$a) {
+use Friendica\App;
+
+function redir_init(App $a) {
 
 	$url = ((x($_GET,'url')) ? $_GET['url'] : '');
 	$quiet = ((x($_GET,'quiet')) ? '&quiet=1' : '');
@@ -18,7 +20,7 @@ function redir_init(&$a) {
 				intval(local_user())
 			);
 
-			if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
+			if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN))
 				goaway(z_root());
 
 			$cid = $r[0]['id'];
@@ -31,7 +33,7 @@ function redir_init(&$a) {
 				intval(local_user())
 			);
 
-			if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
+			if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN))
 				goaway(z_root());
 		}
 
@@ -57,18 +59,20 @@ function redir_init(&$a) {
 			intval(time() + 45)
 		);
 
-		logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); 
+		logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
 		$dest = (($url) ? '&destination_url=' . $url : '');
-		goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
+		goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
 			. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet );
 	}
 
-	if(local_user())
-		$handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3);
-	if(remote_user())
+	if (local_user()) {
+		$handle = $a->user['nickname'] . '@' . substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3);
+	}
+	if (remote_user()) {
 		$handle = $_SESSION['handle'];
+	}
 
-	if($url) {
+	if ($url) {
 		$url = str_replace('{zid}','&zid=' . $handle,$url);
 		goaway($url);
 	}