bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Add Temporal::utcNow()

Browse source
This commit is contained in:
Hypolite Petovan 2018-01-25 23:26:51 -05:00
commit 8aff8a76eb
51 changed files with 191 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Content/OEmbed.php
View file

@ -113,7 +113,7 @@ class OEmbed
'url' => normalise_link($embedurl),
'maxwidth' => $a->videowidth,
'content' => $txt,
'created' => Temporal::convert()
'created' => Temporal::utcNow()
], true);
}

2
src/Core/Cache.php
View file

@ -147,7 +147,7 @@ class Cache
$memcache->set(get_app()->get_hostname().":".$key, serialize($value), MEMCACHE_COMPRESSED, self::duration($duration));
return;
}
$fields = ['v' => serialize($value), 'expire_mode' => $duration, 'updated' => Temporal::convert()];
$fields = ['v' => serialize($value), 'expire_mode' => $duration, 'updated' => Temporal::utcNow()];
$condition = ['k' => $key];
dba::update('cache', $fields, $condition, true);
}

14
src/Core/Worker.php
View file

@ -235,7 +235,7 @@ class Worker
if ($age > 1) {
$stamp = (float)microtime(true);
dba::update('workerqueue', ['executed' => Temporal::convert()], ['pid' => $mypid, 'done' => false]);
dba::update('workerqueue', ['executed' => Temporal::utcNow()], ['pid' => $mypid, 'done' => false]);
self::$db_duration += (microtime(true) - $stamp);
}
@ -245,7 +245,7 @@ class Worker
$stamp = (float)microtime(true);
if (dba::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) {
Config::set('system', 'last_poller_execution', Temporal::convert());
Config::set('system', 'last_poller_execution', Temporal::utcNow());
}
self::$db_duration = (microtime(true) - $stamp);
@ -278,7 +278,7 @@ class Worker
if ($age > 1) {
$stamp = (float)microtime(true);
dba::update('workerqueue', ['executed' => Temporal::convert()], ['pid' => $mypid, 'done' => false]);
dba::update('workerqueue', ['executed' => Temporal::utcNow()], ['pid' => $mypid, 'done' => false]);
self::$db_duration += (microtime(true) - $stamp);
}
@ -286,7 +286,7 @@ class Worker
$stamp = (float)microtime(true);
if (dba::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) {
Config::set('system', 'last_poller_execution', Temporal::convert());
Config::set('system', 'last_poller_execution', Temporal::utcNow());
}
self::$db_duration = (microtime(true) - $stamp);
} else {
@ -574,7 +574,7 @@ class Worker
}
dba::update(
'workerqueue',
['executed' => NULL_DATE, 'created' => Temporal::convert(), 'priority' => $new_priority, 'pid' => 0],
['executed' => NULL_DATE, 'created' => Temporal::utcNow(), 'priority' => $new_priority, 'pid' => 0],
['id' => $entry["id"]]
);
} else {
@ -825,7 +825,7 @@ class Worker
if ($found) {
$condition = "`id` IN (".substr(str_repeat("?, ", count($ids)), 0, -2).") AND `pid` = 0 AND NOT `done`";
array_unshift($ids, $condition);
dba::update('workerqueue', ['executed' => Temporal::convert(), 'pid' => $mypid], $ids);
dba::update('workerqueue', ['executed' => Temporal::utcNow(), 'pid' => $mypid], $ids);
}
return $found;
@ -1040,7 +1040,7 @@ class Worker
$priority = PRIORITY_MEDIUM;
$dont_fork = Config::get("system", "worker_dont_fork");
$created = Temporal::convert();
$created = Temporal::utcNow();
if (is_int($run_parameter)) {
$priority = $run_parameter;

2
src/Database/DBM.php
View file

@ -126,6 +126,6 @@ class DBM
$timestamp = -62135596800;
}
return date('Y-m-d H:i:s', (int)$timestamp);
return date(Temporal::MYSQL, (int)$timestamp);
}
}

36
src/Model/Contact.php
View file

