clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Many "fetch_first" had been replaced

This commit is contained in:
Michael 2018-06-19 21:33:07 +00:00
parent 139d35438d
commit 962fbc9166
7 changed files with 35 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/security.php
View File

@ -99,11 +99,9 @@ function authenticate_success($user_record, $login_initial = false, $interactive
$master_record = $a->user; $master_record = $a->user;
if ((x($_SESSION, 'submanage')) && intval($_SESSION['submanage'])) { if ((x($_SESSION, 'submanage')) && intval($_SESSION['submanage'])) {
$r = dba::fetch_first("SELECT * FROM `user` WHERE `uid` = ? LIMIT 1", $user = dba::selectFirst('user', [], ['uid' => $_SESSION['submanage']]);
intval($_SESSION['submanage']) if (DBM::is_result($user)) {
); $master_record = $user;
if (DBM::is_result($r)) {
$master_record = $r;
} }
} }
@ -155,10 +153,10 @@ function authenticate_success($user_record, $login_initial = false, $interactive
logger('auth_identities refresh: ' . print_r($a->identities, true), LOGGER_DEBUG); logger('auth_identities refresh: ' . print_r($a->identities, true), LOGGER_DEBUG);
} }
$r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $_SESSION['uid']); $contact = dba::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => true]);
if (DBM::is_result($r)) { if (DBM::is_result($contact)) {
$a->contact = $r; $a->contact = $contact;
$a->cid = $r['id']; $a->cid = $contact['id'];
$_SESSION['cid'] = $a->cid; $_SESSION['cid'] = $a->cid;
} }

8
mod/item.php
View File

@ -647,13 +647,13 @@ function item_post(App $a) {
// This field is for storing the raw conversation data // This field is for storing the raw conversation data
$datarray['protocol'] = PROTOCOL_DFRN; $datarray['protocol'] = PROTOCOL_DFRN;
$r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $datarray['parent-uri']); $conversation = dba::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $datarray['parent-uri']]);
if (DBM::is_result($r)) { if (DBM::is_result($conversation)) {
if ($r['conversation-uri'] != '') { if ($r['conversation-uri'] != '') {
$datarray['conversation-uri'] = $r['conversation-uri']; $datarray['conversation-uri'] = $conversation['conversation-uri'];
} }
if ($r['conversation-href'] != '') { if ($r['conversation-href'] != '') {
$datarray['conversation-href'] = $r['conversation-href']; $datarray['conversation-href'] = $conversation['conversation-href'];
} }
} }

15
src/Core/Worker.php
View File

