From 86bf896d668a30027df160dce59fb9d3381be1bf Mon Sep 17 00:00:00 2001 From: akuker Date: Fri, 7 Aug 2020 11:59:18 -0500 Subject: [PATCH] Fixed connect_new_device function --- src/php/lib_rascsi.php | 12 +++--- src/php/rascsi_action.php | 82 ++++++++++++++++++++------------------- 2 files changed, 49 insertions(+), 45 deletions(-) diff --git a/src/php/lib_rascsi.php b/src/php/lib_rascsi.php index 28476e60..467dbab7 100644 --- a/src/php/lib_rascsi.php +++ b/src/php/lib_rascsi.php @@ -13,7 +13,7 @@ function html_generate_header(){ echo ' '. PHP_EOL; echo '

RaSCSI - 68kmla Edition

'. PHP_EOL; echo ' '. PHP_EOL; - echo '
'. PHP_EOL; + echo ' '. PHP_EOL; echo ' '. PHP_EOL; echo '

'.time().'

'. PHP_EOL; echo '
'. PHP_EOL; @@ -61,7 +61,7 @@ function html_generate_success_message(){ } function html_generate_ok_to_go_home(){ - echo '
'. PHP_EOL; + echo ' '. PHP_EOL; echo ' '. PHP_EOL; echo '
'. PHP_EOL; } @@ -115,10 +115,10 @@ function current_rascsi_config() { echo ' '.$scsi_ids[$id]['file'].''. PHP_EOL; echo ' '. PHP_EOL; echo '
'. PHP_EOL; - echo ' '. PHP_EOL; + echo ' '. PHP_EOL; echo ' '. PHP_EOL; echo ' '. PHP_EOL; - echo ' '. PHP_EOL; + echo ' '. PHP_EOL; echo '
'. PHP_EOL; echo '
'. PHP_EOL; echo ' '. PHP_EOL; @@ -133,9 +133,9 @@ function current_rascsi_config() { echo ' -'. PHP_EOL; echo ' '. PHP_EOL; echo ' '. PHP_EOL; - echo ' '. PHP_EOL; + echo ' '. PHP_EOL; echo ' '. PHP_EOL; - echo ' '. PHP_EOL; + echo ' '. PHP_EOL; echo '
'. PHP_EOL; echo ' '. PHP_EOL; diff --git a/src/php/rascsi_action.php b/src/php/rascsi_action.php index ae94d76c..7e746991 100644 --- a/src/php/rascsi_action.php +++ b/src/php/rascsi_action.php @@ -3,12 +3,13 @@ - - + + + -For now, shutdown is disabled...."; -// 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 // if(strlen($type) > 0){ // $result = exec($cmd); - // echo '
'; - // echo 'Ran command: 
'.$cmd.'
'; - // echo '
'; + // echo '
'.PHP_EOL; + // echo 'Ran command: 
'.$cmd.'
'.PHP_EOL; + // echo '
'.PHP_EOL; // } // // Check to see if the command succeeded // if(strlen($result) > 0){ @@ -114,7 +115,7 @@ // else { // html_generate_success_message(); // } - // echo '
'; + // echo '
'.PHP_EOL; // html_generate_ok_to_go_home(); // } // else { @@ -126,7 +127,7 @@ function action_eject_disk(){} function action_remove_device(){ // Check to see if the user has 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 '

Go execute...... '.$command.PHP_EOL; // exec($command, $retArray, $result); // check_result($result, $command,$retArray); @@ -169,7 +170,7 @@ function action_stop_rascsi_service(){ function action_reboot_raspberry_pi(){ // Check to see if the user has confirmed if(isset($_POST['confirmed'])){ - echo('
exec(sudo reboot)'); + echo('
exec(sleep 2 && sudo reboot)'); // The unit should reboot at this point. Doesn't matter what we do now... } else{ @@ -180,7 +181,7 @@ function action_reboot_raspberry_pi(){ function action_shutdown_raspberry_pi(){ // Check to see if the user has confirmed if(isset($_POST['confirmed'])){ - echo('
exec(sudo shutdown -h now)'); + echo('
exec(sleep 2 && sudo shutdown -h now)'); // The unit should reboot at this point. Doesn't matter what we do now... html_generate_ok_to_go_home(); } @@ -210,7 +211,7 @@ function check_result($result,$command,$output){ } function check_are_you_sure($prompt){ - echo '

'.$prompt.'

'; + echo '

'.$prompt.'

'.PHP_EOL; echo ' '.PHP_EOL; echo ' '.PHP_EOL; echo '
'.PHP_EOL; @@ -231,24 +232,26 @@ function check_are_you_sure($prompt){ echo '
'.PHP_EOL; } -function action_connect_new_device($id){ - echo '

Add New Device

'; - echo '
'; - echo ' '; - echo ' '; - echo ' '; - echo ' '.PHP_EOL; + echo ' '.PHP_EOL; + echo ' '.PHP_EOL; + echo '
SCSI ID:'; - echo ' '; +function action_connect_new_device(){ + $id = $_POST['id']; + echo '

Add New Device

'.PHP_EOL; + echo ''.PHP_EOL; + echo ' '.PHP_EOL; + echo ' '.PHP_EOL; + echo ' '.PHP_EOL; + echo ' '.PHP_EOL; + echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '.PHP_EOL; + echo ' '.PHP_EOL; + echo ' '.PHP_EOL; + echo ' '.PHP_EOL; + echo ' '; - echo ' '; - echo ' '; - echo '
SCSI ID:'.PHP_EOL; + echo ' '.PHP_EOL; echo $id; - echo ' Device:'; - html_generate_scsi_type_select_list(); - echo ' File:'; - echo ' Device:'.PHP_EOL; + html_generate_scsi_type_select_list(); + echo ' File:'.PHP_EOL; + echo ' '; - echo ' '; - echo ' '; - echo '
'; + echo ' '.PHP_EOL; + echo ' 		'.PHP_EOL; + echo ' '.PHP_EOL; + echo '
'.PHP_EOL; } ?> - - + + + \ No newline at end of file