Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge pull request #24666 from lamrani002/sortPermission

Browse Source 
optimize and clean function reWriteAllPermissions()
This commit is contained in:
Laurent Destailleur
2023-05-03 11:39:49 +02:00
committed by GitHub
parent 458431facb 90221407ce
commit 07b9f0286e
2 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
htdocs/core/lib/modulebuilder.lib.php
View File

@@ -482,6 +482,16 @@ function deletePerms($file)
dolReplaceInFile($file, array($allContent => '')); dolReplaceInFile($file, array($allContent => ''));
} }
/**
* Compare two value
* @param int|string $a value 1
* @param int|string $b value 2
* @return int less 0 if str1 is less than str2; > 0 if str1 is greater than str2, and 0 if they are equal.
*/
function compareFirstValue($a, $b)
{
return strcmp($a[0], $b[0]);
}
/** /**
* Rewriting all permissions after any actions * Rewriting all permissions after any actions
* @param string $file filename or path * @param string $file filename or path
@@ -515,11 +525,46 @@ function reWriteAllPermissions($file, $permissions, $key, $right, $action)
$permissions[$i][4] = "\$this->rights[\$r][4] = '".$permissions[$i][4]."'"; $permissions[$i][4] = "\$this->rights[\$r][4] = '".$permissions[$i][4]."'";
$permissions[$i][5] = "\$this->rights[\$r][5] = '".$permissions[$i][5]."';\n\t\t"; $permissions[$i][5] = "\$this->rights[\$r][5] = '".$permissions[$i][5]."';\n\t\t";
} }
// for group permissions by object
$perms_grouped = array();
foreach ($permissions as $perms) {
$object = $perms[4];
if (!isset($perms_grouped[$object])) {
$perms_grouped[$object] = [];
}
$perms_grouped[$object][] = $perms;
}
//$perms_grouped = array_values($perms_grouped);
$permissions = $perms_grouped;
// parcourir les objets
$o=0;
foreach ($permissions as &$object) {
// récupérer la permission de l'objet
$p = 1;
foreach ($object as &$obj) {
if (str_contains($obj[5], 'read')) {
$obj[0] = "\$this->rights[\$r][0] = \$this->numero . sprintf('%02d', (".$o." * 10) + 0 + 1)";
} elseif (str_contains($obj[5], 'write')) {
$obj[0] = "\$this->rights[\$r][0] = \$this->numero . sprintf('%02d', (".$o." * 10) + 1 + 1)";
} elseif (str_contains($obj[5], 'delete')) {
$obj[0] = "\$this->rights[\$r][0] = \$this->numero . sprintf('%02d', (".$o." * 10) + 2 + 1)";
} else {
$obj[0] = "\$this->rights[\$r][0] = \$this->numero . sprintf('%02d', (".$o." * 10) + ".$p." + 1)";
$p++;
}
}
usort($object, 'compareFirstValue');
$o++;
}
//convert to string //convert to string
foreach ($permissions as $perms) { foreach ($permissions as $perms) {
$rights[] = implode(";\n\t\t", $perms); foreach ($perms as $per) {
$rights[] = "\$r++;\n\t\t"; $rights[] = implode(";\n\t\t", $per);
$rights[] = "\$r++;\n\t\t";
}
} }
$rights_str = implode("", $rights); $rights_str = implode("", $rights);
// delete all permission from file // delete all permission from file
@@ -527,6 +572,8 @@ function reWriteAllPermissions($file, $permissions, $key, $right, $action)
// rewrite all permission again // rewrite all permission again
dolReplaceInFile($file, array('/* BEGIN MODULEBUILDER PERMISSIONS */' => '/* BEGIN MODULEBUILDER PERMISSIONS */'."\n\t\t".$rights_str)); dolReplaceInFile($file, array('/* BEGIN MODULEBUILDER PERMISSIONS */' => '/* BEGIN MODULEBUILDER PERMISSIONS */'."\n\t\t".$rights_str));
return 1; return 1;
} else {
return -1;
} }
} }

2
htdocs/modulebuilder/index.php
View File

@@ -4792,7 +4792,7 @@ if ($module == 'initmodule') {
//form for add new right //form for add new right
print '<tr class="small">'; print '<tr class="small">';
print '<td><input type="text" readonly name="id" class="width75" value="'.dol_escape_htmltag($moduleobj->numero.sprintf('%02d', $i + count($perms))).'"></td>'; print '<td><input type="text" readonly name="id" class="width75" value="0"></td>';
print '<td>'; print '<td>';
print '<select name="label" >'; print '<select name="label" >';
print '<option value=""></option>'; print '<option value=""></option>';