From 0dcc230114808defb03fed0eaefaf43beb5aa8ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Peters?= Date: Mon, 23 Dec 2019 19:55:44 +0100 Subject: [PATCH] Update json_api.php --- data/web/json_api.php | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/data/web/json_api.php b/data/web/json_api.php index 40d8c05b..f321e914 100644 --- a/data/web/json_api.php +++ b/data/web/json_api.php @@ -1126,22 +1126,19 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u $containerstarttime = ($container_info['State']['StartedAt']); $containerstate = ($container_info['State']['Status']); $containerimage = ($container_info['Config']['Image']); - - $temp[$container] = array( - 'type' => 'info', - 'container' => $container, - 'state' => $containerstate, - 'started_at' => $containerstarttime, - 'image' => $containerimage - ); - - } - echo json_encode($temp, JSON_UNESCAPED_SLASHES); + $temp[$container] = array( + 'type' => 'info', + 'container' => $container, + 'state' => $containerstate, + 'started_at' => $containerstarttime, + 'image' => $containerimage + ); + } + echo json_encode($temp, JSON_UNESCAPED_SLASHES); break; case "vmail": $exec_fields_vmail = array('cmd' => 'system', 'task' => 'df', 'dir' => '/var/vmail'); $vmail_df = explode(',', json_decode(docker('post', 'dovecot-mailcow', 'exec', $exec_fields_vmail), true)); - $temp = array( 'type' => 'info', 'disk' => $vmail_df[0], @@ -1149,27 +1146,24 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u 'total'=> $vmail_df[1], 'used_percent' => $vmail_df[4] ); - echo json_encode($temp, JSON_UNESCAPED_SLASHES); break; case "solr": $solr_status = solr_status(); $solr_size = ($solr_status['status']['dovecot-fts']['index']['size']); $solr_documents = ($solr_status['status']['dovecot-fts']['index']['numDocs']); - if (strtolower(getenv('SKIP_SOLR')) != 'n') { $solr_enabled = false; - } else { + } + else { $solr_enabled = true; } - echo json_encode(array( 'type' => 'info', 'solr_enabled' => $solr_enabled, 'solr_size' => $solr_size, 'solr_documents' => $solr_documents )); - break; } break;