Skip to content

Commit d1d9bc5

Browse files
author
vogelor
committed
Some small improvements of the output of the ISPConfig - Version
1 parent 26759eb commit d1d9bc5

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

interface/web/monitor/show_sys_state.php

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ function _getSysState() {
138138
}
139139
}
140140
}
141-
141+
142142
/*
143143
* Now we have to output all "normal" server or all OpenVZ-Hosts (or all OpenVZ-VE's without
144144
* a OpenVZ-Host managed by ISPConfig). The OpenVz-VE's are then included in them...
@@ -149,7 +149,7 @@ function _getSysState() {
149149
if (!isset($data['is_ve'])) {
150150
/*
151151
* it is NOT a Ve, so do the output of this server and off all VE's included in them
152-
*/
152+
*/
153153
$html .= $data['html_server'];
154154
/* get all VE's of this server */
155155
$veInfo = $data['ve_info'];
@@ -239,13 +239,18 @@ function _getServerState($serverId, $serverName) {
239239
$html_server .= '<div class="systemmonitor-content icons32 ico-' . $serverState . '">';
240240
$html_server .= $app->lng("monitor_serverstate_server_txt") . ': ' . $serverName;
241241
if ($osData != null) {
242-
$html_server .= ' (' . $osData['name'] . ' ' . $osData['version'] . ')';
242+
$html_server .= ' (' . $osData['name'] . ' ' . $osData['version'] . ')<br>';
243+
}
244+
else {
245+
$html_server .= '<br />';
243246
}
244247
if ($ispcData != null) {
245248
$html_server .= $ispcData['name'] . ' ' . $ispcData['version'] . '<br>';
246249
}
250+
else {
251+
$html_server .= '<br />';
252+
}
247253

248-
$html_server .= '<br />';
249254
$html_server .= $app->lng("monitor_serverstate_state_txt") . ': ' . $serverState . ' (';
250255
$html_server .= sizeof($messages[$app->lng("monitor_serverstate_listunknown_txt")]) . ' ' . $app->lng("monitor_serverstate_unknown_txt") . ', ';
251256
$html_server .= sizeof($messages[$app->lng("monitor_serverstate_listinfo_txt")]) . ' ' . $app->lng("monitor_serverstate_info_txt") . ', ';
@@ -258,7 +263,8 @@ function _getServerState($serverId, $serverName) {
258263
* Verbose - Info
259264
*/
260265
$html_verbose = $html_server;
261-
foreach($messages as $key => $state) { {
266+
foreach($messages as $key => $state) {
267+
{
262268
$html_verbose .= $key . ':<br />';
263269
foreach ($state as $msg) {
264270
$html_verbose .= $msg . '<br />';

0 commit comments

Comments
 (0)