From e4f32f8ac8dbee577dc31195b1104add371f77eb Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 25 Jan 2018 23:28:13 -0500
Subject: [PATCH] Add Temporal::utcNow()

---
 public_server/public_server.php |  2 +-
 pumpio/pumpio.php               |  4 ++--
 statusnet/statusnet.php         | 10 +++++-----
 testdrive/testdrive.php         |  2 +-
 twitter/twitter.php             | 14 +++++++-------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 52c115a3..23777654 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -69,7 +69,7 @@ function public_server_cron($a,$b) {
 			]);
 
 			q("update user set expire_notification_sent = '%s' where uid = %d",
-				dbesc(Temporal::convert()),
+				dbesc(Temporal::utcNow()),
 				intval($rr['uid'])
 			);
 		}
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 7e34eab3..afdd3455 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -871,7 +871,7 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) {
 	}
 
 	$r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `verb` = '%s' AND `uid` = %d AND `contact-id` = %d AND `thr-parent` = '%s'",
-		dbesc(Temporal::convert()),
+		dbesc(Temporal::utcNow()),
 		dbesc(ACTIVITY_LIKE),
 		intval($uid),
 		intval($contactid),
@@ -1002,7 +1002,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) {
 					`location`, `about`, `writable`, `blocked`, `readonly`, `pending` )
 				VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
 			intval($uid),
-			dbesc(Temporal::convert()),
+			dbesc(Temporal::utcNow()),
 			dbesc($contact->url),
 			dbesc(normalise_link($contact->url)),
 			dbesc(str_replace("acct:", "", $contact->id)),
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index c5b62a5d..ee0a6dab 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -936,7 +936,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 					`location`, `about`, `writable`, `blocked`, `readonly`, `pending` )
 					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0 ) ",
 			intval($uid),
-			dbesc(Temporal::convert()),
+			dbesc(Temporal::utcNow()),
 			dbesc($contact->statusnet_profile_url),
 			dbesc(normalise_link($contact->statusnet_profile_url)),
 			dbesc(statusnet_address($contact)),
@@ -977,7 +977,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 			dbesc($photos[0]),
 			dbesc($photos[1]),
 			dbesc($photos[2]),
-			dbesc(Temporal::convert()),
+			dbesc(Temporal::utcNow()),
 			intval($contact_id)
 		);
 	} else {
@@ -1008,9 +1008,9 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 				dbesc($photos[0]),
 				dbesc($photos[1]),
 				dbesc($photos[2]),
-				dbesc(Temporal::convert()),
-				dbesc(Temporal::convert()),
-				dbesc(Temporal::convert()),
+				dbesc(Temporal::utcNow()),
+				dbesc(Temporal::utcNow()),
+				dbesc(Temporal::utcNow()),
 				dbesc($contact->statusnet_profile_url),
 				dbesc(normalise_link($contact->statusnet_profile_url)),
 				dbesc(statusnet_address($contact)),
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index efff8c28..4f434123 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -72,7 +72,7 @@ function testdrive_cron($a,$b) {
 			]);
 
 			q("update user set expire_notification_sent = '%s' where uid = %d",
-				dbesc(Temporal::convert()),
+				dbesc(Temporal::utcNow()),
 				intval($rr['uid'])
 			);
 
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 9c2804b1..cc12e8de 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1017,7 +1017,7 @@ function twitter_fetch_contact($uid, $contact, $create_user)
 					`location`, `about`, `writable`, `blocked`, `readonly`, `pending`)
 					VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
 			intval($uid),
-			dbesc(Temporal::convert()),
+			dbesc(Temporal::utcNow()),
 			dbesc("https://twitter.com/" . $contact->screen_name),
 			dbesc(normalise_link("https://twitter.com/" . $contact->screen_name)),
 			dbesc($contact->screen_name."@twitter.com"),
@@ -1061,9 +1061,9 @@ function twitter_fetch_contact($uid, $contact, $create_user)
 				dbesc($photos[0]),
 				dbesc($photos[1]),
 				dbesc($photos[2]),
-				dbesc(Temporal::convert()),
-				dbesc(Temporal::convert()),
-				dbesc(Temporal::convert()),
+				dbesc(Temporal::utcNow()),
+				dbesc(Temporal::utcNow()),
+				dbesc(Temporal::utcNow()),
 				intval($contact_id)
 			);
 		}
@@ -1096,9 +1096,9 @@ function twitter_fetch_contact($uid, $contact, $create_user)
 					dbesc($photos[0]),
 					dbesc($photos[1]),
 					dbesc($photos[2]),
-					dbesc(Temporal::convert()),
-					dbesc(Temporal::convert()),
-					dbesc(Temporal::convert()),
+					dbesc(Temporal::utcNow()),
+					dbesc(Temporal::utcNow()),
+					dbesc(Temporal::utcNow()),
 					dbesc("https://twitter.com/".$contact->screen_name),
 					dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
 					dbesc($contact->screen_name."@twitter.com"),
-- 
2.30.2