X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=e3c8d92eebd23f2ae9e6ba33d98f25fcab3ce8ec;hb=8d195dc4992ff1e1d083ef0777c24ee897e63875;hp=d1917b8b30903138f18a8cd17203588c8c8f1361;hpb=8ec424325375aa923c7d2d78ac8ddcc352f09cff;p=friendica.git

diff --git a/include/auth.php b/include/auth.php
index d1917b8b30..e3c8d92eeb 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -50,7 +50,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 			intval($_SESSION['visitor_id'])
 		);
-		if (count($r)) {
+		if (dbm::is_result($r)) {
 			$a->contact = $r[0];
 		}
 	}
@@ -73,7 +73,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 			intval($_SESSION['uid'])
 		);
 
-		if (!count($r)) {
+		if (!dbm::is_result($r)) {
 			nuke_session();
 			goaway(z_root());
 		}
@@ -125,8 +125,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 				$openid = new LightOpenID;
 				$openid->identity = $openid_url;
 				$_SESSION['openid'] = $openid_url;
-				$a = get_app();
-				$openid->returnUrl = $a->get_baseurl(true).'/openid';
+				$openid->returnUrl = App::get_baseurl(true).'/openid';
 				goaway($openid->authUrl());
 			} catch (Exception $e) {
 				notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'.t('The error message was:').' '.$e->getMessage());
@@ -169,7 +168,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 				dbesc(trim($_POST['username'])),
 				dbesc($encrypted)
 			);
-			if (count($r))
+			if (dbm::is_result($r))
 				$record = $r[0];
 		}