Cleanup - removed ancient references to pre-2.2 modules/plugins.

diff --git a/admin/inst_module.php b/admin/inst_module.php
index f467ce5f73ec81628f3cf832050a9d6e1e56f9c6..f92d2c56aef4d53ae7ddf5de89a39818a00c6b0c 100644 (file)
--- 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 47d7d7e06536d9ea46b9d88ff7b1e549a53d9e7c..d2be5fab97aec7eebcf1a62c3218e4d348e14f2a 100644 (file)
--- 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 fcf9f60f34a55da9508ca6a7522844b2fc6294af..0f8591b2eee748e2f8461502c58ca5e4403efb26 100644 (file)
--- 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;