Fixed problem with counting number of rows for some SQL queries displayed in db pager.

[fa-stable.git] / frontaccounting.php

diff --git a/frontaccounting.php b/frontaccounting.php
index 7e2201882a74b9f954ca64cfa97c8f69c5df83c4..2da5fe9fe9339665c7aab4ab0a6fa737fe6f1d80 100644 (file)
--- a/frontaccounting.php
+++ b/frontaccounting.php
@@ -20,15 +20,6 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        include_once($path_to_root . '/applications/generalledger.php');
        include_once($path_to_root . '/applications/setup.php');
        include_once($path_to_root . '/installed_extensions.php');
-       if (count($installed_extensions) > 0)
-       {
-               foreach ($installed_extensions as $ext)
-               {
-                       include_once($path_to_root."/".$ext['folder']."/".$ext['app_file']);
-               }
-       }       
-
-       include_once($path_to_root . '/modules/installed_modules.php');
 
        class front_accounting
                {
@@ -36,16 +27,16 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
                var $settings;
                var $applications;
                var $selected_application;
-               // GUI
+
                var $menu;
-               //var $renderer;
+
                function front_accounting()
                {
-                       //$this->renderer =& new renderer();
                }
                function add_application(&$app)
-                               {
-                                                       $this->applications[$app->id] = &$app;
+                               {       
+                                       if ($app->enabled) // skip inactive modules
+                                               $this->applications[$app->id] = &$app;
                                }
                function get_application($id)
                                {
@@ -64,18 +55,21 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
                function display()
                {
                        global $path_to_root;
-                       include($path_to_root . "/themes/".user_theme()."/renderer.php");
+                       
+                       include_once($path_to_root . "/themes/".user_theme()."/renderer.php");
+
                        $this->init();
                        $rend = new renderer();
                        $rend->wa_header();
-                       //$rend->menu_header($this->menu);
+
                        $rend->display_applications($this);
-                       //$rend->menu_footer($this->menu);
+
                        $rend->wa_footer();
+                       $this->renderer =& $rend;
                }
                function init()
                {
-                       global $installed_extensions, $path_to_root;
+
                        $this->menu = new menu(_("Main  Menu"));
                        $this->menu->add_item(_("Main  Menu"), "index.php");
                        $this->menu->add_item(_("Logout"), "/account/access/logout.php");
@@ -86,20 +80,10 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
                        $this->add_application(new manufacturing_app());
                        $this->add_application(new dimensions_app());
                        $this->add_application(new general_ledger_app());
-                       if (count($installed_extensions) > 0)
-                       {
-                               foreach ($installed_extensions as $ext)
-                               {
-                                       get_text::add_domain($_SESSION['language']->code, 
-                                               $ext['folder']."/lang");
-                                       $class = $ext['name']."_app";
-                                       $this->add_application(new $class());
-                                       get_text::add_domain($_SESSION['language']->code, 
-                                               $path_to_root."/lang");
-                               }
-                       }       
-                       
+
+                       hook_invoke_all('install_tabs', $this);
+
                        $this->add_application(new setup_app());
-                       }
+               }
 }
 ?>
\ No newline at end of file