summaryrefslogtreecommitdiffstats
path: root/usr/local/www/system_advanced_misc.php
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-03-12 13:59:40 -0400
committerjim-p <jimp@pfsense.org>2013-03-12 13:59:40 -0400
commitefc0e29abc068b41f52a2d5d6ac89cb6c4791662 (patch)
tree150b6929573c9863190dcfb3127a3f99afe70106 /usr/local/www/system_advanced_misc.php
parenta1f735b31c8f7f0cca0ebc5a7153cd06cdf4482e (diff)
downloadpfsense-efc0e29abc068b41f52a2d5d6ac89cb6c4791662.zip
pfsense-efc0e29abc068b41f52a2d5d6ac89cb6c4791662.tar.gz
Move tmp/var init to just after mount of /cf so that the sizing works properly on NanoBSD. Fix input validation for sizes. Add note about needing a reboot to apply the settings.
Diffstat (limited to 'usr/local/www/system_advanced_misc.php')
-rw-r--r--usr/local/www/system_advanced_misc.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index 92b4069..669097d 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -101,11 +101,11 @@ if ($_POST) {
if (!empty($_POST['thermal_hardware']) && !array_key_exists($_POST['thermal_hardware'], $thermal_hardware_modules))
$input_errors[] = gettext("Please select a valid Thermal Hardware Sensor.");
- if (!empty($_POST['use_mfs_tmp_size']) && !is_numeric($_POST['use_mfs_tmp_size']) && ($_POST['use_mfs_tmp_size'] <= 40))
- $input_errors[] = gettext("/tmp Size should not be less than 40MB.");
+ if (!empty($_POST['use_mfs_tmp_size']) && (!is_numeric($_POST['use_mfs_tmp_size']) || ($_POST['use_mfs_tmp_size'] <= 40)))
+ $input_errors[] = gettext("/tmp Size must be numeric and should not be less than 40MB.");
- if (!empty($_POST['use_mfs_var_size']) && !is_numeric($_POST['use_mfs_var_size']) && ($_POST['use_mfs_var_size'] <= 60))
- $input_errors[] = gettext("/var Size should not be less than 60MB.");
+ if (!empty($_POST['use_mfs_var_size']) && (!is_numeric($_POST['use_mfs_var_size']) || ($_POST['use_mfs_var_size'] <= 60)))
+ $input_errors[] = gettext("/var Size must be numeric and should not be less than 60MB.");
if (!$input_errors) {
@@ -565,7 +565,7 @@ function tmpvar_checked(obj) {
</td>
</tr>
<tr>
- <td colspan="2" valign="top" class="listtopic"><?=gettext("RAM Disks"); ?></td>
+ <td colspan="2" valign="top" class="listtopic"><?=gettext("RAM Disk Settings (Reboot to Apply Changes)"); ?></td>
</tr>
<?php if ($g['platform'] == "pfSense"): ?>
<tr>
OpenPOWER on IntegriCloud