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

added spaces + some curly braces + some usage of dbm::is_result()

Browse source 
Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder 2017-04-04 19:48:13 +02:00 committed by Roland Häder
parent f66c5c6823
commit 347803fd5c
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
2 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/pgettext.php
View file

@ -91,7 +91,6 @@ function pop_lang() {
$lang = $a->langsave; $lang = $a->langsave;
} }
// l // l
if (! function_exists('load_translation_table')) { if (! function_exists('load_translation_table')) {

37
include/queue.php
View file

@ -2,13 +2,13 @@
use Friendica\Core\Config; use Friendica\Core\Config;
require_once('include/queue_fn.php'); require_once 'include/queue_fn.php';
require_once('include/dfrn.php'); require_once 'include/dfrn.php';
require_once("include/datetime.php"); require_once 'include/datetime.php';
require_once('include/items.php'); require_once 'include/items.php';
require_once('include/bbcode.php'); require_once 'include/bbcode.php';
require_once('include/socgraph.php'); require_once 'include/socgraph.php';
require_once('include/cache.php'); require_once 'include/cache.php';
function queue_run(&$argv, &$argc) { function queue_run(&$argv, &$argc) {
global $a; global $a;
@ -29,6 +29,25 @@ function queue_run(&$argv, &$argc){
// Handling the pubsubhubbub requests // Handling the pubsubhubbub requests
proc_run(PRIORITY_HIGH,'include/pubsubpublish.php'); proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
// If we are using the worker we don't need a delivery interval
/// @TODO To much get_config() here
if (get_config("system", "worker")) {
$interval = false;
}
$r = q("select * from deliverq where 1");
if ($r) {
foreach ($r as $rr) {
logger('queue: deliverq');
proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
if ($interval) {
time_sleep_until(microtime(true) + (float) $interval);
}
}
}
$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue` $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY"); WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
@ -60,8 +79,8 @@ function queue_run(&$argv, &$argc){
// delivering // delivering
require_once('include/salmon.php'); require_once 'include/salmon.php';
require_once('include/diaspora.php'); require_once 'include/diaspora.php';
$r = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1", $r = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
intval($queue_id)); intval($queue_id));