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

Move Temporal::convert() to DateTimeFormat::convert()

Browse source
This commit is contained in:
Hypolite Petovan 2018-01-26 21:38:34 -05:00
parent b7a7355292
commit 5e7285b9ba
64 changed files with 568 additions and 551 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Worker/Cron.php
View file

@ -8,7 +8,7 @@ use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Util\Temporal;
use Friendica\Util\DateTimeFormat;
use dba;
require_once 'include/dba.php';
@ -71,7 +71,7 @@ Class Cron {
// once daily run birthday_updates and then expire in background
$d1 = Config::get('system', 'last_expire_day');
$d2 = intval(Temporal::utcNow('d'));
$d2 = intval(DateTimeFormat::utcNow('d'));
if ($d2 != intval($d1)) {
@ -142,7 +142,7 @@ Class Cron {
Addon::reload();
$d = Temporal::utcNow();
$d = DateTimeFormat::utcNow();
// Only poll from those with suitable relationships,
// and which have a polling address and ignore Diaspora since
@ -218,33 +218,33 @@ Class Cron {
*/
switch ($contact['priority']) {
case 5:
if (Temporal::utcNow() > Temporal::utc($t . " + 1 month")) {
if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 month")) {
$update = true;
}
break;
case 4:
if (Temporal::utcNow() > Temporal::utc($t . " + 1 week")) {
if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 week")) {
$update = true;
}
break;
case 3:
if (Temporal::utcNow() > Temporal::utc($t . " + 1 day")) {
if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 day")) {
$update = true;
}
break;
case 2:
if (Temporal::utcNow() > Temporal::utc($t . " + 12 hour")) {
if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 12 hour")) {
$update = true;
}
break;
case 1:
if (Temporal::utcNow() > Temporal::utc($t . " + 1 hour")) {
if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 hour")) {
$update = true;
}
break;
case 0:
default:
if (Temporal::utcNow() > Temporal::utc($t . " + ".$min_poll_interval." minute")) {
if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + ".$min_poll_interval." minute")) {
$update = true;
}
break;