Merge commit 'mainline/master'

4 files changed, 764 insertions, 0 deletions

diff --git a/config/backup/backup.inc b/config/backup/backup.inc
new file mode 100644
index 00000000..fa2783d6
--- /dev/null
+++ b/config/backup/backup.inc
@@ -0,0 +1,127 @@
+<?php
+/* $Id$ */
+/*
+/* ========================================================================== */
+/*
+    backup.inc
+    Copyright (C) 2008 Mark J Crane
+    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.
+*/
+
+
+function byte_convert( $bytes ) {
+
+    if ($bytes<=0)
+        return '0 Byte';
+
+    $convention=1000; //[1000->10^x|1024->2^x]
+    $s=array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB');
+    $e=floor(log($bytes,$convention));
+    return round($bytes/pow($convention,$e),2).' '.$s[$e];
+}
+
+ 
+function backup_sync_package_php()
+{
+
+  global $config; 
+  if($config['installedpackages']['backup']['config'] != "") {
+
+    conf_mount_rw();
+    config_unlock();
+				      
+		foreach($config['installedpackages']['backup']['config'] as $rowhelper) {
+			if ($rowhelper['enabled'] != "false") {
+				//$tmp_php = base64_decode($rowhelper['php']);
+				if (strlen($tmp_php) > 0) {
+					$tmp .= "// name: ".$rowhelper['name']." \n";
+					$tmp .= "// description: ".$rowhelper['description']." \n\n";				      
+					$tmp .= base64_decode($rowhelper['php']);
+					$tmp .= "\n";
+				}
+			}
+
+		}
+		          
+		conf_mount_ro();
+
+  }
+}
+
+
+function php_sync_package() 
+{
+  
+	global $config;   
+	backup_sync_package_php();
+
+}
+
+
+function php_install_command() 
+{
+
+	global $config;
+	conf_mount_rw();
+	config_lock();
+
+	if (!is_dir('/usr/local/www/packages/')) {
+	   exec("mkdir /usr/local/www/packages/");
+	}
+	
+	if (!is_dir('/usr/local/www/packages/backup/')) {
+	   exec("mkdir /usr/local/www/packages/backup/");
+	}
+
+	//rename PHP files from .tmp to .php
+	exec("cp /tmp/backup.tmp /usr/local/www/packages/backup/backup.php");
+	unlink_if_exists("/tmp/backup.tmp");
+	
+	exec("cp /tmp/backup_edit.tmp /usr/local/www/packages/backup/backup_edit.php");
+	unlink_if_exists("/tmp/backup_edit.tmp");
+		
+	php_sync_package();
+
+	conf_mount_ro();
+	config_unlock();
+  
+}
+
+
+function deinstall_command() 
+{
+
+	conf_mount_rw();
+	config_lock();
+	unlink_if_exists("/usr/local/pkg/backup.xml");
+	unlink_if_exists("/usr/local/pkg/backup.inc");
+	exec("rm /usr/local/www/packages/backup/");
+	conf_mount_ro();
+	config_unlock();
+	
+}
+
+?>
\ No newline at end of file
diff --git a/config/backup/backup.tmp b/config/backup/backup.tmp
new file mode 100644
index 00000000..86d645d0
--- /dev/null
+++ b/config/backup/backup.tmp
@@ -0,0 +1,309 @@
+<?php
+/* $Id$ */
+/*
+	backup.php
+	Copyright (C) 2008 Mark J Crane
+	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");
+require("/usr/local/pkg/backup.inc");
+
+$a_backup 	   = &$config['installedpackages']['backup']['config'];
+
+
+if ($_GET['act'] == "del") {
+    if ($_GET['type'] == 'backup') {
+        if ($a_backup[$_GET['id']]) {
+            unset($a_backup[$_GET['id']]);
+            write_config();
+            header("Location: backup.php");
+            exit;
+        }
+    }
+}
+
+if ($_GET['a'] == "download") {
+	if ($_GET['t'] == "backup") {
+		$tmp = '/tmp/';
+		$filename = 'pfsense.bak.tgz';
+		//system('cd /usr/local/;tar cvzf /tmp/pfsense.bak.tgz freeswitch');
+		
+		$i = 0;
+		if (count($a_backup) > 0) {
+			$backup_cmd = 'tar --create --verbose --gzip --file '.$tmp.$filename.' --directory / ';
+			foreach ($a_backup as $ent) {
+				if ($ent['enabled'] =="true"){
+					//htmlspecialchars($ent['name']);
+					//htmlspecialchars($ent['path']);
+					//htmlspecialchars($ent['description']);
+					$backup_cmd .= htmlspecialchars($ent['path']).' ';
+					
+				}				
+				$i++; 
+		    }
+		    //echo $backup_cmd; //exit;
+		    system($backup_cmd);
+		}		
+		
+		session_cache_limiter('public');
+		$fd = fopen($tmp.$filename, "rb");
+		header("Content-Type: binary/octet-stream");
+		header("Content-Length: " . filesize($tmp.$filename));
+		header('Content-Disposition: attachment; filename="'.$filename.'"');
+		fpassthru($fd);
+		exit;
+	}
+}
+
+if ($_GET['a'] == "other") {
+  if ($_GET['t'] == "restore") {
+    $tmp = '/tmp/';
+    $filename = 'pfsense.bak.tgz';
+
+    //extract the tgz file
+    if (file_exists('/tmp/'.$filename)) {
+			//echo "The file $filename exists";
+			system('cd /; tar xvpfz /tmp/'.$filename.' ');
+			header( 'Location: backup.php?savemsg=Backup+has+been+restored.' ) ;
+    }
+    else {
+        header( 'Location: backup.php?savemsg=Restore+failed.+Backup+file+not+found.' ) ;
+    }       
+  
+	exit;
+  }
+}
+
+if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['ulfile']['tmp_name'])) {
+  $filename = 'pfsense.bak.tgz';
+	move_uploaded_file($_FILES['ulfile']['tmp_name'], "/tmp/" . $filename);
+	$savemsg = "Uploaded file to /tmp/" . htmlentities($_FILES['ulfile']['name']);
+	system('cd /; tar xvpfz /tmp/'.$filename.' ');
+}
+
+
+include("head.inc");
+
+?>
+
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<p class="pgtitle">Backup: Files & Directories</p>
+
+<?php
+if ($_GET["savemsg"]) {
+  print_info_box($_GET["savemsg"]);
+}
+?>
+
+<div id="mainlevel">
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr><td class="tabnavtbl">
+<?php
+			
+	$tab_array = array();
+	$tab_array[] = array(gettext("Settings"), false, "/packages/backup/backup.php");
+ 	display_top_tabs($tab_array);
+ 	
+?>
+</td></tr>
+</table>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+   <tr>
+     <td class="tabcont" >
+
+	<table width="100%" border="0" cellpadding="0" cellspacing="0">
+	<tr>
+		<td>
+		<p>
+			Use this to tool to backup files and directories. The following directories
+			are recommended for backup.
+			
+			<table>
+			<tr><td><strong>pfSense Config</strong></td><td>/cf/conf</td></tr>
+			<tr><td><strong>RRD Graph Data Files</strong></td><td>/var/db/rrd</td></tr>
+			</table>
+    </p>
+		</td>
+	</tr>
+	</table>
+
+	<br/>
+	<br/>
+	
+	<div id="niftyOutter">
+	
+	<form action="backup.php" method="POST" enctype="multipart/form-data" name="frmUpload" onSubmit="">
+	  <table width='100%' width='690' cellpadding='0' cellspacing='0' border='0'>
+			<tr><td align='left' colspan='4'><strong>Upload and Restore</strong></td></tr>
+			<tr>
+			  <td colspan='2'>Use this to upload and restore your backup file.</td>
+	      <td align="right">File to upload:</td>
+	      <td width='50%' valign="top" align='right' class="label">
+						<input name="ulfile" type="file" class="button" id="ulfile">
+	      </td>
+	      <td valign="top" class="label">	
+       			<input name="submit" type="submit"  class="button" id="upload" value="Upload">
+				 </td>
+	    </tr>
+	   
+	  </table>
+	  <br />
+	  <br />
+	</div>
+	</form>
+	
+
+<?php
+	echo "<table width='690' cellpadding='0' cellspacing='0' border='0'>\n";
+	echo "<tr>\n";
+	echo "<td width='80%'>\n";
+	echo "<b>Backup / Restore</b><br />\n";
+	echo "The 'backup' button will tar gzip the directories that are listed below to /tmp/pfsense.bak.tgz it then presents a file to download. \n";
+	echo "If the backup file does not exist in /tmp/pfsense.bak.tgz then the 'restore' button will be hidden. \n";
+	echo "<br /><br />\n";
+	echo "</td>\n";
+	echo "<td width='20%' valign='middle' align='right'>\n";
+	echo "  <input type='button' value='backup' onclick=\"document.location.href='backup.php?a=download&t=backup';\" />\n";
+	if (file_exists('/tmp/pfsense.bak.tgz')) {
+	  echo "  <input type='button' value='restore' onclick=\"document.location.href='backup.php?a=other&t=restore';\" />\n";
+	}
+	echo "</td>\n";
+	echo "</tr>\n";
+	echo "</table>\n";
+	echo "<br /><br />\n\n";
+
+	
+echo "  <form action='backup.php' method='post' name='iform' id='iform'>\n";
+
+
+if ($config_change == 1) {
+    write_config();
+    $config_change = 0;  
+}
+
+//if ($savemsg) print_info_box($savemsg); 
+//if (file_exists($d_hostsdirty_path)): echo"<p>";
+//print_info_box_np("This is an info box.");
+//echo"<br />";
+//endif; 
+
+?>
+		
+    <table width="100%" border="0" cellpadding="0" cellspacing="0">
+    <tr>
+      <td width="30%" class="listhdrr">Name</td>
+      <td width="20%" class="listhdrr">Enabled</td>
+      <td width="40%" class="listhdr">Description</td>
+      <td width="10%" class="list">
+
+        <table border="0" cellspacing="0" cellpadding="1">
+          <tr>
+            <td width="17"></td>
+            <td valign="middle"><a href="backup_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+          </tr>
+        </table>
+
+      </td>
+	</tr>
+
+
+	<?php 
+    
+	$i = 0;
+	if (count($a_backup) > 0) {
+	
+	  foreach ($a_backup as $ent) {
+	
+	?>
+		<tr>
+		<td class="listr" ondblclick="document.location='backup_edit.php?id=<?=$i;?>';">
+		  <?=$ent['name'];?>&nbsp;
+		</td>
+		<td class="listr" ondblclick="document.location='backup_edit.php?id=<?=$i;?>';">
+		  <?=$ent['enabled'];?>&nbsp;
+		</td>
+		<td class="listbg" ondblclick="document.location='backup_edit.php?id=<?=$i;?>';">
+		  <font color="#FFFFFF"><?=htmlspecialchars($ent['description']);?>&nbsp;
+		</td>
+		<td valign="middle" nowrap class="list">
+		  <table border="0" cellspacing="0" cellpadding="1">
+		    <tr>
+		      <td valign="middle"><a href="backup_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
+		      <td><a href="backup_edit.php?type=backup&act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+		    </tr>
+		 </table>
+		</td>
+		</tr>
+		<?php 
+	
+	      $i++; 
+	    }
+	}
+    ?>
+
+    <tr>
+      <td class="list" colspan="3"></td>
+      <td class="list">          
+        <table border="0" cellspacing="0" cellpadding="1">
+          <tr>
+            <td width="17"></td>
+            <td valign="middle"><a href="backup_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+          </tr>
+        </table>
+		  </td>
+     </tr>
+
+
+     <tr>
+       <td class="list" colspan="3"></td>
+       <td class="list"></td>
+     </tr>
+     </table>
+     
+</form>
+
+
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+
+</td>
+</tr>
+</table>
+
+</div>
+
+
+<?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/config/backup/backup.xml b/config/backup/backup.xml
new file mode 100644
index 00000000..a0f72ba2
--- /dev/null
+++ b/config/backup/backup.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
+<packagegui>
+        <copyright>
+        <![CDATA[
+/* $Id$ */
+/* ========================================================================== */
+/*
+    backup.xml
+    Copyright (C) 2008 Mark J Crane
+    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.
+                                                                              */
+/* ========================================================================== */
+        ]]>
+        </copyright>
+    <description>Backup</description>
+    <requirements>Describe your package requirements here</requirements>
+    <faq>Currently there are no FAQ items provided.</faq>
+	<name>Backup Settings</name>
+	<version>0.1.5</version>
+	<title>Settings</title>
+	<include_file>/usr/local/pkg/backup.inc</include_file>
+	<menu>
+		<name>Backup Files/Dir</name>
+		<tooltiptext>Backup settings.</tooltiptext>
+		<section>Diagnostics</section>
+		<configfile>backup.xml</configfile>
+		<url>/packages/backup/backup.php</url>
+	</menu>
+	<tabs>
+		<tab>
+			<text>Settings</text>
+			<url>/pkg_edit.php?xml=backup.xml&amp;id=0</url>
+			<active/>
+		</tab>
+		<tab>
+			<text>Settings</text>
+			<url>/packages/backup.php</url>
+			<active/>
+		</tab>
+	</tabs>
+	<configpath>installedpackages->package->$packagename->configuration->backup</configpath>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0755</chmod>
+		<item>http://www.pfsense.com/packages/config/backup/backup.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0755</chmod>
+		<item>http://www.pfsense.com/packages/config/backup/backup.inc</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/tmp/</prefix>
+		<chmod>0755</chmod>
+		<item>http://www.pfsense.com/packages/config/backup/backup.tmp</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/tmp/</prefix>
+		<chmod>0755</chmod>
+		<item>http://www.pfsense.com/packages/config/backup/backup_edit.tmp</item>
+	</additional_files_needed>
+	<fields>
+		<field>
+			<fielddescr>Example Variable One</fielddescr>
+			<fieldname>var1</fieldname>
+			<description>Enter the variable one here.</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Example Variable Two</fielddescr>
+			<fieldname>var1</fieldname>
+			<description>Enter the variable one here.</description>
+			<type>input</type>
+		</field>
+	</fields>
+	<custom_add_php_command>
+	</custom_add_php_command>
+	<custom_php_resync_config_command>
+		php_sync_package();
+	</custom_php_resync_config_command>
+	<custom_delete_php_command>
+		php_sync_package();
+	</custom_delete_php_command>
+	<custom_php_install_command>
+		php_install_command();
+	</custom_php_install_command>
+	<custom_php_deinstall_command>
+		deinstall_command();
+	</custom_php_deinstall_command>
+</packagegui>
\ No newline at end of file
diff --git a/config/backup/backup_edit.tmp b/config/backup/backup_edit.tmp
new file mode 100755
index 00000000..69d63866
--- /dev/null
+++ b/config/backup/backup_edit.tmp
@@ -0,0 +1,213 @@
+<?php 
+/* $Id$ */
+/*
+
+	backup_edit.php
+	Copyright (C) 2008 Mark J Crane
+	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");
+require("/usr/local/pkg/backup.inc");
+
+
+$a_backup 	   = &$config['installedpackages']['backup']['config'];
+
+$id = $_GET['id'];
+if (isset($_POST['id'])) {
+	$id = $_POST['id'];
+}
+
+if ($_GET['act'] == "del") {
+  if ($_GET['type'] == 'backup') {
+      if ($a_backup[$_GET['id']]) {
+          unset($a_backup[$_GET['id']]);
+          write_config();
+          php_sync_package();
+          header("Location: backup.php");
+          exit;
+      }
+  }
+}
+
+if (isset($id) && $a_backup[$id]) {
+
+	$pconfig['name'] = $a_backup[$id]['name'];
+	$pconfig['path'] = $a_backup[$id]['path'];
+	$pconfig['enabled'] = $a_backup[$id]['enabled'];
+	$pconfig['description'] = $a_backup[$id]['description'];
+	
+}
+
+if ($_POST) {
+
+	unset($input_errors);
+	$pconfig = $_POST;
+  
+	if (!$input_errors) {
+	
+		$ent = array();
+		$ent['name'] = $_POST['name'];
+		$ent['path'] = $_POST['path'];		
+		$ent['enabled'] = $_POST['enabled'];		
+		$ent['description'] = $_POST['description'];
+
+		if (isset($id) && $a_backup[$id]) {
+		  	//update
+      		$a_backup[$id] = $ent;
+		}
+		else {
+		  	//add	  
+			$a_backup[] = $ent;
+		}
+		
+		write_config();
+		php_sync_package();
+		
+		header("Location: backup.php");
+		exit;
+	}
+}
+
+include("head.inc");
+
+?>
+
+<script type="text/javascript" language="JavaScript">
+
+function show_advanced_config() {
+	document.getElementById("showadvancedbox").innerHTML='';
+	aodiv = document.getElementById('showadvanced');
+	aodiv.style.display = "block";
+</script>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<p class="pgtitle">Backup: Edit</p>
+<?php if ($input_errors) print_input_errors($input_errors); ?>
+
+
+<div id="mainlevel">
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr><td class="tabnavtbl">
+<?php
+			
+	$tab_array = array();
+	$tab_array[] = array(gettext("Settings"), false, "/packages/backup/backup.php");
+	display_top_tabs($tab_array);
+ 	
+?>
+</td></tr>
+</table>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+   <tr>
+     <td class="tabcont" >
+
+	<!--
+  	<table width="100%" border="0" cellpadding="6" cellspacing="0">              
+      <tr>
+        <td><p><span class="vexpl"><span class="red"><strong>PHP<br>
+            </strong></span>
+            </p></td>
+      </tr>
+    </table>
+    -->
+    <br />
+    
+        <form action="backup_edit.php" method="post" name="iform" id="iform">
+            <table width="100%" border="0" cellpadding="6" cellspacing="0">
+
+            <tr>
+              <td width="25%" valign="top" class="vncellreq">Name</td>
+              <td width="75%" class="vtable"> 
+				<input name="name" type="text" class="formfld" id="name" size="40" value="<?=htmlspecialchars($pconfig['name']);?>">
+              </td>
+            </tr> 
+
+            <tr>
+				<td width="22%" valign="top" class="vncellreq">Path</td>
+				<td width="78%" class="vtable">
+					<input name="path" type="text" class="formfld" id="path" size="40" value="<?=htmlspecialchars($pconfig['path']);?>">			   
+				</td>
+            </tr>
+            <tr>
+              <td width="22%" valign="top" class="vncellreq">Enabled</td>
+              <td width="78%" class="vtable"> 
+                <?php                
+                echo "              <select name='enabled' class='formfld'>\n";
+                echo "                <option></option>\n";
+                switch (htmlspecialchars($pconfig['enabled'])) {
+                case "true":
+                    echo "              <option value='true' selected='yes'>true</option>\n";
+                    echo "              <option value='false'>false</option>\n";
+                    break;
+                case "false":
+                    echo "              <option value='true'>true</option>\n";
+                    echo "              <option value='false' selected='yes'>false</option>\n";
+
+                    break;
+                default:
+                    echo "              <option value='true' selected='yes'>true</option>\n";
+                    echo "              <option value='false'>false</option>\n";
+                }
+                echo "              </select>\n";
+                ?>          
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncellreq">Description</td>
+              <td width="75%" class="vtable"> 
+                <input name="description" type="text" class="formfld" id="description" size="40" value="<?=htmlspecialchars($pconfig['description']);?>">
+                <br><span class="vexpl">Enter the description here.<br></span>
+              </td>
+            </tr>
+            
+            <tr>
+              <td valign="top">&nbsp;</td>
+              <td>
+                <input name="Submit" type="submit" class="formbtn" value="Save"> <input class="formbtn" type="button" value="Cancel" onclick="history.back()">
+                <?php if (isset($id) && $a_backup[$id]): ?>
+                  <input name="id" type="hidden" value="<?=$id;?>">
+                <?php endif; ?>
+              </td>
+            </tr>
+            </table>
+        </form>
+
+      <br>
+      <br>
+      <br>
+      <br>
+      <br>
+      <br>
+
+     </td>
+   </tr>
+</table>
+
+</div>
+
+<?php include("fend.inc"); ?>
+</body>
+</html>