From 67bc955d7946cbb38faabb2205fdf03055868289 Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Mon, 24 Jan 2011 18:14:03 -0500
Subject: handle alternate xml_rootobj correctly when doing config backups
 w/RRD data

---
 usr/local/www/diag_backup.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 6ff65fe..5892f06 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -223,7 +223,7 @@ if ($_POST) {
 				 *  Backup RRD Data
 				 */
 				if(!$_POST['donotbackuprrd']) {
-					$data = str_replace("</pfsense>", "\t<rrddata>", $data);
+					$data = str_replace("</" . $g['xml_rootobj'] . ">", "\t<rrddata>", $data);
 					$rrd_files_var_db_rrd = split("\n",`cd /var/db/rrd && ls *.rrd`);
 					foreach($rrd_files_var_db_rrd as $rrd) {
 						if($rrd) {
@@ -237,7 +237,7 @@ if ($_POST) {
 						}
 					}
 					$data .= "\t</rrddata>\n";
-					$data .= "</pfsense>\n";
+					$data .= "</" . $g['xml_rootobj'] . ">\n";
 				}
 
 				$size = strlen($data);
@@ -315,7 +315,7 @@ if ($_POST) {
 								if(file_exists("{$g['tmp_path']}/config.cache"))
 									unlink("{$g['tmp_path']}/config.cache");
 								$config = parse_config(true);
-								/* extract out rrd items, unset from $confgi when done */
+								/* extract out rrd items, unset from $config when done */
 								if($config['rrddata']) {
 									foreach($config['rrddata']['rrddatafile'] as $rrd) {
 										$rrd_fd = fopen("{$g['vardb_path']}/rrd/{$rrd['filename']}", "w");
-- 
cgit v1.1