aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/freenas/pkg/freenas_disks.inc2
-rw-r--r--packages/freenas/pkg/freenas_guiconfig.inc12
-rw-r--r--packages/freenas/www/disks_mount.php2
-rw-r--r--packages/freenas/www/disks_mount_tools.php4
-rw-r--r--packages/freenas/www/disks_raid_gmirror_tools.php2
-rw-r--r--packages/freenas/www/services_ftp.php2
-rw-r--r--packages/freenas/www/services_rsyncd.php4
-rw-r--r--packages/freenas/www/services_rsyncd_client.php4
-rw-r--r--packages/freenas/www/services_rsyncd_local.php4
9 files changed, 19 insertions, 17 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");
}
diff --git a/packages/freenas/www/disks_mount.php b/packages/freenas/www/disks_mount.php
index 9a6a2a63..e8c7d4d5 100644
--- a/packages/freenas/www/disks_mount.php
+++ b/packages/freenas/www/disks_mount.php
@@ -141,7 +141,7 @@ echo $pfSenseHead->getHTML();
<?php
$tab_array = array();
$tab_array[0] = array(gettext("Manage"), true, "disks_mount.php");
- $tab_array[1] = array(gettext("Tools"), false, "disks_miunt_tools.php");
+ $tab_array[1] = array(gettext("Tools"), false, "disks_mount_tools.php");
display_top_tabs($tab_array);
?>
</td></tr>
diff --git a/packages/freenas/www/disks_mount_tools.php b/packages/freenas/www/disks_mount_tools.php
index 472b11b1..6c3710d5 100644
--- a/packages/freenas/www/disks_mount_tools.php
+++ b/packages/freenas/www/disks_mount_tools.php
@@ -127,8 +127,8 @@ echo $pfSenseHead->getHTML();
<tr><td class="tabnavtbl">
<?php
$tab_array = array();
- $tab_array[0] = array(gettext("Manage"), true, "disks_mount.php");
- $tab_array[1] = array(gettext("Tools"), false, "disks_miunt_tools.php");
+ $tab_array[0] = array(gettext("Manage"), false, "disks_mount.php");
+ $tab_array[1] = array(gettext("Tools"), true, "disks_mount_tools.php");
display_top_tabs($tab_array);
?>
</td></tr>
diff --git a/packages/freenas/www/disks_raid_gmirror_tools.php b/packages/freenas/www/disks_raid_gmirror_tools.php
index 9aae8c2d..0fe99576 100644
--- a/packages/freenas/www/disks_raid_gmirror_tools.php
+++ b/packages/freenas/www/disks_raid_gmirror_tools.php
@@ -115,7 +115,7 @@ echo $pfSenseHead->getHTML();
$tab_array = array();
$tab_array[0] = array(gettext("Manage RAID"), false, "disks_raid_gmirror.php");
/* $tab_array[1] = array(gettext("Format RAID"), false, "disks_raid_gmirror_init.php"); */
- $tab_array[1] = array(gettext("Tools"), false, "disks_raid_gmirror_tools.php");
+ $tab_array[1] = array(gettext("Tools"), true, "disks_raid_gmirror_tools.php");
$tab_array[2] = array(gettext("Information"), false, "disks_raid_gmirror_infos.php");
display_top_tabs($tab_array);
?>
diff --git a/packages/freenas/www/services_ftp.php b/packages/freenas/www/services_ftp.php
index e096befb..050361e5 100644
--- a/packages/freenas/www/services_ftp.php
+++ b/packages/freenas/www/services_ftp.php
@@ -196,6 +196,7 @@ function enable_change(enable_change) {
endis ? color = '#D4D0C8' : color = '#FFFFFF';
document.iform.port.disabled = endis;
+ document.iform.authbackend.disabled = endis;
document.iform.timeout.disabled = endis;
document.iform.numberclients.disabled = endis;
document.iform.maxconperip.disabled = endis;
@@ -209,6 +210,7 @@ function enable_change(enable_change) {
document.iform.pasv_min_port.disabled = endis;
/* color adjustments */
document.iform.port.style.backgroundColor = color;
+ document.iform.authbackend.backgroundColor = color;
document.iform.timeout.style.backgroundColor = color;
document.iform.numberclients.style.backgroundColor = color;
document.iform.maxconperip.style.backgroundColor = color;
diff --git a/packages/freenas/www/services_rsyncd.php b/packages/freenas/www/services_rsyncd.php
index 39a581be..e95cbb8c 100644
--- a/packages/freenas/www/services_rsyncd.php
+++ b/packages/freenas/www/services_rsyncd.php
@@ -231,14 +231,14 @@ echo $pfSenseHead->getHTML();
<tr>
<td width="22%" valign="top" class="vncellreq"><?= gettext("TCP port"); ?></td>
<td width="78%" class="vtable">
- <input name="port" type="text" class="formfld" id="port" size="20" value="<?=htmlspecialchars($pconfig['port']);?>" />
+ <input name="port" type="text" class="formfld unknown" id="port" size="20" value="<?=htmlspecialchars($pconfig['port']);?>" />
<br /><?= gettext("Alternate TCP port."); ?>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq"><?= gettext("Maximum connections"); ?></td>
<td width="78%" class="vtable">
- <input name="maxcon" type="text" class="formfld" id="maxcon" size="20" value="<?=htmlspecialchars($pconfig['maxcon']);?>" />
+ <input name="maxcon" type="text" class="formfld unknown" id="maxcon" size="20" value="<?=htmlspecialchars($pconfig['maxcon']);?>" />
<br /><?= gettext("Maximum number of simultaneous connections. Default is 0 (unlimited)"); ?>
</td>
</tr>
diff --git a/packages/freenas/www/services_rsyncd_client.php b/packages/freenas/www/services_rsyncd_client.php
index c1ade277..d3304caf 100644
--- a/packages/freenas/www/services_rsyncd_client.php
+++ b/packages/freenas/www/services_rsyncd_client.php
@@ -232,7 +232,7 @@ $jscriptstr .= <<<EOD
document.iform.minutes2.disabled = endis;
document.iform.minutes3.disabled = endis;
document.iform.hours1.disabled = endis;
- document.iform.hours2.disabled = endis;
+ /* document.iform.hours2.disabled = endis; */
document.iform.days1.disabled = endis;
document.iform.days2.disabled = endis;
document.iform.days3.disabled = endis;
@@ -255,7 +255,7 @@ $jscriptstr .= <<<EOD
document.iform.minutes2.style.backgroundColor = color;
document.iform.minutes3.style.backgroundColor = color;
document.iform.hours1.style.backgroundColor = color;
- document.iform.hours2.style.backgroundColor = color;
+ /* document.iform.hours2.style.backgroundColor = color; */
document.iform.days1.style.backgroundColor = color;
document.iform.days2.style.backgroundColor = color;
document.iform.days3.style.backgroundColor = color;
diff --git a/packages/freenas/www/services_rsyncd_local.php b/packages/freenas/www/services_rsyncd_local.php
index 27d78417..5d975084 100644
--- a/packages/freenas/www/services_rsyncd_local.php
+++ b/packages/freenas/www/services_rsyncd_local.php
@@ -218,7 +218,7 @@ $jscriptstr .= <<<EOD
document.iform.minutes2.disabled = endis;
document.iform.minutes3.disabled = endis;
document.iform.hours1.disabled = endis;
- document.iform.hours2.disabled = endis;
+ /* document.iform.hours2.disabled = endis; */
document.iform.days1.disabled = endis;
document.iform.days2.disabled = endis;
document.iform.days3.disabled = endis;
@@ -242,7 +242,7 @@ $jscriptstr .= <<<EOD
document.iform.minutes2.style.backgroundColor = color;
document.iform.minutes3.style.backgroundColor = color;
document.iform.hours1.style.backgroundColor = color;
- document.iform.hours2.style.backgroundColor = color;
+ /* document.iform.hours2.style.backgroundColor = color; */
document.iform.days1.style.backgroundColor = color;
document.iform.days2.style.backgroundColor = color;
document.iform.days3.style.backgroundColor = color;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 13:49:37 +0000