Inspection of "Update lib_rascsi.php" - akuker/RASCSI - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 0e9165...ef160c )

unknown

created 2020-09-13 06:02 UTC

Status

Indentation +158 added lines, -158 removed lines patch added patch discarded remove patch

@@ -13,107 +13,107 @@  discard block
 block discarded – undo
 $ALLOWED_FILE_TYPES=array('iso','hda');
 
 function html_generate_header(){
-	echo '    <table width="100%" >'. PHP_EOL;
-	echo '        <tr style="background-color: black;">'. PHP_EOL;
-	echo '          <td style="background-color: black;"><a href=http://github.com/akuker/RASCSI><h1>RaSCSI - 68kmla Edition</h1></a></td>'. PHP_EOL;
-	echo '          <td style="background-color: black;">'. PHP_EOL;
-	echo '                <form action="rascsi.php">'. PHP_EOL;
-   echo '                    <input type="submit" value="Go Home"/>'. PHP_EOL;
-   if($GLOBALS['DEBUG_ENABLE']){
-      echo '                    <p style="color:#595959">Debug Timestamp: '.time().'</p>'. PHP_EOL;
-   }
-	echo '                </form>'. PHP_EOL;
-	echo '          </td>'. PHP_EOL;
-	echo '        </tr>'. PHP_EOL;
-	echo '    </table>'. PHP_EOL;
-	//echo(exec('whoami'));
+    echo '    <table width="100%" >'. PHP_EOL;
+    echo '        <tr style="background-color: black;">'. PHP_EOL;
+    echo '          <td style="background-color: black;"><a href=http://github.com/akuker/RASCSI><h1>RaSCSI - 68kmla Edition</h1></a></td>'. PHP_EOL;
+    echo '          <td style="background-color: black;">'. PHP_EOL;
+    echo '                <form action="rascsi.php">'. PHP_EOL;
+    echo '                    <input type="submit" value="Go Home"/>'. PHP_EOL;
+    if($GLOBALS['DEBUG_ENABLE']){
+        echo '                    <p style="color:#595959">Debug Timestamp: '.time().'</p>'. PHP_EOL;
+    }
+    echo '                </form>'. PHP_EOL;
+    echo '          </td>'. PHP_EOL;
+    echo '        </tr>'. PHP_EOL;
+    echo '    </table>'. PHP_EOL;
+    //echo(exec('whoami'));
 }
 
 function html_generate_image_file_select_list(){
-   $all_files = get_all_files();
-   foreach(explode(PHP_EOL, $all_files) as $this_file){
-         if(strpos($this_file, 'total') === 0){
-               continue;
-         }
-         $file_name = file_name_from_ls($this_file);
-         if(strlen($file_name) === 0){
-               continue;
-         }
-         // Ignore files that start with a .
-         if(strpos($file_name, '.') === 0){
-               continue;
-         }
+    $all_files = get_all_files();
+    foreach(explode(PHP_EOL, $all_files) as $this_file){
+            if(strpos($this_file, 'total') === 0){
+                continue;
+            }
+            $file_name = file_name_from_ls($this_file);
+            if(strlen($file_name) === 0){
+                continue;
+            }
+            // Ignore files that start with a .
+            if(strpos($file_name, '.') === 0){
+                continue;
+            }
 
-         echo '<option value="'.$file_name.'">'.$file_name.'</option>'.PHP_EOL;
-   }
+            echo '<option value="'.$file_name.'">'.$file_name.'</option>'.PHP_EOL;
+    }
 }
 
 
 function html_generate_scsi_id_select_list(){
-	echo '<select>'. PHP_EOL;
-	foreach(range(0,7) as $id){
-		echo '<option value="'.$id.'">'.$id.'</option>'. PHP_EOL;
-	}
-	echo '</select>'. PHP_EOL;
+    echo '<select>'. PHP_EOL;
+    foreach(range(0,7) as $id){
+        echo '<option value="'.$id.'">'.$id.'</option>'. PHP_EOL;
+    }
+    echo '</select>'. PHP_EOL;
 }
 
 function html_generate_scsi_type_select_list(){
-	echo '<select name=type>'. PHP_EOL;
-	$options = array("Hard Disk", "CD-ROM", "Zip Drive", "Ethernet Tap", "Filesystem Bridge");
-	foreach($options as $type){
-		echo '<option value="'.$type.'">'.$type.'</option>'. PHP_EOL;
-	}
-	echo '</select>'. PHP_EOL;
+    echo '<select name=type>'. PHP_EOL;
+    $options = array("Hard Disk", "CD-ROM", "Zip Drive", "Ethernet Tap", "Filesystem Bridge");
+    foreach($options as $type){
+        echo '<option value="'.$type.'">'.$type.'</option>'. PHP_EOL;
+    }
+    echo '</select>'. PHP_EOL;
 }
 
 function html_generate_warning($message){
-	echo '    <table width="100%" >'. PHP_EOL;
-	echo '        <tr style="background-color: red;">'. PHP_EOL;
-	echo '          <td style="background-color: red;">'. PHP_EOL;
-	echo '              <font size=+2>'.$message.'</font>'. PHP_EOL;
-	echo '         </td>'. PHP_EOL;
-	echo '        </tr>'. PHP_EOL;
-	echo '    </table>'. PHP_EOL;
+    echo '    <table width="100%" >'. PHP_EOL;
+    echo '        <tr style="background-color: red;">'. PHP_EOL;
+    echo '          <td style="background-color: red;">'. PHP_EOL;
+    echo '              <font size=+2>'.$message.'</font>'. PHP_EOL;
+    echo '         </td>'. PHP_EOL;
+    echo '        </tr>'. PHP_EOL;
+    echo '    </table>'. PHP_EOL;
 }
 
 function html_generate_success_message($message){
-	echo '    <table width="100%" >'. PHP_EOL;
-	echo '        <tr style="background-color: green;">'. PHP_EOL;
-	echo '          <td style="background-color: green;">'. PHP_EOL;
-   echo '              <font size=+2>Success</font>'. PHP_EOL;
-	echo '         </td>'. PHP_EOL;
-   echo '        </tr>'. PHP_EOL;
-   if(strlen($message) > 0){
-      echo '        <tr style="background-color: green;">'. PHP_EOL;
-      echo '          <td style="background-color: green;">'. PHP_EOL;
-      echo '              '.$message.PHP_EOL;
-      echo '         </td>'. PHP_EOL;
-      echo '        </tr>'. PHP_EOL;
-   }
-	echo '    </table>'. PHP_EOL;
+    echo '    <table width="100%" >'. PHP_EOL;
+    echo '        <tr style="background-color: green;">'. PHP_EOL;
+    echo '          <td style="background-color: green;">'. PHP_EOL;
+    echo '              <font size=+2>Success</font>'. PHP_EOL;
+    echo '         </td>'. PHP_EOL;
+    echo '        </tr>'. PHP_EOL;
+    if(strlen($message) > 0){
+        echo '        <tr style="background-color: green;">'. PHP_EOL;
+        echo '          <td style="background-color: green;">'. PHP_EOL;
+        echo '              '.$message.PHP_EOL;
+        echo '         </td>'. PHP_EOL;
+        echo '        </tr>'. PHP_EOL;
+    }
+    echo '    </table>'. PHP_EOL;
 }
 
 function html_generate_ok_to_go_home(){
-	echo '   <form action="rascsi.php">'. PHP_EOL;
-	echo '       <input type="submit" value="OK"/>'. PHP_EOL;
-	echo '   </form>'. PHP_EOL;
+    echo '   <form action="rascsi.php">'. PHP_EOL;
+    echo '       <input type="submit" value="OK"/>'. PHP_EOL;
+    echo '   </form>'. PHP_EOL;
 }
 
 
 function current_rascsi_config() {
-	$raw_output = shell_exec("/usr/local/bin/rasctl -l");
-	$rasctl_lines = explode(PHP_EOL, $raw_output);
+    $raw_output = shell_exec("/usr/local/bin/rasctl -l");
+    $rasctl_lines = explode(PHP_EOL, $raw_output);
 
-	echo '      <br>'. PHP_EOL;
-	echo '      <h2>Current RaSCSI Configuration</h2>'. PHP_EOL;
-	echo '      <table border="black" cellpadding="3">'. PHP_EOL;
-	echo '          <tr>'. PHP_EOL;
-	echo '              <td><b>SCSI ID</b></td>'. PHP_EOL;
-	echo ' 	             <td><b>Type</b></td>'. PHP_EOL;
-	echo '             <td><b>File</b></td>'. PHP_EOL;
-	echo '              <td><b>File Ops</b></td>'. PHP_EOL;
-	echo '              <td><b>Device Ops</b></td>'. PHP_EOL;
-	echo '          </tr>'. PHP_EOL;
+    echo '      <br>'. PHP_EOL;
+    echo '      <h2>Current RaSCSI Configuration</h2>'. PHP_EOL;
+    echo '      <table border="black" cellpadding="3">'. PHP_EOL;
+    echo '          <tr>'. PHP_EOL;
+    echo '              <td><b>SCSI ID</b></td>'. PHP_EOL;
+    echo ' 	             <td><b>Type</b></td>'. PHP_EOL;
+    echo '             <td><b>File</b></td>'. PHP_EOL;
+    echo '              <td><b>File Ops</b></td>'. PHP_EOL;
+    echo '              <td><b>Device Ops</b></td>'. PHP_EOL;
+    echo '          </tr>'. PHP_EOL;
 
         $scsi_ids = array();
 
@@ -141,117 +141,117 @@  discard block
 block discarded – undo
 
 
         foreach (range(0,7) as $id){
-               echo '         <tr>'. PHP_EOL;
-               echo '                 <td style="text-align:center">'.$id.'</td>'. PHP_EOL;
-               if(isset($scsi_ids[$id]))
-               {
-                  echo '    <td style="text-align:center">'.$scsi_ids[$id]['type'].'</td>'. PHP_EOL;
-                  if(strtolower($scsi_ids[$id]['file']) == "no media"){
-                     echo '   <td>'.PHP_EOL;
-                     echo '      <form action="rascsi_action.php" method="post">'. PHP_EOL;
-                     echo '         <select name="file_name">'.PHP_EOL;
-                     echo '            <option value="None">None</option>'.PHP_EOL;
-                     html_generate_image_file_select_list();
-                     echo '         </select>'.PHP_EOL;
-                     echo '         <input type="hidden" name="command" value="insert_disk" />'. PHP_EOL;
-                     echo '         <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
-                     echo '         <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'. PHP_EOL;
-                     echo '   </td><td>'.PHP_EOL;
-                     echo '         <input type="submit" name="insert_disk" value="Insert" />'. PHP_EOL;
-                     echo '      </form>'. PHP_EOL;
-                     echo '   </td>'.PHP_EOL;
-                  }
-                  else{
-                     // rascsi inserts "WRITEPROTECT" for the read-only drives. We want to display that differently.
-                     echo '   <form action="rascsi_action.php" method="post">'. PHP_EOL;
-                     echo '      <td>'.str_replace('(WRITEPROTECT)', '', $scsi_ids[$id]['file']). PHP_EOL;
-                     echo '   </td><td>'.PHP_EOL;
-                     if(strtolower($scsi_ids[$id]['type']) == 'sccd'){
+                echo '         <tr>'. PHP_EOL;
+                echo '                 <td style="text-align:center">'.$id.'</td>'. PHP_EOL;
+                if(isset($scsi_ids[$id]))
+                {
+                    echo '    <td style="text-align:center">'.$scsi_ids[$id]['type'].'</td>'. PHP_EOL;
+                    if(strtolower($scsi_ids[$id]['file']) == "no media"){
+                        echo '   <td>'.PHP_EOL;
+                        echo '      <form action="rascsi_action.php" method="post">'. PHP_EOL;
+                        echo '         <select name="file_name">'.PHP_EOL;
+                        echo '            <option value="None">None</option>'.PHP_EOL;
+                        html_generate_image_file_select_list();
+                        echo '         </select>'.PHP_EOL;
+                        echo '         <input type="hidden" name="command" value="insert_disk" />'. PHP_EOL;
+                        echo '         <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
+                        echo '         <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'. PHP_EOL;
+                        echo '   </td><td>'.PHP_EOL;
+                        echo '         <input type="submit" name="insert_disk" value="Insert" />'. PHP_EOL;
+                        echo '      </form>'. PHP_EOL;
+                        echo '   </td>'.PHP_EOL;
+                    }
+                    else{
+                        // rascsi inserts "WRITEPROTECT" for the read-only drives. We want to display that differently.
+                        echo '   <form action="rascsi_action.php" method="post">'. PHP_EOL;
+                        echo '      <td>'.str_replace('(WRITEPROTECT)', '', $scsi_ids[$id]['file']). PHP_EOL;
+                        echo '   </td><td>'.PHP_EOL;
+                        if(strtolower($scsi_ids[$id]['type']) == 'sccd'){
                         echo '          <input type="hidden" name="command" value="eject_disk" />'. PHP_EOL;
                         echo '          <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
                         echo '          <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'. PHP_EOL;
                         echo '          <input type="submit" name="eject_disk" value="Eject" />'. PHP_EOL;
-                     }
-                     echo '   </td>'.PHP_EOL;
-                     echo '      </form>'. PHP_EOL;
-                  }
-                  echo '    <td>'. PHP_EOL;
-                  echo '       <form action="rascsi_action.php" method="post">'. PHP_EOL;
-                  echo '          <input type="hidden" name="command" value="remove_device" />'. PHP_EOL;
-                  echo '          <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
-                  echo '          <input type="submit" name="remove_device" value="Disconnect" />'. PHP_EOL;
-						echo '      </form>'. PHP_EOL;
-                  echo '   </td>'. PHP_EOL;
+                        }
+                        echo '   </td>'.PHP_EOL;
+                        echo '      </form>'. PHP_EOL;
+                    }
+                    echo '    <td>'. PHP_EOL;
+                    echo '       <form action="rascsi_action.php" method="post">'. PHP_EOL;
+                    echo '          <input type="hidden" name="command" value="remove_device" />'. PHP_EOL;
+                    echo '          <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
+                    echo '          <input type="submit" name="remove_device" value="Disconnect" />'. PHP_EOL;
+                        echo '      </form>'. PHP_EOL;
+                    echo '   </td>'. PHP_EOL;
                 }
                 else
                 {
-                  echo '                 <td style="text-align:center">-</td>'. PHP_EOL;
-                  echo '                 <td>-</td>'. PHP_EOL;
-                  echo '                 <td></td>'. PHP_EOL;
-                  echo '                 <td>'. PHP_EOL;
-						echo '                 <form action="rascsi_action.php" method="post">'. PHP_EOL;
-						echo '                 <input type="hidden" name="command" value="connect_new_device" />'. PHP_EOL;
-						echo '                 <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
-						echo '                 <input type="submit" name="connect_new_device" value="Connect New" />'. PHP_EOL;
-						echo '                 </form>'. PHP_EOL;
+                    echo '                 <td style="text-align:center">-</td>'. PHP_EOL;
+                    echo '                 <td>-</td>'. PHP_EOL;
+                    echo '                 <td></td>'. PHP_EOL;
+                    echo '                 <td>'. PHP_EOL;
+                        echo '                 <form action="rascsi_action.php" method="post">'. PHP_EOL;
+                        echo '                 <input type="hidden" name="command" value="connect_new_device" />'. PHP_EOL;
+                        echo '                 <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
+                        echo '                 <input type="submit" name="connect_new_device" value="Connect New" />'. PHP_EOL;
+                        echo '                 </form>'. PHP_EOL;
                         echo '                 </td>'. PHP_EOL;
 
                 }
                 echo '             </form>'. PHP_EOL;
                 echo '         </tr>'. PHP_EOL;
-	}
-	echo '</table>'. PHP_EOL;
+    }
+    echo '</table>'. PHP_EOL;
 }
 function get_all_files()
 {
-	$raw_ls_output = shell_exec('ls --time-style="+\"%Y-%m-%d %H:%M:%S\"" -alh --quoting-style=c '.$GLOBALS['FILE_PATH']);
-	return $raw_ls_output;
+    $raw_ls_output = shell_exec('ls --time-style="+\"%Y-%m-%d %H:%M:%S\"" -alh --quoting-style=c '.$GLOBALS['FILE_PATH']);
+    return $raw_ls_output;
 }
 
 function mod_date_from_ls($value){
-	$ls_pieces = explode("\"", $value);
-	if(count($ls_pieces)<1){
-		return "";
-	}
-	return $ls_pieces[1];
+    $ls_pieces = explode("\"", $value);
+    if(count($ls_pieces)<1){
+        return "";
+    }
+    return $ls_pieces[1];
 }
 function file_name_from_ls($value){
-	$ls_pieces = explode("\"", $value);
-	if(count($ls_pieces) < 4){
-		return "";
-	}
-	return $ls_pieces[3];
+    $ls_pieces = explode("\"", $value);
+    if(count($ls_pieces) < 4){
+        return "";
+    }
+    return $ls_pieces[3];
 }
 function file_size_from_ls($value){
-	$ls_pieces = explode("\"", $value);
-	$file_props = preg_split("/\s+/", $ls_pieces[0]);
-	return $file_props[4];
+    $ls_pieces = explode("\"", $value);
+    $file_props = preg_split("/\s+/", $ls_pieces[0]);
+    return $file_props[4];
 }
 function file_category_from_file_name($value){
-	if(strpos($value,".iso") > 0){
-		return "CD-ROM Image";
-	}
-	if(strpos($value,".hda") > 0){
-		return "Hard Disk Image";
-	}
-	return "Unknown type: " . $value;
+    if(strpos($value,".iso") > 0){
+        return "CD-ROM Image";
+    }
+    if(strpos($value,".hda") > 0){
+        return "Hard Disk Image";
+    }
+    return "Unknown type: " . $value;
 }
 
 
 
 function type_string_to_rasctl_type($typestr){
-	if(strcasecmp($typestr,"Hard Disk") == 0){
-		return "hd";
-	}
-	if(strcasecmp($typestr,"CD-ROM") == 0){
-		return "cd";
-	}
-	if(strcasecmp($typestr,"Zip Drive") == 0){
-	}
-	if(strcasecmp($typestr,"Filesystem bridge") == 0){
-		return "bridge";
-	}
-	return "";
+    if(strcasecmp($typestr,"Hard Disk") == 0){
+        return "hd";
+    }
+    if(strcasecmp($typestr,"CD-ROM") == 0){
+        return "cd";
+    }
+    if(strcasecmp($typestr,"Zip Drive") == 0){
+    }
+    if(strcasecmp($typestr,"Filesystem bridge") == 0){
+        return "bridge";
+    }
+    return "";
 }
 
 

