pacnpal/RASCSI
1
0
Fork 0
mirror of https://github.com/thewesker/RASCSI.git synced 2025-12-20 04:11:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed connect_new_device function

Browse Source
This commit is contained in:
akuker
2020-08-07 11:59:18 -05:00
parent c37abe3e73
commit 86bf896d66
2 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/php/lib_rascsi.php
View File

@@ -13,7 +13,7 @@ function html_generate_header(){
echo ' <tr style="background-color: black;">'. 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;"><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 ' <td style="background-color: black;">'. PHP_EOL;
echo ' <form action="/rascsi.php">'. PHP_EOL; echo ' <form action="rascsi.php">'. PHP_EOL;
echo ' <input type="submit" value="Refresh"/>'. PHP_EOL; echo ' <input type="submit" value="Refresh"/>'. PHP_EOL;
echo ' <p style="color:white">'.time().'</p>'. PHP_EOL; echo ' <p style="color:white">'.time().'</p>'. PHP_EOL;
echo ' </form>'. PHP_EOL; echo ' </form>'. PHP_EOL;
@@ -61,7 +61,7 @@ function html_generate_success_message(){
} }
function html_generate_ok_to_go_home(){ function html_generate_ok_to_go_home(){
echo ' <form action="/rascsi.php">'. PHP_EOL; echo ' <form action="rascsi.php">'. PHP_EOL;
echo ' <input type="submit" value="OK"/>'. PHP_EOL; echo ' <input type="submit" value="OK"/>'. PHP_EOL;
echo ' </form>'. PHP_EOL; echo ' </form>'. PHP_EOL;
} }
@@ -115,10 +115,10 @@ function current_rascsi_config() {
echo ' <td>'.$scsi_ids[$id]['file'].'</td>'. PHP_EOL; echo ' <td>'.$scsi_ids[$id]['file'].'</td>'. PHP_EOL;
echo ' <td>'. PHP_EOL; 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 ' <input type="hidden" name="command" value="eject" />'. PHP_EOL; 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="id" value="'.$id.'" />'. PHP_EOL;
echo ' <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'. PHP_EOL; echo ' <input type="hidden" name="file" value="'.$scsi_ids[$id]['file'].'" />'. PHP_EOL;
echo ' <input type="submit" name="eject" value="Eject" />'. PHP_EOL; echo ' <input type="submit" name="eject_disk" value="Eject" />'. PHP_EOL;
echo ' </form>'. PHP_EOL; echo ' </form>'. PHP_EOL;
echo ' <form action="rascsi_action.php" method="post">'. 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="command" value="remove_device" />'. PHP_EOL;
@@ -133,9 +133,9 @@ function current_rascsi_config() {
echo ' <td>-</td>'. PHP_EOL; echo ' <td>-</td>'. PHP_EOL;
echo ' <td>'. PHP_EOL; 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 ' <input type="hidden" name="command" value="connect_new" />'. 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="hidden" name="id" value="'.$id.'" />'. PHP_EOL;
echo ' <input type="submit" name="connect_new" value="Connect New Device" />'. PHP_EOL; echo ' <input type="submit" name="connect_new_device" value="Connect New Device" />'. PHP_EOL;
echo ' </form>'. PHP_EOL; echo ' </form>'. PHP_EOL;
echo ' </td>'. PHP_EOL; echo ' </td>'. PHP_EOL;

80
src/php/rascsi_action.php
View File

@@ -3,12 +3,13 @@
<!-- Distributed under the BSD-3 Clause License --> <!-- Distributed under the BSD-3 Clause License -->
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<link rel="stylesheet" href="rascsi_styles.css"> <head>
<link rel="stylesheet" href="rascsi_styles.css">
</head> </head>
<body> <body>
<?php <?php
include 'lib_rascsi.php'; include 'lib_rascsi.php';
html_generate_header(); html_generate_header();
@@ -71,7 +72,7 @@
// } else if(isset($_GET['shutdown_raspberry_pi'])){ // } else if(isset($_GET['shutdown_raspberry_pi'])){
// // Shut down the Raspberry Pi // // Shut down the Raspberry Pi
// echo "<h1>For now, shutdown is disabled....</h1>"; // echo "<h1>For now, shutdown is disabled....</h1>";
// echo 'exec("sudo /sbin/shutdown -s -t 0");'; // echo 'exec("sudo /sbin/shutdown -s -t 0");'.PHP_EOL;
// } // }
@@ -103,9 +104,9 @@
// // Go do the actual action // // Go do the actual action
// if(strlen($type) > 0){ // if(strlen($type) > 0){
// $result = exec($cmd); // $result = exec($cmd);
// echo '<br>'; // echo '<br>'.PHP_EOL;
// echo 'Ran command: <pre>'.$cmd.'</pre>'; // echo 'Ran command: <pre>'.$cmd.'</pre>'.PHP_EOL;
// echo '<br>'; // echo '<br>'.PHP_EOL;
// } // }
// // Check to see if the command succeeded // // Check to see if the command succeeded
// if(strlen($result) > 0){ // if(strlen($result) > 0){
@@ -114,7 +115,7 @@
// else { // else {
// html_generate_success_message(); // html_generate_success_message();
// } // }
// echo '<br>'; // echo '<br>'.PHP_EOL;
// html_generate_ok_to_go_home(); // html_generate_ok_to_go_home();
// } // }
// else { // else {
@@ -126,7 +127,7 @@ function action_eject_disk(){}
function action_remove_device(){ function action_remove_device(){
// Check to see if the user has confirmed // Check to see if the user has confirmed
if(isset($_POST['confirmed'])){ if(isset($_POST['confirmed'])){
$command = 'rasctl -i '.$_POST['id'].' -c disconnect 2>&1'; $command = 'rasctl -i '.$_POST['id'].' -c disconnect 2>&1'.PHP_EOL;
echo '<br><br> Go execute...... '.$command.PHP_EOL; echo '<br><br> Go execute...... '.$command.PHP_EOL;
// exec($command, $retArray, $result); // exec($command, $retArray, $result);
// check_result($result, $command,$retArray); // check_result($result, $command,$retArray);
@@ -169,7 +170,7 @@ function action_stop_rascsi_service(){
function action_reboot_raspberry_pi(){ function action_reboot_raspberry_pi(){
// Check to see if the user has confirmed // Check to see if the user has confirmed
if(isset($_POST['confirmed'])){ if(isset($_POST['confirmed'])){
echo('<br>exec(sudo reboot)'); echo('<br>exec(sleep 2 && sudo reboot)');
// The unit should reboot at this point. Doesn't matter what we do now... // The unit should reboot at this point. Doesn't matter what we do now...
} }
else{ else{
@@ -180,7 +181,7 @@ function action_reboot_raspberry_pi(){
function action_shutdown_raspberry_pi(){ function action_shutdown_raspberry_pi(){
// Check to see if the user has confirmed // Check to see if the user has confirmed
if(isset($_POST['confirmed'])){ if(isset($_POST['confirmed'])){
echo('<br>exec(sudo shutdown -h now)'); echo('<br>exec(sleep 2 && sudo shutdown -h now)');
// The unit should reboot at this point. Doesn't matter what we do now... // The unit should reboot at this point. Doesn't matter what we do now...
html_generate_ok_to_go_home(); html_generate_ok_to_go_home();
} }
@@ -210,7 +211,7 @@ function check_result($result,$command,$output){
} }
function check_are_you_sure($prompt){ function check_are_you_sure($prompt){
echo '<br><h2>'.$prompt.'</h2>'; echo '<br><h2>'.$prompt.'</h2>'.PHP_EOL;
echo ' <table style="border: none">'.PHP_EOL; echo ' <table style="border: none">'.PHP_EOL;
echo ' <tr style="border: none">'.PHP_EOL; echo ' <tr style="border: none">'.PHP_EOL;
echo ' <td style="border: none; vertical-align:top;">'.PHP_EOL; echo ' <td style="border: none; vertical-align:top;">'.PHP_EOL;
@@ -231,24 +232,26 @@ function check_are_you_sure($prompt){
echo '</table>'.PHP_EOL; echo '</table>'.PHP_EOL;
} }
function action_connect_new_device($id){ function action_connect_new_device(){
echo '<h2>Add New Device</h2>'; $id = $_POST['id'];
echo '<form action=add_device.php method="post">'; echo '<h2>Add New Device</h2>'.PHP_EOL;
echo ' <table style="border: none">'; echo '<form action=rascsi_action.php method="post">'.PHP_EOL;
echo ' <tr style="border: none">'; echo ' <input type="hidden" name="command" value="'.$_POST['command'].'"/>'.PHP_EOL;
echo ' <td style="border: none">SCSI ID:</td>'; echo ' <table style="border: none">'.PHP_EOL;
echo ' <td style="border: none">'; echo ' <tr style="border: none">'.PHP_EOL;
echo ' <input type="hidden" name=id value="'.$id.'"/>'; echo ' <td style="border: none">SCSI ID:</td>'.PHP_EOL;
echo ' <td style="border: none">'.PHP_EOL;
echo ' <input type="hidden" name=id value="'.$id.'"/>'.PHP_EOL;
echo $id; echo $id;
echo ' </td>'; echo ' </td>'.PHP_EOL;
echo ' <td style="border: none">Device:</td>'; echo ' <td style="border: none">Device:</td>'.PHP_EOL;
echo ' <td style="border: none">'; echo ' <td style="border: none">'.PHP_EOL;
html_generate_scsi_type_select_list(); html_generate_scsi_type_select_list();
echo ' </td>'; echo ' </td>'.PHP_EOL;
echo ' <td style="border: none">File:</td>'; echo ' <td style="border: none">File:</td>'.PHP_EOL;
echo ' <td style="border: none">'; echo ' <td style="border: none">'.PHP_EOL;
echo ' <select name="file">'; echo ' <select name="file">'.PHP_EOL;
echo ' <option value="None">None</option>'; echo ' <option value="None">None</option>'.PHP_EOL;
$all_files = get_all_files(); $all_files = get_all_files();
foreach(explode(PHP_EOL, $all_files) as $this_file){ foreach(explode(PHP_EOL, $all_files) as $this_file){
if(strpos($this_file, 'total') === 0){ if(strpos($this_file, 'total') === 0){
@@ -263,17 +266,18 @@ function action_connect_new_device($id){
continue; continue;
} }
echo '<option value="'.$file_name.'">'.$file_name.'</option>'; echo '<option value="'.$file_name.'">'.$file_name.'</option>'.PHP_EOL;
} }
echo ' </select>'; echo ' </select>'.PHP_EOL;
echo ' </td>'; echo ' </td>'.PHP_EOL;
echo ' <td style="border: none">'; echo ' <td style="border: none">'.PHP_EOL;
echo ' <INPUT type="submit" value="Add"/>'; echo ' <INPUT type="submit" value="Add"/>'.PHP_EOL;
echo ' </td>'; echo ' </td>'.PHP_EOL;
echo ' </tr>'; echo ' </tr>'.PHP_EOL;
echo ' </table>'; echo ' </table>'.PHP_EOL;
} }
?> ?>
</body> </body>
</html> </html>