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

Class file relocations

Browse source 
Issue #3878
This commit is contained in:
Adam Magness 2017-11-07 22:57:46 -05:00
parent 6189f6c8e7
commit 4ca68c7af0
151 changed files with 987 additions and 8742 deletions
Download patch file Download diff file Expand all files Collapse all files

15
include/queue.php
View file

@ -2,8 +2,9 @@
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\Dfrn;
use Friendica\Protocol\DFRN;
require_once 'include/queue_fn.php';
require_once 'include/datetime.php';
@ -35,7 +36,7 @@ function queue_run(&$argv, &$argc) {
INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
if (dbm::is_result($r)) {
if (DBM::is_result($r)) {
foreach ($r as $rr) {
logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
logger('Expired queue data: ' . $rr['content'], LOGGER_DATA);
@ -51,7 +52,7 @@ function queue_run(&$argv, &$argc) {
call_hooks('queue_predeliver', $a, $r);
if (dbm::is_result($r)) {
if (DBM::is_result($r)) {
foreach ($r as $q_item) {
logger('Call queue for id '.$q_item['id']);
Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "queue", (int)$q_item['id']);
@ -68,7 +69,7 @@ function queue_run(&$argv, &$argc) {
$r = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
intval($queue_id));
if (!dbm::is_result($r)) {
if (!DBM::is_result($r)) {
return;
}
@ -78,7 +79,7 @@ function queue_run(&$argv, &$argc) {
intval($q_item['cid'])
);
if (!dbm::is_result($c)) {
if (!DBM::is_result($c)) {
remove_queue_item($q_item['id']);
return;
}
@ -114,7 +115,7 @@ function queue_run(&$argv, &$argc) {
FROM `user` WHERE `uid` = %d LIMIT 1",
intval($c[0]['uid'])
);
if (!dbm::is_result($u)) {
if (!DBM::is_result($u)) {
remove_queue_item($q_item['id']);
return;
}
@ -129,7 +130,7 @@ function queue_run(&$argv, &$argc) {
switch ($contact['network']) {
case NETWORK_DFRN:
logger('queue: dfrndelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
$deliver_status = Dfrn::deliver($owner, $contact, $data);
$deliver_status = DFRN::deliver($owner, $contact, $data);
if ($deliver_status == (-1)) {
update_queue_time($q_item['id']);