From a2ee2b56d219846d43a2214fbf9cbb9e325e5826 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Fri, 26 Jan 2018 19:16:22 -0500
Subject: [PATCH] Add Temporal::localNow() shorthand for Temporal::convert()

---
 include/items.php     |  4 ++--
 mod/cal.php           |  4 ++--
 mod/events.php        |  4 ++--
 mod/photos.php        |  4 ++--
 src/Util/Temporal.php | 19 +++++++++++++++----
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/include/items.php b/include/items.php
index b5ec592e00..e5a04b1200 100644
--- a/include/items.php
+++ b/include/items.php
@@ -416,7 +416,7 @@ function drop_item($id) {
 
 /* arrange the list in years */
 function list_post_dates($uid, $wall) {
-	$dnow = Temporal::timezoneNow(date_default_timezone_get(), 'Y-m-d');
+	$dnow = Temporal::localNow('Y-m-d');
 
 	$dthen = Item::firstPostDate($uid, $wall);
 	if (!$dthen) {
@@ -474,7 +474,7 @@ function posted_date_widget($url, $uid, $wall) {
 		return $o;
 	}
 
-	$cutoff_year = intval(Temporal::timezoneNow(date_default_timezone_get(), 'Y')) - $visible_years;
+	$cutoff_year = intval(Temporal::localNow('Y')) - $visible_years;
 	$cutoff = ((array_key_exists($cutoff_year, $ret))? true : false);
 
 	$o = replace_macros(get_markup_template('posted_date_widget.tpl'),[
diff --git a/mod/cal.php b/mod/cal.php
index 11a1a5e6f9..d48ce1c5e8 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -152,8 +152,8 @@ function cal_content(App $a)
 
 	// The view mode part is similiar to /mod/events.php
 	if ($mode == 'view') {
-		$thisyear = Temporal::timezoneNow(date_default_timezone_get(), 'Y');
-		$thismonth = Temporal::timezoneNow(date_default_timezone_get(), 'm');
+		$thisyear = Temporal::localNow('Y');
+		$thismonth = Temporal::localNow('m');
 		if (!$y) {
 			$y = intval($thisyear);
 		}
diff --git a/mod/events.php b/mod/events.php
index aad56f43aa..028e23e51f 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -276,8 +276,8 @@ function events_content(App $a) {
 	// The view mode part is similiar to /mod/cal.php
 	if ($mode == 'view') {
 
-		$thisyear  = Temporal::timezoneNow(date_default_timezone_get(), 'Y');
-		$thismonth = Temporal::timezoneNow(date_default_timezone_get(), 'm');
+		$thisyear  = Temporal::localNow('Y');
+		$thismonth = Temporal::localNow('m');
 		if (! $y) {
 			$y = intval($thisyear);
 		}
diff --git a/mod/photos.php b/mod/photos.php
index dac52b1d05..49b68a345d 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -402,7 +402,7 @@ function photos_post(App $a)
 		$resource_id = $a->argv[2];
 
 		if (!strlen($albname)) {
-			$albname = Temporal::timezoneNow(date_default_timezone_get(), 'Y');
+			$albname = Temporal::localNow('Y');
 		}
 
 		if (x($_POST,'rotate') !== false &&
@@ -738,7 +738,7 @@ function photos_post(App $a)
 		if (strlen($newalbum)) {
 			$album = $newalbum;
 		} else {
-			$album = Temporal::timezoneNow(date_default_timezone_get(), 'Y');
+			$album = Temporal::localNow('Y');
 		}
 	}
 
diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index 37be4eb919..8deadd5e8f 100644
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -136,7 +136,7 @@ class Temporal
 	}
 
 	/**
-	 * convert() shorthand for UTC now.
+	 * convert() shorthand for timezoned now.
 	 *
 	 * @param string $format DateTime format string or Temporal constant
 	 * @return string
@@ -146,6 +146,17 @@ class Temporal
 		return self::convert('now', $timezone, 'UTC', $format);
 	}
 
+	/**
+	 * convert() shorthand for local now.
+	 *
+	 * @param string $format DateTime format string or Temporal constant
+	 * @return string
+	 */
+	public static function localNow($format = self::MYSQL)
+	{
+		return self::convert('now', date_default_timezone_get(), 'UTC', $format);
+	}
+
 	/**
 	 * convert() shorthand for UTC now.
 	 *
@@ -542,8 +553,8 @@ class Temporal
 			'October', 'November', 'December'
 		];
 
-		$thisyear = self::timezoneNow(date_default_timezone_get(), 'Y');
-		$thismonth = self::timezoneNow(date_default_timezone_get(), 'm');
+		$thisyear = self::localNow('Y');
+		$thismonth = self::localNow('m');
 		if (!$y) {
 			$y = $thisyear;
 		}
@@ -560,7 +571,7 @@ class Temporal
 		$started = false;
 
 		if (($y == $thisyear) && ($m == $thismonth)) {
-			$tddate = intval(self::timezoneNow(date_default_timezone_get(), 'j'));
+			$tddate = intval(self::localNow('j'));
 		}
 
 		$str_month = day_translate($mtab[$m]);
-- 
2.39.5