From 9d94cdeec69fd615ab3d8687577709146db8f54c Mon Sep 17 00:00:00 2001
From: akuker <akuker@gmail.com>
Date: Sat, 1 Aug 2020 19:22:07 -0500
Subject: [PATCH] Updated SCSI table list to show all SCSI IDs

---
 src/php/rascsi.php | 75 +++++++++++++++++++++++++++++-----------------
 1 file changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/php/rascsi.php b/src/php/rascsi.php
index d0960a17..a762232e 100644
--- a/src/php/rascsi.php
+++ b/src/php/rascsi.php
@@ -34,10 +34,6 @@ function remove_device(id){
 		alert("OK");
 }
 
-
-
-
-
 function delete_file(f){
 	if(confirm("Are you sure you want to delete "+f+"?"))
 		alert("OK");
@@ -120,33 +116,56 @@ function current_rascsi_config() {
 	echo '             <td><b>Image File</b></td>';
 	echo '              <td><b>Actions</b></td>';
 	echo '          </tr>';
-	
-	foreach ($rasctl_lines as $current_line)
-	{
-		if(strlen($current_line) === 0){
-			continue;
-		}
-		if(strpos($current_line, '+----') === 0){
-			continue;
 
-		}
-		if(strpos($current_line, '| ID | UN') === 0){
-			continue;
-		}
-		$segments = explode("|", $current_line);
+        $scsi_ids = array();
 
-		echo '         <tr>';
-		echo '             <form>';
-		echo '                 <td>'.trim($segments[1]).'</td>';
-		echo '                 <td>'.trim($segments[3]).'</td>';
-		echo '                 <td>'.trim($segments[4]).'</td>';
-		echo '                 <td>';
-		echo '                     <input type="button" value="Eject" onClick="eject_image(\''.trim($segments[1]).'\',\''.trim($segments[4]).'\')"/>';
-		echo '                     <input type="button" value="Disconnect" onClick="remove_device('.trim($segments[1]).')"/>';
-		echo '                 </td>';
-		echo '             </form>';
-		echo '         </tr>';
+        foreach ($rasctl_lines as $current_line)
+        {
+                if(strlen($current_line) === 0){
+                        continue;
+                }
+                if(strpos($current_line, '+----') === 0){
+                        continue;
 
+                }
+                if(strpos($current_line, '| ID | UN') === 0){
+                        continue;
+                }
+                $segments = explode("|", $current_line);
+
+                $id_config = array();
+                $id_config['id'] = trim($segments[1]);
+                $id_config['type'] = trim($segments[3]);
+                $id_config['file'] = trim($segments[4]);
+
+                $scsi_ids[$id_config['id']] = $id_config;
+        }
+
+
+        foreach (range(0,7) as $id){
+                echo '         <tr>';
+                echo '             <form>';
+              echo '                 <td style="text-align:center">'.$id.'</td>';
+                if(isset($scsi_ids[$id]))
+                {
+                        echo '                 <td style="text-align:center">'.$scsi_ids[$id]['type'].'</td>';
+                        echo '                 <td>'.$scsi_ids[$id]['file'].'</td>';
+                        echo '                 <td>';
+                        echo '                     <input type="button" value="Eject" onClick="eject_image(\''.$id.'\',\''.$scsi_ids[$id]['file'].'\')"/>';
+                        echo '                     <input type="button" value="Disconnect" onClick="remove_device('.$id.')"/>';
+                        echo '                 </td>';
+                }
+                else
+                {
+                        echo '                 <td style="text-align:center">-</td>';
+                        echo '                 <td>-</td>';
+                        echo '                 <td>';
+                        echo '                     <input type="button" value="Connect New Device" onClick="attach_device('.$id.')"/>';
+                        echo '                 </td>';
+
+                }
+                echo '             </form>';
+                echo '         </tr>';
 	}
 	echo '</table>';
 }