* fix: usorting disks in freenas_guiconfig.inc

4 files changed, 24 insertions, 39 deletions

diff --git a/packages/freenas/pkg/freenas_disks.inc b/packages/freenas/pkg/freenas_disks.inc
index 0a19524e..8ac8eb72 100644
--- a/packages/freenas/pkg/freenas_disks.inc
+++ b/packages/freenas/pkg/freenas_disks.inc
@@ -81,7 +81,7 @@ function disks_mount($mount) {
   $mountname=escapeshellcmd($mount['sharename']);
 
   @mkdir ("/mnt/$mountname",0777);
-                
+
   /* mount the filesystems */
   $devname=escapeshellcmd($mount['fullname']);
 
diff --git a/packages/freenas/pkg/freenas_guiconfig.inc b/packages/freenas/pkg/freenas_guiconfig.inc
index 08dc7e8d..18f936a4 100644
--- a/packages/freenas/pkg/freenas_guiconfig.inc
+++ b/packages/freenas/pkg/freenas_guiconfig.inc
@@ -67,7 +67,7 @@ function gvinum_sort() {
 		return strcmp($a['name'], $b['name']);
 	}
 
-	usort($freenas_config['raid']['vdisk'], "gvinumcmp");
+	usort($freenas_config['gvinum']['vdisk'], "gvinumcmp");
 	
 }
 
@@ -83,35 +83,35 @@ function gmirror_sort() {
 }
 
 function gconcat_sort() {
-	global $g, $freenas_cconfig;
+	global $g, $freenas_config;
 
 	function gconcatcmp($a, $b) {
 		return strcmp($a['name'], $b['name']);
 	}
 
-	usort($freenas_cconfig['gconcat']['vdisk'], "gconcatcmp");
+	usort($freenas_config['gconcat']['vdisk'], "gconcatcmp");
 	
 }
 
 function gstripe_sort() {
-	global $g, $freenas_cconfig;
+	global $g, $freenas_config;
 
 	function gstripecmp($a, $b) {
 		return strcmp($a['name'], $b['name']);
 	}
 
-	usort($freenas_cconfig['gstripe']['vdisk'], "gstripecmp");
+	usort($freenas_config['gstripe']['vdisk'], "gstripecmp");
 	
 }
 
 function graid5_sort() {
-	global $g, $freenas_cconfig;
+	global $g, $freenas_config;
 
 	function graid5cmp($a, $b) {
 		return strcmp($a['name'], $b['name']);
 	}
 
-	usort($freenas_cconfig['graid5']['vdisk'], "graid5cmp");
+	usort($freenas_config['graid5']['vdisk'], "graid5cmp");
 	
 }
 
diff --git a/packages/freenas/www/disks_manage_tools.php b/packages/freenas/www/disks_manage_tools.php
index a0bb3901..63ecc393 100644
--- a/packages/freenas/www/disks_manage_tools.php
+++ b/packages/freenas/www/disks_manage_tools.php
@@ -156,53 +156,39 @@ function disk_change() {
         <tr>
           <td width="22%" valign="top" class="vncellreq"><?=gettext("Partition");?></td>
           <td width="78%" class="vtable">
-            <td valign="top" class="vncellreq"><?=_PARTITION;?></td>
-            <td class="vtable"> 
-              <select name="partition" class="formfld" id="partition"></select>
-            </td>
+            <select name="partition" class="formfld" id="partition"></select>
           </td>
         </tr>
         <tr>
           <td width="22%" valign="top" class="vncellreq"><?=gettext("Command");?></td>
           <td width="78%" class="vtable">
-            <td valign="top" class="vncellreq"><?=_PARTITION;?></td>
-            <td class="vtable"> 
-              <select name="action" class="formfld" id="action">
-                <option value="fsck" <?php if ($action == "fsck") echo "selected"; ?>>fsck</option>
-               </select>
-            </td>
+            <select name="action" class="formfld" id="action">
+              <option value="fsck" <?php if ($action == "fsck") echo "selected"; ?>>fsck</option>
+             </select>
           </td>
         </tr>
         <tr>
           <td width="22%" valign="top" class="vncellreq"></td>
           <td width="78%" class="vtable">
-            <td valign="top" class="vncellreq"><?=_PARTITION;?></td>
-            <td class="vtable"> 
-              <input name="umount" type="checkbox" id="umount" value="yes" <?php if ($umount) echo "checked"; ?> />
-              <strong>
-                <?= gettext("Unmount disk/partition"); ?>
-              </strong>
-              <span class="vexpl">
-                <br />
-                <?= gettext("If the selected disk/partition is mounted it will be unmounted temporary to perform selected command, otherwise the commands work in read-only mode."); ?>
-              </span>
-            </td>
+            <input name="umount" type="checkbox" id="umount" value="yes" <?php if ($umount) echo "checked"; ?> />
+            <strong>
+              <?= gettext("Unmount disk/partition"); ?>
+            </strong>
+            <span class="vexpl">
+              <br />
+              <?= gettext("If the selected disk/partition is mounted it will be unmounted temporary to perform selected command, otherwise the commands work in read-only mode."); ?>
+            </span>
           </td>
         </tr>
         <tr>
           <td width="22%" valign="top" class="vncellreq">&nbsp;</td>
           <td width="78%" class="vtable">
-            <td valign="top" class="vncellreq"><?=_PARTITION;?></td>
-            <td class="vtable"> 
-              <input name="Submit" type="submit" class="formbtn" value="<?= gettext("Send Command!"); ?>">
-            </td>
+            <input name="Submit" type="submit" class="formbtn" value="<?= gettext("Send Command!"); ?>">
           </td>
         </tr>
         <tr>
           <td width="22%" valign="top" class="vncellreq">&nbsp;</td>
           <td width="78%" class="vtable">
-            <td valign="top" class="vncellreq"><?=_PARTITION;?></td>
-            <td class="vtable"> 
             <?php
             if($do_action)
             {
@@ -256,7 +242,6 @@ function disk_change() {
               echo('</pre>');
             }
             ?>
-            </td>
           </td>
         </tr>
       </table>
diff --git a/packages/freenas/www/disks_mount_tools.php b/packages/freenas/www/disks_mount_tools.php
index 6c3710d5..abd31b62 100644
--- a/packages/freenas/www/disks_mount_tools.php
+++ b/packages/freenas/www/disks_mount_tools.php
@@ -120,7 +120,7 @@ echo $pfSenseHead->getHTML();
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 
-<form id="iform" name="iform" action="disks_mount.php" method="post">
+<form id="iform" name="iform" action="disks_mount_tools.php" method="post">
 
 <div id="inputerrors"></div>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
@@ -181,11 +181,11 @@ echo $pfSenseHead->getHTML();
               switch($action)
               {
                 case "mount":
-                  echo(gettext("Mounting...") . "<br />");
+                  echo(gettext("Mounting '{$fullname}'...") . "<br />");
                   $result = disks_mount_fullname($fullname);
                   break;
                 case "umount":
-                  echo(gettext("Umounting...") . "<br />");
+                  echo(gettext("Umounting '{$fullname}'...") . "<br />");
                   $result = disks_umount_fullname($fullname);
                   break;
               }