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

Better comments

Browse Source
This commit is contained in:
Laurent Destailleur 2015-03-23 03:50:55 +01:00
parent f4b1d95b3e
commit 042556a9cf
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/conf/conf.php.example
View File

@ -314,7 +314,7 @@ $dolibarr_main_db_prefix='';
// multicompany_transverse_mode // multicompany_transverse_mode
// Prerequisite: Need external module "multicompany" // Prerequisite: Need external module "multicompany"
// Pyramidal (0): The rights and groups are managed in each entity. Each user belongs to the entity he was created into. // Pyramidal (0): The rights and groups are managed in each entity. Each user belongs to the entity he was created into.
// Transversal (1): The user is managed only into master entity and belongs to all entities or only one dedicated entity. // Transversal (1): The user is created and managed only into master entity but can login to all entities.
// Default value: 0 (pyramidal) // Default value: 0 (pyramidal)
// Examples: // Examples:
// $multicompany_transverse_mode='1'; // $multicompany_transverse_mode='1';

6
htdocs/core/login/functions_ldap.php
View File

@ -173,7 +173,11 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
global $mc; global $mc;
$ret=$mc->checkRight($user->id, $entitytotest); $ret=$mc->checkRight($user->id, $entitytotest);
if ($ret < 0) $login=false; // provoque l'echec de l'identification if ($ret < 0)
{
dol_syslog("Failed to checkRight by module multicompany for user id = ".$user->id." into entity ".$entitytotest);
$login=false; // force error of authentication
}
} }

2
htdocs/user/card.php
View File

@ -213,7 +213,7 @@ if ($action == 'add' && $canadduser)
$ret = $extrafields->setOptionalsFromPost($extralabels,$object); $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
if ($ret < 0) $error++; if ($ret < 0) $error++;
// If multicompany is off, admin users must all be on entity 0. // Set entity property
$entity=GETPOST('entity','int'); $entity=GETPOST('entity','int');
if (! empty($conf->multicompany->enabled)) if (! empty($conf->multicompany->enabled))
{ {