From 363fefeb229e35a5b0958907bf88f3a5c5a23176 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Mon, 6 Oct 2008 19:40:00 +0000 Subject: Show data from pfS portal site --- packages/autoconfigbackup/autoconfigbackup.php | 96 ++++++++++++-------------- 1 file changed, 45 insertions(+), 51 deletions(-) (limited to 'packages') diff --git a/packages/autoconfigbackup/autoconfigbackup.php b/packages/autoconfigbackup/autoconfigbackup.php index b3a2e4d2..5cd34dbb 100644 --- a/packages/autoconfigbackup/autoconfigbackup.php +++ b/packages/autoconfigbackup/autoconfigbackup.php @@ -31,8 +31,10 @@ require("guiconfig.inc"); +$pfSversion = str_replace("\n", "", file_get_contents("/etc/version")); + // Seperator used during client / server communications -$oper_sep = "||"; +$oper_sep = "\|\|"; // URL to restore.php $get_url = "https://portal.pfsense.org/pfSconfigbackups/restore.php"; @@ -54,7 +56,7 @@ if($_GET['newver'] != "") { fwrite($fd, $data); fclose($fd); curl_close($curl_Session); - $confvers = unserialize(file_get_contents($g['cf_conf_path'] . '/backup/backup.cache')); + //$confvers = unserialize(file_get_contents($g['cf_conf_path'] . '/backup/backup.cache')); unlink("/tmp/config_restore.xml"); if(config_restore("/tmp/config_restore.xml") == 0) { $savemsg = "Successfully reverted to timestamp " . date("n/j/y H:i:s", $_GET['newver']) . " with description \"" . $confvers[$_GET['newver']]['description'] . "\"."; @@ -75,7 +77,7 @@ if($_GET['newver'] != "") { } if($_GET['rmver'] != "") { - $confvers = unserialize(file_get_contents($g['cf_conf_path'] . '/backup/backup.cache')); + //$confvers = unserialize(file_get_contents($g['cf_conf_path'] . '/backup/backup.cache')); unlink_if_exists($g['conf_path'] . '/backup/config-' . $_GET['rmver'] . '.xml'); $savemsg = "Deleted backup with timestamp " . date("n/j/y H:i:s", $_GET['rmver']) . " and description \"" . $confvers[$_GET['rmver']]['description'] . "\"."; } @@ -83,25 +85,31 @@ if($_GET['rmver'] != "") { // Loop through and create new confvers $data_split = split("\n", $data); $confvers = array(); -$tmp_array = array(); foreach($data_split as $ds) { $ds_split = split($oper_sep, $ds); + $tmp_array = array(); $tmp_array['username'] = $ds_split[0]; $tmp_array['reason'] = $ds_split[1]; $tmp_array['time'] = $ds_split[2]; - $confvers[] = $tmp_array(); + if($ds_split[2] && $ds_split[1] && $ds_split[0]) + $confvers[] = $tmp_array; } $pgtitle = "Diagnostics: Auto Backup"; include("head.inc"); ?> - - -

- - +{$pgtitle}

"; + } + if($savemsg) + print_info_box($savemsg); + if ($input_errors) + print_input_errors($input_errors); +?> -- cgit v1.2.3

- - - - - - - - - - - - - - - - - - - - - +

Date	Configuration Change
		Current
		- -	- -
- -

+ + + + + + + + + + + + + + + + + +

Date	Configuration Change
		+ +
		+ +	+ +