From c97042f53b129df7d9b615c43bcb2c470df691c8 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccouting.eu>
Date: Wed, 19 Dec 2012 18:08:11 +0100
Subject: [PATCH] Cleanup - removed ancient references to pre-2.2
 modules/plugins.

---
 admin/inst_module.php    |  3 +--
 includes/ui/ui_lists.inc |  8 +-------
 sql/alter2.2.php         | 10 +---------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/admin/inst_module.php b/admin/inst_module.php
index f467ce5f..f92d2c56 100644
--- a/admin/inst_module.php
+++ b/admin/inst_module.php
@@ -113,13 +113,12 @@ function display_extensions()
 		$available = @$ext['available'];
 		$installed = @$ext['version'];
 		$id = @$ext['local_id'];
-		$is_mod = $ext['type'] == 'module';
 
 		$entries = fmt_titles(@$ext['entries']);
 		$tabs = fmt_titles(@$ext['tabs']);
 
 		alt_table_row_color($k);
-//		label_cell(is_array($ext['Descr']) ? $ext['Descr'][0] : $ext['Descr']);
+
 		label_cell($available ? get_package_view_str($pkg_name, $ext['name']) : $ext['name']);
 		label_cell($tabs);
 		label_cell($entries);
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 47d7d7e0..d2be5fab 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -2200,7 +2200,7 @@ function security_roles_list_row($label, $name, $selected_id=null, $new_item=fal
 	echo "</tr>\n";
 }
 
-function tab_list_row($label, $name, $selected_id=null, $all = false)
+function tab_list_row($label, $name, $selected_id=null)
 {
 	global $installed_extensions;
 	
@@ -2208,12 +2208,6 @@ function tab_list_row($label, $name, $selected_id=null, $all = false)
 	foreach ($_SESSION['App']->applications as $app) {
 		$tabs[$app->id] = access_string($app->name, true);
 	}
-	if ($all) {	// add also not active ext. modules
-		foreach ($installed_extensions as $ext) {
-			if ($ext['type'] == 'module' && !$ext['active'])
-				$tabs[$ext['tab']] = access_string($ext['title'], true);
-		}
-	}
 	echo "<tr>\n";
 	echo "<td class='label'>$label</td><td>\n";
 	echo array_selector($name, $selected_id, $tabs);
diff --git a/sql/alter2.2.php b/sql/alter2.2.php
index fcf9f60f..0f8591b2 100644
--- a/sql/alter2.2.php
+++ b/sql/alter2.2.php
@@ -258,19 +258,11 @@ function fix_extensions() {
 		$ext['tab'] = $ext['name'];
 		$ext['name'] = access_string($ext['title'], true); 
 		$ext['path'] = $ext['folder']; unset($ext['folder']);
-		$ext['type'] = 'module';
+		$ext['type'] = 'extension';
 		$ext['active'] = '1';
 		$exts[] = $ext;
 	}
 
-	include($path_to_root.'/modules/installed_modules.php');
-	foreach($installed_modules as $mod) {
-		$mod['title'] = $mod['name'];
-		$mod['name'] = access_string($mod['name'], true);
-		$mod['type'] = 'plugin';
-		$ext['active'] = '1';
-		$exts[] = $mod;
-	}
 	if (!write_extensions($exts))
 		return false;
 	
-- 
2.30.2