@ -155,12 +155,7 @@ class Worker
*/ */
private static function totalEntries() private static function totalEntries()
{ {
$s = dba::fetch_first("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` <= ? AND NOT `done`", NULL_DATE); return dba::count('workerqueue', ["`executed` <= ? AND NOT `done`", NULL_DATE]);
if (DBM::is_result($s)) {
return $s["total"];
} else {
return 0;
}
} }
/** /**
@ -718,9 +713,7 @@ class Worker
*/ */
private static function activeWorkers() private static function activeWorkers()
{ {
$workers = dba::fetch_first("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'Worker.php'"); return dba::count('process', ['command' => 'Worker.php']);
return $workers["processes"];
} }
/** /**
@ -973,9 +966,9 @@ class Worker
self::clearProcesses(); self::clearProcesses();
$workers = dba::fetch_first("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'worker.php'"); $workers = self::activeWorkers();
if ($workers["processes"] == 0) { if ($workers == 0) {
self::callWorker(); self::callWorker();
} }
} }

4
src/Model/Conversation.php
View File

@ -52,8 +52,8 @@ class Conversation
$conversation['source'] = $arr['source']; $conversation['source'] = $arr['source'];
} }
$old_conv = dba::fetch_first("SELECT `item-uri`, `reply-to-uri`, `conversation-uri`, `conversation-href`, `protocol`, `source` $fields = ['item-uri', 'reply-to-uri', 'conversation-uri', 'conversation-href', 'protocol', 'source'];
FROM `conversation` WHERE `item-uri` = ?", $conversation['item-uri']); $old_conv = dba::selectFirst('conversation', $fields, ['item-uri' => $conversation['item-uri']]);
if (DBM::is_result($old_conv)) { if (DBM::is_result($old_conv)) {
// Don't update when only the source has changed. // Don't update when only the source has changed.
// Only do this when there had been no source before. // Only do this when there had been no source before.

17
src/Model/User.php
View File

@ -211,18 +211,11 @@ class User
] ]
); );
} else { } else {
$user = dba::fetch_first('SELECT `uid`, `password`, `legacy_password` $fields = ['uid', 'password', 'legacy_password'];
FROM `user` $condition = ["(`email` = ? OR `username` = ? OR `nickname` = ?)
WHERE (`email` = ? OR `username` = ? OR `nickname` = ?) AND NOT `blocked` AND NOT `account_expired` AND NOT `account_removed` AND `verified`",
AND `blocked` = 0 $user_info, $user_info, $user_info];
AND `account_expired` = 0 $user = dba::selectFirst('user', $fields, $condition);
AND `account_removed` = 0
AND `verified` = 1
LIMIT 1',
$user_info,
$user_info,
$user_info
);
} }
if (!DBM::is_result($user)) { if (!DBM::is_result($user)) {

20
src/Protocol/DFRN.php
View File

@ -950,13 +950,13 @@ class DFRN
$conversation_uri = $conversation_href; $conversation_uri = $conversation_href;
if (isset($parent_item)) { if (isset($parent_item)) {
$r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $item['parent-uri']); $conversation = dba::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $item['parent-uri']]);
if (DBM::is_result($r)) { if (DBM::is_result($conversation)) {
if ($r['conversation-uri'] != '') { if ($r['conversation-uri'] != '') {
$conversation_uri = $r['conversation-uri']; $conversation_uri = $conversation['conversation-uri'];
} }
if ($r['conversation-href'] != '') { if ($r['conversation-href'] != '') {
$conversation_href = $r['conversation-href']; $conversation_href = $conversation['conversation-href'];
} }
} }
} }
@ -1537,13 +1537,11 @@ class DFRN
$author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue; $author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue;
$author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue; $author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue;
$contact_old = dba::fetch_first("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `avatar`, `name-date`, `uri-date`, `addr`, $fields = ['id', 'uid', 'url', 'network', 'avatar-date', 'avatar', 'name-date', 'uri-date', 'addr',
`name`, `nick`, `about`, `location`, `keywords`, `xmpp`, `bdyear`, `bd`, `hidden`, `contact-type` 'name', 'nick', 'about', 'location', 'keywords', 'xmpp', 'bdyear', 'bd', 'hidden', 'contact-type'];
FROM `contact` WHERE `uid` = ? AND `nurl` = ? AND `network` != ?", $condition = ["`uid` = ? AND `nurl` = ? AND `network` != ?",
$importer["importer_uid"], $importer["importer_uid"], normalise_link($author["link"]), NETWORK_STATUSNET];
normalise_link($author["link"]), $contact_old = dba::selectFirst('contact', $fields, $condition);
NETWORK_STATUSNET
);
if (DBM::is_result($contact_old)) { if (DBM::is_result($contact_old)) {
$author["contact-id"] = $contact_old["id"]; $author["contact-id"] = $contact_old["id"];

9
src/Protocol/OStatus.php
View File

@ -1971,14 +1971,13 @@ class OStatus
$conversation_uri = $conversation_href; $conversation_uri = $conversation_href;
if (isset($parent_item)) { if (isset($parent_item)) {
$r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $parent_item); $conversation = dba::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]);
if (DBM::is_result($conversation)) {
if (DBM::is_result($r)) {
if ($r['conversation-uri'] != '') { if ($r['conversation-uri'] != '') {
$conversation_uri = $r['conversation-uri']; $conversation_uri = $conversation['conversation-uri'];
} }
if ($r['conversation-href'] != '') { if ($r['conversation-href'] != '') {
$conversation_href = $r['conversation-href']; $conversation_href = $conversation['conversation-href'];
} }
} }
} }