From aef0d1c1268ab7d4bc18996c9c6b4da16a40aadc Mon Sep 17 00:00:00 2001
From: navewindre <nw@moneybot.cc>
Date: Mon, 4 Dec 2023 18:06:10 +0100
Subject: bbbbbbbbwaaaaaaaaaaa

---
 web/index.php     | 22 +++++++++++++++++-----
 web/minecraft.php |  2 +-
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'web')

diff --git a/web/index.php b/web/index.php
index 283df74..bab978c 100644
--- a/web/index.php
+++ b/web/index.php
@@ -1,6 +1,10 @@
 <?php
-require __DIR__ . '\minecraft.php';
-
+require __DIR__ . '/minecraft.php';
+/*
+ini_set('display_errors', '1');
+ini_set('display_startup_errors', '1');
+error_reporting(E_ALL);
+*/
 function var_dump_pre($mixed = null) {
   echo '<pre>';
   var_dump($mixed);
@@ -84,7 +88,7 @@ function query_minecraft_server($ip = null, $port = null) {
 	return $server;
 }
 
-function generate_status_div($server = null) {
+function generate_status_div($server = null, $demos = true) {
 
 	echo "<div class=\"statusbox\">\n";
 	echo "<H5>" . $server['name'] . "</H5>\n";
@@ -95,7 +99,10 @@ function generate_status_div($server = null) {
 	echo "Players: " . $server['players'] . "/" . ($server['playersmax'] - 1) . "\n";
 	echo "Bots: " . $server['bots'] . "\n\n";
 	echo "<hr/>\n";
-	echo "<a href=\"steam://connect/" . $server['ip'] . ":" . $server['port']."\">CONNECT</a>&nbsp;&nbsp;<a href='/demos_css/'>DEMOS</a>";
+  if( $demos == true )
+    echo "<a href=\"steam://connect/" . $server['ip'] . ":" . $server['port']."\">CONNECT</a>&nbsp;&nbsp;<a href='/demos_css/'>DEMOS</a>";
+  else
+    echo "<a href=\"steam://connect/" . $server['ip'] . ":" . $server['port']."\">CONNECT</a>";
 
 	echo "</div>\n";
 }
@@ -104,6 +111,7 @@ function generate_mc_status_div($server = null) {
 
 	echo "<div class=\"statusbox\">\n";
 	echo "<H5>~~~ networkheaven.net ~~~</H5>\n";
+	echo "<H6>minecraft</H6>\n";
 	echo "<H6>" . $server['ip'] . ":" . $server['port'] . "</H6>\n";
 	echo "<hr/>\n";
 	echo "Players: " . $server['players'] . "/" . ($server['playersmax']) . "\n";
@@ -121,7 +129,11 @@ function generate_mc_status_div($server = null) {
 
 //	only server at the moment
 	$server1data = query_source_server("45.33.90.90", "27015");
-	generate_status_div($server1data);
+  if( $server1data['playersmax'] > 0 )
+    generate_status_div($server1data);
+	$server1data = query_source_server("107.192.200.138", "27015");
+  if( $server1data['playersmax'] > 0 )
+    generate_status_div($server1data, false);
 	$mcserverdata = query_minecraft_server("45.33.90.90", "25565");
 	if ($mcserverdata['result_valid'] == true) {
 		generate_mc_status_div($mcserverdata);
diff --git a/web/minecraft.php b/web/minecraft.php
index 5eebb2e..4f9dbc7 100644
--- a/web/minecraft.php
+++ b/web/minecraft.php
@@ -157,7 +157,7 @@ class MinecraftQuery
 			}
 			else if( $Last != false )
 			{
-				$Info[ $Last ] = \mb_convert_encoding( $Value, 'UTF-8' );
+				$Info[ $Last ] = mb_convert_encoding( $Value, 'UTF-8' );
 			}
 		}
 
-- 
cgit v1.2.3