Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-21 13:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename DBM method calls to DBA method calls

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-21 08:40:21 -04:00 • committed by Hypolite Petovan
parent 8ddb94ef06
commit 0ec44f3e8a
153 changed files with 813 additions and 918 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Module/Login.php
View file

@ -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;
@ -185,7 +184,7 @@ class Login extends BaseModule
'verified' => true,
]
);
if (DBM::is_result($user)) {
if (DBA::is_result($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::is_result($r)) {
self::getApp()->contact = $r[0];
}
}
@ -240,7 +239,7 @@ class Login extends BaseModule
'verified' => true,
]
);
if (!DBM::is_result($user)) {
if (!DBA::is_result($user)) {
nuke_session();
goaway(self::getApp()->get_baseurl());
}

3
src/Module/Owa.php
View file

@ -7,7 +7,6 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\OpenWebAuthToken;
use Friendica\Util\HTTPSignature;
@ -52,7 +51,7 @@ class Owa extends BaseModule
$contact = DBA::selectFirst('contact', $fields, $condition);
if (DBM::is_result($contact)) {
if (DBA::is_result($contact)) {
// Try to verify the signed header with the public key of the contact record
// we have found.
$verified = HTTPSignature::verify('', $contact['pubkey']);