tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #5567 from JeroenED/feature/queues-localtime

Browse source 
Converting timezone in admin queues
This commit is contained in:
Michael Vogel 2018-08-07 14:19:15 +02:00 committed by GitHub
commit d60eb25ba7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
mod/admin.php
View file

@ -746,10 +746,18 @@ function admin_page_federation(App $a)
function admin_page_queue(App $a) function admin_page_queue(App $a)
{ {
// get content from the queue table // get content from the queue table
$r = q("SELECT `c`.`name`, `c`.`nurl`, `q`.`id`, `q`.`network`, `q`.`created`, `q`.`last` $entries = DBA::p("SELECT `contact`.`name`, `contact`.`nurl`,
FROM `queue` AS `q`, `contact` AS `c` `queue`.`id`, `queue`.`network`, `queue`.`created`, `queue`.`last`
WHERE `c`.`id` = `q`.`cid` FROM `queue` INNER JOIN `contact` ON `contact`.`id` = `queue`.`cid`
ORDER BY `q`.`cid`, `q`.`created`;"); ORDER BY `queue`.`cid`, `queue`.`created`");
$r = [];
while ($entry = DBA::fetch($entries)) {
$entry['created'] = DateTimeFormat::local($entry['created']);
$entry['last'] = DateTimeFormat::local($entry['last']);
$r[] = $entry;
}
DBA::close($entries);
$t = get_markup_template('admin/queue.tpl'); $t = get_markup_template('admin/queue.tpl');
return replace_macros($t, [ return replace_macros($t, [
@ -781,13 +789,16 @@ function admin_page_queue(App $a)
function admin_page_workerqueue(App $a) function admin_page_workerqueue(App $a)
{ {
// get jobs from the workerqueue table // get jobs from the workerqueue table
$statement = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], ['done' => 0], ['order'=> ['priority']]); $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], ['done' => 0], ['order'=> ['priority']]);
$r = DBA::toArray($statement);
foreach ($r as $key => $rr) { $r = [];
while ($entry = DBA::fetch($entries)) {
// fix GH-5469. ref: src/Core/Worker.php:217 // fix GH-5469. ref: src/Core/Worker.php:217
$r[$key]['parameter'] = Arrays::recursiveImplode(json_decode($rr['parameter'], true), ': '); $entry['parameter'] = Arrays::recursiveImplode(json_decode($entry['parameter'], true), ': ');
$entry['created'] = DateTimeFormat::local($entry['created']);
$r[] = $entry;
} }
DBA::close($entries);
$t = get_markup_template('admin/workerqueue.tpl'); $t = get_markup_template('admin/workerqueue.tpl');
return replace_macros($t, [ return replace_macros($t, [