Merge branch 'development'

Author: AunePVP

css/style.css

@@ -176,6 +176,7 @@ ul li a {
     margin-left: 7px;
     background-color: white;
     cursor: pointer;
+    color: black;
 }
 .centerdiv {
     margin: auto;

html/tabs.php

@@ -50,7 +50,7 @@
         ?>
     </div>
     <!-- DETAILS -->
-    <div class="II <?php if($type=="csgo"){echo'csgo';}elseif($type=="minecraft"&&$qport == 0) {echo "flex";}?>">
+    <div class="II <?php if($type=="csgo"){echo'csgo';}elseif($type=="minecraft") {echo "flex";}?>">
         <?php
         if ($type == "arkse") {
             echo "<div class='flex'><span style='font-weight: 500;'>System:</span><div class='system'></div><br></div>";

index.php

@@ -118,7 +118,7 @@
         }
         ?>
         <p class="countdown"><?php echo $language[$lang][13]?> <span id="countdown"></span>s.</p>
-        <div><button class="countdownbtn" type="button" onclick="callLoadData()">Refresh Servers</button></div>
+        <div style="padding-bottom: 15px;"><button class="countdownbtn" type="button" onclick="callLoadData()">Refresh Servers</button></div>
         <script>
             function callLoadData() {
                 if (typeof downloadTimer !== 'undefined') {

reload.php

@@ -91,13 +91,13 @@
         break;
     case "minecraft":
         $response['raw']['MOTD'] = $motd;
-        $response['raw']['Players'] = $playerlist;
+        $response['raw']['Players'] = $playerlist ?? 0;
         break;
 }
 switch ($type) {
     case "arkse":
         include ('html/type/arkse/modlist.php');
-        $response['raw']['Players'] = $playerlist;
+        $response['raw']['Players'] = $playerlist ?? 0;
         $response['raw']['InGameDay'] = $ingameday;
         $response['raw']['ClusterID'] = $clusterid;
         $response['raw']['Battleye'] = $battleye;
@@ -112,6 +112,7 @@
                 if (!empty($convertedmod)) {
                     $response['raw']['Mods'][$count]['ModName'] = $convertedmod;
                 } else {
+                    $response['inmodlist'] = "not in list";
                     // If mod is not in modlist, get the mod from the steamcommunity website and store the mod in the modlist file
                     $convertedmod = substr(get_title("https://steamcommunity.com/sharedfiles/filedetails/?id=$mod"), 16);
                     $response['raw']['Mods'][$count]['ModName'] = $convertedmod;
@@ -125,15 +126,15 @@
         $response['raw']['MapLink'] = $maplink;
         break;
     case "csgo":
-        $response['raw']['Players'] = $playerlist;
+        $response['raw']['Players'] = $playerlist ?? 0;
         $response['raw']['MapLink'] = $maplink;
         if (isset($serverstatus->rules)) {
             $response['raw']['HasRules'] = 1;
             $response['raw']['Rules'] = $csgorule;
         }
         break;
     case "vrising":
-        $response['raw']['Players'] = $playerlist;
+        $response['raw']['Players'] = $playerlist ?? 0;
         $response['raw']['Description'] = $description;
         $response['raw']['Bloodbound'] = $bloodbound;
         $response['raw']['CastleHeartDamageMode'] = $bloodbound;
@@ -150,7 +151,7 @@
         } else {
             $maplink = "html/img/map/rustgenerate.webp";
         }
-        $response['raw']['Players'] = $playerlist;
+        $response['raw']['Players'] = $playerlist ?? 0;
         $response['raw']['Seed'] = $seed;
         $response['raw']['WorldSize'] = $worldsize;
         $response['raw']['RustUptime'] = $rustuptime;

version.txt

@@ -1 +1 @@
-v2.2.1-alpha
+v2.2.2-alpha