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

Rename Friendica\Database\dba to Friendica\Database\DBA

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-20 08:19:26 -04:00
parent b6a1df0598
commit af6dbc654f
127 changed files with 1169 additions and 1169 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Hashtag.php
View file

@ -6,7 +6,7 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\System;
use Friendica\Database\dba;
use Friendica\Database\DBA;
require_once 'include/dba.php';
require_once 'include/text.php';
@ -26,14 +26,14 @@ class Hashtag extends BaseModule
System::jsonExit($result);
}
$taglist = dba::p("SELECT DISTINCT(`term`) FROM `term` WHERE `term` LIKE ? AND `type` = ? ORDER BY `term`",
$taglist = DBA::p("SELECT DISTINCT(`term`) FROM `term` WHERE `term` LIKE ? AND `type` = ? ORDER BY `term`",
$t . '%',
intval(TERM_HASHTAG)
);
while ($tag = dba::fetch($taglist)) {
while ($tag = DBA::fetch($taglist)) {
$result[] = ['text' => $tag['term']];
}
dba::close($taglist);
DBA::close($taglist);
System::jsonExit($result);
}

8
src/Module/Login.php
View file

@ -9,7 +9,7 @@ use Friendica\BaseModule;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Database\dba;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\User;
use Friendica\Util\DateTimeFormat;
@ -135,7 +135,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 +176,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,
@ -231,7 +231,7 @@ class Login extends BaseModule
goaway(self::getApp()->get_baseurl());
}
$user = dba::selectFirst('user', [],
$user = DBA::selectFirst('user', [],
[
'uid' => $_SESSION['uid'],
'blocked' => false,

4
src/Module/Magic.php
View file

@ -5,7 +5,7 @@
namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Database\dba;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Util\HTTPSignature;
use Friendica\Util\Network;
@ -44,7 +44,7 @@ class Magic extends BaseModule
goaway($dest);
}
$contact = dba::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
$contact = DBA::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
// Redirect if the contact is already authenticated on this site.
if (!empty($a->contact) && array_key_exists('id', $a->contact) && strpos($contact['nurl'], normalise_link(self::getApp()->get_baseurl())) !== false) {

4
src/Module/Owa.php
View file

@ -6,7 +6,7 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\System;
use Friendica\Database\dba;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\OpenWebAuthToken;
@ -50,7 +50,7 @@ class Owa extends BaseModule
$fields = ['id', 'url', 'addr', 'pubkey'];
$condition = ['id' => $cid];
$contact = dba::selectFirst('contact', $fields, $condition);
$contact = DBA::selectFirst('contact', $fields, $condition);
if (DBM::is_result($contact)) {
// Try to verify the signed header with the public key of the contact record