X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FLogin.php;h=3f9d6998c782fcdaa3aac6e87661bff9159dc653;hb=cfa68c52b9117616fa95a4639ad74e7d220d193d;hp=06d724bb2adc5eac1b48871ecd515c3fef665e99;hpb=66a103e36a42ab251fd9ca6c4b56b54380e4d535;p=friendica.git

diff --git a/src/Module/Login.php b/src/Module/Login.php
index 06d724bb2a..3f9d6998c7 100644
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -4,16 +4,15 @@
  */
 namespace Friendica\Module;
 
+use Exception;
 use Friendica\BaseModule;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use dba;
-use Exception;
 use LightOpenID;
 
 require_once 'boot.php';
@@ -135,7 +134,7 @@ class Login extends BaseModule
 					throw new Exception(L10n::t('Login failed.'));
 				}
 			} else {
-				$record = dba::selectFirst('user', [],
+				$record = DBA::selectFirst('user', [],
 					['uid' => User::getIdFromPasswordAuthentication($username, $password)]
 				);
 			}
@@ -176,7 +175,7 @@ class Login extends BaseModule
 			$data = json_decode($_COOKIE["Friendica"]);
 			if (isset($data->uid)) {
 
-				$user = dba::selectFirst('user', [],
+				$user = DBA::selectFirst('user', [],
 					[
 						'uid'             => $data->uid,
 						'blocked'         => false,
@@ -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();
@@ -215,7 +214,7 @@ class Login extends BaseModule
 				$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 					intval($_SESSION['visitor_id'])
 				);
-				if (DBM::is_result($r)) {
+				if (DBA::isResult($r)) {
 					self::getApp()->contact = $r[0];
 				}
 			}
@@ -231,7 +230,7 @@ class Login extends BaseModule
 					goaway(self::getApp()->get_baseurl());
 				}
 
-				$user = dba::selectFirst('user', [],
+				$user = DBA::selectFirst('user', [],
 					[
 						'uid'             => $_SESSION['uid'],
 						'blocked'         => false,
@@ -240,7 +239,7 @@ class Login extends BaseModule
 						'verified'        => true,
 					]
 				);
-				if (!DBM::is_result($user)) {
+				if (!DBA::isResult($user)) {
 					nuke_session();
 					goaway(self::getApp()->get_baseurl());
 				}