[0004216] Print Work Orders: database error fixed when voided WO is in selected range.

[fa-stable.git] / admin / inst_module.php

diff --git a/admin/inst_module.php b/admin/inst_module.php
index 71d6f7424200b1634439de6b4fca394bc159a6db..6c974ddb4bda02234902550237a7e75365b122e1 100644 (file)
--- a/admin/inst_module.php
+++ b/admin/inst_module.php
@@ -42,8 +42,18 @@ function local_extension($id)
                        'active' => false
        );
 
-       if (file_exists($path_to_root.'/modules/'.clean_file_name($id).'/hooks.php')) {
-               include_once($path_to_root.'/modules/'.clean_file_name($id).'/hooks.php');
+       $local_module_path = $path_to_root.'/modules/'.clean_file_name($id);
+       $local_config_file = $local_module_path.'/_init/config';
+       $local_hook_file = $local_module_path.'/hooks.php';
+
+       if (file_exists($local_config_file)) {
+               $ctrl = get_control_file($local_config_file);
+               if (key_exists('Name', $ctrl)) $exts[$next_extension_id-1]['name'] = $ctrl['Name'];
+               if (key_exists('Version', $ctrl)) $exts[$next_extension_id-1]['version'] = $ctrl['Version'];
+       }
+       if (file_exists($local_hook_file)) {
+               include_once($local_hook_file);
+
        }
        $hooks_class = 'hooks_'.$id;
        if (class_exists($hooks_class, false)) {
@@ -123,7 +133,7 @@ function display_extensions($mods)
                label_cell($entries);
 
                label_cell($id === null ? _("None") :
-                       ($available && $installed ? $installed : _("Unknown")));
+                       (($installed && ($installed != '-' || $installed != '')) ? $installed : _("Unknown")));
                label_cell($available ? $available : _("Unknown"));
 
                if (!$available && $ext['type'] == 'extension') {// third-party plugin
@@ -210,18 +220,16 @@ if (get_post('Refresh')) {
 
        $result = true;
        foreach($exts as $i => $ext) {
-               if ($ext['package'] && ($ext['active'] ^ check_value('Active'.$i))) {
+               if ($ext['package'] && ($ext['active'] ^ check_value('Active'.$i))) 
+               {
                        if (check_value('Active'.$i) && !check_src_ext_version($ext['version']))
                        {
                                display_warning(sprintf(_("Package '%s' is incompatible with current application version and cannot be activated.\n")
                                        . _("Check Install/Activate page for newer package version."), $ext['name']));
                                continue;
                        }
-                       if (!$ext['active'])
-                               $activated = activate_hooks($ext['package'], $comp);
-                       else
-                               $activated = hook_invoke($ext['package'], check_value('Active'.$i) ?
-                                'activate_extension':'deactivate_extension', $comp, false);
+                       $activated = activate_hooks($ext['package'], $comp, !$ext['active']);   // change active state
+
                        if ($activated !== null)
                                $result &= $activated;
                        if ($activated || ($activated === null))