@ -112,7 +112,7 @@ class Contact extends BaseObject
$return = dba::insert('contact', [
'uid' => $user['uid'],
'created' => Temporal::convert(),
'created' => Temporal::utcNow(),
'self' => 1,
'name' => $user['username'],
'nick' => $user['nickname'],
@ -129,9 +129,9 @@ class Contact extends BaseObject
'poll' => System::baseUrl() . '/dfrn_poll/' . $user['nickname'],
'confirm' => System::baseUrl() . '/dfrn_confirm/' . $user['nickname'],
'poco' => System::baseUrl() . '/poco/' . $user['nickname'],
'name-date' => Temporal::convert(),
'uri-date' => Temporal::convert(),
'avatar-date' => Temporal::convert(),
'name-date' => Temporal::utcNow(),
'uri-date' => Temporal::utcNow(),
'avatar-date' => Temporal::utcNow(),
'closeness' => 0
]);
@ -210,10 +210,10 @@ class Contact extends BaseObject
}
if ($contact['term-date'] <= NULL_DATE) {
dba::update('contact', ['term-date' => Temporal::convert()], ['id' => $contact['id']]);
dba::update('contact', ['term-date' => Temporal::utcNow()], ['id' => $contact['id']]);
if ($contact['url'] != '') {
dba::update('contact', ['term-date' => Temporal::convert()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
dba::update('contact', ['term-date' => Temporal::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
}
} else {
/* @todo
@ -224,7 +224,7 @@ class Contact extends BaseObject
/// @todo Check for contact vitality via probing
$expiry = $contact['term-date'] . ' + 32 days ';
if (Temporal::convert() > Temporal::convert($expiry)) {
if (Temporal::utcNow() > Temporal::convert($expiry)) {
/* Relationship is really truly dead. archive them rather than
* delete, though if the owner tries to unarchive them we'll start
* the whole process over again.
@ -728,7 +728,7 @@ class Contact extends BaseObject
if (!$contact_id) {
dba::insert('contact', [
'uid' => $uid,
'created' => Temporal::convert(),
'created' => Temporal::utcNow(),
'url' => $data["url"],
'nurl' => normalise_link($data["url"]),
'addr' => $data["addr"],
@ -749,9 +749,9 @@ class Contact extends BaseObject
'request' => $data["request"],
'confirm' => $data["confirm"],
'poco' => $data["poco"],
'name-date' => Temporal::convert(),
'uri-date' => Temporal::convert(),
'avatar-date' => Temporal::convert(),
'name-date' => Temporal::utcNow(),
'uri-date' => Temporal::utcNow(),
'avatar-date' => Temporal::utcNow(),
'writable' => 1,
'blocked' => 0,
'readonly' => 0,
@ -823,13 +823,13 @@ class Contact extends BaseObject
}
if (($data["addr"] != $contact["addr"]) || ($data["alias"] != $contact["alias"])) {
$updated['uri-date'] = Temporal::convert();
$updated['uri-date'] = Temporal::utcNow();
}
if (($data["name"] != $contact["name"]) || ($data["nick"] != $contact["nick"])) {
$updated['name-date'] = Temporal::convert();
$updated['name-date'] = Temporal::utcNow();
}
$updated['avatar-date'] = Temporal::convert();
$updated['avatar-date'] = Temporal::utcNow();
dba::update('contact', $updated, ['id' => $contact_id], $contact);
@ -1026,7 +1026,7 @@ class Contact extends BaseObject
if ($photos) {
dba::update(
'contact',
['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => Temporal::convert()],
['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => Temporal::utcNow()],
['id' => $cid]
);
@ -1261,7 +1261,7 @@ class Contact extends BaseObject
// create contact record
dba::insert('contact', [
'uid' => $uid,
'created' => Temporal::convert(),
'created' => Temporal::utcNow(),
'url' => $ret['url'],
'nurl' => normalise_link($ret['url']),
'addr' => $ret['addr'],
@ -1485,7 +1485,7 @@ class Contact extends BaseObject
foreach ($r as $rr) {
logger('update_contact_birthday: ' . $rr['bd']);
$nextbd = Temporal::convert('now', 'UTC', 'UTC', 'Y') . substr($rr['bd'], 4);
$nextbd = Temporal::convert('Y') . substr($rr['bd'], 4);
/*
* Add new birthday event for this person
@ -1508,7 +1508,7 @@ class Contact extends BaseObject
q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ", intval($rr['uid']), intval($rr['id']),
dbesc(Temporal::convert()), dbesc(Temporal::convert()), dbesc(Temporal::convert($nextbd)),
dbesc(Temporal::utcNow()), dbesc(Temporal::utcNow()), dbesc(Temporal::convert($nextbd)),
dbesc(Temporal::convert($nextbd . ' + 1 day ')), dbesc($bdtext), dbesc($bdtext2), dbesc('birthday'),
intval(0)
);

10
src/Model/GContact.php
View file

@ -120,12 +120,12 @@ class GContact
intval($uid),
intval($gcid),
intval($zcid),
dbesc(Temporal::convert())
dbesc(Temporal::utcNow())
);
} else {
q(
"UPDATE `glink` SET `updated` = '%s' WHERE `cid` = %d AND `uid` = %d AND `gcid` = %d AND `zcid` = %d",
dbesc(Temporal::convert()),
dbesc(Temporal::utcNow()),
intval($cid),
intval($uid),
intval($gcid),
@ -717,8 +717,8 @@ class GContact
dbesc($contact["url"]),
dbesc(normalise_link($contact["url"])),
dbesc($contact["photo"]),
dbesc(Temporal::convert()),
dbesc(Temporal::convert()),
dbesc(Temporal::utcNow()),
dbesc(Temporal::utcNow()),
dbesc($contact["location"]),
dbesc($contact["about"]),
intval($contact["hide"]),
@ -1050,7 +1050,7 @@ class GContact
foreach ($r as $server) {
self::fetchGsUsers($server["url"]);
q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(Temporal::convert()), dbesc($server["nurl"]));
q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(Temporal::utcNow()), dbesc($server["nurl"]));
}
}

2
src/Model/Item.php
View file

@ -149,7 +149,7 @@ class Item extends BaseObject
// Set the item to "deleted"
dba::update('item', ['deleted' => true, 'title' => '', 'body' => '',
'edited' => Temporal::convert(), 'changed' => Temporal::convert()],
'edited' => Temporal::utcNow(), 'changed' => Temporal::utcNow()],
['id' => $item['id']]);
create_tags_from_item($item['id']);

8
src/Model/Mail.php
View file

@ -82,7 +82,7 @@ class Mail
$handles = $recip_handle . ';' . $sender_handle;
$fields = ['uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle,
'created' => Temporal::convert(), 'updated' => Temporal::convert(),
'created' => Temporal::utcNow(), 'updated' => Temporal::utcNow(),
'subject' => $subject, 'recips' => $handles];
if (dba::insert('conv', $fields)) {
$convid = dba::lastInsertId();
@ -116,7 +116,7 @@ class Mail
'replied' => 0,
'uri' => $uri,
'parent-uri' => $replyto,
'created' => Temporal::convert()
'created' => Temporal::utcNow()
]
);
@ -196,7 +196,7 @@ class Mail
$convid = null;
$fields = ['uid' => $recipient['uid'], 'guid' => $conv_guid, 'creator' => $sender_handle,
'created' => Temporal::convert(), 'updated' => Temporal::convert(),
'created' => Temporal::utcNow(), 'updated' => Temporal::utcNow(),
'subject' => $subject, 'recips' => $handles];
if (dba::insert('conv', $fields)) {
$convid = dba::lastInsertId();
@ -224,7 +224,7 @@ class Mail
'replied' => 0,
'uri' => $uri,
'parent-uri' => $replyto,
'created' => Temporal::convert(),
'created' => Temporal::utcNow(),
'unknown' => 1
]
);

4
src/Model/Photo.php
View file

@ -55,8 +55,8 @@ class Photo
'contact-id' => $cid,
'guid' => $guid,
'resource-id' => $rid,
'created' => Temporal::convert(),
'edited' => Temporal::convert(),
'created' => Temporal::utcNow(),
'edited' => Temporal::utcNow(),
'filename' => basename($filename),
'type' => $Image->getType(),
'album' => $album,

2
src/Model/Process.php
View file

@ -34,7 +34,7 @@ class Process extends BaseObject
dba::transaction();
if (!dba::exists('process', ['pid' => $pid])) {
$return = dba::insert('process', ['pid' => $pid, 'command' => $command, 'created' => Temporal::convert()]);
$return = dba::insert('process', ['pid' => $pid, 'command' => $command, 'created' => Temporal::utcNow()]);
}
dba::commit();

2
src/Model/Profile.php
View file

@ -557,7 +557,7 @@ class Profile
ORDER BY `start` ASC ",
local_user(),
Temporal::convert('now + 6 days'),
Temporal::convert('now')
Temporal::utcNow()
);
if (DBM::is_result($s)) {
$r = dba::inArray($s);

4
src/Model/Queue.php
View file

@ -20,7 +20,7 @@ class Queue
public static function updateTime($id)
{
logger('queue: requeue item ' . $id);
dba::update('queue', ['last' => Temporal::convert()], ['id' => $id]);
dba::update('queue', ['last' => Temporal::utcNow()], ['id' => $id]);
}
/**
@ -95,6 +95,6 @@ class Queue
}
}
dba::insert('queue', ['cid' => $cid, 'network' => $network, 'created' => Temporal::convert(), 'last' => Temporal::convert(), 'content' => $msg, 'batch' =>($batch) ? 1 : 0]);
dba::insert('queue', ['cid' => $cid, 'network' => $network, 'created' => Temporal::utcNow(), 'last' => Temporal::utcNow(), 'content' => $msg, 'batch' =>($batch) ? 1 : 0]);
}
}

4
src/Model/User.php
View file

@ -396,7 +396,7 @@ class User
'verified' => $verified,
'blocked' => $blocked,
'timezone' => 'UTC',
'register_date' => Temporal::convert(),
'register_date' => Temporal::utcNow(),
'default-location' => ''
]);
@ -613,7 +613,7 @@ class User
dba::insert('userd', ['username' => $user['nickname']]);
// The user and related data will be deleted in "cron_expire_and_remove_users" (cronjobs.php)
dba::update('user', ['account_removed' => true, 'account_expires_on' => Temporal::convert()], ['uid' => $uid]);
dba::update('user', ['account_removed' => true, 'account_expires_on' => Temporal::utcNow()], ['uid' => $uid]);
Worker::add(PRIORITY_HIGH, "Notifier", "removeme", $uid);
// Send an update to the directory

6
src/Module/Login.php
View file

@ -121,7 +121,7 @@ class Login extends BaseModule
// if we haven't failed up this point, log them in.
$_SESSION['remember'] = $_POST['remember'];
$_SESSION['last_login_date'] = Temporal::convert();
$_SESSION['last_login_date'] = Temporal::utcNow();
authenticate_success($record, true, true);
if (x($_SESSION, 'return_url')) {
@ -220,10 +220,10 @@ class Login extends BaseModule
// stays logged in for a long time, e.g. with "Remember Me"
$login_refresh = false;
if (!x($_SESSION['last_login_date'])) {
$_SESSION['last_login_date'] = Temporal::convert();
$_SESSION['last_login_date'] = Temporal::utcNow();
}
if (strcmp(Temporal::convert('now - 12 hours'), $_SESSION['last_login_date']) > 0) {
$_SESSION['last_login_date'] = Temporal::convert();
$_SESSION['last_login_date'] = Temporal::utcNow();
$login_refresh = true;
}
authenticate_success($user, false, false, $login_refresh);

2
src/Network/FKOAuth1.php
View file

@ -68,7 +68,7 @@ class FKOAuth1 extends OAuthServer
$_SESSION['cid'] = $a->cid;
}
dba::update('user', ['login_date' => Temporal::convert()], ['uid' => $_SESSION['uid']]);
dba::update('user', ['login_date' => Temporal::utcNow()], ['uid' => $_SESSION['uid']]);
Addon::callHooks('logged_in', $a->user);
}

12
src/Protocol/DFRN.php
View file

@ -1406,8 +1406,8 @@ class DFRN
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
intval($contact["uid"]),
intval($contact["id"]),
dbesc(Temporal::convert()),
dbesc(Temporal::convert()),
dbesc(Temporal::utcNow()),
dbesc(Temporal::utcNow()),
dbesc(Temporal::convert($birthday)),
dbesc(Temporal::convert($birthday . " + 1 day ")),
dbesc($bdtext),
@ -1889,7 +1889,7 @@ class DFRN
intval($suggest["cid"]),
dbesc($suggest["body"]),
dbesc($hash),
dbesc(Temporal::convert()),
dbesc(Temporal::utcNow()),
intval(0)
);
@ -2086,7 +2086,7 @@ class DFRN
}
$fields = ['title' => $item["title"], 'body' => $item["body"],
'tag' => $item["tag"], 'changed' => Temporal::convert(),
'tag' => $item["tag"], 'changed' => Temporal::utcNow(),
'edited' => Temporal::convert($item["edited"])];
$condition = ["`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]];
@ -2836,7 +2836,7 @@ class DFRN
`body` = '', `title` = ''
WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
dbesc($when),
dbesc(Temporal::convert()),
dbesc(Temporal::utcNow()),
dbesc($uri),
intval($importer["uid"])
);
@ -2849,7 +2849,7 @@ class DFRN
`body` = '', `title` = ''
WHERE `uri` = '%s' AND `uid` IN (0, %d)",
dbesc($when),
dbesc(Temporal::convert()),
dbesc(Temporal::utcNow()),
dbesc($uri),
intval($importer["uid"])
);

34
src/Protocol/Diaspora.php
View file

@ -77,7 +77,7 @@ class Diaspora
$r = q(
"INSERT INTO `contact` (`uid`, `created`, `name`, `nick`, `addr`, `url`, `nurl`, `batch`, `network`, `rel`, `blocked`, `pending`, `writable`, `name-date`, `uri-date`, `avatar-date`)
VALUES (0, '%s', '%s', 'relay', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, '%s', '%s', '%s')",
Temporal::convert(),
Temporal::utcNow(),
dbesc($addr),
dbesc($addr),
dbesc($server),
@ -85,9 +85,9 @@ class Diaspora
dbesc($batch),
dbesc(NETWORK_DIASPORA),
intval(CONTACT_IS_FOLLOWER),
dbesc(Temporal::convert()),
dbesc(Temporal::convert()),
dbesc(Temporal::convert())
dbesc(Temporal::utcNow()),
dbesc(Temporal::utcNow()),
dbesc(Temporal::utcNow())
);
$relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' LIMIT 1", dbesc($batch));
@ -871,7 +871,7 @@ class Diaspora
dbesc($arr["confirm"]),
dbesc($arr["alias"]),
dbesc($arr["pubkey"]),
dbesc(Temporal::convert()),
dbesc(Temporal::utcNow()),
dbesc($arr["url"]),
dbesc($arr["network"])
);
@ -894,7 +894,7 @@ class Diaspora
dbesc($arr["network"]),
dbesc($arr["alias"]),
dbesc($arr["pubkey"]),
dbesc(Temporal::convert())
dbesc(Temporal::utcNow())
);
}
@ -1656,7 +1656,7 @@ class Diaspora
if (isset($data->created_at)) {
$created_at = Temporal::convert(notags(unxmlify($data->created_at)));
} else {
$created_at = Temporal::convert();
$created_at = Temporal::utcNow();
}
if (isset($data->thread_parent_guid)) {
@ -1831,7 +1831,7 @@ class Diaspora
dba::unlock();
dba::update('conv', ['updated' => Temporal::convert()], ['id' => $conversation["id"]]);
dba::update('conv', ['updated' => Temporal::utcNow()], ['id' => $conversation["id"]]);
notification(
[
@ -1897,7 +1897,7 @@ class Diaspora
dbesc($guid),
dbesc($author),
dbesc($created_at),
dbesc(Temporal::convert()),
dbesc(Temporal::utcNow()),
dbesc($subject),
dbesc($participants)
);
@ -2164,7 +2164,7 @@ class Diaspora
dba::unlock();
dba::update('conv', ['updated' => Temporal::convert()], ['id' => $conversation["id"]]);
dba::update('conv', ['updated' => Temporal::utcNow()], ['id' => $conversation["id"]]);
return true;
}
@ -2331,7 +2331,7 @@ class Diaspora
dbesc($name),
dbesc($nick),
dbesc($author),
dbesc(Temporal::convert()),
dbesc(Temporal::utcNow()),
dbesc($birthday),
dbesc($location),
dbesc($about),
@ -2537,7 +2537,7 @@ class Diaspora
intval($importer["uid"]),
dbesc($ret["network"]),
dbesc($ret["addr"]),
Temporal::convert(),
Temporal::utcNow(),
dbesc($ret["url"]),
dbesc(normalise_link($ret["url"])),
dbesc($batch),
@ -2580,7 +2580,7 @@ class Diaspora
0,
dbesc(L10n::t("Sharing notification from Diaspora network")),
dbesc($hash),
dbesc(Temporal::convert())
dbesc(Temporal::utcNow())
);
} else {
// automatic friend approval
@ -2611,8 +2611,8 @@ class Diaspora
WHERE `id` = %d
",
intval($new_relation),
dbesc(Temporal::convert()),
dbesc(Temporal::convert()),
dbesc(Temporal::utcNow()),
dbesc(Temporal::utcNow()),
intval($contact_record["id"])
);
@ -2852,8 +2852,8 @@ class Diaspora
'deleted' => true,
'title' => '',
'body' => '',
'edited' => Temporal::convert(),
'changed' => Temporal::convert()],
'edited' => Temporal::utcNow(),
'changed' => Temporal::utcNow()],
['id' => $item["id"]]
);

6
src/Protocol/OStatus.php
View file

@ -199,7 +199,7 @@ class OStatus
$contact["location"] = $value;
}
$contact['name-date'] = Temporal::convert();
$contact['name-date'] = Temporal::utcNow();
dba::update('contact', $contact, ['id' => $contact["id"]], $current);
@ -220,7 +220,7 @@ class OStatus
'nurl' => normalise_link($author["author-link"]),
'nick' => $contact["nick"], 'alias' => $contact["alias"],
'about' => $contact["about"], 'location' => $contact["location"],
'success_update' => Temporal::convert(), 'last-update' => Temporal::convert()];
'success_update' => Temporal::utcNow(), 'last-update' => Temporal::utcNow()];
dba::update('contact', $fields, ['id' => $cid], $old_contact);
@ -558,7 +558,7 @@ class OStatus
dba::update(
'item',
['deleted' => true, 'title' => '', 'body' => '',
'edited' => Temporal::convert(), 'changed' => Temporal::convert()],
'edited' => Temporal::utcNow(), 'changed' => Temporal::utcNow()],
['id' => $deleted["id"]]
);

34
src/Protocol/PortableContact.php
View file

@ -315,7 +315,7 @@ class PortableContact
$contact = ["url" => $profile];
if ($gcontacts[0]["created"] <= NULL_DATE) {
$contact['created'] = Temporal::convert();
$contact['created'] = Temporal::utcNow();
}
if ($force) {
@ -338,7 +338,7 @@ class PortableContact
if ($server_url != "") {
if (!self::checkServer($server_url, $gcontacts[0]["network"], $force)) {
if ($force) {
$fields = ['last_failure' => Temporal::convert()];
$fields = ['last_failure' => Temporal::utcNow()];
dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
}
@ -412,14 +412,14 @@ class PortableContact
// Set the date of the last contact
/// @todo By now the function "update_gcontact" doesn't work with this field
//$contact["last_contact"] = Temporal::convert();
//$contact["last_contact"] = Temporal::utcNow();
$contact = array_merge($contact, $noscrape);
GContact::update($contact);
if (trim($noscrape["updated"]) != "") {
$fields = ['last_contact' => Temporal::convert()];
$fields = ['last_contact' => Temporal::utcNow()];
dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
logger("Profile ".$profile." was last updated at ".$noscrape["updated"]." (noscrape)", LOGGER_DEBUG);
@ -468,7 +468,7 @@ class PortableContact
}
if (($data["poll"] == "") || (in_array($data["network"], [NETWORK_FEED, NETWORK_PHANTOM]))) {
$fields = ['last_failure' => Temporal::convert()];
$fields = ['last_failure' => Temporal::utcNow()];
dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
logger("Profile ".$profile." wasn't reachable (profile)", LOGGER_DEBUG);
@ -484,7 +484,7 @@ class PortableContact
$feedret = Network::curl($data["poll"]);
if (!$feedret["success"]) {
$fields = ['last_failure' => Temporal::convert()];
$fields = ['last_failure' => Temporal::utcNow()];
dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
logger("Profile ".$profile." wasn't reachable (no feed)", LOGGER_DEBUG);
@ -533,7 +533,7 @@ class PortableContact
public static function updateNeeded($created, $updated, $last_failure, $last_contact)
{
$now = strtotime(Temporal::convert());
$now = strtotime(Temporal::utcNow());
if ($updated > $last_contact) {
$contact_time = strtotime($updated);
@ -922,7 +922,7 @@ class PortableContact
$gserver = dba::selectFirst('gserver', [], ['nurl' => normalise_link($server_url)]);
if (DBM::is_result($gserver)) {
if ($gserver["created"] <= NULL_DATE) {
$fields = ['created' => Temporal::convert()];
$fields = ['created' => Temporal::utcNow()];
$condition = ['nurl' => normalise_link($server_url)];
dba::update('gserver', $fields, $condition);
}
@ -969,7 +969,7 @@ class PortableContact
// Mastodon uses the "@" for user profiles.
// But this can be misunderstood.
if (parse_url($server_url, PHP_URL_USER) != '') {
dba::update('gserver', ['last_failure' => Temporal::convert()], ['nurl' => normalise_link($server_url)]);
dba::update('gserver', ['last_failure' => Temporal::utcNow()], ['nurl' => normalise_link($server_url)]);
return false;
}
@ -985,7 +985,7 @@ class PortableContact
if (DBM::is_result($gserver) && ($orig_server_url == $server_url) &&
($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
dba::update('gserver', ['last_failure' => Temporal::convert()], ['nurl' => normalise_link($server_url)]);
dba::update('gserver', ['last_failure' => Temporal::utcNow()], ['nurl' => normalise_link($server_url)]);
return false;
}
@ -1000,7 +1000,7 @@ class PortableContact
// Quit if there is a timeout
if ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT) {
logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
dba::update('gserver', ['last_failure' => Temporal::convert()], ['nurl' => normalise_link($server_url)]);
dba::update('gserver', ['last_failure' => Temporal::utcNow()], ['nurl' => normalise_link($server_url)]);
return false;
}
@ -1332,9 +1332,9 @@ class PortableContact
if ($failure) {
$last_contact = $orig_last_contact;
$last_failure = Temporal::convert();
$last_failure = Temporal::utcNow();
} else {
$last_contact = Temporal::convert();
$last_contact = Temporal::utcNow();
$last_failure = $orig_last_failure;
}
@ -1362,7 +1362,7 @@ class PortableContact
dba::update('gserver', $fields, ['nurl' => normalise_link($server_url)]);
} elseif (!$failure) {
$fields['nurl'] = normalise_link($server_url);
$fields['created'] = Temporal::convert();
$fields['created'] = Temporal::utcNow();
dba::insert('gserver', $fields);
}
logger("End discovery for server " . $server_url, LOGGER_DEBUG);
@ -1526,7 +1526,7 @@ class PortableContact
}
}
$fields = ['last_poco_query' => Temporal::convert()];
$fields = ['last_poco_query' => Temporal::utcNow()];
dba::update('gserver', $fields, ['nurl' => $server["nurl"]]);
return true;
@ -1535,7 +1535,7 @@ class PortableContact
self::checkServer($server["url"], $server["network"], true);
// If we couldn't reach the server, we will try it some time later
$fields = ['last_poco_query' => Temporal::convert()];
$fields = ['last_poco_query' => Temporal::utcNow()];
dba::update('gserver', $fields, ['nurl' => $server["nurl"]]);
return false;
@ -1561,7 +1561,7 @@ class PortableContact
foreach ($r as $server) {
if (!self::checkServer($server["url"], $server["network"])) {
// The server is not reachable? Okay, then we will try it later
$fields = ['last_poco_query' => Temporal::convert()];
$fields = ['last_poco_query' => Temporal::utcNow()];
dba::update('gserver', $fields, ['nurl' => $server["nurl"]]);
continue;
}

2
src/Util/ParseUrl.php
View file

@ -73,7 +73,7 @@ class ParseUrl
[
'url' => normalise_link($url), 'guessing' => !$no_guessing,
'oembed' => $do_oembed, 'content' => serialize($data),
'created' => Temporal::convert()
'created' => Temporal::utcNow()
],
true
);

11
src/Util/Temporal.php
View file

@ -123,6 +123,17 @@ class Temporal
]);
}
/**
* convert() shorthand for UTC now.
*
* @param string $format DateTime format string or Temporal constant
* @return string
*/
public static function utcNow($format = self::MYSQL)
{
return self::convert('now', 'UTC', 'UTC', $format);
}
/**
* @brief General purpose date parse/convert/format function.
*

16
src/Worker/Cron.php
View file

@ -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::convert('now', 'UTC', 'UTC', 'd'));
$d2 = intval(Temporal::utcNow('d'));
if ($d2 != intval($d1)) {
@ -142,7 +142,7 @@ Class Cron {
Addon::reload();
$d = Temporal::convert();
$d = Temporal::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::convert('now') > Temporal::convert($t . " + 1 month")) {
if (Temporal::utcNow() > Temporal::convert($t . " + 1 month")) {
$update = true;
}
break;
case 4:
if (Temporal::convert('now') > Temporal::convert($t . " + 1 week")) {
if (Temporal::utcNow() > Temporal::convert($t . " + 1 week")) {
$update = true;
}
break;
case 3:
if (Temporal::convert('now') > Temporal::convert($t . " + 1 day")) {
if (Temporal::utcNow() > Temporal::convert($t . " + 1 day")) {
$update = true;
}
break;
case 2:
if (Temporal::convert('now') > Temporal::convert($t . " + 12 hour")) {
if (Temporal::utcNow() > Temporal::convert($t . " + 12 hour")) {
$update = true;
}
break;
case 1:
if (Temporal::convert('now') > Temporal::convert($t . " + 1 hour")) {
if (Temporal::utcNow() > Temporal::convert($t . " + 1 hour")) {
$update = true;
}
break;
case 0:
default:
if (Temporal::convert('now') > Temporal::convert($t . " + ".$min_poll_interval." minute")) {
if (Temporal::utcNow() > Temporal::convert($t . " + ".$min_poll_interval." minute")) {
$update = true;
}
break;

2
src/Worker/CronHooks.php
View file

@ -45,7 +45,7 @@ Class CronHooks {
logger('cronhooks: start');
$d = Temporal::convert();
$d = Temporal::utcNow();
if (is_array($a->hooks) && array_key_exists("cron", $a->hooks)) {
foreach ($a->hooks["cron"] as $hook) {

2
src/Worker/DiscoverPoCo.php
View file

@ -198,7 +198,7 @@ class DiscoverPoCo {
}
} else {
q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
dbesc(Temporal::convert()), dbesc(normalise_link($user["url"])));
dbesc(Temporal::utcNow()), dbesc(normalise_link($user["url"])));
}
// Quit the loop after 3 minutes

44
src/Worker/OnePoll.php
View file

@ -44,7 +44,7 @@ class OnePoll
return;
}
$d = Temporal::convert();
$d = Temporal::utcNow();
$contact = dba::selectFirst('contact', [], ['id' => $contact_id]);
if (!DBM::is_result($contact)) {
@ -70,7 +70,7 @@ class OnePoll
// Diaspora users, archived users and followers are only checked if they still exist.
if ($contact['archive'] || ($contact["network"] == NETWORK_DIASPORA) || ($contact["rel"] == CONTACT_IS_FOLLOWER)) {
$last_updated = PortableContact::lastUpdated($contact["url"], true);
$updated = Temporal::convert();
$updated = Temporal::utcNow();
if ($last_updated) {
logger('Contact '.$contact['id'].' had last update on '.$last_updated, LOGGER_DEBUG);
@ -99,7 +99,7 @@ class OnePoll
$contact['priority'] = intval($poll_interval);
$hub_update = false;
if (Temporal::convert('now') > Temporal::convert($t . " + 1 day")) {
if (Temporal::utcNow() > Temporal::convert($t . " + 1 day")) {
$hub_update = true;
}
} else {
@ -117,7 +117,7 @@ class OnePoll
logger("Skipping probably dead contact ".$contact['url']);
// set the last-update so we don't keep polling
dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]);
dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
return;
}
@ -126,7 +126,7 @@ class OnePoll
logger('Contact is marked dead');
// set the last-update so we don't keep polling
dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]);
dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
return;
} else {
Contact::unmarkForArchival($contact);
@ -137,7 +137,7 @@ class OnePoll
logger('Ignore public contacts');
// set the last-update so we don't keep polling
dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]);
dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
return;
}
@ -149,7 +149,7 @@ class OnePoll
logger('No self contact for user '.$importer_uid);
// set the last-update so we don't keep polling
dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]);
dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
return;
}
@ -185,7 +185,7 @@ class OnePoll
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
// set the last-update so we don't keep polling
dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]);
dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
Contact::markForArchival($contact);
return;
}
@ -207,7 +207,7 @@ class OnePoll
Contact::markForArchival($contact);
// set the last-update so we don't keep polling
$fields = ['last-update' => Temporal::convert(), 'failure_update' => Temporal::convert()];
$fields = ['last-update' => Temporal::utcNow(), 'failure_update' => Temporal::utcNow()];
self::updateContact($contact, $fields);
return;
}
@ -217,7 +217,7 @@ class OnePoll
Contact::markForArchival($contact);
$fields = ['last-update' => Temporal::convert(), 'failure_update' => Temporal::convert()];
$fields = ['last-update' => Temporal::utcNow(), 'failure_update' => Temporal::utcNow()];
self::updateContact($contact, $fields);
return;
}
@ -230,7 +230,7 @@ class OnePoll
// we may not be friends anymore. Will keep trying for one month.
// set the last-update so we don't keep polling
$fields = ['last-update' => Temporal::convert(), 'failure_update' => Temporal::convert()];
$fields = ['last-update' => Temporal::utcNow(), 'failure_update' => Temporal::utcNow()];
self::updateContact($contact, $fields);
Contact::markForArchival($contact);
@ -241,7 +241,7 @@ class OnePoll
if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {
// set the last-update so we don't keep polling
dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]);
dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
return;
}
@ -276,7 +276,7 @@ class OnePoll
logger('ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);
// set the last-update so we don't keep polling
dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]);
dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
Contact::markForArchival($contact);
return;
}
@ -311,7 +311,7 @@ class OnePoll
if ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly']) {
// set the last-update so we don't keep polling
dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]);
dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
return;
}
@ -321,7 +321,7 @@ class OnePoll
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
// set the last-update so we don't keep polling
dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]);
dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
Contact::markForArchival($contact);
return;
}
@ -335,7 +335,7 @@ class OnePoll
$mail_disabled = ((function_exists('imap_open') && (! Config::get('system', 'imap_disabled'))) ? 0 : 1);
if ($mail_disabled) {
// set the last-update so we don't keep polling
dba::update('contact', ['last-update' => Temporal::convert()], ['id' => $contact['id']]);
dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
Contact::markForArchival($contact);
return;
}
@ -355,7 +355,7 @@ class OnePoll
unset($password);
logger("Mail: Connect to " . $mailconf['user']);
if ($mbox) {
$fields = ['last_check' => Temporal::convert()];
$fields = ['last_check' => Temporal::utcNow()];
dba::update('mailacct', $fields, ['id' => $mailconf['id']]);
logger("Mail: Connected to " . $mailconf['user']);
} else {
@ -395,7 +395,7 @@ class OnePoll
// Only delete when mails aren't automatically moved or deleted
if (($mailconf['action'] != 1) && ($mailconf['action'] != 3))
if ($meta->deleted && ! $item['deleted']) {
$fields = ['deleted' => true, 'changed' => Temporal::convert()];
$fields = ['deleted' => true, 'changed' => Temporal::utcNow()];
dba::update('item', $fields, ['id' => $item['id']]);
}
@ -572,7 +572,7 @@ class OnePoll
if (!strstr($xml, '<')) {
logger('post_handshake: response from ' . $url . ' did not contain XML.');
$fields = ['last-update' => Temporal::convert(), 'failure_update' => Temporal::convert()];
$fields = ['last-update' => Temporal::utcNow(), 'failure_update' => Temporal::utcNow()];
self::updateContact($contact, $fields);
Contact::markForArchival($contact);
return;
@ -616,19 +616,19 @@ class OnePoll
}
}
$updated = Temporal::convert();
$updated = Temporal::utcNow();
self::updateContact($contact, ['last-update' => $updated, 'success_update' => $updated]);
dba::update('gcontact', ['last_contact' => $updated], ['nurl' => $contact['nurl']]);
Contact::unmarkForArchival($contact);
} elseif (in_array($contact["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED])) {
$updated = Temporal::convert();
$updated = Temporal::utcNow();
self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
dba::update('gcontact', ['last_failure' => $updated], ['nurl' => $contact['nurl']]);
Contact::markForArchival($contact);
} else {
$updated = Temporal::convert();
$updated = Temporal::utcNow();
dba::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
}

2
src/Worker/UpdateGContact.php
View file

@ -42,7 +42,7 @@ class UpdateGContact
}
q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `id` = %d",
dbesc(Temporal::convert()), intval($contact_id));
dbesc(Temporal::utcNow()), intval($contact_id));
return;
}