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

converting timezones in php

Browse source
This commit is contained in:
Unknown 2018-08-06 12:30:43 +02:00
parent e4049d2793
commit 480d573fc5
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mod/admin.php
View file

@ -746,21 +746,25 @@ 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
// PLEASE REVIEW (not 100% sure about my code) /*
//todo: convert q() to DBA::Select()
$statement = DBA::Select('`queue` AS `q`, `contact` AS `c`', $statement = DBA::Select('`queue` AS `q`, `contact` AS `c`',
[ '`c`.`name`', '`c`.`nurl`', '`q`.`id`', '`q`.`network`', "CONVERT_TZ(`q`.`created`, 'UTC' " . Config::get('system', 'default_timezone') . ') as created', "CONVERT_TZ(`q`.`last`, 'UTC', " . Config::get('system', 'default_timezone') . "') as last" ], [ '`c`.`name`', '`c`.`nurl`', '`q`.`id`', '`q`.`network`', "CONVERT_TZ(`q`.`created`, 'UTC' " . Config::get('system', 'default_timezone') . ') as created', "CONVERT_TZ(`q`.`last`, 'UTC', " . Config::get('system', 'default_timezone') . "') as last" ],
'`c`.`id`' => '`q`.`cid`', '`c`.`id`' => '`q`.`cid`',
['order'=> ['`q`.`cid`, `q`.`created`']] ['order'=> ['`q`.`cid`, `q`.`created`']]
); );
$r = DBA::toArray($statement); $r = DBA::toArray($statement);
*/
/*
// Leaving this one here for the code review as well as backup
$r = q("SELECT `c`.`name`, `c`.`nurl`, `q`.`id`, `q`.`network`, `q`.`created`, `q`.`last` $r = q("SELECT `c`.`name`, `c`.`nurl`, `q`.`id`, `q`.`network`, `q`.`created`, `q`.`last`
FROM `queue` AS `q`, `contact` AS `c` FROM `queue` AS `q`, `contact` AS `c`
WHERE `c`.`id` = `q`.`cid` WHERE `c`.`id` = `q`.`cid`
ORDER BY `q`.`cid`, `q`.`created`;"); ORDER BY `q`.`cid`, `q`.`created`;");
*/
foreach ($r as $key => $rr) {
$r[$key]['created'] = DateTimeFormat::local($rr['created']);
$r[$key]['last'] = DateTimeFormat::local($rr['last']);
}
$t = get_markup_template('admin/queue.tpl'); $t = get_markup_template('admin/queue.tpl');
return replace_macros($t, [ return replace_macros($t, [
'$title' => L10n::t('Administration'), '$title' => L10n::t('Administration'),
@ -791,12 +795,13 @@ 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', "CONVERT_TZ(created', 'UTC', " . Config::get('system', 'default_timezone') . "') as created", 'priority'], ['done' => 0], ['order'=> ['priority']]); $statement = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], ['done' => 0], ['order'=> ['priority']]);
$r = DBA::toArray($statement); $r = DBA::toArray($statement);
foreach ($r as $key => $rr) { foreach ($r as $key => $rr) {
// 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), ': '); $r[$key]['parameter'] = Arrays::recursiveImplode(json_decode($rr['parameter'], true), ': ');
$r[$key]['created'] = DateTimeFormat::local($rr['created']);
} }
$t = get_markup_template('admin/workerqueue.tpl'); $t = get_markup_template('admin/workerqueue.tpl');