From 215f3889924973ad138cfce309744cb1abf38cf0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 23 Sep 2020 13:04:26 +0300
Subject: move timestamp-related stuff to a separate class

---
 classes/pref/feeds.php   | 8 ++++----
 classes/pref/filters.php | 2 +-
 classes/pref/prefs.php   | 4 ++--
 classes/pref/system.php  | 7 +++----
 classes/pref/users.php   | 8 ++++----
 5 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'classes/pref')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index d7220f9ae..8b9099007 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -101,7 +101,7 @@ class Pref_Feeds extends Handler_Protected {
 			$feed['unread'] = -1;
 			$feed['error'] = $feed_line['last_error'];
 			$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
-			$feed['param'] = make_local_datetime(
+			$feed['param'] = TimeHelper::make_local_datetime(
 				$feed_line['last_updated'], true);
 			$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
 
@@ -268,7 +268,7 @@ class Pref_Feeds extends Handler_Protected {
 				$feed['checkbox'] = false;
 				$feed['error'] = $feed_line['last_error'];
 				$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
-				$feed['param'] = make_local_datetime(
+				$feed['param'] = TimeHelper::make_local_datetime(
 					$feed_line['last_updated'], true);
 				$feed['unread'] = -1;
 				$feed['type'] = 'feed';
@@ -303,7 +303,7 @@ class Pref_Feeds extends Handler_Protected {
 				$feed['checkbox'] = false;
 				$feed['error'] = $feed_line['last_error'];
 				$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
-				$feed['param'] = make_local_datetime(
+				$feed['param'] = TimeHelper::make_local_datetime(
 					$feed_line['last_updated'], true);
 				$feed['unread'] = -1;
 				$feed['type'] = 'feed';
@@ -1478,7 +1478,7 @@ class Pref_Feeds extends Handler_Protected {
 				htmlspecialchars($line["title"])."</a>";
 
 			print "</td><td class='text-muted' align='right'>";
-			print make_local_datetime($line['last_article'], false);
+			print TimeHelper::make_local_datetime($line['last_article'], false);
 			print "</td>";
 			print "</tr>";
 
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 6121e4c14..1113f251e 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -302,7 +302,7 @@ class Pref_Filters extends Handler_Protected {
 			$filter['name'] = $name[0];
 			$filter['param'] = $name[1];
 			$filter['checkbox'] = false;
-			$filter['last_triggered'] = $line["last_triggered"] ? make_local_datetime($line["last_triggered"], false) : null;
+			$filter['last_triggered'] = $line["last_triggered"] ? TimeHelper::make_local_datetime($line["last_triggered"], false) : null;
 			$filter['enabled'] = sql_bool_to_bool($line["enabled"]);
 			$filter['rules'] = $this->getfilterrules_list($line['id']);
 
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index f825454dd..d7b486cbb 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1320,11 +1320,11 @@ class Pref_Prefs extends Handler_Protected {
 			print "<td>" . htmlspecialchars($row["title"]) . "</td>";
 
 			print "<td align='right' class='text-muted'>";
-			print make_local_datetime($row['created'], false);
+			print TimeHelper::make_local_datetime($row['created'], false);
 			print "</td>";
 
 			print "<td align='right' class='text-muted'>";
-			print make_local_datetime($row['last_used'], false);
+			print TimeHelper::make_local_datetime($row['last_used'], false);
 			print "</td>";
 
 			print "</tr>";
diff --git a/classes/pref/system.php b/classes/pref/system.php
index d0f8a8273..7e9aa44a1 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -26,7 +26,7 @@ class Pref_System extends Handler_Protected {
 	function index() {
 
 		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
-		print "<div dojoType=\"dijit.layout.AccordionPane\" 
+		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>report</i> ".__('Event Log')."\">";
 
 		if (LOG_DESTINATION == "sql") {
@@ -66,8 +66,7 @@ class Pref_System extends Handler_Protected {
 				print "<td class='login'>" . $line["login"] . "</td>";
 
 				print "<td class='timestamp'>" .
-					make_local_datetime(
-					$line["created_at"], false) . "</td>";
+					TimeHelper::make_local_datetime($line["created_at"], false) . "</td>";
 
 				print "</tr>";
 			}
@@ -81,7 +80,7 @@ class Pref_System extends Handler_Protected {
 
 		print "</div>";
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\" 
+		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>info</i> ".__('PHP Information')."\">";
 
 		ob_start();
diff --git a/classes/pref/users.php b/classes/pref/users.php
index fd307f7ec..5ec7aa2e6 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -137,10 +137,10 @@ class Pref_Users extends Handler_Protected {
 			if ($row = $sth->fetch()) {
 				print "<table width='100%'>";
 
-				$last_login = make_local_datetime(
+				$last_login = TimeHelper::make_local_datetime(
 					$row["last_login"], true);
 
-				$created = make_local_datetime(
+				$created = TimeHelper::make_local_datetime(
 					$row["created"], true);
 
 				$stored_articles = $row["stored_articles"];
@@ -399,8 +399,8 @@ class Pref_Users extends Handler_Protected {
 				print "<tr data-row-id='$uid' onclick='Users.edit($uid)'>";
 
 				$line["login"] = htmlspecialchars($line["login"]);
-				$line["created"] = make_local_datetime($line["created"], false);
-				$line["last_login"] = make_local_datetime($line["last_login"], false);
+				$line["created"] = TimeHelper::make_local_datetime($line["created"], false);
+				$line["last_login"] = TimeHelper::make_local_datetime($line["last_login"], false);
 
 				print "<td align='center'><input onclick='Tables.onRowChecked(this); event.stopPropagation();'
 					dojoType='dijit.form.CheckBox' type='checkbox'></td>";
-- 
cgit v1.2.3-54-g00ecf