Fixed: FS#3183 - Fix & Improve RAID Monitoring for tw_cli (3Ware)

Till Brehm

2014-02-16 5fc730efc3d3b50b8faab636e2bbb2708dddb9a2

Fixed: FS#3183 - Fix & Improve RAID Monitoring for tw_cli (3Ware)

 interface/lib/classes/tools_monitor.inc.php

@@ -377,7 +377,9 @@
            }
            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>';


 server/lib/classes/monitor_tools.inc.php

@@ -1149,10 +1149,13 @@
        /*
        * 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'])) {