diff options
| author | Daniel Stefan Haischt <dsh@pfsense.org> | 2007-01-08 02:34:06 +0000 |
|---|---|---|
| committer | Daniel Stefan Haischt <dsh@pfsense.org> | 2007-01-08 02:34:06 +0000 |
| commit | 57a4bc69ba39d6f030ca97011aefb6bb617929ee (patch) | |
| tree | e10ae4b9c4af50f8e51253d02ba50a9661ec31b8 /packages/freenas/www/disks_mount_edit.php | |
| parent | b851eccedef9ff677cd6d2ee0d193fd724e5591d (diff) | |
| download | pfsense-packages-57a4bc69ba39d6f030ca97011aefb6bb617929ee.tar.gz pfsense-packages-57a4bc69ba39d6f030ca97011aefb6bb617929ee.tar.bz2 pfsense-packages-57a4bc69ba39d6f030ca97011aefb6bb617929ee.zip | |
* fix: output an Ajax compliant error message if the disk is still mounted
Diffstat (limited to 'packages/freenas/www/disks_mount_edit.php')
| -rw-r--r-- | packages/freenas/www/disks_mount_edit.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/freenas/www/disks_mount_edit.php b/packages/freenas/www/disks_mount_edit.php index b4cd7378..6b7a2248 100644 --- a/packages/freenas/www/disks_mount_edit.php +++ b/packages/freenas/www/disks_mount_edit.php @@ -116,7 +116,7 @@ if (! empty($_POST)) $pconfig = $_POST; /* input validation */ - $reqdfields = split(" ", "partition mdisk fstype"); + $reqdfields = split(" ", "partitionno mdisk fstype"); $reqdfieldsn = split(",", "Partition,Mdisk,Fstype"); do_input_validation_new($_POST, $reqdfields, $reqdfieldsn, &$error_bucket); @@ -134,7 +134,7 @@ if (! empty($_POST)) "field" => "desc"); } - $device=$_POST['mdisk'].$_POST['partition']; + $device=$_POST['mdisk'].$_POST['partitionno']; if ($device == $cfdevice ) { @@ -179,12 +179,12 @@ if (! empty($_POST)) { $mount = array(); $mount['mdisk'] = $_POST['mdisk']; - $mount['partition'] = $_POST['partition']; + $mount['partition'] = $_POST['partitionno']; $mount['fstype'] = $_POST['fstype']; $mount['desc'] = $_POST['desc']; /* if not sharename given, create one */ if (!$_POST['sharename']) - $mount['sharename'] = "disk_{$_POST['mdisk']}_part_{$_POST['partition']}"; + $mount['sharename'] = "disk_{$_POST['mdisk']}_part_{$_POST['partitionno']}"; else $mount['sharename'] = $_POST['sharename']; @@ -238,7 +238,7 @@ echo $pfSenseHead->getHTML(); <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Partition");?></td> <td width="78%" class="vtable"> - <select name="partition" class="formselect" id="partition number"> + <select name="partitionno" class="formselect" id="partition_number"> <option value="s1" <?php if ($pconfig['partition'] == "s1") echo "selected"; ?>>1 (or new software RAID method)</option> <option value="s2" <?php if ($pconfig['partition'] == "s2") echo "selected"; ?>>2</option> <option value="s3" <?php if ($pconfig['partition'] == "s3") echo "selected"; ?>>3</option> @@ -246,7 +246,7 @@ echo $pfSenseHead->getHTML(); <option value="gmirror" <?php if ($pconfig['partition'] == "gmirror") echo "selected"; ?>>previous <?=_SOFTRAID ;?> - gmirror</option> <option value="graid5" <?php if ($pconfig['partition'] == "graid5") echo "selected"; ?>>previous <?=_SOFTRAID ;?> - graid5</option> <option value="gvinum" <?php if ($pconfig['partition'] == "gvinum") echo "selected"; ?>>previous <?=_SOFTRAID ;?> - gvinum</option> - <option value="p1" <?php if ($pconfig['partition'] == "gpt") echo "selected"; ?>>GPT (or new software RAID method with GPT)</option> + <option value="p1" <?php if ($pconfig['partition'] == "gpt") echo "selected"; ?>>GPT (or new software RAID method with GPT)</option> </select> </td> </tr> |