diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/StatusController.php b/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/StatusController.php
index c9a9b58ef..0a8e3ede6 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/StatusController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/StatusController.php
@@ -83,7 +83,7 @@ class StatusController extends ApiControllerBase
if ($format == 'xml') {
$result['status'] = simplexml_load_string($response);
} elseif ($format === 'text') {
- $result['status'] = '
' . $this->bashColorToCSS($response) . '
';
+ $result['status'] = '' . $this->bashColorToCSS($response) . '
';
}
}
} else {
@@ -95,7 +95,7 @@ If you have started Monit recently, wait for StartDelay seconds and refresh this
if ($format == 'xml') {
$result['status'] = $msg;
} elseif ($format === 'text') {
- $result['status'] = '' . $msg . '
';
+ $result['status'] = '';
}
}
return $result;
@@ -109,35 +109,35 @@ If you have started Monit recently, wait for StartDelay seconds and refresh this
private function bashColorToCSS($string)
{
$colors = [
- '/\x1b\[0;30m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;30m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;30m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;31m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;32m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;33m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;34m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;35m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;36m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;37m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;30m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;31m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;32m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;33m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;34m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;35m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;36m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;37m(.*?)\x1b\[0m/s' => '$1',
'/\x1b\[0;39m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[1;30m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[1;31m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[1;32m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[1;33m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[1;34m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[1;35m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[1;36m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[1;37m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[1;30m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[1;31m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[1;32m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[1;33m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[1;34m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[1;35m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[1;36m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[1;37m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;90m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;91m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;92m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;93m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;94m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;95m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;96m(.*?)\x1b\[0m/s' => '$1',
- '/\x1b\[0;97m(.*?)\x1b\[0m/s' => '$1'
+ '/\x1b\[0;90m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;91m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;92m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;93m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;94m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;95m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;96m(.*?)\x1b\[0m/s' => '$1',
+ '/\x1b\[0;97m(.*?)\x1b\[0m/s' => '$1'
];
return preg_replace(array_keys($colors), $colors, $string);
}
diff --git a/src/opnsense/mvc/app/views/OPNsense/Monit/status.volt b/src/opnsense/mvc/app/views/OPNsense/Monit/status.volt
index e9c279c01..db67a2712 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Monit/status.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Monit/status.volt
@@ -35,11 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
return textArea.value;
}
ajaxCall(url="/api/monit/status/get/html", sendData={}, callback=function(data,status) {
- $("#status").html(decodeEntities(data['status']));
+ $("#messageregion").html(decodeEntities(data['status']));
});
});
-
-
-Loading...
-