* bug fixing

* issues not fixed: services_samba.php and disks_manage_tools.php do have layouting issues

2 files changed, 7 insertions, 7 deletions

diff --git a/packages/freenas/pkg/freenas_disks.inc b/packages/freenas/pkg/freenas_disks.inc
index 3f0dd694..0a19524e 100644
--- a/packages/freenas/pkg/freenas_disks.inc
+++ b/packages/freenas/pkg/freenas_disks.inc
@@ -130,7 +130,7 @@ function disks_mount($mount) {
     case "ntfs":
       if (mwexec("/sbin/mount_ntfs -u ftp -g ftp -m 777 $devname /mnt/$mountname") == 0) {
         $result = 0;
-      else {
+      } else {
         /* Not OK, remove the directory, prevent writing on RAM disk */
         @rmdir ("/mnt/$mountname");
         $result = 1;
diff --git a/packages/freenas/pkg/freenas_guiconfig.inc b/packages/freenas/pkg/freenas_guiconfig.inc
index 7dd5ec47..08dc7e8d 100644
--- a/packages/freenas/pkg/freenas_guiconfig.inc
+++ b/packages/freenas/pkg/freenas_guiconfig.inc
@@ -83,35 +83,35 @@ function gmirror_sort() {
 }
 
 function gconcat_sort() {
-	global $g, $config;
+	global $g, $freenas_cconfig;
 
 	function gconcatcmp($a, $b) {
 		return strcmp($a['name'], $b['name']);
 	}
 
-	usort($config['gconcat']['vdisk'], "gconcatcmp");
+	usort($freenas_cconfig['gconcat']['vdisk'], "gconcatcmp");
 	
 }
 
 function gstripe_sort() {
-	global $g, $config;
+	global $g, $freenas_cconfig;
 
 	function gstripecmp($a, $b) {
 		return strcmp($a['name'], $b['name']);
 	}
 
-	usort($config['gstripe']['vdisk'], "gstripecmp");
+	usort($freenas_cconfig['gstripe']['vdisk'], "gstripecmp");
 	
 }
 
 function graid5_sort() {
-	global $g, $config;
+	global $g, $freenas_cconfig;
 
 	function graid5cmp($a, $b) {
 		return strcmp($a['name'], $b['name']);
 	}
 
-	usort($config['graid5']['vdisk'], "graid5cmp");
+	usort($freenas_cconfig['graid5']['vdisk'], "graid5cmp");
 	
 }