aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2008-12-07 04:20:03 +0000
committerScott Ullrich <sullrich@pfsense.org>2008-12-07 04:20:03 +0000
commit8d66475e0a9fc0c37a47d7a2d5a7522e56ed692f (patch)
tree2e7a138ae162f340fe507f6dc40a973f313e349f /packages
parent5b8ac7b1e4401d9819c36b0f9bde19eb434ffca9 (diff)
downloadpfsense-packages-8d66475e0a9fc0c37a47d7a2d5a7522e56ed692f.tar.gz
pfsense-packages-8d66475e0a9fc0c37a47d7a2d5a7522e56ed692f.tar.bz2
pfsense-packages-8d66475e0a9fc0c37a47d7a2d5a7522e56ed692f.zip
* Move backup functions to its own tab backup now
* Add nooverwrite support for hostname
Diffstat (limited to 'packages')
-rw-r--r--packages/autoconfigbackup/autoconfigbackup.inc8
-rw-r--r--packages/autoconfigbackup/autoconfigbackup.php32
-rw-r--r--packages/autoconfigbackup/autoconfigbackup.xml9
-rw-r--r--packages/autoconfigbackup/autoconfigbackup_backup.php144
4 files changed, 162 insertions, 31 deletions
diff --git a/packages/autoconfigbackup/autoconfigbackup.inc b/packages/autoconfigbackup/autoconfigbackup.inc
index 818f154a..45d0efbe 100644
--- a/packages/autoconfigbackup/autoconfigbackup.inc
+++ b/packages/autoconfigbackup/autoconfigbackup.inc
@@ -100,6 +100,13 @@ function upload_config() {
* (C) 2008 BSD Perimeter LLC
*
*/
+
+ if(file_exists("/tmp/acb_nooverwrite")) {
+ unlink("/tmp/acb_nooverwrite");
+ $nooverwrite = "true";
+ } else {
+ $nooverwrite = "false";
+ }
// Define some needed variables
if(!file_exists("/cf/conf/lastpfSbackup.txt")) {
@@ -152,6 +159,7 @@ function upload_config() {
'reason' => urlencode($reason),
'hostname' => urlencode($hostname),
'configxml' => urlencode($data),
+ 'nooverwrite' => urlencode($nooverwrite),
'raw_config_sha256_hash' => urlencode($raw_config_sha256_hash)
);
diff --git a/packages/autoconfigbackup/autoconfigbackup.php b/packages/autoconfigbackup/autoconfigbackup.php
index 12d1406e..54cd246c 100644
--- a/packages/autoconfigbackup/autoconfigbackup.php
+++ b/packages/autoconfigbackup/autoconfigbackup.php
@@ -194,27 +194,6 @@ include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<script type="text/javascript">
- function backupnow() {
- scroll(0,0);
- var reason = prompt ("Enter the reason for the backup","");
- var url = "/autoconfigbackup.php";
- var pars = 'backup=yes&reason=' + reason;
- var myAjax = new Ajax.Request(
- url,
- {
- method: 'post',
- parameters: pars,
- onComplete: backupcomplete
- });
- if($('savemsg'))
- $('savemsg').innerHTML = '';
- $('feedbackdiv').innerHTML = "<img src='themes/metallic/images/misc/loader.gif'> One moment please, saving backup to portal.pfsense.org...<p/>";
- }
- function backupcomplete(transport) {
- document.location.href = 'autoconfigbackup.php?savemsg=Backup+completed+successfully';
- }
-</script>
<div id='maincontent'>
<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
<?php
@@ -243,6 +222,7 @@ include("head.inc");
$tab_array[1] = array("Restore", $active, "/autoconfigbackup.php");
if($_REQUEST['download'])
$tab_array[] = array("Revision", true, "/autoconfigbackup.php?download={$_REQUEST['download']}");
+ $tab_array[] = array("Backup now", true, "/autoconfigbackup_backup.php");
display_top_tabs($tab_array);
?>
</td></tr>
@@ -279,9 +259,6 @@ include("head.inc");
exit;
}
?>
- <form method="post" action="autoconfigbackup.php">
- <input type="button" onClick='backupnow()' name="backup" value="Backup Now">
- </form>
</td>
</tr>
<tr>
@@ -329,13 +306,6 @@ include("head.inc");
</p>
</td>
</tr>
- <tr>
- <td>
- <form method="post" action="autoconfigbackup.php">
- <input type="button" onClick='backupnow()' name="backup" value="Backup Now">
- </form>
- </td>
- </tr>
</tr>
</table>
</form>
diff --git a/packages/autoconfigbackup/autoconfigbackup.xml b/packages/autoconfigbackup/autoconfigbackup.xml
index 4cda9ee7..c0514506 100644
--- a/packages/autoconfigbackup/autoconfigbackup.xml
+++ b/packages/autoconfigbackup/autoconfigbackup.xml
@@ -73,6 +73,11 @@
<chmod>0755</chmod>
<item>http://www.pfsense.com/packages/config/autoconfigbackup/crypt_acb.php</item>
</additional_files_needed>
+ <additional_files_needed>
+ <prefix>/usr/local/www/</prefix>
+ <chmod>0755</chmod>
+ <item>http://www.pfsense.com/packages/config/autoconfigbackup/autoconfigbackup_backup.php</item>
+ </additional_files_needed>
<tabs>
<tab>
<text>Settings</text>
@@ -83,6 +88,10 @@
<text>Restore</text>
<url>/autoconfigbackup.php</url>
</tab>
+ <tab>
+ <text>Backup now</text>
+ <url>/autoconfigbackup_backup.php</url>
+ </tab>
</tabs>
<fields>
<field>
diff --git a/packages/autoconfigbackup/autoconfigbackup_backup.php b/packages/autoconfigbackup/autoconfigbackup_backup.php
new file mode 100644
index 00000000..e4763d57
--- /dev/null
+++ b/packages/autoconfigbackup/autoconfigbackup_backup.php
@@ -0,0 +1,144 @@
+<?php
+/* $Id$ */
+/*
+ autoconfigbackup_backup.php
+ Copyright (C) 2008 Scott Ullrich
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require("guiconfig.inc");
+
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+if(strstr($pfSversion, "1.2"))
+ require("crypt_acb.php");
+
+// Seperator used during client / server communications
+$oper_sep = "\|\|";
+
+// Encryption password
+$decrypt_password = $config['installedpackages']['autoconfigbackup']['config'][0]['crypto_password'];
+
+// Defined username
+$username = $config['installedpackages']['autoconfigbackup']['config'][0]['username'];
+
+// Defined password
+$password = $config['installedpackages']['autoconfigbackup']['config'][0]['password'];
+
+// URL to restore.php
+$get_url = "https://{$username}:{$password}@portal.pfsense.org/pfSconfigbackups/restore.php";
+
+// URL to delete.php
+$del_url = "https://{$username}:{$password}@portal.pfsense.org/pfSconfigbackups/delete.php";
+
+// Set hostname
+$hostname = $config['system']['hostname'] . "." . $config['system']['domain'];
+
+if(!$username) {
+ Header("Location: /pkg_edit.php?xml=autoconfigbackup.xml&id=0");
+ exit;
+}
+
+if($_POST) {
+ touch("/tmp/acb_nooverwrite");
+ if($_REQUEST['reason'])
+ write_config($_REQUEST['reason']);
+ else
+ write_config("Backup invoked via Auto Config Backup.");
+ $savemsg = "Backup completed successfully.";
+ exec("echo > /cf/conf/lastpfSbackup.txt");
+ filter_configure_sync();
+ print_info_box($savemsg);
+ $donotshowheader=true;
+}
+
+$pgtitle = "Diagnostics: Auto Configuration Backup Now";
+
+include("head.inc");
+
+?>
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<div id='maincontent'>
+<?php
+ include("fbegin.inc");
+ if(strstr($pfSversion, "1.2"))
+ echo "<p class=\"pgtitle\">{$pgtitle}</p>";
+ if($savemsg) {
+ echo "<div id='savemsg'>";
+ print_info_box($savemsg);
+ echo "</div>";
+ }
+ if ($input_errors)
+ print_input_errors($input_errors);
+
+?>
+<form method="post" action="autoconfigbackup_backup.php">
+<table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td>
+<div id='feedbackdiv'></div>
+<?php
+ $tab_array = array();
+ $tab_array[0] = array("Settings", false, "/pkg_edit.php?xml=autoconfigbackup.xml&amp;id=0");
+ $tab_array[1] = array("Restore", false, "/autoconfigbackup.php");
+ $tab_array[] = array("Backup now", true, "/autoconfigbackup_backup.php");
+ display_top_tabs($tab_array);
+?>
+ </td></tr>
+ <tr>
+ <td>
+ <table id="backuptable" class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0">
+ <tr>
+ <td colspan="2" align="left">
+ <table>
+ <tr>
+ <td>
+ Enter the backup reason:
+ </td>
+ <td>
+ <input name="reason" id="reason">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Do not overwrite previous backups for this hostname:
+ </td>
+ <td>
+ <input type="nooverwrite" type="checkbox">
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <input type="button" name="Backup" value="Backup">
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </td>
+ </tr>
+</table>
+</form>
+<?php include("fend.inc"); ?>
+</body>
+</html>