keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved dba calls

Browse source 
- 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', $user = dba::select('user',
[], [],
[ [
'uid' => intval($data->uid), 'uid' => $data->uid,
'blocked' => 0, 'blocked' => false,
'account_expired' => 0, 'account_expired' => false,
'account_removed' => 0, 'account_removed' => false,
'verified' => 1, 'verified' => true,
], ],
['limit' => 1] ['limit' => 1]
); );
@ -86,11 +86,11 @@ if (isset($_SESSION) && x($_SESSION, 'authenticated') && (!x($_POST, 'auth-param
$user = dba::select('user', $user = dba::select('user',
[], [],
[ [
'uid' => intval($_SESSION['uid']), 'uid' => $_SESSION['uid'],
'blocked' => 0, 'blocked' => false,
'account_expired' => 0, 'account_expired' => false,
'account_removed' => 0, 'account_removed' => false,
'verified' => 1, 'verified' => true,
], ],
['limit' => 1] ['limit' => 1]
); );

2
src/Model/User.php
View file

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

4
src/Worker/Queue.php
View file

@ -80,7 +80,7 @@ class Queue
$q_item = $r[0]; $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)) { if (!DBM::is_result($contact)) {
remove_queue_item($q_item['id']); remove_queue_item($q_item['id']);
return; 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)) { if (!DBM::is_result($user)) {
remove_queue_item($q_item['id']); remove_queue_item($q_item['id']);
return; return;