| '; print $langs->trans('ProspectLevel'); print ' | '; - if ($action != 'editlevel' && $user->rights->societe->contact->creer) { + if ($action != 'editlevel' && $user->hasRight('societe', 'contact', 'creer')) { print ' | id.'">'.img_edit($langs->trans('Modify'), 1).' | '; } print '
';
$htmllink .= '';
- if (($cid || $socid) && isModEnabled('agenda') && $user->rights->agenda->myactions->create) {
+ if (($cid || $socid) && isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create')) {
$addlink = 'AC_SKYPE';
$link = '';
if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) {
@@ -3634,7 +3634,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
}
}
- //if (($cid || $socid) && isModEnabled('agenda') && $user->rights->agenda->myactions->create)
+ //if (($cid || $socid) && isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create'))
if (isModEnabled('agenda') && $user->hasRight("agenda", "myactions", "create")) {
$type = 'AC_TEL';
$link = '';
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index a2c45f725c3..17b6d17114a 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -608,13 +608,13 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
}
} elseif (!empty($feature2)) { // This is for permissions on 2 levels (module->object->write)
foreach ($feature2 as $subfeature) {
- if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->creer) {
+ if ($subfeature == 'user' && $user->id == $objectid && $user->hasRight('user', 'self', 'creer')) {
continue; // User can edit its own card
}
- if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->password) {
+ if ($subfeature == 'user' && $user->id == $objectid && $user->hasRight('user', 'self', 'password')) {
continue; // User can edit its own password
}
- if ($subfeature == 'user' && $user->id != $objectid && $user->rights->user->user->password) {
+ if ($subfeature == 'user' && $user->id != $objectid && $user->hasRight('user', 'user', 'password')) {
continue; // User can edit another user's password
}
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 8058deb387b..552881fd6cc 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -40,7 +40,7 @@ function user_prepare_head(User $object)
$canreadperms = true;
if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
- $canreadperms = ($user->admin || ($user->id != $object->id && $user->rights->user->user_advance->readperms) || ($user->id == $object->id && $user->rights->user->self_advance->readperms));
+ $canreadperms = ($user->admin || ($user->id != $object->id && $user->hasRight('user', 'user_advance', 'readperms')) || ($user->id == $object->id && $user->hasRight('user', 'self_advance', 'readperms')));
}
$h = 0;
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 25e0f914807..e4258d45aba 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -151,7 +151,7 @@ if ($permission) {
$nbofcontacts = $form->num;
$newcardbutton = '';
- if (!empty($object->socid) && $object->socid > 1 && $user->rights->societe->creer) {
+ if (!empty($object->socid) && $object->socid > 1 && $user->hasRight('societe', 'creer')) {
$newcardbutton .= '';
}
print $newcardbutton;
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 672d7575e3f..0b57af620e3 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -242,7 +242,7 @@ if (empty($reshook)) {
$action = '';
}
// merge products
- if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer) {
+ if ($action == 'confirm_merge' && $confirm == 'yes' && $user->hasRight('societe', 'creer')) {
$error = 0;
$productOriginId = GETPOST('product_origin', 'int');
$productOrigin = new Product($db);
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 9dc6090c3d7..ceb3fb11c5f 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -630,7 +630,7 @@ $listofreferent = array(
'lang'=>'agenda',
'buttonnew'=>'AddEvent',
'testnew'=>$user->rights->agenda->myactions->create,
- 'test'=> isModEnabled('agenda') && $user->rights->agenda->myactions->read),
+ 'test'=> isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'read')),
*/
);
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 80558b67e49..af6983e26c6 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -201,7 +201,7 @@ if (empty($reshook)) {
}
// Create user from a member
- if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer) {
+ if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->hasRight('user', 'user', 'creer')) {
$jobposition = new RecruitmentJobPosition($db);
$jobposition->fetch($object->fk_recruitmentjobposition);
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 75e53fc72c2..db9201852d5 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -188,7 +188,7 @@ if (empty($reshook)) {
$action = '';
}
- if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer) {
+ if ($action == 'confirm_merge' && $confirm == 'yes' && $user->hasRight('societe', 'creer')) {
$error = 0;
$soc_origin_id = GETPOST('soc_origin', 'int');
$soc_origin = new Societe($db);
@@ -413,7 +413,7 @@ if (empty($reshook)) {
// Add new or update third party
if ((!GETPOST('getcustomercode') && !GETPOST('getsuppliercode'))
- && ($action == 'add' || $action == 'update') && $user->rights->societe->creer) {
+ && ($action == 'add' || $action == 'update') && $user->hasRight('societe', 'creer')) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
if (!GETPOST('name')) {
@@ -933,31 +933,31 @@ if (empty($reshook)) {
}
// Set third-party type
- if ($action == 'set_thirdpartytype' && $user->rights->societe->creer) {
+ if ($action == 'set_thirdpartytype' && $user->hasRight('societe', 'creer')) {
$object->fetch($socid);
$result = $object->setThirdpartyType(GETPOST('typent_id', 'int'));
}
// Set incoterm
- if ($action == 'set_incoterms' && $user->rights->societe->creer && isModEnabled('incoterm')) {
+ if ($action == 'set_incoterms' && $user->hasRight('societe', 'creer') && isModEnabled('incoterm')) {
$object->fetch($socid);
$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
}
// Set parent company
- if ($action == 'set_thirdparty' && $user->rights->societe->creer) {
+ if ($action == 'set_thirdparty' && $user->hasRight('societe', 'creer')) {
$object->fetch($socid);
$result = $object->setParent(GETPOST('parent_id', 'int'));
}
// Set sales representatives
- if ($action == 'set_salesrepresentatives' && $user->rights->societe->creer) {
+ if ($action == 'set_salesrepresentatives' && $user->hasRight('societe', 'creer')) {
$object->fetch($socid);
$result = $object->setSalesRep(GETPOST('commercial', 'array'));
}
// warehouse
- if ($action == 'setwarehouse' && $user->rights->societe->creer) {
+ if ($action == 'setwarehouse' && $user->hasRight('societe', 'creer')) {
$result = $object->setWarehouse(GETPOST('fk_warehouse', 'int'));
}
@@ -3192,7 +3192,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print $dolibarr_user->getLoginUrl(-1);
} else {
//print ''.$langs->trans("NoDolibarrAccess").'';
- if (!$object->user_id && $user->rights->user->user->creer) {
+ if (!$object->user_id && $user->hasRight('user', 'user', 'creer')) {
print ''.img_picto($langs->trans("CreateDolibarrLogin"), 'add').' '.$langs->trans("CreateDolibarrLogin").'';
}
}
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index c25713959d2..9a4b95afade 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -147,7 +147,7 @@ if (!empty($conf->global->SOCIETE_USEPREFIX)) { // Old not used prefix field
print '