projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update from beta to RC1
[fa-stable.git]
/
frontaccounting.php
diff --git
a/frontaccounting.php
b/frontaccounting.php
index 033c99283758f9f537cb096323221779ad7b69f2..3324d6bb4bdcd14b978305979626d659b296863c 100644
(file)
--- a/
frontaccounting.php
+++ b/
frontaccounting.php
@@
-20,15
+20,14
@@
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');
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
{
class front_accounting
{
@@
-39,6
+38,7
@@
if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
// GUI
var $menu;
//var $renderer;
// GUI
var $menu;
//var $renderer;
+
function front_accounting()
{
//$this->renderer =& new renderer();
function front_accounting()
{
//$this->renderer =& new renderer();
@@
-65,7
+65,9
@@
if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
function display()
{
global $path_to_root;
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();
$this->init();
$rend = new renderer();
$rend->wa_header();
@@
-73,10
+75,12
@@
if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
$rend->display_applications($this);
//$rend->menu_footer($this->menu);
$rend->wa_footer();
$rend->display_applications($this);
//$rend->menu_footer($this->menu);
$rend->wa_footer();
+ $this->renderer =& $rend;
}
function init()
{
global $installed_extensions, $path_to_root;
}
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");
$this->menu = new menu(_("Main Menu"));
$this->menu->add_item(_("Main Menu"), "index.php");
$this->menu->add_item(_("Logout"), "/account/access/logout.php");
@@
-87,20
+91,26
@@
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());
$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)
- {
- $_SESSION['get_text']->add_domain($_SESSION['language']->code,
- $ext['folder']."/lang");
- $class = $ext['name']."_app";
- $this->add_application(new $class());
+ if (@($ext['active'] && isset($ext['tabs']))) { // supressed warnings before 2.2 upgrade
$_SESSION['get_text']->add_domain($_SESSION['language']->code,
$_SESSION['get_text']->add_domain($_SESSION['language']->code,
- $path_to_root."/lang");
+ $ext['path']."/lang");
+ 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());
}
}
+ $_SESSION['get_text']->add_domain($_SESSION['language']->code,
+ $path_to_root."/lang", $_SESSION['language']->version);
+ $this->add_application(new setup_app());
+ }
}
?>
\ No newline at end of file
}
?>
\ No newline at end of file