diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-02-27 08:06:23 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-02-27 08:06:23 -0300 |
| commit | 9beebb5e54428ada74c902a091a6992f4583f370 (patch) | |
| tree | 6aa18f9f9ea3b6363cd841589669fb9dba1f267c | |
| parent | 4b805dbc93a3d5171bb15c59a4e2f13e3d91a747 (diff) | |
| download | pfsense-9beebb5e54428ada74c902a091a6992f4583f370.zip pfsense-9beebb5e54428ada74c902a091a6992f4583f370.tar.gz | |
Hide 'Perform full backup prior to upgrade' option on nano, also hide restore full backup. Fixes #2844
| -rw-r--r-- | etc/inc/globals.inc | 3 | ||||
| -rwxr-xr-x | usr/local/www/system_firmware.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/system_firmware_check.php | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 21be0e4..0aa58cc 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -64,6 +64,7 @@ $g = array( "product_email" => "coreteam@pfsense.org", "hideplatform" => false, "hidedownloadbackup" => false, + "hidebackupbeforeupgrade" => false, "disablethemeselection" => false, "disablehelpmenu" => false, "disablehelpicon" => false, @@ -102,6 +103,8 @@ if(file_exists("/etc/platform")) { $g['update_url']="http://snapshots.pfsense.org/FreeBSD_RELENG_8_3/{$arch}/pfSense_HEAD/.updaters/"; $g['update_manifest']="http://updates.pfSense.com/nanobsd/manifest"; $g['firmware_update_text']="pfSense-*.img.gz"; + $g['hidedownloadbackup'] = true; + $g['hidebackupbeforeupgrade'] = true; } else { $g['update_url']="http://snapshots.pfsense.org/FreeBSD_RELENG_8_3/{$arch}/pfSense_HEAD/.updaters/"; diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index 794a247..35521f9 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -299,8 +299,10 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd")) } } ?> + <?php if ($g['hidebackupbeforeupgrade'] === false): ?> <input type="checkbox" name='backupbeforeupgrade' id='backupbeforeupgrade'> <?=gettext("Perform full backup prior to upgrade");?> <br> + <?php endif; ?> <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Upgrade firmware");?>"> <?=gettext('Click "Upgrade firmware" to start the upgrade process.');?> <?php endif; else: ?> diff --git a/usr/local/www/system_firmware_check.php b/usr/local/www/system_firmware_check.php index 9e439f8..c69ce68 100755 --- a/usr/local/www/system_firmware_check.php +++ b/usr/local/www/system_firmware_check.php @@ -100,7 +100,9 @@ include("head.inc"); <textarea border='1' bordercolordark='#000000' bordercolorlight='#000000' cols='90' rows='9' name='output' id='output' wrap='hard'> </textarea> <div id='backupdiv' name='backupdiv' style='visibility:hidden'> + <?php if ($g['hidebackupbeforeupgrade'] === false): ?> <br/><input type="checkbox" name='backupbeforeupgrade' id='backupbeforeupgrade'> <?=gettext("Perform full backup prior to upgrade");?> + <?php endif; ?> </div> </center> <p> |
