From 94503103d8ce4e34de79f221f4fdd24f07dccb93 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Sun, 5 Mar 2017 19:51:09 +0100
Subject: Remove useless add_base_packages_menu_items() function

Not really sure what was the idea 7+ years ago, but the code just doesn't make sense now.
---
 src/usr/local/www/diag_backup.php | 35 -----------------------------------
 1 file changed, 35 deletions(-)

(limited to 'src/usr/local/www/diag_backup.php')

diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php
index 79b66e5..c095f16 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);
 }
@@ -306,7 +274,6 @@ if ($_POST) {
 									unset($config['rrddata']);
 									unlink_if_exists("{$g['tmp_path']}/config.cache");
 									write_config();
-									add_base_packages_menu_items();
 									convert_config();
 								}
 								filter_configure();
@@ -342,7 +309,6 @@ if ($_POST) {
 									unset($config['rrddata']);
 									unlink_if_exists("{$g['tmp_path']}/config.cache");
 									write_config();
-									add_base_packages_menu_items();
 									convert_config();
 								}
 								if ($m0n0wall_upgrade == true) {
@@ -403,7 +369,6 @@ if ($_POST) {
 									}
 									$config['diag']['ipv6nat'] = true;
 									write_config();
-									add_base_packages_menu_items();
 									convert_config();
 									$savemsg = gettext("The m0n0wall configuration has been restored and upgraded to pfSense.");
 									mark_subsystem_dirty("restore");
-- 
cgit v1.1