X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FLogin.php;h=fadfb206612c3bd728f00efa276b453372ba280a;hb=de8787dd5bb9fadd6388c050bad35ec4c0332e08;hp=fccf8b9d85f6e347ee044987ada3fc9fbf456708;hpb=af6dbc654f82225cfc647fe2072662acae388e47;p=friendica.git

diff --git a/src/Module/Login.php b/src/Module/Login.php
index fccf8b9d85..fadfb20661 100644
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -10,7 +10,6 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -23,7 +22,7 @@ require_once 'include/text.php';
 /**
  * Login module
  *
- * @author Hypolite Petovan mrpetovan@gmail.com
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Login extends BaseModule
 {
@@ -185,7 +184,7 @@ class Login extends BaseModule
 						'verified'        => true,
 					]
 				);
-				if (DBM::is_result($user)) {
+				if (DBA::isResult($user)) {
 					if ($data->hash != cookie_hash($user)) {
 						logger("Hash for user " . $data->uid . " doesn't fit.");
 						nuke_session();
@@ -212,11 +211,9 @@ class Login extends BaseModule
 
 		if (isset($_SESSION) && x($_SESSION, 'authenticated')) {
 			if (x($_SESSION, 'visitor_id') && !x($_SESSION, 'uid')) {
-				$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
-					intval($_SESSION['visitor_id'])
-				);
-				if (DBM::is_result($r)) {
-					self::getApp()->contact = $r[0];
+				$contact = DBA::selectFirst('contact', [], ['id' => $_SESSION['visitor_id']]);
+				if (DBA::isResult($contact)) {
+					self::getApp()->contact = $contact;
 				}
 			}
 
@@ -240,7 +237,7 @@ class Login extends BaseModule
 						'verified'        => true,
 					]
 				);
-				if (!DBM::is_result($user)) {
+				if (!DBA::isResult($user)) {
 					nuke_session();
 					goaway(self::getApp()->get_baseurl());
 				}