From 0526548e0594e0d2f7b94c6d6956baed85e15e50 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Sat, 11 Jan 2020 11:00:56 +0100
Subject: [PATCH] [Web] Fix Solr status and sort containers

---
 data/web/debug.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/web/debug.php b/data/web/debug.php
index 863e3527..6e1f92dc 100644
--- a/data/web/debug.php
+++ b/data/web/debug.php
@@ -4,8 +4,9 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php';
 if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == "admin") {
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/header.inc.php';
 $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
-$solr_status = (preg_match("/^([yY][eE][sS]|[yY])+$/", $_ENV["SKIP_SOLR"]) === false) ? solr_status() : false;
-$clamd_status = (preg_match("/^([yY][eE][sS]|[yY])+$/", $_ENV["SKIP_CLAMD"]) === false) ? true : false;
+echo $_ENV["SKIP_SOLR"];
+$solr_status = (preg_match("/^([yY][eE][sS]|[yY])+$/", $_ENV["SKIP_SOLR"])) ? false : solr_status();
+$clamd_status = (preg_match("/^([yY][eE][sS]|[yY])+$/", $_ENV["SKIP_CLAMD"])) ? true : false;
 ?>
 <div class="container">
 
@@ -102,6 +103,7 @@ $clamd_status = (preg_match("/^([yY][eE][sS]|[yY])+$/", $_ENV["SKIP_CLAMD"]) ===
             <ul class="list-group">
             <?php
             $containers = (docker('info'));
+            ksort($containers);
             foreach ($containers as $container => $container_info) {
               if ($container == 'clamd-mailcow' && $clamd_status === false) { continue; }
               if ($container == 'solr-mailcow' && $solr_status === false) { continue; }