aboutsummaryrefslogtreecommitdiffstats
path: root/config/autoconfigbackup
diff options
context:
space:
mode:
Diffstat (limited to 'config/autoconfigbackup')
-rw-r--r--config/autoconfigbackup/autoconfigbackup.inc5
-rw-r--r--config/autoconfigbackup/autoconfigbackup.php13
-rw-r--r--config/autoconfigbackup/autoconfigbackup.xml12
-rw-r--r--config/autoconfigbackup/autoconfigbackup_backup.php8
4 files changed, 14 insertions, 24 deletions
diff --git a/config/autoconfigbackup/autoconfigbackup.inc b/config/autoconfigbackup/autoconfigbackup.inc
index 2c9d18f9..2511a2a1 100644
--- a/config/autoconfigbackup/autoconfigbackup.inc
+++ b/config/autoconfigbackup/autoconfigbackup.inc
@@ -2,7 +2,7 @@
/* $Id$ */
/*
autoconfigbackup.inc
- Copyright (C) 2008 Scott Ullrich
+ Copyright (C) 2008-2014 Electric Sheep Fencing LP
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -144,9 +144,6 @@ function upload_config($reasonm = "") {
* This file plugs into config.inc (/usr/local/pkg/parse_config)
* and runs every time the running firewall filter changes.
*
- * Written by Scott Ullrich
- * (C) 2008 BSD Perimeter LLC
- *
*/
if(file_exists("/tmp/acb_nooverwrite")) {
diff --git a/config/autoconfigbackup/autoconfigbackup.php b/config/autoconfigbackup/autoconfigbackup.php
index 755c47aa..52b3eca9 100644
--- a/config/autoconfigbackup/autoconfigbackup.php
+++ b/config/autoconfigbackup/autoconfigbackup.php
@@ -357,10 +357,17 @@ EOF;
<center>
<b>Hostname:</b>
<select id="hostname" name="hostname" onChange="document.location='autoconfigbackup.php?hostname=' + this.value;">
- <?foreach($hostnames as $hn):?>
- <option value='<?=$hn?>'><?=$hn?></option>
+ <?
+ $host_not_found = true;
+ foreach($hostnames as $hn):
+ ?>
+ <option value='<?=$hn?>' <? if ($hn == $hostname) {echo " selected=\"selected\""; $host_not_found = false;}?>>
+ <?=$hn?>
+ </option>
<?endforeach?>
- <option value='<?=$hostname?>' SELECTED><?=$hostname?></option>
+ <? if ($host_not_found) { ?>
+ <option value='<?=$hostname?>' SELECTED><?=$hostname?></option>
+ <? } ?>
</select>
</td>
</tr>
diff --git a/config/autoconfigbackup/autoconfigbackup.xml b/config/autoconfigbackup/autoconfigbackup.xml
index ee125efc..eb3f7545 100644
--- a/config/autoconfigbackup/autoconfigbackup.xml
+++ b/config/autoconfigbackup/autoconfigbackup.xml
@@ -7,8 +7,8 @@
/* $Id$ */
/*
autoconfigbackup.xml
- part of pfSense (http://www.pfSense.com)
- Copyright (C) 2008 BSD Perimeter
+ part of pfSense (https://www.pfsense.org)
+ Copyright (C) 2008-2014 Electric Sheep Fencing LP
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
<description>Automatically backs up your pfSense configuration. All contents are encrypted before being sent to the server. Requires Gold Subscription from https://portal.pfsense.org</description>
<requirements>pfSense Portal subscription</requirements>
<name>AutoConfigBackup</name>
- <version>1.25</version>
+ <version>1.28</version>
<title>Diagnostics: Auto Configuration Backup</title>
<savetext>Change</savetext>
<include_file>/usr/local/pkg/autoconfigbackup.inc</include_file>
@@ -132,12 +132,6 @@
<fieldname>crypto_password2</fieldname>
<type>password</type>
</field>
- <field>
- <fielddescr>Test connection</fielddescr>
- <description>Check this box to test the connection to portal.pfsense.org.</description>
- <fieldname>testconnection</fieldname>
- <type>checkbox</type>
- </field>
</fields>
<custom_php_validation_command>
custom_php_validation_command($_POST, $input_errors);
diff --git a/config/autoconfigbackup/autoconfigbackup_backup.php b/config/autoconfigbackup/autoconfigbackup_backup.php
index f14b8aed..3c5ea423 100644
--- a/config/autoconfigbackup/autoconfigbackup_backup.php
+++ b/config/autoconfigbackup/autoconfigbackup_backup.php
@@ -105,14 +105,6 @@ include("head.inc");
</td>
</tr>
<tr>
- <td align="right">
- Do not overwrite previous backups for this hostname:
- </td>
- <td>
- <input type="checkbox" name="nooverwrite">
- </td>
- </tr>
- <tr>
<td>
&nbsp;
</td>