+ - - + diff --git a/packages/freenas/www/disks_manage_tools.php b/packages/freenas/www/disks_manage_tools.php index 85de9ce8..01438dab 100644 --- a/packages/freenas/www/disks_manage_tools.php +++ b/packages/freenas/www/disks_manage_tools.php @@ -49,6 +49,81 @@ require_once("guiconfig.inc"); require_once("freenas_guiconfig.inc"); require_once("freenas_functions.inc"); +function create_cmd_output(&$action, &$a_disk, &$disk, &$partition, &$umount) { + $cmdout = CMDOUT_PARA; + + ob_end_flush(); + + $retvalue =<< " . gettext("The disk is currently mounted! The mount point will be removed temporary to perform selected command.") . "

"; + $retvalue .=<< +

{$diskinit_str}

+ + +EOD; + + disks_umount_fullname($disk.$partition); + } + + switch($type) + { + case "": + case "ufs": + case "ufs_no_su": + case "ufsgpt": + case "ufsgpt_no_su": + $button = create_toggle_button("Checking disk", "ufsgn_fsck_out"); + $cmd = "/sbin/fsck_ufs -y -f /dev/" . escapeshellarg($disk . $partition); + $out = create_cmdout_container("ufsgn_fsck_out", $cmd); + $retvalue .= assemble_cmdout($button, $out); + break; + case "gmirror": + case "gvinum": + case "graid5": + $diskinit_str = sprintf(gettext("Use RAID tools for this disk!"), "disks_raid_{$type}_tools.php"); + $retvalue .=<< +

{$diskinit_str}

+ + +EOD; + break; + case "msdos": + $button = create_toggle_button("Checking disk", "dos_fsck_out"); + $cmd = "/sbin/fsck_msdosfs -y -f /dev/" . escapeshellarg($disk . $partition); + $out = create_cmdout_container("dos_fsck_out", $cmd); + $retvalue .= assemble_cmdout($button, $out); + break; + } + + /* Mount disk if necessary. */ + if($umount && $ismounted) { + disks_mount_fullname($disk.$partition); + } + + break; + } + + return $retvalue; +} + if (!is_array($freenas_config['disks']['disk'])) $freenas_config['disks']['disk'] = array(); @@ -65,6 +140,12 @@ if ($_POST) { $reqdfieldsn = explode(",", "Disk,Action"); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); + /* if this is an AJAX caller then handle via JSON */ + if(isAjax() && is_array($error_bucket)) { + input_errors2Ajax(NULL, $error_bucket); + exit; + } + if (!$input_errors) { $do_action = true; @@ -72,6 +153,9 @@ if ($_POST) { $action = $_POST['action']; $partition = $_POST['partition']; $umount = $_POST['umount']; + + echo create_cmd_output($action, $a_disk, $disk, $partition, $umount); + exit; // cause of Ajax } } @@ -116,6 +200,8 @@ function disk_change() { } } + + // --> @@ -140,6 +226,7 @@ function disk_change() {

@@ -697,22 +476,21 @@ function toggle_cmdout(image, totoggle) {

- " onclick="execFormat();" /> + " onclick="execCMD();" />

- - WARNING: - -
- - - + + WARNING: + +
+ +

+ @@ -181,68 +268,14 @@ function disk_change() { - - + - - + +

- " /> +

+ " onclick="execCMD();" />

- " . gettext("Command output:") . "
"); - echo('

');
-              ob_end_flush();
-  
-              switch($action)
-              {
-                case "fsck":
-                  /* Get the id of the disk. */
-                  $id = array_search_ex($disk, $a_disk, "name");
-                  /* Get the filesystem type of the disk. */ 
-                  $type = $a_disk[$id]['fstype'];
-                  /* Check if disk is mounted. */
-                  $ismounted = disks_check_mount($disk,$partition);
-  
-                  /* Umount disk if necessary. */
-                  if($umount && $ismounted) {
-                    echo("" . gettext("Note") . ": " . gettext("The disk is currently mounted! The mount point will be removed temporary to perform selected command.") . "

");
-                    disks_umount_ex($disk,$partition);
-                  }
-  
-                  switch($type)
-                  {
-                    case "":
-                    case "ufs":
-                    case "ufs_no_su":
-                    case "ufsgpt":
-                    case "ufsgpt_no_su":
-                      system("/sbin/fsck_ufs -y -f /dev/" . escapeshellarg($disk . $partition));
-                      break;
-                    case "gmirror":
-                    case "gvinum":
-                    case "graid5":
-                      $infomsg = sprintf(gettext("Use RAID tools for this disk!"), "disks_raid_{$type}_tools.php");
-                      print_info_box_np($infomsg);
-                      break;
-                    case "msdos":
-                      system("/sbin/fsck_msdosfs -y -f /dev/" . escapeshellarg($disk . $partition));
-                      break;
-                  }
-  
-                  /* Mount disk if necessary. */
-                  if($umount && $ismounted) {
-                    disks_mount_ex($disk,$partition);
-                  }
-  
-                  break;
-              }
-              echo('

'); - } - ?> -

diff --git a/packages/freenas/www/disks_mount_tools.php b/packages/freenas/www/disks_mount_tools.php index 67006981..26e7471d 100644 --- a/packages/freenas/www/disks_mount_tools.php +++ b/packages/freenas/www/disks_mount_tools.php @@ -50,6 +50,46 @@ require_once("guiconfig.inc"); require_once("freenas_guiconfig.inc"); require_once("freenas_functions.inc"); +function create_cmd_output(&$action, &$a_mount, &$fullname) { + $cmdout = CMDOUT_PARA; + + ob_end_flush(); + + $retvalue =<<"; + $result = disks_mount_fullname($fullname); + break; + case "umount": + $diskinit_str = gettext("Umounting '{$fullname}'...") . "
"; + $result = disks_umount_fullname($fullname); + break; + } + + /* Display result */ + (0 == $result) ? $diskinit_str .= gettext("Successful") : $diskinit_str .= gettext("Failed"); + + $retvalue .=<< +

{$diskinit_str}

+ + +EOD; + + return $retvalue; +} + if (!is_array($freenas_config['mounts']['mount'])) $freenas_config['mounts']['mount'] = array(); @@ -85,6 +125,9 @@ if (! empty($_POST)) $do_action = true; $fullname = $_POST['fullname']; $action = $_POST['action']; + + echo create_cmd_output($action, $a_mount, $fullname); + exit; // cause of Ajax } } @@ -107,13 +150,23 @@ if(isset($_GET['action'])) { $action = $_GET['action']; } +/* if ajax is calling, give them an update message */ +if(isAjax()) + print_info_box_np($savemsg); + include("head.inc"); /* put your custom HTML head content here */ /* using some of the $pfSenseHead function calls */ +$pfSenseHead->setCloseHead(false); echo $pfSenseHead->getHTML(); ?> - + + "> @@ -134,6 +187,7 @@ echo $pfSenseHead->getHTML();

+ @@ -160,41 +214,12 @@ echo $pfSenseHead->getHTML(); - + +

- " /> + " onclick="execCMD();" />

- " . gettext("Command output") . ":
"); - echo('

');
-              ob_end_flush();
-  
-              /* Get the id of the mount array entry. */
-              $id = array_search_ex($fullname, $a_mount, "fullname");
-              /* Get the mount data. */
-              $mount = $a_mount[$id];
-  
-              switch($action)
-              {
-                case "mount":
-                  echo(gettext("Mounting '{$fullname}'...") . "
");
-                  $result = disks_mount_fullname($fullname);
-                  break;
-                case "umount":
-                  echo(gettext("Umounting '{$fullname}'...") . "
");
-                  $result = disks_umount_fullname($fullname);
-                  break;
-              }
-  
-              /* Display result */
-              echo((0 == $result) ? gettext("Successful") : gettext("Failed"));
-  
-              echo('

'); - } - ?> -

-- cgit v1.2.3