Gettext switching clenaup.

[fa-stable.git] / frontaccounting.php

diff --git a/frontaccounting.php b/frontaccounting.php
index df1ff02cfdcdb15bd5ada726c72b18b3aa2534fd..d3662cd7f293619bb2a591189cea94b9b4f1fad9 100644 (file)
--- a/frontaccounting.php
+++ b/frontaccounting.php
@@ -9,6 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
+       die("Restricted access");
        include_once($path_to_root . '/applications/application.php');
        include_once($path_to_root . '/applications/customers.php');
        include_once($path_to_root . '/applications/suppliers.php');
@@ -18,15 +20,14 @@
        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');
+       foreach ($installed_extensions as $ext)
+       {
+               if (@($ext['active'] && isset($ext['tabs']))) // supressed warnings before 2.2 upgrade
+                       foreach($ext['tabs'] as $tab) {
+                               include_once($path_to_root.'/'.$ext['path'].'/'.$tab['url']);
+                       }
+       }
 
        class front_accounting
                {
@@ -37,13 +38,15 @@
                // 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)
                                {
@@ -62,7 +65,9 @@
                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();
@@ -70,10 +75,12 @@
                        $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");
@@ -84,20 +91,24 @@
                        $this->add_application(new manufacturing_app());
                        $this->add_application(new dimensions_app());
                        $this->add_application(new general_ledger_app());
-                       if (count($installed_extensions) > 0)
+
+                       // Do not use global array directly here, or you suffer 
+                       // from buggy php behaviour (unexpected loop break 
+                       // because of same var usage in class constructor).
+                       $extensions = $installed_extensions;
+                       foreach ($extensions as $ext)
                        {
-                               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");
+                               if (@($ext['active'] && isset($ext['tabs']))) { // supressed warnings before 2.2 upgrade
+                                       set_ext_domain($ext['path']);
+                                       foreach($ext['tabs'] as $tab) {
+                                               $class = $tab['tab_id']."_app";
+                                               if (class_exists($class))
+                                                       $this->add_application(new $class());
+                                       }
                                }
-                       }       
-                       
-                       $this->add_application(new setup_app());
                        }
+                       set_ext_domain();
+                       $this->add_application(new setup_app());
+               }
 }
 ?>
\ No newline at end of file