From a799afdbd9dbf3a9d4f204fc8032e09ee2b392b8 Mon Sep 17 00:00:00 2001
From: phaze1G <justrixs@gmail.com>
Date: Thu, 14 Jun 2018 00:52:44 +0200
Subject: [PATCH] Small fix to calcualted/servertime (#548)

* Calcuated & server time

* Update plus1.php

* Update rules.php

* Update menu.tpl

* Update maintenance.php

* Update version.php

* Update dorf3.php

* Update karte.php

* Update berichte.php

* Update dorf2.php

* Update plus.php

* Update warsim.php

* Update support.php

* Update statistiken.php

* Update nachrichten.php

* Update spieler.php

* Update crop_finder.php

* Update winner.php

* Update a2b2.php
---
 Templates/menu.tpl | 10 +++++-----
 a2b2.php           |  6 ++++--
 berichte.php       |  6 +++---
 crop_finder.php    | 12 +++---------
 dorf2.php          |  4 ++--
 dorf3.php          |  4 ++--
 karte.php          |  6 +++---
 logout.php         |  6 +++---
 maintenance.php    |  7 +++++--
 nachrichten.php    |  6 +++---
 plus.php           |  6 +++---
 plus1.php          |  6 +++---
 rules.php          |  6 +++---
 spieler.php        |  4 ++--
 statistiken.php    |  6 +++---
 support.php        |  4 ++--
 version.php        |  4 ++--
 warsim.php         |  4 ++--
 winner.php         |  7 +++++--
 19 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/Templates/menu.tpl b/Templates/menu.tpl
index 3b01b773..29ca87bf 100644
--- a/Templates/menu.tpl
+++ b/Templates/menu.tpl
@@ -121,11 +121,11 @@ div.c1 {text-align: center}
     <div id="stime">
         <div id="ltime">
             <div id="ltimeWrap">
-                Calculated in <b><?php
-                echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
-                ?></b> ms
-                <br>
-                Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+                <?php echo CALCULATED_IN;?> <b><?php
+echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
+?></b> ms
+
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
             </div>
         </div>
     </div>
diff --git a/a2b2.php b/a2b2.php
index e2547f3f..66033233 100644
--- a/a2b2.php
+++ b/a2b2.php
@@ -359,9 +359,11 @@
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000); ?></b> ms
+<?php echo CALCULATED_IN;?> <b><?php
+echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
+?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/berichte.php b/berichte.php
index f0ec9520..add05dbf 100644
--- a/berichte.php
+++ b/berichte.php
@@ -136,15 +136,15 @@
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
 
 <div id="ce"></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/crop_finder.php b/crop_finder.php
index ead411d2..7b4b6780 100644
--- a/crop_finder.php
+++ b/crop_finder.php
@@ -226,17 +226,11 @@
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
-
-echo round(($generator->pageLoadTimeEnd() - $start_timer) * 1000);
-
+<?php echo CALCULATED_IN;?> <b><?php
+echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php
-
-   echo date('H:i:s');
-
-?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/dorf2.php b/dorf2.php
index 8e69b574..656a422f 100644
--- a/dorf2.php
+++ b/dorf2.php
@@ -93,11 +93,11 @@
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/dorf3.php b/dorf3.php
index c69d734e..58db23a2 100644
--- a/dorf3.php
+++ b/dorf3.php
@@ -112,11 +112,11 @@
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/karte.php b/karte.php
index e2ad874b..72252678 100644
--- a/karte.php
+++ b/karte.php
@@ -109,14 +109,14 @@
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
 <div id="ce"></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/logout.php b/logout.php
index cc9511ac..b6a6d6ac 100644
--- a/logout.php
+++ b/logout.php
@@ -83,14 +83,14 @@
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
 <div id="ce"></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/maintenance.php b/maintenance.php
index 86205c79..341062d4 100644
--- a/maintenance.php
+++ b/maintenance.php
@@ -108,8 +108,11 @@ function mysqli_result($res, $row, $field = 0) {
 			<div id="stime">
 				<div id="ltime">
 					<div id="ltimeWrap">
-						Calculated in <b><?php echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);?></b> ms
-						<br/>Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+						<?php echo CALCULATED_IN;?> <b><?php
+echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
+?></b> ms
+
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 					</div>
 				</div>
 			</div>
diff --git a/nachrichten.php b/nachrichten.php
index af0d76f3..74271174 100644
--- a/nachrichten.php
+++ b/nachrichten.php
@@ -172,14 +172,14 @@
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
 <div id="ce"></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plus.php b/plus.php
index 003dae03..eb19f837 100644
--- a/plus.php
+++ b/plus.php
@@ -170,15 +170,15 @@
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
 
 <div id="ce"></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plus1.php b/plus1.php
index 066a5450..be628d7d 100644
--- a/plus1.php
+++ b/plus1.php
@@ -97,15 +97,15 @@
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
 
 <div id="ce"></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/rules.php b/rules.php
index 10796f38..7bddde5e 100644
--- a/rules.php
+++ b/rules.php
@@ -87,14 +87,14 @@
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
 <div id="ce"></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spieler.php b/spieler.php
index 3532bc08..1f5b0f10 100644
--- a/spieler.php
+++ b/spieler.php
@@ -180,11 +180,11 @@ function med_showDescription(coords, desc_string){
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/statistiken.php b/statistiken.php
index 0f0b1285..d6a4cf5e 100644
--- a/statistiken.php
+++ b/statistiken.php
@@ -190,11 +190,11 @@
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
-echo round(($generator->pageLoadTimeEnd()-$__start)*1000);
+<?php echo CALCULATED_IN;?> <b><?php
+echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/support.php b/support.php
index 719bf1a9..00655677 100644
--- a/support.php
+++ b/support.php
@@ -160,11 +160,11 @@ function chkFormular () {
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/version.php b/version.php
index 427a5f3e..91ffbce9 100644
--- a/version.php
+++ b/version.php
@@ -127,11 +127,11 @@
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/warsim.php b/warsim.php
index 9d2a586e..4e3282a9 100644
--- a/warsim.php
+++ b/warsim.php
@@ -184,11 +184,11 @@
 <div id="stime">
 <div id="ltime">
 <div id="ltimeWrap">
-Calculated in <b><?php
+<?php echo CALCULATED_IN;?> <b><?php
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br />Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/winner.php b/winner.php
index 44f5bbeb..bddb0184 100644
--- a/winner.php
+++ b/winner.php
@@ -243,8 +243,11 @@ function mysqli_result($res, $row, $field = 0) {
 			<div id="stime">
 				<div id="ltime">
 					<div id="ltimeWrap">
-						Calculated in <b><?php echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);?></b> ms
-						<br/>Server time: <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+						<?php echo CALCULATED_IN;?> <b><?php
+echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
+?></b> ms
+
+<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 					</div>
 				</div>
 			</div>