Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

[Web] Fix Solr status and sort containers

Browse Source
This commit is contained in:
andryyy 2020-01-11 11:00:56 +01:00
parent 3bea17c51a
commit 0526548e05
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/web/debug.php
View File

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