From 6028890a492f3d0f2e9a3638fcbfb10e5c84da08 Mon Sep 17 00:00:00 2001 From: Chriztoffer Date: Fri, 10 Jan 2020 14:24:21 +0000 Subject: [PATCH] roagen.php: remove use of uneeded varables, added human readable DateTime --- roagen.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/roagen.php b/roagen.php index 4f144d8..ccb153d 100755 --- a/roagen.php +++ b/roagen.php @@ -227,19 +227,18 @@ foreach ($raw_array as $sub_array) * Numbers must be unquoted integers, and timeformat must * be epoch format. TImezone is set to Etc/UTC. */ - -$roaRegistryCount = (int)count($roas["roas"]); -$roaFileDateTimeCreated = (int)( date_format( new \DateTime( "now", new \DateTimeZone( "UTC" ) ), "U" ) ); -$roaFileDateTimeExpire = (int)( date_format( date_modify( new \DateTime( "now", new \DateTimeZone( "UTC" ) ), "+3 day" ), "U" ) ); - -$roas["metadata"]["counts"] = $roaRegistryCount; -$roas["metadata"]["generated"] = $roaFileDateTimeCreated; -$roas["metadata"]["valid"] = $roaFileDateTimeExpire; +$roas["metadata"]["counts"] = (int)count($roas["roas"]); +$roas["metadata"]["generated"] = (int)(date_format(new \DateTime("now", new \DateTimeZone("UTC")), "U")); +$roas["metadata"]["valid"] = (int)(date_format(date_modify(new \DateTime("now", new \DateTimeZone("UTC")), "+3 day"), "U")); /* -$roas["metadata"]["signature"] = ""; +$roas["metadata"]["signature"] = ""; $roas["metadata"]["signatureData"] = ""; */ +// Additional human readbable DateTime format, example: 2013-04-12T15:52:01+00:00 +$roas["metadata"]["human"]["generated"] = date_format(new \DateTime("now", new \DateTimeZone("UTC")), "DATE_W3C"); +$roas["metadata"]["human"]["valid"] = date_format(date_modify(new \DateTime("now", new \DateTimeZone("UTC")), "+3 day"), "DATE_W3C"); + writeExportJSON($roas); writeBirdConfig($roas);