Eliminated non-static method calls and other bulk fixes to fix php5 warnings

[fa-stable.git] / frontaccounting.php

diff --git a/frontaccounting.php b/frontaccounting.php
index 0f4c98d71d54b5ba443298840cb5c1ef18ee64ee..033c99283758f9f537cb096323221779ad7b69f2 100644 (file)
--- a/frontaccounting.php
+++ b/frontaccounting.php
@@ -9,17 +9,26 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-       include_once('applications/application.php');
-       include_once('applications/customers.php');
-       include_once('applications/suppliers.php');
-       include_once('applications/inventory.php');
-       include_once('applications/manufacturing.php');
-       include_once('applications/dimensions.php');
-       include_once('applications/generalledger.php');
-       include_once('applications/setup.php');
-       include_once('installed_extensions.php');
-       $path_to_root=".";
-       include_once($path_to_root . "/includes/session.inc");
+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');
+       include_once($path_to_root . '/applications/inventory.php');
+       include_once($path_to_root . '/applications/manufacturing.php');
+       include_once($path_to_root . '/applications/dimensions.php');
+       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
                {
@@ -34,9 +43,10 @@
                {
                        //$this->renderer =& new renderer();
                }
-               function add_application($app)
-                               {
-                                                       $this->applications[$app->id] = &$app;
+               function add_application(&$app)
+                               {       
+                                       if ($app->enabled) // skip inactive modules
+                                               $this->applications[$app->id] = &$app;
                                }
                function get_application($id)
                                {
@@ -66,7 +76,7 @@
                }
                function init()
                {
-                       global $installed_extensions, $applications, $path_to_root;
+                       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");
@@ -81,12 +91,11 @@
                        {
                                foreach ($installed_extensions as $ext)
                                {
-                                       get_text::add_domain($_SESSION['language']->code, 
+                                       $_SESSION['get_text']->add_domain($_SESSION['language']->code, 
                                                $ext['folder']."/lang");
-                                       include_once($ext['folder']."/".$ext['app_file']);
                                        $class = $ext['name']."_app";
                                        $this->add_application(new $class());
-                                       get_text::add_domain($_SESSION['language']->code, 
+                                       $_SESSION['get_text']->add_domain($_SESSION['language']->code, 
                                                $path_to_root."/lang");
                                }
                        }