Merging latest changes from stable branch up to 2.3.24

[fa-stable.git] / applications / dimensions.php

diff --git a/applications/dimensions.php b/applications/dimensions.php
index bf46ef8d53284c3f5dbb2f2051d9253ea5a271eb..52fb9f7e0cddc0902a020353585ec6a8556a4047 100644 (file)
--- a/applications/dimensions.php
+++ b/applications/dimensions.php
@@ -13,7 +13,6 @@ class dimensions_app extends application
 {
        function dimensions_app()
        {
-               global $installed_extensions;
                $dim = get_company_pref('use_dimension');
                $this->application("proj", _($this->help_context = "&Dimensions"), $dim);
 
@@ -21,36 +20,23 @@ class dimensions_app extends application
                {
                        $this->add_module(_("Transactions"));
                        $this->add_lapp_function(0, _("Dimension &Entry"),
-                               "dimensions/dimension_entry.php?", 'SA_DIMENSION');
+                               "dimensions/dimension_entry.php?", 'SA_DIMENSION', MENU_ENTRY);
                        $this->add_lapp_function(0, _("&Outstanding Dimensions"),
-                               "dimensions/inquiry/search_dimensions.php?outstanding_only=1", 'SA_DIMTRANSVIEW');
+                               "dimensions/inquiry/search_dimensions.php?outstanding_only=1", 'SA_DIMTRANSVIEW', MENU_TRANSACTION);
 
                        $this->add_module(_("Inquiries and Reports"));
                        $this->add_lapp_function(1, _("Dimension &Inquiry"),
-                               "dimensions/inquiry/search_dimensions.php?", 'SA_DIMTRANSVIEW');
+                               "dimensions/inquiry/search_dimensions.php?", 'SA_DIMTRANSVIEW', MENU_INQUIRY);
 
                        $this->add_rapp_function(1, _("Dimension &Reports"),
-                               "reporting/reports_main.php?Class=4", 'SA_DIMENSIONREP');
+                               "reporting/reports_main.php?Class=4", 'SA_DIMENSIONREP', MENU_REPORT);
                        
                        $this->add_module(_("Maintenance"));
                        $this->add_lapp_function(2, _("Dimension &Tags"),
-                               "admin/tags.php?type=dimension", 'SA_DIMTAGS');
-                               
-                       if (count($installed_extensions) > 0)
-                       {
-                               foreach ($installed_extensions as $mod)
-                               {
-                                       if (@$mod['active'] && $mod['type'] == 'plugin' && $mod["tab"] == "proj")
-                                       {
-                                               $this->add_rapp_function(2, $mod["title"], 
-                                                       "modules/".$mod["path"]."/".$mod["filename"]."?",
-                                                       isset($mod["access"]) ? $mod["access"] : 'SA_OPEN' );
-                                       }
-                               }
-                       }
+                               "admin/tags.php?type=dimension", 'SA_DIMTAGS', MENU_MAINTENANCE);
+
+                       $this->add_extensions();
                }
        }
 }
 
-
-?>
\ No newline at end of file