From 073beed5c6576bf199cd57e8e287870ec0f36296 Mon Sep 17 00:00:00 2001
From: Martin Ambrus <martin@martinambrus.com>
Date: Sat, 2 Dec 2017 14:24:58 +0100
Subject: [PATCH] fix: reverting testing server changes

---
 Templates/News/newsbox2.tpl | 65 ++++++++++++++++++++++++++++++-------
 Templates/menu.tpl          | 14 --------
 2 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/Templates/News/newsbox2.tpl b/Templates/News/newsbox2.tpl
index ec69b690..2787ee98 100644
--- a/Templates/News/newsbox2.tpl
+++ b/Templates/News/newsbox2.tpl
@@ -1,12 +1,55 @@
-<div class="news" style="width:300px">
-    <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-    <!-- TravianZ Side Text Ads -->
-    <ins class="adsbygoogle"
-         style="display:block"
-         data-ad-client="ca-pub-3671427797112044"
-         data-ad-slot="8817917899"
-         data-ad-format="auto"></ins>
-    <script>
-        (adsbygoogle = window.adsbygoogle || []).push({});
-    </script>
+<h5><img src="img/en/t2/newsbox2.gif" alt="newsbox 2"></h5>
+<?php
+
+$online = mysqli_query($GLOBALS['link'],"SELECT Count(*) as Total FROM " . TB_PREFIX . "users WHERE timestamp > ".(time() - (60*10))." AND tribe!=0 AND tribe!=4 AND tribe!=5");
+
+?>
+
+<div class="news">
+<table width="100%" border="0">
+<tr>
+<td align="left"><b>Online Users</td>
+<td>: <font color="Red"><?php
+
+	if (!empty($online)) {
+    	echo mysqli_fetch_assoc($online)['Total'];
+    } else {
+    	echo 0;
+    }
+
+?> users</font></b></td>
+</tr>
+<tr>
+<td><b>Server Speed</td>
+<td>: <font color="Red"><?php echo ''.SPEED.'x';?></font></b></td>
+</tr>
+<tr>
+<td><b>Troop Speed</td>
+<td>: <font color="Red"><?php echo INCREASE_SPEED;?>x</font></b></td>
+</tr>
+<tr>
+<td><b>Evasion Speed</td>
+<td>: <font color="Red"><?php echo EVASION_SPEED;?></font></b></td>
+</tr>
+<tr>
+<td><b>Map Size</td>
+<td>: <font color="Red"><?php echo WORLD_MAX;?>x<?php echo WORLD_MAX;?></font></b></td>
+</tr>
+<tr>
+<td><b>Village Exp.</td>
+<td>: <font color="Red"><?php if(CP == 0){ echo "Fast"; } else if(CP == 1){ echo "Slow"; } ?></font></b></td>
+</tr>
+<tr>
+<td><b>Beginners Prot.</td>
+<td>: <font color="Red"><?php echo (PROTECTION/3600);?> hrs</font></b></td>
+</tr>
+<tr>
+<td><b>Medal Interval</td>
+<td>: <font color="Red"><?php if(MEDALINTERVAL >= 86400){ echo ''.(MEDALINTERVAL/86400).' Days'; } else if(MEDALINTERVAL < 86400){ echo ''.(MEDALINTERVAL/3600).' Hours'; } ?></font></b></td>
+</tr>
+<tr>
+<td><b>Server Start</td>
+<td>: <font color="Red"><?php echo START_DATE;?></font></b></td>
+</tr>
+</table>
 </div>
diff --git a/Templates/menu.tpl b/Templates/menu.tpl
index 340f9317..0256df28 100644
--- a/Templates/menu.tpl
+++ b/Templates/menu.tpl
@@ -68,20 +68,6 @@ div.c1 {text-align: center}
             	}
             ?>
         <br></p>
-
-        <b>VOTE FOR US</b>
-        <br /><br />
-
-        <!-- SERVER VOTING //-->
-        <a href="http://topg.org/travian-private-servers/in-474476" target="_blank"><img src="http://topg.org/topg2.gif" width="88" height="31" border="0" alt="travian private servers"></a><br /><br />
-        <a href="http://www.arena-top100.com/index.php?a=in&u=ZathrusWriter"><img src="http://www.arena-top100.com/button.php?u=ZathrusWriter&buttontype=static" alt="Travian Private Servers" title="Travian Private Servers" /></a><br /><br />
-        <a href="http://www.gtop100.com/topsites/Travian/sitedetails/TRAVIANZ--LATEST-UPDATES-93181?vote=1" title="Travian Private Server" target="_blank"><img src="http://www.gtop100.com/images/votebutton.jpg" border="0" alt="Travian Private Server"></a><br /><br />
-        <a href="http://www.mmorpgprivateserver.com/Travian-Private-Server/?v=ZathrusWriter" title="Travian Private Server" rev="vote-for" rel="directory" target="_blank"><img src="http://www.mmorpgprivateserver.com/Travian-Private-Server.gif" alt="" /></a><noscript><a href="http://www.mmorpgprivateserver.com/" title="" rev="vote-for" rel="tag directory"></a><a href="http://www.mmorpgprivateserver.com/Travian-Private-Server/" title="Travian" rev="vote-for" rel="tag directory">Travian Private Server</a></noscript><br /><br />
-        <div style="width:88px"><a href="http://www.topmmorpgservers.com/in/ZathrusWriter" title="Toplist Travian P Servers"><img src="http://www.topmmorpgservers.com/images/button.png" alt="Top Travian Private Servers" border="0"></a></div>
-
-
-        <br>
-        <br>
 		<?php
 		$timestamp = $database->isDeleting($session->uid);
 		if($timestamp) {