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

Add TODO

Browse Source
This commit is contained in:
Laurent Destailleur 2013-02-11 21:23:25 +01:00
parent c7a6ee492d
commit 935f2d9bd8
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/filefunc.inc.php
View File

@ -106,6 +106,7 @@ if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey='';
if (empty($dolibarr_main_limit_users)) $dolibarr_main_limit_users=0; if (empty($dolibarr_main_limit_users)) $dolibarr_main_limit_users=0;
if (empty($dolibarr_mailing_limit_sendbyweb)) $dolibarr_mailing_limit_sendbyweb=0; if (empty($dolibarr_mailing_limit_sendbyweb)) $dolibarr_mailing_limit_sendbyweb=0;
if (empty($dolibarr_strict_mode)) $dolibarr_strict_mode=0; // For debug in php strict mode if (empty($dolibarr_strict_mode)) $dolibarr_strict_mode=0; // For debug in php strict mode
// TODO Multicompany Remove this. Useless.
if (empty($multicompany_transverse_mode)) $multicompany_transverse_mode=0; if (empty($multicompany_transverse_mode)) $multicompany_transverse_mode=0;
if (empty($multicompany_force_entity)) $multicompany_force_entity=0; // To force entity in login page if (empty($multicompany_force_entity)) $multicompany_force_entity=0; // To force entity in login page

2
htdocs/main.inc.php
View File

@ -584,6 +584,7 @@ if (! defined('NOLOGIN'))
} }
// Create entity cookie, just used for login page // Create entity cookie, just used for login page
// TODO Multicompany Move this into hook
if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_COOKIE_ENABLED) && isset($_POST["entity"])) if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_COOKIE_ENABLED) && isset($_POST["entity"]))
{ {
include_once DOL_DOCUMENT_ROOT.'/core/class/cookie.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/cookie.class.php';
@ -754,6 +755,7 @@ else
$heightforframes=52; $heightforframes=52;
// Switch to another entity // Switch to another entity
// TODO Multicompany Remove this
if (! empty($conf->multicompany->enabled) && GETPOST('action') == 'switchentity') if (! empty($conf->multicompany->enabled) && GETPOST('action') == 'switchentity')
{ {
if ($mc->switchEntity(GETPOST('entity','int')) > 0) if ($mc->switchEntity(GETPOST('entity','int')) > 0)

2
htdocs/master.inc.php
View File

@ -75,6 +75,7 @@ if (! empty($dolibarr_main_document_root_alt))
} }
// Set properties specific to multicompany // Set properties specific to multicompany
// TODO Multicompany Remove this. Useless. Var should be read when required.
$conf->multicompany->transverse_mode = empty($multicompany_transverse_mode)?'':$multicompany_transverse_mode; // Force Multi-Company transverse mode $conf->multicompany->transverse_mode = empty($multicompany_transverse_mode)?'':$multicompany_transverse_mode; // Force Multi-Company transverse mode
$conf->multicompany->force_entity = empty($multicompany_force_entity)?'':(int) $multicompany_force_entity; // Force entity in login page $conf->multicompany->force_entity = empty($multicompany_force_entity)?'':(int) $multicompany_force_entity; // Force entity in login page
@ -141,6 +142,7 @@ if (! defined('NOREQUIREDB'))
{ {
$conf->entity = DOLENTITY; $conf->entity = DOLENTITY;
} }
// TODO Multicompany Remove this.
else if (! empty($conf->multicompany->force_entity) && is_int($conf->multicompany->force_entity)) // To force entity in login page else if (! empty($conf->multicompany->force_entity) && is_int($conf->multicompany->force_entity)) // To force entity in login page
{ {
$conf->entity = $conf->multicompany->force_entity; $conf->entity = $conf->multicompany->force_entity;