Make "decorated" `server->server->features->software` in server tab

diff --git a/misc/server-lookup-misc.php b/misc/server-lookup-misc.php
index 29bad75f4759ccd90f98de1324e6bf0575645572..4804f7b7688cf194150bba2614dd5f0cc5e99c3a 100644 (file)
--- a/misc/server-lookup-misc.php
+++ b/misc/server-lookup-misc.php
@@ -46,13 +46,14 @@ function generate_html_servermodes($server)
 function sinfo_conv_version_string($server) : string
 {
     $string = (isset($server->server->features->software)) ? $server->server->features->software : "";
+    $return = "";
     if (strlen($string) && strpos($string,"-"))
     {
         $tok = split($string, "-");
-        $return = "<code>" . $tok[1] . "</code> <label class=\"badge label rounded-pill badge-dark\">" . $tok[2] . "</div>";
+        $return = "<code>" . $tok[1] . "</code> <label class=\"badge rounded-pill badge-dark\">" . $tok[2] . "</div>";
     }
     if ($server->server->ulined)
-        $return .= "<div class=\"label rounded-pill badge-warning\">Services</div>";
+        $return .= "<div class=\"badge rounded-pill badge-warning\">Services</div>";
     return $return;
 }
 

diff --git a/servers/index.php b/servers/index.php
index de2a26ff97579aca04c7663b12bb24100a490580..93bebf5c78f2acc5e38baf70d58052637c11df0b 100644 (file)
--- a/servers/index.php
+++ b/servers/index.php
@@ -58,13 +58,9 @@ Click on a server name to view more information.
                        echo "<th scope=\"row\"><input type=\"checkbox\" value='" . base64_encode($server->id)."' name=\"serverch[]\"></th>";
                        echo "<td><a href=\"details.php?server=".$server->id."\">$server->name</a></td>";
                        echo "<td>".$server->server->num_users."</td>";
-                       $s = "";
-                       if (isset($server->server->features->software)) // not (always) present on services
-                               $s .= $server->server->features->software;
-
-                       if ($server->server->ulined == true)
-                                       $s .= " <span class=\"badge rounded-pill badge-warning\">Services</span>";
                        
+                       $s = sinfo_conv_version_string($server);
+
                        echo "<td>$s</td>";
                        echo "<td>".$server->hostname." (".$server->ip.")</td>";
                        if (isset($server->server->uplink))