diff --git a/interface/lib/classes/tools_monitor.inc.php b/interface/lib/classes/tools_monitor.inc.php index abf8923a1d77e4a8c081483bf4f7c63ec1f9614e..52888e867a7e7b16e4fb74748cc217d0ca2127c6 100644 --- a/interface/lib/classes/tools_monitor.inc.php +++ b/interface/lib/classes/tools_monitor.inc.php @@ -377,7 +377,9 @@ class tools_monitor { } else { $data = unserialize($record['data']); - $html .= nl2br($data['output']); + // improve view @Author <info@typoworx.de> + //-- $html .= nl2br($data['output']); + $html .= '<xmp>' . $data['output'] . '</xmp>'; } $html .= '</div></div>'; diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php index 45a56780849bce2a9d392064f7c900e19f08791f..e8df5ec491bbbd20194acc7fc2165827570676d3 100644 --- a/server/lib/classes/monitor_tools.inc.php +++ b/server/lib/classes/monitor_tools.inc.php @@ -1149,10 +1149,13 @@ class monitor_tools { /* * 3ware Controller */ + system('which tw_cli', $retval); if($retval === 0) { - - $data['output'] = shell_exec('tw_cli info c0'); + + // TYPOWORX FIX | Determine Controler-ID + $availableControlers = shell_exec('tw_cli info | grep -Eo "c[0-9]+'); + $data['output'] = shell_exec('tw_cli info ' . $availableControlers); $state = 'ok'; if(is_array($data['output'])) {