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

fix errors and conflicts

Browse Source
This commit is contained in:
Lamrani Abdel 2023-02-07 15:26:23 +01:00
commit 352ac40d06
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/modulebuilder/index.php
View File

@ -1994,8 +1994,9 @@ if ($dirins && $action == 'addright' && !empty($module) && empty($cancel)) {
$existRight = 0; $existRight = 0;
$allObject = array(); $allObject = array();
$nbOfPermissions = count($permissions); $countPerms = count($permissions);
for ($i =0; $i<$nbOfPermissions; $i++) {
for ($i =0; $i<$countPerms; $i++) {
if ($permissions[$i][4] == $objectForPerms) { if ($permissions[$i][4] == $objectForPerms) {
$counter++; $counter++;
if (count($permsForObject) < 3) { if (count($permsForObject) < 3) {
@ -2004,9 +2005,10 @@ if ($dirins && $action == 'addright' && !empty($module) && empty($cancel)) {
} }
$allObject[] = $permissions[$i][4]; $allObject[] = $permissions[$i][4];
} }
$nbOfpermsInObj = count($permsForObject);
// check if label of object already exists // check if label of object already exists
for ($j = 0; $j<$nbOfpermsInObj; $j++) { $countPermsObj = count($permsForObject);
for ($j = 0; $j<$countPermsObj; $j++) {
if (in_array($label, $permsForObject[$j])) { if (in_array($label, $permsForObject[$j])) {
$existRight++; $existRight++;
setEventMessages($langs->trans("ErrorExistingPermission", $langs->transnoentities($label), $langs->transnoentities($objectForPerms)), null, 'errors'); setEventMessages($langs->trans("ErrorExistingPermission", $langs->transnoentities($label), $langs->transnoentities($objectForPerms)), null, 'errors');
@ -2037,6 +2039,7 @@ if ($dirins && $action == 'addright' && !empty($module) && empty($cancel)) {
"; ";
$moduledescriptorfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php'; $moduledescriptorfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
if (!$existRight) { if (!$existRight) {
//var_dump(1);exit;
dolReplaceInFile($moduledescriptorfile, array('/*END '.strtoupper($objectForPerms).'*/' => $rightToAdd.'/*END '.strtoupper($objectForPerms).'*/')); dolReplaceInFile($moduledescriptorfile, array('/*END '.strtoupper($objectForPerms).'*/' => $rightToAdd.'/*END '.strtoupper($objectForPerms).'*/'));
setEventMessages($langs->trans('PermissionAddedSuccesfuly'), null); setEventMessages($langs->trans('PermissionAddedSuccesfuly'), null);
} }
@ -2100,12 +2103,17 @@ if ($dirins && GETPOST('action') == 'update_right' && GETPOST('modifyright')&& e
$x2 = $permissions[$r-1][4]; $x2 = $permissions[$r-1][4];
$x3 = $permissions[$r-1][5]; $x3 = $permissions[$r-1][5];
//check existing object permission //check existing object permission
$counter = 0;
$permsForObject =array(); $permsForObject =array();
$permissions = $moduleobj->rights;
$firstRight = 0;
$existRight = 0;
$allObject = array(); $allObject = array();
$nbOfPermissions = count($permissions);
for ($i =0; $i<$nbOfPermissions; $i++) { $countPerms = count($permissions);
for ($i =0; $i<$countPerms; $i++) {
if ($permissions[$i][4] == $objectForPerms) { if ($permissions[$i][4] == $objectForPerms) {
$counter++;
if (count($permsForObject) < 3) { if (count($permsForObject) < 3) {
$permsForObject[] = $permissions[$i]; $permsForObject[] = $permissions[$i];
} }
@ -2114,8 +2122,8 @@ if ($dirins && GETPOST('action') == 'update_right' && GETPOST('modifyright')&& e
} }
if ($label != $x1 && $crud != $x3) { if ($label != $x1 && $crud != $x3) {
$x = count($permsForObject); $countPermsObj = count($permsForObject);
for ($j = 0; $j<$x; $j++) { for ($j = 0; $j<$countPermsObj; $j++) {
if (in_array($label, $permsForObject[$j])) { if (in_array($label, $permsForObject[$j])) {
$error++; $error++;
setEventMessages($langs->trans("ErrorExistingPermission", $langs->transnoentities($label), $langs->transnoentities($objectForPerms)), null, 'errors'); setEventMessages($langs->trans("ErrorExistingPermission", $langs->transnoentities($label), $langs->transnoentities($objectForPerms)), null, 'errors');