From 25b52f6b1ad6f9b63813085ac47844803132b63b Mon Sep 17 00:00:00 2001
From: Vladyslav <security_2007@ukr.net>
Date: Fri, 18 May 2018 20:20:53 +0300
Subject: [PATCH] Changed information output in Newsbox 2

issue #541
---
 Templates/News/newsbox2.tpl | 45 +++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/Templates/News/newsbox2.tpl b/Templates/News/newsbox2.tpl
index 6957b023..3434cc3f 100644
--- a/Templates/News/newsbox2.tpl
+++ b/Templates/News/newsbox2.tpl
@@ -1,29 +1,30 @@
+<?php
+$textArray = ["Natars Spawn", "WW Spawn", "WW Plan Spawn"];
+$newTextArray = ["Natars Tribe", "WW Village", "Construction Plan"];
+$spawnTimeArray = [NATARS_SPAWN_TIME, NATARS_WW_SPAWN_TIME, NATARS_WW_BUILDING_PLAN_SPAWN_TIME];
+$areSpawned = [$database->areArtifactsSpawned(), $database->areWWVillagesSpawned(), $database->areArtifactsSpawned(true)];
+
+?>
 <h5><img src="img/en/t2/newsbox2.gif" alt="newsbox 2"></h5>
 <div class="news">
 <table width="100%">
+<?php for($i = 0; $i < count($spawnTimeArray); $i++){ ?>
 <tr>
-<td><b>Natars spawn</b></td>
+<td><b>
+<?php
+    if($areSpawned[$i]) echo $newTextArray[$i];
+    else echo $textArray[$i];
+    ?></b></td>
 <td><b>: <font color="Red"><?php
-    $time = strtotime(START_DATE); // Date of server installation (the countdown for the appearance of Natars begins)
-    $interval = NATARS_SPAWN_TIME * 24 * 3600; // The number of seconds in the number of days that is set for the appearance of Natars
-    $time += $interval;
-    echo date('m/d/Y', $time); ?></font></b></td>
-</tr>
-<tr>
-<td><b>WW spawn</b></td>
-<td><b>: <font color="Red"><?php
-    $time = strtotime(START_DATE); // Date of server installation (the countdown for the appearance of Natars begins)
-    $interval = NATARS_WW_SPAWN_TIME * 24 * 3600; // The number of seconds in the number of days that is set for the appearance of WW village
-    $time += $interval;
-    echo date('m/d/Y', $time); ?></font></b></td>
-</tr>
-<tr>
-<td><b>WW Plan spawn</b></td>
-<td><b>: <font color="Red"><?php
-    $time = strtotime(START_DATE); // Date of server installation (the countdown for the appearance of Natars begins)
-    $interval = NATARS_WW_BUILDING_PLAN_SPAWN_TIME * 24 * 3600; // The number of seconds in the number of days that is set for the appearance of Ancient Construction Plan
-    $time += $interval;
-    echo date('m/d/Y', $time); ?></font></b></td>
+    if($areSpawned[$i]) echo "Released";
+    else
+    {
+        $time = strtotime(START_DATE); // Date of server started (the countdown for the appearance of Natars begins)
+        $interval = $spawnTimeArray[$i] * 86400; // The number of seconds in the number of days that is set for the appearance of Natars
+        echo date('d.m.Y', $time + $interval);
+    }
+    ?></font></b></td>
 </tr>
+<?php } ?>
 </table>
-</div>
+</div>
\ No newline at end of file