X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=frontaccounting.php;h=267780b191b40593fbf4880aea4d5c480ccf5415;hb=498f13d19b716779a3b986ff399121fb2ac9a53a;hp=ccbc5755c9499db332ea8c4e989eb51b29832e39;hpb=324fd5303def6848f9f276596d417786b08377c3;p=fa-stable.git

diff --git a/frontaccounting.php b/frontaccounting.php
index ccbc5755..267780b1 100644
--- a/frontaccounting.php
+++ b/frontaccounting.php
@@ -1,25 +1,33 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    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)
+		{
+			if ($ext['type'] == 'module')
+				@include_once($path_to_root."/".$ext['path']."/".$ext['filename']);
+		}
+	}	
 
 	class front_accounting
 		{
@@ -34,9 +42,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 +75,7 @@
 		}
 		function init()
 		{
-			global $installed_extensions, $applications;
+			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,13 +90,15 @@
 			{
 				foreach ($installed_extensions as $ext)
 				{
-					$s = $applications['system'];
-					array_pop($applications);
-					$applications[$ext['name']] = $ext['title'];;
-					$applications['system'] = $s;
-					include_once("applications/".$ext['app_file']);
-					$class = $ext['name']."_app";
-					$this->add_application(new $class());
+					if (@($ext['active'] && $ext['type'] == 'module')) { // supressed warnings before 2.2 upgrade
+						$_SESSION['get_text']->add_domain($_SESSION['language']->code, 
+							$ext['path']."/lang");
+						$class = $ext['tab']."_app";
+						if (class_exists($class))
+							$this->add_application(new $class());
+						$_SESSION['get_text']->add_domain($_SESSION['language']->code, 
+							$path_to_root."/lang");
+					}
 				}
 			}