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

Warning messages after module activation and for user with no permission

Browse Source
This commit is contained in:
Maxime Kohlhaas 2016-06-04 13:25:39 +02:00
parent 857454a28d
commit d777fca0b9
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/admin/modules.php
View File

@ -79,6 +79,11 @@ if ($action == 'set' && $user->admin)
{
$result=activateModule($value);
if ($result) setEventMessages($result, null, 'errors');
else
{
$msg = $langs->trans('ModuleEnabledAdminMustCheckRights');
setEventMessages($msg, null, 'warnings');
}
header("Location: modules.php?mode=".$mode.$param.($page_y?'&page_y='.$page_y:''));
exit;
}

2
htdocs/langs/en_US/admin.lang
View File

@ -1752,3 +1752,5 @@ AddSubstitutions=Add keys substitutions
DetectionNotPossible=Detection not possible
UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on database user table and will be checked on each future access)
ListOfAvailableAPIs=List of available APIs
ModuleEnabledAdminMustCheckRights=Module has been activated. All permissions were given to admin users only.
UserHasNoPermissions=This user has no permission defined

4
htdocs/user/card.php
View File

@ -1129,6 +1129,10 @@ else
$object->fetch($id);
if ($res < 0) { dol_print_error($db,$object->error); exit; }
$res=$object->fetch_optionals($object->id,$extralabels);
// Check if user has rights
$object->getrights();
if(empty($object->nb_rights)) setEventMessages($langs->trans('UserHasNoPermissions'), null, 'warnings');
// Connexion ldap
// pour recuperer passDoNotExpire et userChangePassNextLogon

6
htdocs/user/class/user.class.php
View File

@ -107,6 +107,7 @@ class User extends CommonObject
var $rights; // Array of permissions user->rights->permx
var $all_permissions_are_loaded; /**< \private all_permissions_are_loaded */
private $_tab_loaded=array(); // Array of cache of already loaded permissions
var $nb_rights; // Number of rights granted to the user
var $conf; // To store personal config
var $oldcopy; // To contains a clone of this when we need to save old properties of object
@ -138,6 +139,7 @@ class User extends CommonObject
// For cache usage
$this->all_permissions_are_loaded = 0;
$this->nb_rights = 0;
// Force some default values
$this->admin = 0;
@ -629,10 +631,12 @@ class User extends CommonObject
if ($subperms)
{
if (! isset($this->rights->$module->$perms) || ! is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
if(empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
$this->rights->$module->$perms->$subperms = 1;
}
else
{
if(empty($this->rights->$module->$perms)) $this->nb_rights++;
$this->rights->$module->$perms = 1;
}
@ -679,10 +683,12 @@ class User extends CommonObject
if ($subperms)
{
if (! isset($this->rights->$module->$perms) || ! is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
if(empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
$this->rights->$module->$perms->$subperms = 1;
}
else
{
if(empty($this->rights->$module->$perms)) $this->nb_rights++;
$this->rights->$module->$perms = 1;
}