Merge pull request #8443 from atm-florian/6.0

fix user right on modRessource,  fix security check on fourn card
This commit is contained in:
Laurent Destailleur 2018-03-24 16:37:11 +01:00 committed by GitHub
commit 1c581c6fff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View File

@ -231,7 +231,7 @@ class modResource extends DolibarrModules
'langs'=> 'resource', 'langs'=> 'resource',
'position'=> 101, 'position'=> 101,
'enabled'=> '1', 'enabled'=> '1',
'perms'=> '$user->rights->resource->read', 'perms'=> '$user->rights->resource->write',
'target'=> '', 'target'=> '',
'user'=> 0 'user'=> 0
); );

View File

@ -50,7 +50,7 @@ $cancelbutton = GETPOST('cancel');
// Security check // Security check
$id = (GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int')); $id = (GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
if ($user->societe_id) $id=$user->societe_id; if ($user->societe_id) $id=$user->societe_id;
$result = restrictedArea($user, 'societe&fournisseur', $id, '&societe'); $result = restrictedArea($user, 'societe&fournisseur', $id, '&societe', '', 'rowid');
$object = new Fournisseur($db); $object = new Fournisseur($db);
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);