summaryrefslogtreecommitdiffstats
path: root/etc/inc/pkg-utils.inc
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-04-17 11:46:17 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-04-17 11:46:59 -0300
commita0f190a25863d6b95839919005b50a43115a8cac (patch)
tree63fe943f45602e65ff7062bb1b3151df90ecdd42 /etc/inc/pkg-utils.inc
parentf2b714fb46cd51ea3ba420a8aee1dfd7606e51a7 (diff)
downloadpfsense-a0f190a25863d6b95839919005b50a43115a8cac.zip
pfsense-a0f190a25863d6b95839919005b50a43115a8cac.tar.gz
Do not try to add package tabs info to config
Remove broken code that was supposed to add packages tabs entries to config.xml. Since tag['name'] doesn't exist, it only adds the first item of first installed package, and in the end this is not used at all since pkg_edit.php uses tabs information from package config_file directly
Diffstat (limited to 'etc/inc/pkg-utils.inc')
-rw-r--r--etc/inc/pkg-utils.inc37
1 files changed, 0 insertions, 37 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index 351e311..c51916f 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -919,25 +919,6 @@ function install_package_xml($pkg) {
$static_output .= gettext("done.") . "\n";
update_output_window($static_output);
}
- /* integrated tab items */
- if (is_array($pkg_config['tabs']['tab'])) {
- $static_output .= gettext("Integrated Tab items... ");
- update_output_window($static_output);
- foreach ($pkg_config['tabs']['tab'] as $tab) {
- if (is_array($config['installedpackages']['tab'])) {
- foreach ($config['installedpackages']['tab'] as $atab) {
- if ($atab['name'] == $tab['name']) {
- continue 2;
- }
- }
- } else {
- $config['installedpackages']['tab'] = array();
- }
- $config['installedpackages']['tab'][] = $tab;
- }
- $static_output .= gettext("done.") . "\n";
- update_output_window($static_output);
- }
/* services */
if (is_array($pkg_config['service'])) {
$static_output .= gettext("Services... ");
@@ -1041,29 +1022,11 @@ function delete_package_xml($pkg) {
update_output_window($static_output);
/* parse package configuration */
$packages = &$config['installedpackages']['package'];
- $tabs =& $config['installedpackages']['tab'];
$menus =& $config['installedpackages']['menu'];
$services = &$config['installedpackages']['service'];
$pkg_info =& $packages[$pkgid];
if (file_exists("/usr/local/pkg/" . $pkg_info['configurationfile'])) {
$pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $packages[$pkgid]['configurationfile'], "packagegui");
- /* remove tab items */
- if (is_array($pkg_config['tabs'])) {
- $static_output .= gettext("Tabs items... ");
- update_output_window($static_output);
- if (is_array($pkg_config['tabs']['tab']) && is_array($tabs)) {
- foreach ($pkg_config['tabs']['tab'] as $tab) {
- foreach ($tabs as $key => $insttab) {
- if ($insttab['name'] == $tab['name']) {
- unset($tabs[$key]);
- break;
- }
- }
- }
- }
- $static_output .= gettext("done.") . "\n";
- update_output_window($static_output);
- }
/* remove menu items */
if (is_array($pkg_config['menu'])) {
$static_output .= gettext("Menu items... ");
OpenPOWER on IntegriCloud