lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: regression

Browse Source
This commit is contained in:
Regis Houssin 2010-03-30 21:38:07 +00:00
parent 226901a7b9
commit d7205fe627
3 changed files with 9 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/comm/index.php
View File

@ -26,24 +26,12 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
if (! empty($dolibarr_allow_overwritekernel)) require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
{ require_once(DOL_DOCUMENT_ROOT."/client.class.php");
require_once("html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
require_once("client.class.php"); require_once(DOL_DOCUMENT_ROOT."/agenda.lib.php");
require_once("actioncomm.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
require_once("agenda.lib.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
if ($conf->contrat->enabled) require_once("contrat/contrat.class.php");
if ($conf->propal->enabled) require_once("comm/propal/propal.class.php");
}
else
{
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/client.class.php");
require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/agenda.lib.php");
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
}
if (!$user->rights->societe->lire) if (!$user->rights->societe->lire)
accessforbidden(); accessforbidden();

21
htdocs/core/conf.class.php
View File

@ -57,7 +57,6 @@ class Conf
var $tabs_modules = array(); var $tabs_modules = array();
var $need_smarty = array(); var $need_smarty = array();
var $modules = array(); var $modules = array();
var $include_path = array();
var $logbuffer = array(); var $logbuffer = array();
@ -82,13 +81,6 @@ class Conf
{ {
dol_syslog("Conf::setValues"); dol_syslog("Conf::setValues");
// Add root path
$this->include_path[] = DOL_DOCUMENT_ROOT."/";
// Add core path
$this->include_path[] = DOL_DOCUMENT_ROOT."/core/";
// Add library path
$this->include_path[] = DOL_DOCUMENT_ROOT."/lib/";
// Avoid warning if not defined // Avoid warning if not defined
if (empty($this->db->dolibarr_main_db_encryption)) $this->db->dolibarr_main_db_encryption=0; if (empty($this->db->dolibarr_main_db_encryption)) $this->db->dolibarr_main_db_encryption=0;
if (empty($this->db->dolibarr_main_db_cryptkey)) $this->db->dolibarr_main_db_cryptkey=''; if (empty($this->db->dolibarr_main_db_cryptkey)) $this->db->dolibarr_main_db_cryptkey='';
@ -167,16 +159,6 @@ class Conf
$this->$module->enabled=true; $this->$module->enabled=true;
// Add this module in list of enabled modules // Add this module in list of enabled modules
$this->modules[]=$module; $this->modules[]=$module;
// Add class path
if (file_exists(DOL_DOCUMENT_ROOT.'/'.$module.'/class/'))
{
$this->include_path[] = DOL_DOCUMENT_ROOT.'/'.$module.'/class/';
}
// Add library path
if (file_exists(DOL_DOCUMENT_ROOT.'/'.$module.'/lib/'))
{
$this->include_path[] = DOL_DOCUMENT_ROOT.'/'.$module.'/lib/';
}
} }
} }
$i++; $i++;
@ -184,9 +166,6 @@ class Conf
} }
$db->free($result); $db->free($result);
// Set include_path
set_include_path(implode(PATH_SEPARATOR, $this->include_path));
// Clean some variables // Clean some variables
// conf->menu_top et conf->menu_left are defined in main.inc.php (according to user choice) // conf->menu_top et conf->menu_left are defined in main.inc.php (according to user choice)
if (! $this->global->MAIN_MENU_BARRETOP) $this->global->MAIN_MENU_BARRETOP="eldy_backoffice.php"; if (! $this->global->MAIN_MENU_BARRETOP) $this->global->MAIN_MENU_BARRETOP="eldy_backoffice.php";

6
htdocs/multicompany/admin/multicompany.php
View File

@ -24,9 +24,9 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once("multicompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/multicompany/class/multicompany.class.php");
require_once("admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once("company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
$langs->load("admin"); $langs->load("admin");