friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Improved dba calls 

- Removed intval calls
- Used boolean values for params when relevant
This commit is contained in:
Hypolite Petovan 2017-11-27 08:17:56 -05:00
parent 9ddb81ce5f
commit ced1063a10
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/auth.php
View File

@ -17,11 +17,11 @@ if (isset($_COOKIE["Friendica"])) {
$user = dba::select('user',
[],
[
'uid' => intval($data->uid),
'blocked' => 0,
'account_expired' => 0,
'account_removed' => 0,
'verified' => 1,
'uid' => $data->uid,
'blocked' => false,
'account_expired' => false,
'account_removed' => false,
'verified' => true,
],
['limit' => 1]
);
@ -86,11 +86,11 @@ if (isset($_SESSION) && x($_SESSION, 'authenticated') && (!x($_POST, 'auth-param
$user = dba::select('user',
[],
[
'uid' => intval($_SESSION['uid']),
'blocked' => 0,
'account_expired' => 0,
'account_removed' => 0,
'verified' => 1,
'uid' => $_SESSION['uid'],
'blocked' => false,
'account_expired' => false,
'account_removed' => false,
'verified' => true,
],
['limit' => 1]
);

2
src/Model/User.php
View File

@ -87,7 +87,7 @@ class User
dba::insert('userd', ['username' => $user['nickname']]);
// The user and related data will be deleted in "cron_expire_and_remove_users" (cronjobs.php)
dba::update('user', ['account_removed' => 1, 'account_expires_on' => datetime_convert()], ['uid' => intval($uid)]);
dba::update('user', ['account_removed' => true, 'account_expires_on' => datetime_convert()], ['uid' => $uid]);
Worker::add(PRIORITY_HIGH, "Notifier", "removeme", $uid);
// Send an update to the directory

4
src/Worker/Queue.php
View File

@ -80,7 +80,7 @@ class Queue
$q_item = $r[0];
$contact = dba::select('contact', [], ['id' => intval($q_item['cid'])], ['limit' => 1]);
$contact = dba::select('contact', [], ['id' => $q_item['cid']], ['limit' => 1]);
if (!DBM::is_result($contact)) {
remove_queue_item($q_item['id']);
return;
@ -113,7 +113,7 @@ class Queue
}
}
$user = dba::select('user', [], ['uid' => intval($contact['uid'])], ['limit' => 1]);
$user = dba::select('user', [], ['uid' => $contact['uid']], ['limit' => 1]);
if (!DBM::is_result($user)) {
remove_queue_item($q_item['id']);
return;