Please login to merge, or discard this patch.

Spacing +125 added lines, -125 removed lines patch added patch discarded remove patch

@@ -6,41 +6,41 @@  discard block
 block discarded – undo
 
 <?php
 
-$DEBUG_ENABLE=0;
-$FILE_PATH='/home/pi/images';
+$DEBUG_ENABLE = 0;
+$FILE_PATH = '/home/pi/images';
 // Limit the maximum upload file size to 1GB
-$MAX_UPLOAD_FILE_SIZE=1000000000;
-$ALLOWED_FILE_TYPES=array('iso','hda');
+$MAX_UPLOAD_FILE_SIZE = 1000000000;
+$ALLOWED_FILE_TYPES = array('iso', 'hda');
 
-function html_generate_header(){
-	echo '    <table width="100%" >'. PHP_EOL;
-	echo '        <tr style="background-color: black;">'. PHP_EOL;
-	echo '          <td style="background-color: black;"><a href=http://github.com/akuker/RASCSI><h1>RaSCSI - 68kmla Edition</h1></a></td>'. PHP_EOL;
-	echo '          <td style="background-color: black;">'. PHP_EOL;
-	echo '                <form action="rascsi.php">'. PHP_EOL;
-   echo '                    <input type="submit" value="Go Home"/>'. PHP_EOL;
-   if($GLOBALS['DEBUG_ENABLE']){
-      echo '                    <p style="color:#595959">Debug Timestamp: '.time().'</p>'. PHP_EOL;
+function html_generate_header() {
+	echo '    <table width="100%" >'.PHP_EOL;
+	echo '        <tr style="background-color: black;">'.PHP_EOL;
+	echo '          <td style="background-color: black;"><a href=http://github.com/akuker/RASCSI><h1>RaSCSI - 68kmla Edition</h1></a></td>'.PHP_EOL;
+	echo '          <td style="background-color: black;">'.PHP_EOL;
+	echo '                <form action="rascsi.php">'.PHP_EOL;
+   echo '                    <input type="submit" value="Go Home"/>'.PHP_EOL;
+   if ($GLOBALS['DEBUG_ENABLE']) {
+      echo '                    <p style="color:#595959">Debug Timestamp: '.time().'</p>'.PHP_EOL;
    }
-	echo '                </form>'. PHP_EOL;
-	echo '          </td>'. PHP_EOL;
-	echo '        </tr>'. PHP_EOL;
-	echo '    </table>'. PHP_EOL;
+	echo '                </form>'.PHP_EOL;
+	echo '          </td>'.PHP_EOL;
+	echo '        </tr>'.PHP_EOL;
+	echo '    </table>'.PHP_EOL;
 	//echo(exec('whoami'));
 }
 
-function html_generate_image_file_select_list(){
+function html_generate_image_file_select_list() {
    $all_files = get_all_files();
-   foreach(explode(PHP_EOL, $all_files) as $this_file){
-         if(strpos($this_file, 'total') === 0){
+   foreach (explode(PHP_EOL, $all_files) as $this_file) {
+         if (strpos($this_file, 'total') === 0) {
                continue;
          }
          $file_name = file_name_from_ls($this_file);
-         if(strlen($file_name) === 0){
+         if (strlen($file_name) === 0) {
                continue;
          }
          // Ignore files that start with a .
-         if(strpos($file_name, '.') === 0){
+         if (strpos($file_name, '.') === 0) {
                continue;
          }
 
@@ -49,54 +49,54 @@  discard block
 block discarded – undo
 }
 
 
-function html_generate_scsi_id_select_list(){
-	echo '<select>'. PHP_EOL;
-	foreach(range(0,7) as $id){
-		echo '<option value="'.$id.'">'.$id.'</option>'. PHP_EOL;
+function html_generate_scsi_id_select_list() {
+	echo '<select>'.PHP_EOL;
+	foreach (range(0, 7) as $id) {
+		echo '<option value="'.$id.'">'.$id.'</option>'.PHP_EOL;
 	}
-	echo '</select>'. PHP_EOL;
+	echo '</select>'.PHP_EOL;
 }
 
-function html_generate_scsi_type_select_list(){
-	echo '<select name=type>'. PHP_EOL;
+function html_generate_scsi_type_select_list() {
+	echo '<select name=type>'.PHP_EOL;
 	$options = array("Hard Disk", "CD-ROM", "Zip Drive", "Ethernet Tap", "Filesystem Bridge");
-	foreach($options as $type){
-		echo '<option value="'.$type.'">'.$type.'</option>'. PHP_EOL;
+	foreach ($options as $type) {
+		echo '<option value="'.$type.'">'.$type.'</option>'.PHP_EOL;
 	}
-	echo '</select>'. PHP_EOL;
+	echo '</select>'.PHP_EOL;
 }
 
-function html_generate_warning($message){
-	echo '    <table width="100%" >'. PHP_EOL;
-	echo '        <tr style="background-color: red;">'. PHP_EOL;
-	echo '          <td style="background-color: red;">'. PHP_EOL;
-	echo '              <font size=+2>'.$message.'</font>'. PHP_EOL;
-	echo '         </td>'. PHP_EOL;
-	echo '        </tr>'. PHP_EOL;
-	echo '    </table>'. PHP_EOL;
+function html_generate_warning($message) {
+	echo '    <table width="100%" >'.PHP_EOL;
+	echo '        <tr style="background-color: red;">'.PHP_EOL;
+	echo '          <td style="background-color: red;">'.PHP_EOL;
+	echo '              <font size=+2>'.$message.'</font>'.PHP_EOL;
+	echo '         </td>'.PHP_EOL;
+	echo '        </tr>'.PHP_EOL;
+	echo '    </table>'.PHP_EOL;
 }
 
-function html_generate_success_message($message){
-	echo '    <table width="100%" >'. PHP_EOL;
-	echo '        <tr style="background-color: green;">'. PHP_EOL;
-	echo '          <td style="background-color: green;">'. PHP_EOL;
-   echo '              <font size=+2>Success</font>'. PHP_EOL;
-	echo '         </td>'. PHP_EOL;
-   echo '        </tr>'. PHP_EOL;
-   if(strlen($message) > 0){
-      echo '        <tr style="background-color: green;">'. PHP_EOL;
-      echo '          <td style="background-color: green;">'. PHP_EOL;
+function html_generate_success_message($message) {
+	echo '    <table width="100%" >'.PHP_EOL;
+	echo '        <tr style="background-color: green;">'.PHP_EOL;
+	echo '          <td style="background-color: green;">'.PHP_EOL;
+   echo '              <font size=+2>Success</font>'.PHP_EOL;
+	echo '         </td>'.PHP_EOL;
+   echo '        </tr>'.PHP_EOL;
+   if (strlen($message) > 0) {
+      echo '        <tr style="background-color: green;">'.PHP_EOL;
+      echo '          <td style="background-color: green;">'.PHP_EOL;
       echo '              '.$message.PHP_EOL;
-      echo '         </td>'. PHP_EOL;
-      echo '        </tr>'. PHP_EOL;
+      echo '         </td>'.PHP_EOL;
+      echo '        </tr>'.PHP_EOL;
    }
-	echo '    </table>'. PHP_EOL;
+	echo '    </table>'.PHP_EOL;
 }
 
-function html_generate_ok_to_go_home(){
-	echo '   <form action="rascsi.php">'. PHP_EOL;
-	echo '       <input type="submit" value="OK"/>'. PHP_EOL;
-	echo '   </form>'. PHP_EOL;
+function html_generate_ok_to_go_home() {
+	echo '   <form action="rascsi.php">'.PHP_EOL;
+	echo '       <input type="submit" value="OK"/>'.PHP_EOL;
+	echo '   </form>'.PHP_EOL;
 }
 
 
@@ -104,29 +104,29 @@  discard block
 block discarded – undo
 	$raw_output = shell_exec("/usr/local/bin/rasctl -l");
 	$rasctl_lines = explode(PHP_EOL, $raw_output);
 
-	echo '      <br>'. PHP_EOL;
-	echo '      <h2>Current RaSCSI Configuration</h2>'. PHP_EOL;
-	echo '      <table border="black" cellpadding="3">'. PHP_EOL;
-	echo '          <tr>'. PHP_EOL;
-	echo '              <td><b>SCSI ID</b></td>'. PHP_EOL;
-	echo ' 	             <td><b>Type</b></td>'. PHP_EOL;
-	echo '             <td><b>File</b></td>'. PHP_EOL;
-	echo '              <td><b>File Ops</b></td>'. PHP_EOL;
-	echo '              <td><b>Device Ops</b></td>'. PHP_EOL;
-	echo '          </tr>'. PHP_EOL;
+	echo '      <br>'.PHP_EOL;
+	echo '      <h2>Current RaSCSI Configuration</h2>'.PHP_EOL;
+	echo '      <table border="black" cellpadding="3">'.PHP_EOL;
+	echo '          <tr>'.PHP_EOL;
+	echo '              <td><b>SCSI ID</b></td>'.PHP_EOL;
+	echo ' 	             <td><b>Type</b></td>'.PHP_EOL;
+	echo '             <td><b>File</b></td>'.PHP_EOL;
+	echo '              <td><b>File Ops</b></td>'.PHP_EOL;
+	echo '              <td><b>Device Ops</b></td>'.PHP_EOL;
+	echo '          </tr>'.PHP_EOL;
 
         $scsi_ids = array();
 
         foreach ($rasctl_lines as $current_line)
         {
-                if(strlen($current_line) === 0){
+                if (strlen($current_line) === 0) {
                         continue;
                 }
-                if(strpos($current_line, '+----') === 0){
+                if (strpos($current_line, '+----') === 0) {
                         continue;
 
                 }
-                if(strpos($current_line, '| ID | UN') === 0){
+                if (strpos($current_line, '| ID | UN') === 0) {
                         continue;
                 }
                 $segments = explode("|", $current_line);
@@ -140,67 +140,67 @@  discard block
 block discarded – undo
         }
 
 
-        foreach (range(0,7) as $id){
-               echo '         <tr>'. PHP_EOL;
-               echo '                 <td style="text-align:center">'.$id.'</td>'. PHP_EOL;
-               if(isset($scsi_ids[$id]))
+        foreach (range(0, 7) as $id) {
+               echo '         <tr>'.PHP_EOL;
+               echo '                 <td style="text-align:center">'.$id.'</td>'.PHP_EOL;
+               if (isset($scsi_ids[$id]))
                {
-                  echo '    <td style="text-align:center">'.$scsi_ids[$id]['type'].'</td>'. PHP_EOL;
-                  if(strtolower($scsi_ids[$id]['file']) == "no media"){
+                  echo '    <td style="text-align:center">'.$scsi_ids[$id]['type'].'</td>'.PHP_EOL;
+                  if (strtolower($scsi_ids[$id]['file']) == "no media") {
                      echo '   <td>'.PHP_EOL;
-                     echo '      <form action="rascsi_action.php" method="post">'. PHP_EOL;
+                     echo '      <form action="rascsi_action.php" method="post">'.PHP_EOL;
                      echo '         <select name="file_name">'.PHP_EOL;
                      echo '            <option value="None">None</option>'.PHP_EOL;
                      html_generate_image_file_select_list();
                      echo '         </select>'.PHP_EOL;
-                     echo '         <input type="hidden" name="command" value="insert_disk" />'. PHP_EOL;
-                     echo '         <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
-                     echo '         <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'. PHP_EOL;
+                     echo '         <input type="hidden" name="command" value="insert_disk" />'.PHP_EOL;
+                     echo '         <input type="hidden" name="id" value="'.$id.'" />'.PHP_EOL;
+                     echo '         <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'.PHP_EOL;
                      echo '   </td><td>'.PHP_EOL;
-                     echo '         <input type="submit" name="insert_disk" value="Insert" />'. PHP_EOL;
-                     echo '      </form>'. PHP_EOL;
+                     echo '         <input type="submit" name="insert_disk" value="Insert" />'.PHP_EOL;
+                     echo '      </form>'.PHP_EOL;
                      echo '   </td>'.PHP_EOL;
                   }
-                  else{
+                  else {
                      // rascsi inserts "WRITEPROTECT" for the read-only drives. We want to display that differently.
-                     echo '   <form action="rascsi_action.php" method="post">'. PHP_EOL;
-                     echo '      <td>'.str_replace('(WRITEPROTECT)', '', $scsi_ids[$id]['file']). PHP_EOL;
+                     echo '   <form action="rascsi_action.php" method="post">'.PHP_EOL;
+                     echo '      <td>'.str_replace('(WRITEPROTECT)', '', $scsi_ids[$id]['file']).PHP_EOL;
                      echo '   </td><td>'.PHP_EOL;
-                     if(strtolower($scsi_ids[$id]['type']) == 'sccd'){
-                        echo '          <input type="hidden" name="command" value="eject_disk" />'. PHP_EOL;
-                        echo '          <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
-                        echo '          <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'. PHP_EOL;
-                        echo '          <input type="submit" name="eject_disk" value="Eject" />'. PHP_EOL;
+                     if (strtolower($scsi_ids[$id]['type']) == 'sccd') {
+                        echo '          <input type="hidden" name="command" value="eject_disk" />'.PHP_EOL;
+                        echo '          <input type="hidden" name="id" value="'.$id.'" />'.PHP_EOL;
+                        echo '          <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'.PHP_EOL;
+                        echo '          <input type="submit" name="eject_disk" value="Eject" />'.PHP_EOL;
                      }
                      echo '   </td>'.PHP_EOL;
-                     echo '      </form>'. PHP_EOL;
+                     echo '      </form>'.PHP_EOL;
                   }
-                  echo '    <td>'. PHP_EOL;
-                  echo '       <form action="rascsi_action.php" method="post">'. PHP_EOL;
-                  echo '          <input type="hidden" name="command" value="remove_device" />'. PHP_EOL;
-                  echo '          <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
-                  echo '          <input type="submit" name="remove_device" value="Disconnect" />'. PHP_EOL;
-						echo '      </form>'. PHP_EOL;
-                  echo '   </td>'. PHP_EOL;
+                  echo '    <td>'.PHP_EOL;
+                  echo '       <form action="rascsi_action.php" method="post">'.PHP_EOL;
+                  echo '          <input type="hidden" name="command" value="remove_device" />'.PHP_EOL;
+                  echo '          <input type="hidden" name="id" value="'.$id.'" />'.PHP_EOL;
+                  echo '          <input type="submit" name="remove_device" value="Disconnect" />'.PHP_EOL;
+						echo '      </form>'.PHP_EOL;
+                  echo '   </td>'.PHP_EOL;
                 }
                 else
                 {
-                  echo '                 <td style="text-align:center">-</td>'. PHP_EOL;
-                  echo '                 <td>-</td>'. PHP_EOL;
-                  echo '                 <td></td>'. PHP_EOL;
-                  echo '                 <td>'. PHP_EOL;
-						echo '                 <form action="rascsi_action.php" method="post">'. PHP_EOL;
-						echo '                 <input type="hidden" name="command" value="connect_new_device" />'. PHP_EOL;
-						echo '                 <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
-						echo '                 <input type="submit" name="connect_new_device" value="Connect New" />'. PHP_EOL;
-						echo '                 </form>'. PHP_EOL;
-                        echo '                 </td>'. PHP_EOL;
+                  echo '                 <td style="text-align:center">-</td>'.PHP_EOL;
+                  echo '                 <td>-</td>'.PHP_EOL;
+                  echo '                 <td></td>'.PHP_EOL;
+                  echo '                 <td>'.PHP_EOL;
+						echo '                 <form action="rascsi_action.php" method="post">'.PHP_EOL;
+						echo '                 <input type="hidden" name="command" value="connect_new_device" />'.PHP_EOL;
+						echo '                 <input type="hidden" name="id" value="'.$id.'" />'.PHP_EOL;
+						echo '                 <input type="submit" name="connect_new_device" value="Connect New" />'.PHP_EOL;
+						echo '                 </form>'.PHP_EOL;
+                        echo '                 </td>'.PHP_EOL;
 
                 }
-                echo '             </form>'. PHP_EOL;
-                echo '         </tr>'. PHP_EOL;
+                echo '             </form>'.PHP_EOL;
+                echo '         </tr>'.PHP_EOL;
 	}
-	echo '</table>'. PHP_EOL;
+	echo '</table>'.PHP_EOL;
 }
 function get_all_files()
 {
@@ -208,47 +208,47 @@  discard block
 block discarded – undo
 	return $raw_ls_output;
 }
 
-function mod_date_from_ls($value){
+function mod_date_from_ls($value) {
 	$ls_pieces = explode("\"", $value);
-	if(count($ls_pieces)<1){
+	if (count($ls_pieces) < 1) {
 		return "";
 	}
 	return $ls_pieces[1];
 }
-function file_name_from_ls($value){
+function file_name_from_ls($value) {
 	$ls_pieces = explode("\"", $value);
-	if(count($ls_pieces) < 4){
+	if (count($ls_pieces) < 4) {
 		return "";
 	}
 	return $ls_pieces[3];
 }
-function file_size_from_ls($value){
+function file_size_from_ls($value) {
 	$ls_pieces = explode("\"", $value);
 	$file_props = preg_split("/\s+/", $ls_pieces[0]);
 	return $file_props[4];
 }
-function file_category_from_file_name($value){
-	if(strpos($value,".iso") > 0){
+function file_category_from_file_name($value) {
+	if (strpos($value, ".iso") > 0) {
 		return "CD-ROM Image";
 	}
-	if(strpos($value,".hda") > 0){
+	if (strpos($value, ".hda") > 0) {
 		return "Hard Disk Image";
 	}
-	return "Unknown type: " . $value;
+	return "Unknown type: ".$value;
 }
 
 
 
-function type_string_to_rasctl_type($typestr){
-	if(strcasecmp($typestr,"Hard Disk") == 0){
+function type_string_to_rasctl_type($typestr) {
+	if (strcasecmp($typestr, "Hard Disk") == 0) {
 		return "hd";
 	}
-	if(strcasecmp($typestr,"CD-ROM") == 0){
+	if (strcasecmp($typestr, "CD-ROM") == 0) {
 		return "cd";
 	}
-	if(strcasecmp($typestr,"Zip Drive") == 0){
+	if (strcasecmp($typestr, "Zip Drive") == 0) {
 	}
-	if(strcasecmp($typestr,"Filesystem bridge") == 0){
+	if (strcasecmp($typestr, "Filesystem bridge") == 0) {
 		return "bridge";
 	}
 	return "";

Please login to merge, or discard this patch.

		@@ -13,107 +13,107 @@ discard block
		block discarded – undo
13	13	$ALLOWED_FILE_TYPES=array('iso','hda');
14	14
15	15	function html_generate_header(){
16		- echo ' <table width="100%" >'. PHP_EOL;
17		- echo ' <tr style="background-color: black;">'. PHP_EOL;
18		- echo ' <td style="background-color: black;"><a href=http://github.com/akuker/RASCSI><h1>RaSCSI - 68kmla Edition</h1></a></td>'. PHP_EOL;
19		- echo ' <td style="background-color: black;">'. PHP_EOL;
20		- echo ' <form action="rascsi.php">'. PHP_EOL;
21		- echo ' <input type="submit" value="Go Home"/>'. PHP_EOL;
22		- if($GLOBALS['DEBUG_ENABLE']){
23		- echo ' <p style="color:#595959">Debug Timestamp: '.time().'</p>'. PHP_EOL;
24		- }
25		- echo ' </form>'. PHP_EOL;
26		- echo ' </td>'. PHP_EOL;
27		- echo ' </tr>'. PHP_EOL;
28		- echo ' </table>'. PHP_EOL;
29		- //echo(exec('whoami'));
	16	+ echo ' <table width="100%" >'. PHP_EOL;
	17	+ echo ' <tr style="background-color: black;">'. PHP_EOL;
	18	+ echo ' <td style="background-color: black;"><a href=http://github.com/akuker/RASCSI><h1>RaSCSI - 68kmla Edition</h1></a></td>'. PHP_EOL;
	19	+ echo ' <td style="background-color: black;">'. PHP_EOL;
	20	+ echo ' <form action="rascsi.php">'. PHP_EOL;
	21	+ echo ' <input type="submit" value="Go Home"/>'. PHP_EOL;
	22	+ if($GLOBALS['DEBUG_ENABLE']){
	23	+ echo ' <p style="color:#595959">Debug Timestamp: '.time().'</p>'. PHP_EOL;
	24	+ }
	25	+ echo ' </form>'. PHP_EOL;
	26	+ echo ' </td>'. PHP_EOL;
	27	+ echo ' </tr>'. PHP_EOL;
	28	+ echo ' </table>'. PHP_EOL;
	29	+ //echo(exec('whoami'));
30	30	}
31	31
32	32	function html_generate_image_file_select_list(){
33		- $all_files = get_all_files();
34		- foreach(explode(PHP_EOL, $all_files) as $this_file){
35		- if(strpos($this_file, 'total') === 0){
36		- continue;
37		- }
38		- $file_name = file_name_from_ls($this_file);
39		- if(strlen($file_name) === 0){
40		- continue;
41		- }
42		- // Ignore files that start with a .
43		- if(strpos($file_name, '.') === 0){
44		- continue;
45		- }
	33	+ $all_files = get_all_files();
	34	+ foreach(explode(PHP_EOL, $all_files) as $this_file){
	35	+ if(strpos($this_file, 'total') === 0){
	36	+ continue;
	37	+ }
	38	+ $file_name = file_name_from_ls($this_file);
	39	+ if(strlen($file_name) === 0){
	40	+ continue;
	41	+ }
	42	+ // Ignore files that start with a .
	43	+ if(strpos($file_name, '.') === 0){
	44	+ continue;
	45	+ }
46	46
47		- echo '<option value="'.$file_name.'">'.$file_name.'</option>'.PHP_EOL;
48		- }
	47	+ echo '<option value="'.$file_name.'">'.$file_name.'</option>'.PHP_EOL;
	48	+ }
49	49	}
50	50
51	51
52	52	function html_generate_scsi_id_select_list(){
53		- echo '<select>'. PHP_EOL;
54		- foreach(range(0,7) as $id){
55		- echo '<option value="'.$id.'">'.$id.'</option>'. PHP_EOL;
56		- }
57		- echo '</select>'. PHP_EOL;
	53	+ echo '<select>'. PHP_EOL;
	54	+ foreach(range(0,7) as $id){
	55	+ echo '<option value="'.$id.'">'.$id.'</option>'. PHP_EOL;
	56	+ }
	57	+ echo '</select>'. PHP_EOL;
58	58	}
59	59
60	60	function html_generate_scsi_type_select_list(){
61		- echo '<select name=type>'. PHP_EOL;
62		- $options = array("Hard Disk", "CD-ROM", "Zip Drive", "Ethernet Tap", "Filesystem Bridge");
63		- foreach($options as $type){
64		- echo '<option value="'.$type.'">'.$type.'</option>'. PHP_EOL;
65		- }
66		- echo '</select>'. PHP_EOL;
	61	+ echo '<select name=type>'. PHP_EOL;
	62	+ $options = array("Hard Disk", "CD-ROM", "Zip Drive", "Ethernet Tap", "Filesystem Bridge");
	63	+ foreach($options as $type){
	64	+ echo '<option value="'.$type.'">'.$type.'</option>'. PHP_EOL;
	65	+ }
	66	+ echo '</select>'. PHP_EOL;
67	67	}
68	68
69	69	function html_generate_warning($message){
70		- echo ' <table width="100%" >'. PHP_EOL;
71		- echo ' <tr style="background-color: red;">'. PHP_EOL;
72		- echo ' <td style="background-color: red;">'. PHP_EOL;
73		- echo ' <font size=+2>'.$message.'</font>'. PHP_EOL;
74		- echo ' </td>'. PHP_EOL;
75		- echo ' </tr>'. PHP_EOL;
76		- echo ' </table>'. PHP_EOL;
	70	+ echo ' <table width="100%" >'. PHP_EOL;
	71	+ echo ' <tr style="background-color: red;">'. PHP_EOL;
	72	+ echo ' <td style="background-color: red;">'. PHP_EOL;
	73	+ echo ' <font size=+2>'.$message.'</font>'. PHP_EOL;
	74	+ echo ' </td>'. PHP_EOL;
	75	+ echo ' </tr>'. PHP_EOL;
	76	+ echo ' </table>'. PHP_EOL;
77	77	}
78	78
79	79	function html_generate_success_message($message){
80		- echo ' <table width="100%" >'. PHP_EOL;
81		- echo ' <tr style="background-color: green;">'. PHP_EOL;
82		- echo ' <td style="background-color: green;">'. PHP_EOL;
83		- echo ' <font size=+2>Success</font>'. PHP_EOL;
84		- echo ' </td>'. PHP_EOL;
85		- echo ' </tr>'. PHP_EOL;
86		- if(strlen($message) > 0){
87		- echo ' <tr style="background-color: green;">'. PHP_EOL;
88		- echo ' <td style="background-color: green;">'. PHP_EOL;
89		- echo ' '.$message.PHP_EOL;
90		- echo ' </td>'. PHP_EOL;
91		- echo ' </tr>'. PHP_EOL;
92		- }
93		- echo ' </table>'. PHP_EOL;
	80	+ echo ' <table width="100%" >'. PHP_EOL;
	81	+ echo ' <tr style="background-color: green;">'. PHP_EOL;
	82	+ echo ' <td style="background-color: green;">'. PHP_EOL;
	83	+ echo ' <font size=+2>Success</font>'. PHP_EOL;
	84	+ echo ' </td>'. PHP_EOL;
	85	+ echo ' </tr>'. PHP_EOL;
	86	+ if(strlen($message) > 0){
	87	+ echo ' <tr style="background-color: green;">'. PHP_EOL;
	88	+ echo ' <td style="background-color: green;">'. PHP_EOL;
	89	+ echo ' '.$message.PHP_EOL;
	90	+ echo ' </td>'. PHP_EOL;
	91	+ echo ' </tr>'. PHP_EOL;
	92	+ }
	93	+ echo ' </table>'. PHP_EOL;
94	94	}
95	95
96	96	function html_generate_ok_to_go_home(){
97		- echo ' <form action="rascsi.php">'. PHP_EOL;
98		- echo ' <input type="submit" value="OK"/>'. PHP_EOL;
99		- echo ' </form>'. PHP_EOL;
	97	+ echo ' <form action="rascsi.php">'. PHP_EOL;
	98	+ echo ' <input type="submit" value="OK"/>'. PHP_EOL;
	99	+ echo ' </form>'. PHP_EOL;
100	100	}
101	101
102	102
103	103	function current_rascsi_config() {
104		- $raw_output = shell_exec("/usr/local/bin/rasctl -l");
105		- $rasctl_lines = explode(PHP_EOL, $raw_output);
	104	+ $raw_output = shell_exec("/usr/local/bin/rasctl -l");
	105	+ $rasctl_lines = explode(PHP_EOL, $raw_output);
106	106
107		- echo ' <br>'. PHP_EOL;
108		- echo ' <h2>Current RaSCSI Configuration</h2>'. PHP_EOL;
109		- echo ' <table border="black" cellpadding="3">'. PHP_EOL;
110		- echo ' <tr>'. PHP_EOL;
111		- echo ' <td><b>SCSI ID</b></td>'. PHP_EOL;
112		- echo ' <td><b>Type</b></td>'. PHP_EOL;
113		- echo ' <td><b>File</b></td>'. PHP_EOL;
114		- echo ' <td><b>File Ops</b></td>'. PHP_EOL;
115		- echo ' <td><b>Device Ops</b></td>'. PHP_EOL;
116		- echo ' </tr>'. PHP_EOL;
	107	+ echo ' <br>'. PHP_EOL;
	108	+ echo ' <h2>Current RaSCSI Configuration</h2>'. PHP_EOL;
	109	+ echo ' <table border="black" cellpadding="3">'. PHP_EOL;
	110	+ echo ' <tr>'. PHP_EOL;
	111	+ echo ' <td><b>SCSI ID</b></td>'. PHP_EOL;
	112	+ echo ' <td><b>Type</b></td>'. PHP_EOL;
	113	+ echo ' <td><b>File</b></td>'. PHP_EOL;
	114	+ echo ' <td><b>File Ops</b></td>'. PHP_EOL;
	115	+ echo ' <td><b>Device Ops</b></td>'. PHP_EOL;
	116	+ echo ' </tr>'. PHP_EOL;
117	117
118	118	$scsi_ids = array();
119	119
		@@ -141,117 +141,117 @@ discard block
		block discarded – undo
141	141
142	142
143	143	foreach (range(0,7) as $id){
144		- echo ' <tr>'. PHP_EOL;
145		- echo ' <td style="text-align:center">'.$id.'</td>'. PHP_EOL;
146		- if(isset($scsi_ids[$id]))
147		- {
148		- echo ' <td style="text-align:center">'.$scsi_ids[$id]['type'].'</td>'. PHP_EOL;
149		- if(strtolower($scsi_ids[$id]['file']) == "no media"){
150		- echo ' <td>'.PHP_EOL;
151		- echo ' <form action="rascsi_action.php" method="post">'. PHP_EOL;
152		- echo ' <select name="file_name">'.PHP_EOL;
153		- echo ' <option value="None">None</option>'.PHP_EOL;
154		- html_generate_image_file_select_list();
155		- echo ' </select>'.PHP_EOL;
156		- echo ' <input type="hidden" name="command" value="insert_disk" />'. PHP_EOL;
157		- echo ' <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
158		- echo ' <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'. PHP_EOL;
159		- echo ' </td><td>'.PHP_EOL;
160		- echo ' <input type="submit" name="insert_disk" value="Insert" />'. PHP_EOL;
161		- echo ' </form>'. PHP_EOL;
162		- echo ' </td>'.PHP_EOL;
163		- }
164		- else{
165		- // rascsi inserts "WRITEPROTECT" for the read-only drives. We want to display that differently.
166		- echo ' <form action="rascsi_action.php" method="post">'. PHP_EOL;
167		- echo ' <td>'.str_replace('(WRITEPROTECT)', '', $scsi_ids[$id]['file']). PHP_EOL;
168		- echo ' </td><td>'.PHP_EOL;
169		- if(strtolower($scsi_ids[$id]['type']) == 'sccd'){
	144	+ echo ' <tr>'. PHP_EOL;
	145	+ echo ' <td style="text-align:center">'.$id.'</td>'. PHP_EOL;
	146	+ if(isset($scsi_ids[$id]))
	147	+ {
	148	+ echo ' <td style="text-align:center">'.$scsi_ids[$id]['type'].'</td>'. PHP_EOL;
	149	+ if(strtolower($scsi_ids[$id]['file']) == "no media"){
	150	+ echo ' <td>'.PHP_EOL;
	151	+ echo ' <form action="rascsi_action.php" method="post">'. PHP_EOL;
	152	+ echo ' <select name="file_name">'.PHP_EOL;
	153	+ echo ' <option value="None">None</option>'.PHP_EOL;
	154	+ html_generate_image_file_select_list();
	155	+ echo ' </select>'.PHP_EOL;
	156	+ echo ' <input type="hidden" name="command" value="insert_disk" />'. PHP_EOL;
	157	+ echo ' <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
	158	+ echo ' <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'. PHP_EOL;
	159	+ echo ' </td><td>'.PHP_EOL;
	160	+ echo ' <input type="submit" name="insert_disk" value="Insert" />'. PHP_EOL;
	161	+ echo ' </form>'. PHP_EOL;
	162	+ echo ' </td>'.PHP_EOL;
	163	+ }
	164	+ else{
	165	+ // rascsi inserts "WRITEPROTECT" for the read-only drives. We want to display that differently.
	166	+ echo ' <form action="rascsi_action.php" method="post">'. PHP_EOL;
	167	+ echo ' <td>'.str_replace('(WRITEPROTECT)', '', $scsi_ids[$id]['file']). PHP_EOL;
	168	+ echo ' </td><td>'.PHP_EOL;
	169	+ if(strtolower($scsi_ids[$id]['type']) == 'sccd'){
170	170	echo ' <input type="hidden" name="command" value="eject_disk" />'. PHP_EOL;
171	171	echo ' <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
172	172	echo ' <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'. PHP_EOL;
173	173	echo ' <input type="submit" name="eject_disk" value="Eject" />'. PHP_EOL;
174		- }
175		- echo ' </td>'.PHP_EOL;
176		- echo ' </form>'. PHP_EOL;
177		- }
178		- echo ' <td>'. PHP_EOL;
179		- echo ' <form action="rascsi_action.php" method="post">'. PHP_EOL;
180		- echo ' <input type="hidden" name="command" value="remove_device" />'. PHP_EOL;
181		- echo ' <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
182		- echo ' <input type="submit" name="remove_device" value="Disconnect" />'. PHP_EOL;
183		- echo ' </form>'. PHP_EOL;
184		- echo ' </td>'. PHP_EOL;
	174	+ }
	175	+ echo ' </td>'.PHP_EOL;
	176	+ echo ' </form>'. PHP_EOL;
	177	+ }
	178	+ echo ' <td>'. PHP_EOL;
	179	+ echo ' <form action="rascsi_action.php" method="post">'. PHP_EOL;
	180	+ echo ' <input type="hidden" name="command" value="remove_device" />'. PHP_EOL;
	181	+ echo ' <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
	182	+ echo ' <input type="submit" name="remove_device" value="Disconnect" />'. PHP_EOL;
	183	+ echo ' </form>'. PHP_EOL;
	184	+ echo ' </td>'. PHP_EOL;
185	185	}
186	186	else
187	187	{
188		- echo ' <td style="text-align:center">-</td>'. PHP_EOL;
189		- echo ' <td>-</td>'. PHP_EOL;
190		- echo ' <td></td>'. PHP_EOL;
191		- echo ' <td>'. PHP_EOL;
192		- echo ' <form action="rascsi_action.php" method="post">'. PHP_EOL;
193		- echo ' <input type="hidden" name="command" value="connect_new_device" />'. PHP_EOL;
194		- echo ' <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
195		- echo ' <input type="submit" name="connect_new_device" value="Connect New" />'. PHP_EOL;
196		- echo ' </form>'. PHP_EOL;
	188	+ echo ' <td style="text-align:center">-</td>'. PHP_EOL;
	189	+ echo ' <td>-</td>'. PHP_EOL;
	190	+ echo ' <td></td>'. PHP_EOL;
	191	+ echo ' <td>'. PHP_EOL;
	192	+ echo ' <form action="rascsi_action.php" method="post">'. PHP_EOL;
	193	+ echo ' <input type="hidden" name="command" value="connect_new_device" />'. PHP_EOL;
	194	+ echo ' <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
	195	+ echo ' <input type="submit" name="connect_new_device" value="Connect New" />'. PHP_EOL;
	196	+ echo ' </form>'. PHP_EOL;
197	197	echo ' </td>'. PHP_EOL;
198	198
199	199	}
200	200	echo ' </form>'. PHP_EOL;
201	201	echo ' </tr>'. PHP_EOL;
202		- }
203		- echo '</table>'. PHP_EOL;
	202	+ }
	203	+ echo '</table>'. PHP_EOL;
204	204	}
205	205	function get_all_files()
206	206	{
207		- $raw_ls_output = shell_exec('ls --time-style="+\"%Y-%m-%d %H:%M:%S\"" -alh --quoting-style=c '.$GLOBALS['FILE_PATH']);
208		- return $raw_ls_output;
	207	+ $raw_ls_output = shell_exec('ls --time-style="+\"%Y-%m-%d %H:%M:%S\"" -alh --quoting-style=c '.$GLOBALS['FILE_PATH']);
	208	+ return $raw_ls_output;
209	209	}
210	210
211	211	function mod_date_from_ls($value){
212		- $ls_pieces = explode("\"", $value);
213		- if(count($ls_pieces)<1){
214		- return "";
215		- }
216		- return $ls_pieces[1];
	212	+ $ls_pieces = explode("\"", $value);
	213	+ if(count($ls_pieces)<1){
	214	+ return "";
	215	+ }
	216	+ return $ls_pieces[1];
217	217	}
218	218	function file_name_from_ls($value){
219		- $ls_pieces = explode("\"", $value);
220		- if(count($ls_pieces) < 4){
221		- return "";
222		- }
223		- return $ls_pieces[3];
	219	+ $ls_pieces = explode("\"", $value);
	220	+ if(count($ls_pieces) < 4){
	221	+ return "";
	222	+ }
	223	+ return $ls_pieces[3];
224	224	}
225	225	function file_size_from_ls($value){
226		- $ls_pieces = explode("\"", $value);
227		- $file_props = preg_split("/\s+/", $ls_pieces[0]);
228		- return $file_props[4];
	226	+ $ls_pieces = explode("\"", $value);
	227	+ $file_props = preg_split("/\s+/", $ls_pieces[0]);
	228	+ return $file_props[4];
229	229	}
230	230	function file_category_from_file_name($value){
231		- if(strpos($value,".iso") > 0){
232		- return "CD-ROM Image";
233		- }
234		- if(strpos($value,".hda") > 0){
235		- return "Hard Disk Image";
236		- }
237		- return "Unknown type: " . $value;
	231	+ if(strpos($value,".iso") > 0){
	232	+ return "CD-ROM Image";
	233	+ }
	234	+ if(strpos($value,".hda") > 0){
	235	+ return "Hard Disk Image";
	236	+ }
	237	+ return "Unknown type: " . $value;
238	238	}
239	239
240	240
241	241
242	242	function type_string_to_rasctl_type($typestr){
243		- if(strcasecmp($typestr,"Hard Disk") == 0){
244		- return "hd";
245		- }
246		- if(strcasecmp($typestr,"CD-ROM") == 0){
247		- return "cd";
248		- }
249		- if(strcasecmp($typestr,"Zip Drive") == 0){
250		- }
251		- if(strcasecmp($typestr,"Filesystem bridge") == 0){
252		- return "bridge";
253		- }
254		- return "";
	243	+ if(strcasecmp($typestr,"Hard Disk") == 0){
	244	+ return "hd";
	245	+ }
	246	+ if(strcasecmp($typestr,"CD-ROM") == 0){
	247	+ return "cd";
	248	+ }
	249	+ if(strcasecmp($typestr,"Zip Drive") == 0){
	250	+ }
	251	+ if(strcasecmp($typestr,"Filesystem bridge") == 0){
	252	+ return "bridge";
	253	+ }
	254	+ return "";
255	255	}
256	256
257	257

		@@ -6,41 +6,41 @@ discard block
		block discarded – undo
6	6
7	7	<?php
8	8
9		-$DEBUG_ENABLE=0;
10		-$FILE_PATH='/home/pi/images';
	9	+$DEBUG_ENABLE = 0;
	10	+$FILE_PATH = '/home/pi/images';
11	11	// Limit the maximum upload file size to 1GB
12		-$MAX_UPLOAD_FILE_SIZE=1000000000;
13		-$ALLOWED_FILE_TYPES=array('iso','hda');
	12	+$MAX_UPLOAD_FILE_SIZE = 1000000000;
	13	+$ALLOWED_FILE_TYPES = array('iso', 'hda');
14	14
15		-function html_generate_header(){
16		- echo ' <table width="100%" >'. PHP_EOL;
17		- echo ' <tr style="background-color: black;">'. PHP_EOL;
18		- echo ' <td style="background-color: black;"><a href=http://github.com/akuker/RASCSI><h1>RaSCSI - 68kmla Edition</h1></a></td>'. PHP_EOL;
19		- echo ' <td style="background-color: black;">'. PHP_EOL;
20		- echo ' <form action="rascsi.php">'. PHP_EOL;
21		- echo ' <input type="submit" value="Go Home"/>'. PHP_EOL;
22		- if($GLOBALS['DEBUG_ENABLE']){
23		- echo ' <p style="color:#595959">Debug Timestamp: '.time().'</p>'. PHP_EOL;
	15	+function html_generate_header() {
	16	+ echo ' <table width="100%" >'.PHP_EOL;
	17	+ echo ' <tr style="background-color: black;">'.PHP_EOL;
	18	+ echo ' <td style="background-color: black;"><a href=http://github.com/akuker/RASCSI><h1>RaSCSI - 68kmla Edition</h1></a></td>'.PHP_EOL;
	19	+ echo ' <td style="background-color: black;">'.PHP_EOL;
	20	+ echo ' <form action="rascsi.php">'.PHP_EOL;
	21	+ echo ' <input type="submit" value="Go Home"/>'.PHP_EOL;
	22	+ if ($GLOBALS['DEBUG_ENABLE']) {
	23	+ echo ' <p style="color:#595959">Debug Timestamp: '.time().'</p>'.PHP_EOL;
24	24	}
25		- echo ' </form>'. PHP_EOL;
26		- echo ' </td>'. PHP_EOL;
27		- echo ' </tr>'. PHP_EOL;
28		- echo ' </table>'. PHP_EOL;
	25	+ echo ' </form>'.PHP_EOL;
	26	+ echo ' </td>'.PHP_EOL;
	27	+ echo ' </tr>'.PHP_EOL;
	28	+ echo ' </table>'.PHP_EOL;
29	29	//echo(exec('whoami'));
30	30	}
31	31
32		-function html_generate_image_file_select_list(){
	32	+function html_generate_image_file_select_list() {
33	33	$all_files = get_all_files();
34		- foreach(explode(PHP_EOL, $all_files) as $this_file){
35		- if(strpos($this_file, 'total') === 0){
	34	+ foreach (explode(PHP_EOL, $all_files) as $this_file) {
	35	+ if (strpos($this_file, 'total') === 0) {
36	36	continue;
37	37	}
38	38	$file_name = file_name_from_ls($this_file);
39		- if(strlen($file_name) === 0){
	39	+ if (strlen($file_name) === 0) {
40	40	continue;
41	41	}
42	42	// Ignore files that start with a .
43		- if(strpos($file_name, '.') === 0){
	43	+ if (strpos($file_name, '.') === 0) {
44	44	continue;
45	45	}
46	46
		@@ -49,54 +49,54 @@ discard block
		block discarded – undo
49	49	}
50	50
51	51
52		-function html_generate_scsi_id_select_list(){
53		- echo '<select>'. PHP_EOL;
54		- foreach(range(0,7) as $id){
55		- echo '<option value="'.$id.'">'.$id.'</option>'. PHP_EOL;
	52	+function html_generate_scsi_id_select_list() {
	53	+ echo '<select>'.PHP_EOL;
	54	+ foreach (range(0, 7) as $id) {
	55	+ echo '<option value="'.$id.'">'.$id.'</option>'.PHP_EOL;
56	56	}
57		- echo '</select>'. PHP_EOL;
	57	+ echo '</select>'.PHP_EOL;
58	58	}
59	59
60		-function html_generate_scsi_type_select_list(){
61		- echo '<select name=type>'. PHP_EOL;
	60	+function html_generate_scsi_type_select_list() {
	61	+ echo '<select name=type>'.PHP_EOL;
62	62	$options = array("Hard Disk", "CD-ROM", "Zip Drive", "Ethernet Tap", "Filesystem Bridge");
63		- foreach($options as $type){
64		- echo '<option value="'.$type.'">'.$type.'</option>'. PHP_EOL;
	63	+ foreach ($options as $type) {
	64	+ echo '<option value="'.$type.'">'.$type.'</option>'.PHP_EOL;
65	65	}
66		- echo '</select>'. PHP_EOL;
	66	+ echo '</select>'.PHP_EOL;
67	67	}
68	68
69		-function html_generate_warning($message){
70		- echo ' <table width="100%" >'. PHP_EOL;
71		- echo ' <tr style="background-color: red;">'. PHP_EOL;
72		- echo ' <td style="background-color: red;">'. PHP_EOL;
73		- echo ' <font size=+2>'.$message.'</font>'. PHP_EOL;
74		- echo ' </td>'. PHP_EOL;
75		- echo ' </tr>'. PHP_EOL;
76		- echo ' </table>'. PHP_EOL;
	69	+function html_generate_warning($message) {
	70	+ echo ' <table width="100%" >'.PHP_EOL;
	71	+ echo ' <tr style="background-color: red;">'.PHP_EOL;
	72	+ echo ' <td style="background-color: red;">'.PHP_EOL;
	73	+ echo ' <font size=+2>'.$message.'</font>'.PHP_EOL;
	74	+ echo ' </td>'.PHP_EOL;
	75	+ echo ' </tr>'.PHP_EOL;
	76	+ echo ' </table>'.PHP_EOL;
77	77	}
78	78
79		-function html_generate_success_message($message){
80		- echo ' <table width="100%" >'. PHP_EOL;
81		- echo ' <tr style="background-color: green;">'. PHP_EOL;
82		- echo ' <td style="background-color: green;">'. PHP_EOL;
83		- echo ' <font size=+2>Success</font>'. PHP_EOL;
84		- echo ' </td>'. PHP_EOL;
85		- echo ' </tr>'. PHP_EOL;
86		- if(strlen($message) > 0){
87		- echo ' <tr style="background-color: green;">'. PHP_EOL;
88		- echo ' <td style="background-color: green;">'. PHP_EOL;
	79	+function html_generate_success_message($message) {
	80	+ echo ' <table width="100%" >'.PHP_EOL;
	81	+ echo ' <tr style="background-color: green;">'.PHP_EOL;
	82	+ echo ' <td style="background-color: green;">'.PHP_EOL;
	83	+ echo ' <font size=+2>Success</font>'.PHP_EOL;
	84	+ echo ' </td>'.PHP_EOL;
	85	+ echo ' </tr>'.PHP_EOL;
	86	+ if (strlen($message) > 0) {
	87	+ echo ' <tr style="background-color: green;">'.PHP_EOL;
	88	+ echo ' <td style="background-color: green;">'.PHP_EOL;
89	89	echo ' '.$message.PHP_EOL;
90		- echo ' </td>'. PHP_EOL;
91		- echo ' </tr>'. PHP_EOL;
	90	+ echo ' </td>'.PHP_EOL;
	91	+ echo ' </tr>'.PHP_EOL;
92	92	}
93		- echo ' </table>'. PHP_EOL;
	93	+ echo ' </table>'.PHP_EOL;
94	94	}
95	95
96		-function html_generate_ok_to_go_home(){
97		- echo ' <form action="rascsi.php">'. PHP_EOL;
98		- echo ' <input type="submit" value="OK"/>'. PHP_EOL;
99		- echo ' </form>'. PHP_EOL;
	96	+function html_generate_ok_to_go_home() {
	97	+ echo ' <form action="rascsi.php">'.PHP_EOL;
	98	+ echo ' <input type="submit" value="OK"/>'.PHP_EOL;
	99	+ echo ' </form>'.PHP_EOL;
100	100	}
101	101
102	102
		@@ -104,29 +104,29 @@ discard block
		block discarded – undo
104	104	$raw_output = shell_exec("/usr/local/bin/rasctl -l");
105	105	$rasctl_lines = explode(PHP_EOL, $raw_output);
106	106
107		- echo ' <br>'. PHP_EOL;
108		- echo ' <h2>Current RaSCSI Configuration</h2>'. PHP_EOL;
109		- echo ' <table border="black" cellpadding="3">'. PHP_EOL;
110		- echo ' <tr>'. PHP_EOL;
111		- echo ' <td><b>SCSI ID</b></td>'. PHP_EOL;
112		- echo ' <td><b>Type</b></td>'. PHP_EOL;
113		- echo ' <td><b>File</b></td>'. PHP_EOL;
114		- echo ' <td><b>File Ops</b></td>'. PHP_EOL;
115		- echo ' <td><b>Device Ops</b></td>'. PHP_EOL;
116		- echo ' </tr>'. PHP_EOL;
	107	+ echo ' <br>'.PHP_EOL;
	108	+ echo ' <h2>Current RaSCSI Configuration</h2>'.PHP_EOL;
	109	+ echo ' <table border="black" cellpadding="3">'.PHP_EOL;
	110	+ echo ' <tr>'.PHP_EOL;
	111	+ echo ' <td><b>SCSI ID</b></td>'.PHP_EOL;
	112	+ echo ' <td><b>Type</b></td>'.PHP_EOL;
	113	+ echo ' <td><b>File</b></td>'.PHP_EOL;
	114	+ echo ' <td><b>File Ops</b></td>'.PHP_EOL;
	115	+ echo ' <td><b>Device Ops</b></td>'.PHP_EOL;
	116	+ echo ' </tr>'.PHP_EOL;
117	117
118	118	$scsi_ids = array();
119	119
120	120	foreach ($rasctl_lines as $current_line)
121	121	{
122		- if(strlen($current_line) === 0){
	122	+ if (strlen($current_line) === 0) {
123	123	continue;
124	124	}
125		- if(strpos($current_line, '+----') === 0){
	125	+ if (strpos($current_line, '+----') === 0) {
126	126	continue;
127	127
128	128	}
129		- if(strpos($current_line, '\| ID \| UN') === 0){
	129	+ if (strpos($current_line, '\| ID \| UN') === 0) {
130	130	continue;
131	131	}
132	132	$segments = explode("\|", $current_line);
		@@ -140,67 +140,67 @@ discard block
		block discarded – undo
140	140	}
141	141
142	142
143		- foreach (range(0,7) as $id){
144		- echo ' <tr>'. PHP_EOL;
145		- echo ' <td style="text-align:center">'.$id.'</td>'. PHP_EOL;
146		- if(isset($scsi_ids[$id]))
	143	+ foreach (range(0, 7) as $id) {
	144	+ echo ' <tr>'.PHP_EOL;
	145	+ echo ' <td style="text-align:center">'.$id.'</td>'.PHP_EOL;
	146	+ if (isset($scsi_ids[$id]))
147	147	{
148		- echo ' <td style="text-align:center">'.$scsi_ids[$id]['type'].'</td>'. PHP_EOL;
149		- if(strtolower($scsi_ids[$id]['file']) == "no media"){
	148	+ echo ' <td style="text-align:center">'.$scsi_ids[$id]['type'].'</td>'.PHP_EOL;
	149	+ if (strtolower($scsi_ids[$id]['file']) == "no media") {
150	150	echo ' <td>'.PHP_EOL;
151		- echo ' <form action="rascsi_action.php" method="post">'. PHP_EOL;
	151	+ echo ' <form action="rascsi_action.php" method="post">'.PHP_EOL;
152	152	echo ' <select name="file_name">'.PHP_EOL;
153	153	echo ' <option value="None">None</option>'.PHP_EOL;
154	154	html_generate_image_file_select_list();
155	155	echo ' </select>'.PHP_EOL;
156		- echo ' <input type="hidden" name="command" value="insert_disk" />'. PHP_EOL;
157		- echo ' <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
158		- echo ' <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'. PHP_EOL;
	156	+ echo ' <input type="hidden" name="command" value="insert_disk" />'.PHP_EOL;
	157	+ echo ' <input type="hidden" name="id" value="'.$id.'" />'.PHP_EOL;
	158	+ echo ' <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'.PHP_EOL;
159	159	echo ' </td><td>'.PHP_EOL;
160		- echo ' <input type="submit" name="insert_disk" value="Insert" />'. PHP_EOL;
161		- echo ' </form>'. PHP_EOL;
	160	+ echo ' <input type="submit" name="insert_disk" value="Insert" />'.PHP_EOL;
	161	+ echo ' </form>'.PHP_EOL;
162	162	echo ' </td>'.PHP_EOL;
163	163	}
164		- else{
	164	+ else {
165	165	// rascsi inserts "WRITEPROTECT" for the read-only drives. We want to display that differently.
166		- echo ' <form action="rascsi_action.php" method="post">'. PHP_EOL;
167		- echo ' <td>'.str_replace('(WRITEPROTECT)', '', $scsi_ids[$id]['file']). PHP_EOL;
	166	+ echo ' <form action="rascsi_action.php" method="post">'.PHP_EOL;
	167	+ echo ' <td>'.str_replace('(WRITEPROTECT)', '', $scsi_ids[$id]['file']).PHP_EOL;
168	168	echo ' </td><td>'.PHP_EOL;
169		- if(strtolower($scsi_ids[$id]['type']) == 'sccd'){
170		- echo ' <input type="hidden" name="command" value="eject_disk" />'. PHP_EOL;
171		- echo ' <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
172		- echo ' <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'. PHP_EOL;
173		- echo ' <input type="submit" name="eject_disk" value="Eject" />'. PHP_EOL;
	169	+ if (strtolower($scsi_ids[$id]['type']) == 'sccd') {
	170	+ echo ' <input type="hidden" name="command" value="eject_disk" />'.PHP_EOL;
	171	+ echo ' <input type="hidden" name="id" value="'.$id.'" />'.PHP_EOL;
	172	+ echo ' <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'.PHP_EOL;
	173	+ echo ' <input type="submit" name="eject_disk" value="Eject" />'.PHP_EOL;
174	174	}
175	175	echo ' </td>'.PHP_EOL;
176		- echo ' </form>'. PHP_EOL;
	176	+ echo ' </form>'.PHP_EOL;
177	177	}
178		- echo ' <td>'. PHP_EOL;
179		- echo ' <form action="rascsi_action.php" method="post">'. PHP_EOL;
180		- echo ' <input type="hidden" name="command" value="remove_device" />'. PHP_EOL;
181		- echo ' <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
182		- echo ' <input type="submit" name="remove_device" value="Disconnect" />'. PHP_EOL;
183		- echo ' </form>'. PHP_EOL;
184		- echo ' </td>'. PHP_EOL;
	178	+ echo ' <td>'.PHP_EOL;
	179	+ echo ' <form action="rascsi_action.php" method="post">'.PHP_EOL;
	180	+ echo ' <input type="hidden" name="command" value="remove_device" />'.PHP_EOL;
	181	+ echo ' <input type="hidden" name="id" value="'.$id.'" />'.PHP_EOL;
	182	+ echo ' <input type="submit" name="remove_device" value="Disconnect" />'.PHP_EOL;
	183	+ echo ' </form>'.PHP_EOL;
	184	+ echo ' </td>'.PHP_EOL;
185	185	}
186	186	else
187	187	{
188		- echo ' <td style="text-align:center">-</td>'. PHP_EOL;
189		- echo ' <td>-</td>'. PHP_EOL;
190		- echo ' <td></td>'. PHP_EOL;
191		- echo ' <td>'. PHP_EOL;
192		- echo ' <form action="rascsi_action.php" method="post">'. PHP_EOL;
193		- echo ' <input type="hidden" name="command" value="connect_new_device" />'. PHP_EOL;
194		- echo ' <input type="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
195		- echo ' <input type="submit" name="connect_new_device" value="Connect New" />'. PHP_EOL;
196		- echo ' </form>'. PHP_EOL;
197		- echo ' </td>'. PHP_EOL;
	188	+ echo ' <td style="text-align:center">-</td>'.PHP_EOL;
	189	+ echo ' <td>-</td>'.PHP_EOL;
	190	+ echo ' <td></td>'.PHP_EOL;
	191	+ echo ' <td>'.PHP_EOL;
	192	+ echo ' <form action="rascsi_action.php" method="post">'.PHP_EOL;
	193	+ echo ' <input type="hidden" name="command" value="connect_new_device" />'.PHP_EOL;
	194	+ echo ' <input type="hidden" name="id" value="'.$id.'" />'.PHP_EOL;
	195	+ echo ' <input type="submit" name="connect_new_device" value="Connect New" />'.PHP_EOL;
	196	+ echo ' </form>'.PHP_EOL;
	197	+ echo ' </td>'.PHP_EOL;
198	198
199	199	}
200		- echo ' </form>'. PHP_EOL;
201		- echo ' </tr>'. PHP_EOL;
	200	+ echo ' </form>'.PHP_EOL;
	201	+ echo ' </tr>'.PHP_EOL;
202	202	}
203		- echo '</table>'. PHP_EOL;
	203	+ echo '</table>'.PHP_EOL;
204	204	}
205	205	function get_all_files()
206	206	{
		@@ -208,47 +208,47 @@ discard block
		block discarded – undo
208	208	return $raw_ls_output;
209	209	}
210	210
211		-function mod_date_from_ls($value){
	211	+function mod_date_from_ls($value) {
212	212	$ls_pieces = explode("\"", $value);
213		- if(count($ls_pieces)<1){
	213	+ if (count($ls_pieces) < 1) {
214	214	return "";
215	215	}
216	216	return $ls_pieces[1];
217	217	}
218		-function file_name_from_ls($value){
	218	+function file_name_from_ls($value) {
219	219	$ls_pieces = explode("\"", $value);
220		- if(count($ls_pieces) < 4){
	220	+ if (count($ls_pieces) < 4) {
221	221	return "";
222	222	}
223	223	return $ls_pieces[3];
224	224	}
225		-function file_size_from_ls($value){
	225	+function file_size_from_ls($value) {
226	226	$ls_pieces = explode("\"", $value);
227	227	$file_props = preg_split("/\s+/", $ls_pieces[0]);
228	228	return $file_props[4];
229	229	}
230		-function file_category_from_file_name($value){
231		- if(strpos($value,".iso") > 0){
	230	+function file_category_from_file_name($value) {
	231	+ if (strpos($value, ".iso") > 0) {
232	232	return "CD-ROM Image";
233	233	}
234		- if(strpos($value,".hda") > 0){
	234	+ if (strpos($value, ".hda") > 0) {
235	235	return "Hard Disk Image";
236	236	}
237		- return "Unknown type: " . $value;
	237	+ return "Unknown type: ".$value;
238	238	}
239	239
240	240
241	241
242		-function type_string_to_rasctl_type($typestr){
243		- if(strcasecmp($typestr,"Hard Disk") == 0){
	242	+function type_string_to_rasctl_type($typestr) {
	243	+ if (strcasecmp($typestr, "Hard Disk") == 0) {
244	244	return "hd";
245	245	}
246		- if(strcasecmp($typestr,"CD-ROM") == 0){
	246	+ if (strcasecmp($typestr, "CD-ROM") == 0) {
247	247	return "cd";
248	248	}
249		- if(strcasecmp($typestr,"Zip Drive") == 0){
	249	+ if (strcasecmp($typestr, "Zip Drive") == 0) {
250	250	}
251		- if(strcasecmp($typestr,"Filesystem bridge") == 0){
	251	+ if (strcasecmp($typestr, "Filesystem bridge") == 0) {
252	252	return "bridge";
253	253	}
254	254	return "";

akuker / RASCSI

Push — master ( 0e9165...ef160c )

Status

Category

Indentation +158 added lines, -158 removed lines patch added patch discarded remove patch

Spacing +125 added lines, -125 removed lines patch added patch discarded remove patch