Synchornize with m0n0wall 1.2b3. These files have not really been

modified too much so a straight copy works.   9 files remain to be
patched by hand.

1 files changed, 30 insertions, 33 deletions

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index b91cc6b..bc4d9d4 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -1,24 +1,22 @@
 #!/usr/local/bin/php
-<?php
+<?php 
 /*
 	diag_backup.php
-	Copyright (C) 2004 Scott Ullrich
-	All rights reserved.
-
-	originially part of m0n0wall (http://m0n0.ch/wall)
+	part of m0n0wall (http://m0n0.ch/wall)
+	
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
 	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
@@ -33,26 +31,26 @@
 
 /* omit no-cache headers because it confuses IE with file downloads */
 $omit_nocacheheaders = true;
-require("guiconfig.inc");
+require("guiconfig.inc"); 
 
 if ($_POST) {
 
 	unset($input_errors);
-
+	
 	if (stristr($_POST['Submit'], "Restore"))
 		$mode = "restore";
 	else if (stristr($_POST['Submit'], "Download"))
 		$mode = "download";
-
+		
 	if ($mode) {
 		if ($mode == "download") {
 			config_lock();
-
-			$fn = "config-" . $config['system']['hostname'] . "." .
+			
+			$fn = "config-" . $config['system']['hostname'] . "." . 
 				$config['system']['domain'] . "-" . date("YmdHis") . ".xml";
-
+			
 			$fs = filesize($g['conf_path'] . "/config.xml");
-			header("Content-Type: application/octet-stream");
+			header("Content-Type: application/octet-stream"); 
 			header("Content-Disposition: attachment; filename=$fn");
 			header("Content-Length: $fs");
 			readfile($g['conf_path'] . "/config.xml");
@@ -87,28 +85,28 @@ if ($_POST) {
             <form action="diag_backup.php" method="post" enctype="multipart/form-data">
             <?php if ($input_errors) print_input_errors($input_errors); ?>
             <?php if ($savemsg) print_info_box($savemsg); ?>
-              <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                <tr>
+              <table width="100%" border="0" cellspacing="0" cellpadding="6">
+                <tr> 
                   <td colspan="2" class="listtopic">Backup configuration</td>
                 </tr>
-                <tr>
-                  <td width="22%" valign="baseline">&nbsp;</td>
-                  <td width="78%" class="listn">
-                    <p> Click this button to download the system configuration
+                <tr> 
+                  <td width="22%" valign="baseline" class="vncell">&nbsp;</td>
+                  <td width="78%" class="vtable"> 
+                    <p> Click this button to download the system configuration 
                       in XML format.<br>
                       <br>
-                      <input name="Submit" type="submit" class="formbtn" id="download" value="Download configuration">
-                      <br>
-                      &nbsp; <br>
-                      &nbsp; </p></td>
+                      <input name="Submit" type="submit" class="formbtn" id="download" value="Download configuration"></td>
+                </tr>
+                <tr> 
+                  <td colspan="2" class="list" height="12"></td>
                 </tr>
-                <tr>
+                <tr> 
                   <td colspan="2" class="listtopic">Restore configuration</td>
                 </tr>
-                <tr>
-                  <td width="22%" valign="baseline">&nbsp;</td>
-                  <td width="78%" class="listn">
-                    <p> Open a pfSense configuration XML file and click the button
+                <tr> 
+                  <td width="22%" valign="baseline" class="vncell">&nbsp;</td>
+                  <td width="78%" class="vtable"> 
+                    Open a m0n0wall configuration XML file and click the button 
                       below to restore the configuration.<br>
                       <br>
                       <strong><span class="red">Note:</span></strong><br>
@@ -118,8 +116,7 @@ if ($_POST) {
                       <br>
                       <br>
                       <input name="Submit" type="submit" class="formbtn" id="restore" value="Restore configuration">
-                    </p>
-                    </td>
+                  </td>
                 </tr>
               </table>
             </form>