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

Author: Till Brehm

interface/lib/classes/tools_monitor.inc.php

@@ -377,7 +377,9 @@ function showRaidState() {
 			}
 			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 @@ public function monitorRaid() {
 		/*
 		* 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'])) {