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

Add Temporal::utcNow()

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

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