summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-03-06 23:19:45 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-03-06 23:19:45 +0000
commit63562b76084e943611543e29aa40cfc7749745c3 (patch)
tree52fc9f46ee80a6a20edb816a431a32003f9fae20 /usr
parent1717b51f8b9ac5c2bb0188652f702694db77135f (diff)
downloadpfsense-63562b76084e943611543e29aa40cfc7749745c3.zip
pfsense-63562b76084e943611543e29aa40cfc7749745c3.tar.gz
Really upgrade m0n0wall -> pfsense during configuration restore
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/diag_backup.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 9acba9e..d048d00 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -81,9 +81,9 @@ if ($_POST) {
if(stristr($tmp, "m0n0wall" != FALSE)) {
log_error("Upgrading m0n0wall configuration to pfsense.");
/* m0n0wall was found in config. convert it. */
- $onlyconsonants = str_replace("m0n0wall", "pfsense", $tmp);
+ $upgradedconfig = str_replace("m0n0wall", "pfsense", $tmp);
fopen($_FILES['conffile']['tmp_name'], "w");
- fwrite($fd, $tmp);
+ fwrite($fd, $upgradedconfig);
fclose($fd);
}
system_reboot();
@@ -125,7 +125,7 @@ if ($_POST) {
<p> Click this button to download the system configuration
in XML format.<br>
<br>
- <input name="nopackages" type="checkbox" class="formcheckbox" id="nopackages">Do not backup package information.<br><br>
+ <input name="nopackages" type="checkbox" class="formcheckbox" id="nopackages">Do not backup package information.<br><br>
<input name="Submit" type="submit" class="formbtn" id="download" value="Download configuration"></td>
</tr>
<tr>
OpenPOWER on IntegriCloud