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

Removed a TODO

Browse Source
This commit is contained in:
Laurent Destailleur 2011-09-24 01:56:05 +00:00
parent c055bab721
commit ba7f117cdf
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/admin/perms.php
View File

@ -143,7 +143,7 @@ $sql = "SELECT r.id, r.libelle, r.module, r.perms, r.subperms, r.bydefault";
$sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r"; $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r";
$sql.= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous" $sql.= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
$sql.= " AND entity in (".(!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)?"1,":"").$conf->entity.")"; $sql.= " AND entity in (".(!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)?"1,":"").$conf->entity.")";
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql.= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is disable if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql.= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
$sql.= " ORDER BY r.module, r.id"; $sql.= " ORDER BY r.module, r.id";
$result = $db->query($sql); $result = $db->query($sql);
@ -164,12 +164,23 @@ if ($result)
continue; continue;
} }
// Check if permission is inside module definition // Check if permission we found is inside a module definition. If not, we discard it.
// TODO If not, we remove it $found=false;
/*foreach($objMod->rights as $key => $val) foreach($objMod->rights as $key => $val)
{ {
}*/ $rights_class=$objMod->rights_class;
if ($val[4] == $obj->perms && (empty($val[5]) || $val[5] == $obj->subperms))
{
$found=true;
break;
}
}
if (! $found)
{
$i++;
continue;
}
// Break found, it's a new module to catch // Break found, it's a new module to catch
if ($old <> $obj->module) if ($old <> $obj->module)
{ {