Merge pull request #3616 from doktornotor/patch-18

2 files changed, 3 insertions, 39 deletions

diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc
index a1a8fe0..3a55902 100644
--- a/src/etc/inc/globals.inc
+++ b/src/etc/inc/globals.inc
@@ -37,7 +37,6 @@ define('DMYPWD', "********");
 
 global $g;
 $g = array(
-	"base_packages" => "siproxd",
 	"event_address" => "unix:///var/run/check_reload_status",
 	"factory_shipped_username" => "admin",
 	"factory_shipped_password" => "pfsense",
diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php
index 79b66e5..be44f68 100644
--- a/src/usr/local/www/diag_backup.php
+++ b/src/usr/local/www/diag_backup.php
@@ -118,38 +118,6 @@ function restore_rrddata() {
 	}
 }
 
-function add_base_packages_menu_items() {
-	global $g, $config;
-	$base_packages = explode(",", $g['base_packages']);
-	$modified_config = false;
-	foreach ($base_packages as $bp) {
-		$basepkg_path = "/usr/local/pkg/{$bp}";
-		$tmpinfo = pathinfo($basepkg_path, PATHINFO_EXTENSION);
-		if ($tmpinfo['extension'] == "xml" && file_exists($basepkg_path)) {
-			$pkg_config = parse_xml_config_pkg($basepkg_path, "packagegui");
-			if ($pkg_config['menu'] != "") {
-				if (is_array($pkg_config['menu'])) {
-					foreach ($pkg_config['menu'] as $menu) {
-						if (is_array($config['installedpackages']['menu'])) {
-							foreach ($config['installedpackages']['menu'] as $amenu) {
-								if ($amenu['name'] == $menu['name']) {
-									continue;
-								}
-							}
-						}
-						$config['installedpackages']['menu'][] = $menu;
-						$modified_config = true;
-					}
-				}
-			}
-		}
-	}
-	if ($modified_config) {
-		write_config(gettext("Restored base_package menus after configuration restore."));
-		$config = parse_config(true);
-	}
-}
-
 function remove_bad_chars($string) {
 	return preg_replace('/[^a-z_0-9]/i', '', $string);
 }
@@ -305,8 +273,7 @@ if ($_POST) {
 									restore_rrddata();
 									unset($config['rrddata']);
 									unlink_if_exists("{$g['tmp_path']}/config.cache");
-									write_config();
-									add_base_packages_menu_items();
+									write_config(sprintf(gettext("Unset RRD data from configuration after restoring %s configuration area"), $_POST['restorearea']));
 									convert_config();
 								}
 								filter_configure();
@@ -341,8 +308,7 @@ if ($_POST) {
 									restore_rrddata();
 									unset($config['rrddata']);
 									unlink_if_exists("{$g['tmp_path']}/config.cache");
-									write_config();
-									add_base_packages_menu_items();
+									write_config(gettext("Unset RRD data from configuration after restoring full configuration"));
 									convert_config();
 								}
 								if ($m0n0wall_upgrade == true) {
@@ -402,8 +368,7 @@ if ($_POST) {
 										}
 									}
 									$config['diag']['ipv6nat'] = true;
-									write_config();
-									add_base_packages_menu_items();
+									write_config(gettext("Imported m0n0wall configuration"));
 									convert_config();
 									$savemsg = gettext("The m0n0wall configuration has been restored and upgraded to pfSense.");
 									mark_subsystem_dirty("restore");