From 0f4feec3ff26fe422363c2df4e0d211d13dda828 Mon Sep 17 00:00:00 2001 From: Lamrani Abdel Date: Mon, 5 Jun 2023 16:15:52 +0200 Subject: [PATCH 01/15] fix some problems --- htdocs/core/lib/modulebuilder.lib.php | 54 +++++-------------- htdocs/langs/en_US/errors.lang | 1 + htdocs/langs/fr_FR/errors.lang | 1 + htdocs/modulebuilder/index.php | 11 +++- .../core/modules/modMyModule.class.php | 4 +- .../template/doc/Documentation.asciidoc | 2 +- .../modulebuilder/template/myobject_list.php | 26 ++++----- 7 files changed, 42 insertions(+), 57 deletions(-) diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php index 453b34529b4..2f416e2e296 100644 --- a/htdocs/core/lib/modulebuilder.lib.php +++ b/htdocs/core/lib/modulebuilder.lib.php @@ -657,44 +657,28 @@ function writePropsInAsciiDoc($file, $objectname, $destfile) $table .= "|".$attUnique; } $table .="\n"; - $countKeys = count($keys); - for ($j=0;$j<$countKeys;$j++) { - $string = $keys[$j]; + foreach ($keys as $string) { $string = trim($string, "'"); $string = rtrim($string, ","); - - $array = []; - eval("\$array = [$string];"); + $array = eval("return [$string];"); // check if is array after cleaning string if (!is_array($array)) { return -1; } - // name of field - $field = array_keys($array); - // all values of each property - $values = array_values($array); + $field = array_keys($array); + $values = array_values($array)[0]; // check each field has all properties and add it if missed - if (count($values[0]) <=22) { - foreach ($attributesUnique as $cle) { - if (!in_array($cle, array_keys($values[0]))) { - $values[0][$cle] = ''; - } + foreach ($attributesUnique as $attUnique) { + if (!array_key_exists($attUnique, $values)) { + $values[$attUnique] = ''; } } - //reorganize $values with order attributeUnique - $valuesRestructured = array(); - foreach ($attributesUnique as $key) { - if (array_key_exists($key, $values[0])) { - $valuesRestructured[$key] = $values[0][$key]; - } - } - // write all values of properties for each field - $table .= "|*".$field[0]."*|"; - $table .= implode("|", array_values($valuesRestructured))."\n"; + $table .= "|*" . $field[0] . "*|"; + $table .= implode("|", $values) . "\n"; } // end table $table .= "|==="; @@ -780,8 +764,7 @@ function writePermsInAsciiDoc($file, $destfile) $string .= "\n"; //content table $array = explode(";", $content); - $indexIgnored = 15; - $permissions = array_slice($array, $indexIgnored, null, true); + $permissions = array_filter($array); // delete occurrences "$r++" and ID $permissions = str_replace('$r++', 1, $permissions); @@ -806,21 +789,12 @@ function writePermsInAsciiDoc($file, $destfile) array_pop($permsN); // Group permissions by Object and add it to string - $temp_array = []; $final_array = []; - $countRights = count($permsN); - for ($i = 0; $i < $countRights ; $i++) { - // Add current element to temporary array - $temp_array[] = $permsN[$i]; - // add them to the final array and empty the temporary array - if (count($temp_array) == 2) { - $final_array[] = $temp_array; - $temp_array = []; - } - } - // add it to the final array - if (count($temp_array) > 0) { + $index = 0; + while ($index < count($permsN)) { + $temp_array = [$permsN[$index], $permsN[$index + 1]]; $final_array[] = $temp_array; + $index += 2; } $result = array(); diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 1ca41cadfb7..1fe46109c61 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -316,6 +316,7 @@ ErrorFixThisHere=Fix this here ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Error: The URL of you current instance (%s) does not match the URL defined into your OAuth2 login setup (%s). Doing OAuth2 login in such a configuration is not allowed. ErrorMenuExistValue=A Menu already exist with this Title or URL ErrorSVGFilesNotAllowedAsLinksWithout=SVG files are not allowed as external links without option %s +ErrorTypeMenu=Impossible to add another menu for the same module on the navbar, not handle yet # Warnings WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup. diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index 14bf3e959f5..cee77697d33 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -312,6 +312,7 @@ ErrorEqualModule=Module invalide dans %s. ErrorFieldValue=La valeur pour %s est incorrecte ErrorCoherenceMenu=Le champ %s est requis lorsque %s vaut 'left' ErrorMenuExistValue=Un menu existe déjà avec ce titre ou cette URL +ErrorTypeMenu=Impossible de rajouter un autre menu sur la navbar pour le même module ,pas encore traité # Warnings diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php index 99d2bf28bbd..d6527adc0a8 100644 --- a/htdocs/modulebuilder/index.php +++ b/htdocs/modulebuilder/index.php @@ -1473,7 +1473,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname) { 'mon module'=>$module, 'Mon module'=>$module, 'htdocs/modulebuilder/template/'=>strtolower($modulename), - //'myobject'=>strtolower($objectname), + 'myobject'=>strtolower($objectname), 'MyObject'=>$objectname, //'MYOBJECT'=>strtoupper($objectname), '---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '') @@ -2499,6 +2499,10 @@ if ($dirins && $action == 'addmenu' && empty($cancel)) { setEventMessages($langs->trans("ErrorCoherenceMenu", $langs->transnoentities("leftmenu"), $langs->transnoentities("type")), null, 'errors'); } } + if (GETPOST('type', 'alpha') == 'top') { + $error++; + setEventMessages($langs->trans("ErrorTypeMenu", $langs->transnoentities("type")), null, 'errors'); + } $moduledescriptorfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php'; if (!$error) { @@ -2599,6 +2603,11 @@ if ($dirins && $action == "modify_menu" && GETPOST('menukey', 'int')) { } else { $menuModify['enabled'] = "0"; } + + if (GETPOST('type', 'alpha') == 'top') { + $error++; + setEventMessages($langs->trans("ErrorTypeMenu", $langs->transnoentities("type")), null, 'errors'); + } if (!$error) { //update menu $result = reWriteAllMenus($moduledescriptorfile, $menus, $menuModify, $key, 2); diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php index bcf72d401ae..71983dbcdb2 100644 --- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php +++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php @@ -268,7 +268,7 @@ class modMyModule extends DolibarrModules $r = 0; // Add here entries to declare new permissions /* BEGIN MODULEBUILDER PERMISSIONS */ - $this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used) + /*$this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used) $this->rights[$r][1] = 'Read objects of MyModule'; // Permission label $this->rights[$r][4] = 'myobject'; $this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->mymodule->myobject->read) @@ -282,7 +282,7 @@ class modMyModule extends DolibarrModules $this->rights[$r][1] = 'Delete objects of MyModule'; // Permission label $this->rights[$r][4] = 'myobject'; $this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->mymodule->myobject->delete) - $r++; + $r++;*/ /* END MODULEBUILDER PERMISSIONS */ // Main menu entries to add diff --git a/htdocs/modulebuilder/template/doc/Documentation.asciidoc b/htdocs/modulebuilder/template/doc/Documentation.asciidoc index a6dc59eea14..e649ad16fe2 100644 --- a/htdocs/modulebuilder/template/doc/Documentation.asciidoc +++ b/htdocs/modulebuilder/template/doc/Documentation.asciidoc @@ -37,7 +37,7 @@ This document was generated using Dolibarr ERP CRM process :toc: manual :toc-placement: preamble -<<< + == INTRODUCTION diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index 56872c26289..a443753a8a7 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -149,19 +149,19 @@ foreach ($object->fields as $key => $val) { } // List of fields to search into when doing a "search in all" -$fieldstosearchall = array(); -foreach ($object->fields as $key => $val) { - if (!empty($val['searchall'])) { - $fieldstosearchall['t.'.$key] = $val['label']; - } -} -$parameters = array('fieldstosearchall'=>$fieldstosearchall); -$reshook = $hookmanager->executeHooks('completeFieldsToSearchAll', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks -if ($reshook > 0) { - $fieldstosearchall = empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall']; -} elseif ($reshook == 0) { - $fieldstosearchall = array_merge($fieldstosearchall, empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall']); -} +// $fieldstosearchall = array(); +// foreach ($object->fields as $key => $val) { +// if (!empty($val['searchall'])) { +// $fieldstosearchall['t.'.$key] = $val['label']; +// } +// } +// $parameters = array('fieldstosearchall'=>$fieldstosearchall); +// $reshook = $hookmanager->executeHooks('completeFieldsToSearchAll', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks +// if ($reshook > 0) { +// $fieldstosearchall = empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall']; +// } elseif ($reshook == 0) { +// $fieldstosearchall = array_merge($fieldstosearchall, empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall']); +// } // Definition of array of fields for columns $arrayfields = array(); From acc6cc24de7a54613b038403e22662280eb1e7a5 Mon Sep 17 00:00:00 2001 From: FLIO Date: Mon, 5 Jun 2023 18:02:15 +0200 Subject: [PATCH 02/15] fixing the total ttc in the multicurrency section --- htdocs/compta/facture/card.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 77ecc4e4a05..16021261e0f 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -4795,7 +4795,6 @@ if ($action == 'create') { if (!empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE_SCREEN) && $object->type == $object::TYPE_CREDIT_NOTE) { $sign = -1; // We invert sign for output } - print ''; // Amount HT print '' . $langs->trans('AmountHT') . ''; @@ -4843,7 +4842,7 @@ if ($action == 'create') { print '' . price($sign * $object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . ''; if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) { // Multicurrency Amount TTC - print '' . price($sign * $object->total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . ''; + print '' . price($sign * $object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . ''; } print ''; From f11d3ded2c1ddbae43a7b787ee90363229c078cc Mon Sep 17 00:00:00 2001 From: Guillaume Wauquier Date: Mon, 5 Jun 2023 19:54:48 +0200 Subject: [PATCH 03/15] Rectif bug dans l'api documents chemin incorrect pour les commandes fournisseurs --- htdocs/api/class/api_documents.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php index ee0ae57e0e2..059802e9e88 100644 --- a/htdocs/api/class/api_documents.class.php +++ b/htdocs/api/class/api_documents.class.php @@ -403,7 +403,7 @@ class Documents extends DolibarrApi throw new RestException(404, 'Purchase order not found'); } - $upload_dir = $conf->fournisseur->dir_output."/facture/".get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').dol_sanitizeFileName($object->ref); + $upload_dir = $conf->fournisseur->dir_output."/commande/".dol_sanitizeFileName($object->ref); } elseif ($modulepart == 'shipment' || $modulepart == 'expedition') { require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; From fd4c24e000dfefb7291e459ac2bb6fff1ed098a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= Date: Mon, 5 Jun 2023 23:49:13 +0200 Subject: [PATCH 04/15] use user hasRight --- htdocs/accountancy/bookkeeping/list.php | 2 +- htdocs/accountancy/bookkeeping/listbyaccount.php | 2 +- htdocs/accountancy/customer/list.php | 2 +- htdocs/accountancy/expensereport/card.php | 2 +- htdocs/accountancy/expensereport/lines.php | 2 +- htdocs/accountancy/expensereport/list.php | 2 +- htdocs/accountancy/supplier/card.php | 2 +- htdocs/accountancy/supplier/index.php | 2 +- htdocs/accountancy/supplier/lines.php | 2 +- htdocs/accountancy/supplier/list.php | 2 +- htdocs/adherents/ldap.php | 2 +- htdocs/adherents/subscription.php | 2 +- htdocs/asset/model/accountancy_codes.php | 4 ++-- htdocs/asset/model/agenda.php | 4 ++-- htdocs/asset/model/card.php | 6 +++--- htdocs/asset/model/depreciation_options.php | 4 ++-- htdocs/asset/model/list.php | 6 +++--- htdocs/asset/model/note.php | 4 ++-- htdocs/categories/viewcat.php | 16 ++++++++-------- htdocs/comm/action/card.php | 14 +++++++------- .../comm/action/class/api_agendaevents.class.php | 2 +- htdocs/comm/action/document.php | 2 +- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/info.php | 2 +- htdocs/comm/action/list.php | 2 +- htdocs/comm/multiprix.php | 2 +- .../actions_contactcard_default.class.php | 2 +- .../canvas/default/tpl/contactcard_view.tpl.php | 2 +- htdocs/contact/card.php | 12 ++++++------ htdocs/contact/list.php | 2 +- htdocs/contact/perso.php | 2 +- htdocs/core/boxes/box_contacts.php | 2 +- htdocs/core/lib/functions.lib.php | 4 ++-- htdocs/core/lib/security.lib.php | 6 +++--- htdocs/core/lib/usergroups.lib.php | 2 +- htdocs/core/tpl/contacts.tpl.php | 2 +- htdocs/product/card.php | 2 +- htdocs/projet/element.php | 2 +- .../recruitment/recruitmentcandidature_card.php | 2 +- htdocs/societe/card.php | 16 ++++++++-------- htdocs/societe/consumption.php | 2 +- htdocs/societe/societecontact.php | 6 +++--- htdocs/user/agenda_extsites.php | 2 +- htdocs/user/bank.php | 10 +++++----- htdocs/user/clicktodial.php | 2 +- htdocs/user/info.php | 2 +- htdocs/user/ldap.php | 2 +- htdocs/user/virtualcard.php | 2 +- 48 files changed, 90 insertions(+), 90 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 585d5b664cb..53650a3cd28 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -720,7 +720,7 @@ if ($limit > 0 && $limit != $conf->liste_limit) { // List of mass actions available $arrayofmassactions = array(); -if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->rights->accounting->mouvements->creer) { +if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->hasRight('accounting', 'mouvements', 'creer')) { $arrayofmassactions['letteringauto'] = img_picto('', 'check', 'class="pictofixedwidth"') . $langs->trans('LetteringAuto'); $arrayofmassactions['preunletteringauto'] = img_picto('', 'uncheck', 'class="pictofixedwidth"') . $langs->trans('UnletteringAuto'); $arrayofmassactions['letteringmanual'] = img_picto('', 'check', 'class="pictofixedwidth"') . $langs->trans('LetteringManual'); diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index 9031c73624b..b61b82aeca2 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -381,7 +381,7 @@ if (empty($reshook)) { $param = '&type='.$type.$param; } - //if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouvements->supprimer_tous) { + //if ($action == 'delbookkeepingyearconfirm' && $user->hasRight('accounting', 'mouvements', 'supprimer')_tous) { // $delmonth = GETPOST('delmonth', 'int'); // $delyear = GETPOST('delyear', 'int'); // if ($delyear == -1) { diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 987d35512a5..1f3d8d56cd6 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -166,7 +166,7 @@ if (empty($reshook)) { } -if ($massaction == 'ventil' && $user->rights->accounting->bind->write) { +if ($massaction == 'ventil' && $user->hasRight('accounting', 'bind', 'write')) { $msg = ''; //print '
' . $langs->trans("Processing") . '...
'; diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php index 0255e019138..63848372044 100644 --- a/htdocs/accountancy/expensereport/card.php +++ b/htdocs/accountancy/expensereport/card.php @@ -57,7 +57,7 @@ if (empty($user->rights->accounting->mouvements->lire)) { * Actions */ -if ($action == 'ventil' && $user->rights->accounting->bind->write) { +if ($action == 'ventil' && $user->hasRight('accounting', 'bind', 'write')) { if (!$cancel) { if ($codeventil < 0) { $codeventil = 0; diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php index ba98ebcaaa7..c523df85326 100644 --- a/htdocs/accountancy/expensereport/lines.php +++ b/htdocs/accountancy/expensereport/lines.php @@ -118,7 +118,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x' $search_date_end = ''; } -if (is_array($changeaccount) && count($changeaccount) > 0 && $user->rights->accounting->bind->write) { +if (is_array($changeaccount) && count($changeaccount) > 0 && $user->hasRight('accounting', 'bind', 'write')) { $error = 0; if (!(GETPOST('account_parent', 'int') >= 0)) { diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php index 253879eb462..67d8be1b38a 100644 --- a/htdocs/accountancy/expensereport/list.php +++ b/htdocs/accountancy/expensereport/list.php @@ -158,7 +158,7 @@ if (empty($reshook)) { } -if ($massaction == 'ventil' && $user->rights->accounting->bind->write) { +if ($massaction == 'ventil' && $user->hasRight('accounting', 'bind', 'write')) { $msg = ''; if (!empty($mesCasesCochees)) { diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php index 306b88d11ea..b393c0f54ce 100644 --- a/htdocs/accountancy/supplier/card.php +++ b/htdocs/accountancy/supplier/card.php @@ -57,7 +57,7 @@ if (empty($user->rights->accounting->mouvements->lire)) { * Actions */ -if ($action == 'ventil' && $user->rights->accounting->bind->write) { +if ($action == 'ventil' && $user->hasRight('accounting', 'bind', 'write')) { if (!$cancel) { if ($codeventil < 0) { $codeventil = 0; diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php index 5d212e57ccf..d6df336d979 100644 --- a/htdocs/accountancy/supplier/index.php +++ b/htdocs/accountancy/supplier/index.php @@ -91,7 +91,7 @@ if (empty($user->rights->accounting->mouvements->lire)) { * Actions */ -if (($action == 'clean' || $action == 'validatehistory') && $user->rights->accounting->bind->write) { +if (($action == 'clean' || $action == 'validatehistory') && $user->hasRight('accounting', 'bind', 'write')) { // Clean database $db->begin(); $sql1 = "UPDATE ".$db->prefix()."facture_fourn_det as fd"; diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php index 2c4fece83f0..06fd0369f03 100644 --- a/htdocs/accountancy/supplier/lines.php +++ b/htdocs/accountancy/supplier/lines.php @@ -133,7 +133,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x' $search_tvaintra = ''; } -if (is_array($changeaccount) && count($changeaccount) > 0 && $user->rights->accounting->bind->write) { +if (is_array($changeaccount) && count($changeaccount) > 0 && $user->hasRight('accounting', 'bind', 'write')) { $error = 0; if (!(GETPOST('account_parent', 'int') >= 0)) { diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index 2b8fea60e51..101bd33ea6f 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -169,7 +169,7 @@ if (empty($reshook)) { } -if ($massaction == 'ventil' && $user->rights->accounting->bind->write) { +if ($massaction == 'ventil' && $user->hasRight('accounting', 'bind', 'write')) { $msg = ''; if (!empty($mesCasesCochees)) { diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index c466ff7ff9d..a7503190a08 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -57,7 +57,7 @@ if ($id > 0 || !empty($ref)) { // $User is the user who edits, $object->user_id is the id of the related user in the edited member $caneditfielduser = ((($user->id == $object->user_id) && !empty($user->rights->user->self->creer)) || (($user->id != $object->user_id) && $user->hasRight('user', 'user', 'creer'))); - $caneditpassworduser = ((($user->id == $object->user_id) && $user->rights->user->self->password) + $caneditpassworduser = ((($user->id == $object->user_id) && $user->hasRight('user', 'self', 'password')) || (($user->id != $object->user_id) && $user->hasRight('user', 'user', 'password'))); } } diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index d800c181c18..31dec948f89 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -134,7 +134,7 @@ if ($reshook < 0) { } // Create third party from a member -if (empty($reshook) && $action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer) { +if (empty($reshook) && $action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->hasRight('societe', 'creer')) { if ($result > 0) { // Creation of thirdparty $company = new Societe($db); diff --git a/htdocs/asset/model/accountancy_codes.php b/htdocs/asset/model/accountancy_codes.php index b39a72bb7a3..539e11204a3 100644 --- a/htdocs/asset/model/accountancy_codes.php +++ b/htdocs/asset/model/accountancy_codes.php @@ -53,8 +53,8 @@ if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id; } -$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read))); -$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write))); // Used by the include of actions_addupdatedelete.inc.php +$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset', 'read')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read))); +$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset', 'write')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write))); // Used by the include of actions_addupdatedelete.inc.php // Security check (enable the most restrictive one) if ($user->socid > 0) accessforbidden(); diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php index 44a0fa504a3..31c49d5e40f 100644 --- a/htdocs/asset/model/agenda.php +++ b/htdocs/asset/model/agenda.php @@ -82,8 +82,8 @@ if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[$object->entity] . "/model/" . $object->id; } -$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read))); -$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write))); // Used by the include of actions_addupdatedelete.inc.php +$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset', 'read')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read))); +$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset', 'write')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write))); // Used by the include of actions_addupdatedelete.inc.php // Security check (enable the most restrictive one) if ($user->socid > 0) accessforbidden(); diff --git a/htdocs/asset/model/card.php b/htdocs/asset/model/card.php index 3eb75eded08..11e94e53ace 100644 --- a/htdocs/asset/model/card.php +++ b/htdocs/asset/model/card.php @@ -69,9 +69,9 @@ if (empty($action) && empty($id) && empty($ref)) { // Load object include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. -$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read))); -$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write))); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php -$permissiontodelete = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->delete) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->delete))) || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT); +$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset', 'read')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read))); +$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset', 'write')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write))); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php +$permissiontodelete = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset', 'delete')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->delete))) || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT); $permissionnote = $permissiontoadd; // Used by the include of actions_setnotes.inc.php $permissiondellink = $permissiontoadd; // Used by the include of actions_dellink.inc.php $upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1]; diff --git a/htdocs/asset/model/depreciation_options.php b/htdocs/asset/model/depreciation_options.php index e8519e581d9..5f4a3276202 100644 --- a/htdocs/asset/model/depreciation_options.php +++ b/htdocs/asset/model/depreciation_options.php @@ -53,8 +53,8 @@ if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id; } -$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read))); -$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write))); // Used by the include of actions_addupdatedelete.inc.php +$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset', 'read')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read))); +$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset', 'write')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write))); // Used by the include of actions_addupdatedelete.inc.php // Security check (enable the most restrictive one) if ($user->socid > 0) accessforbidden(); diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php index d87a9ea55c8..dc6c544abaf 100644 --- a/htdocs/asset/model/list.php +++ b/htdocs/asset/model/list.php @@ -121,9 +121,9 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php'; $object->fields = dol_sort_array($object->fields, 'position'); $arrayfields = dol_sort_array($arrayfields, 'position'); -$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read))); -$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write))); -$permissiontodelete = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->delete) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->delete))); +$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset', 'read')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read))); +$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset', 'write')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write))); +$permissiontodelete = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset', 'delete')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->delete))); // Security check if (!isModEnabled('asset')) { diff --git a/htdocs/asset/model/note.php b/htdocs/asset/model/note.php index c3490445429..9e26aee3e19 100644 --- a/htdocs/asset/model/note.php +++ b/htdocs/asset/model/note.php @@ -51,8 +51,8 @@ if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id; } -$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read))); -$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write))); // Used by the include of actions_addupdatedelete.inc.php +$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset', 'read')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read))); +$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset', 'write')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write))); // Used by the include of actions_addupdatedelete.inc.php $permissionnote = $permissiontoadd; // Used by the include of actions_setnotes.inc.php // Security check (enable the most restrictive one) diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index a262e8d8885..3a01c3b9c2d 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -112,11 +112,11 @@ if ($id > 0 && $removeelem > 0 && $action == 'unlink') { $tmpobject = new Product($db); $result = $tmpobject->fetch($removeelem); $elementtype = 'product'; - } elseif ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer) { + } elseif ($type == Categorie::TYPE_SUPPLIER && $user->hasRight('societe', 'creer')) { $tmpobject = new Societe($db); $result = $tmpobject->fetch($removeelem); $elementtype = 'supplier'; - } elseif ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer) { + } elseif ($type == Categorie::TYPE_CUSTOMER && $user->hasRight('societe', 'creer')) { $tmpobject = new Societe($db); $result = $tmpobject->fetch($removeelem); $elementtype = 'customer'; @@ -125,7 +125,7 @@ if ($id > 0 && $removeelem > 0 && $action == 'unlink') { $tmpobject = new Adherent($db); $result = $tmpobject->fetch($removeelem); $elementtype = 'member'; - } elseif ($type == Categorie::TYPE_CONTACT && $user->rights->societe->creer) { + } elseif ($type == Categorie::TYPE_CONTACT && $user->hasRight('societe', 'creer')) { require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; $tmpobject = new Contact($db); $result = $tmpobject->fetch($removeelem); @@ -140,7 +140,7 @@ if ($id > 0 && $removeelem > 0 && $action == 'unlink') { $tmpobject = new Project($db); $result = $tmpobject->fetch($removeelem); $elementtype = 'project'; - } elseif ($type == Categorie::TYPE_USER && $user->rights->user->user->creer) { + } elseif ($type == Categorie::TYPE_USER && $user->hasRight('user', 'user', 'creer')) { require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; $tmpobject = new User($db); $result = $tmpobject->fetch($removeelem); @@ -174,13 +174,13 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi if ($elemid && $action == 'addintocategory' && (($type == Categorie::TYPE_PRODUCT && ($user->rights->produit->creer || $user->rights->service->creer)) || - ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer) || - ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer) || + ($type == Categorie::TYPE_CUSTOMER && $user->hasRight('societe', 'creer')) || + ($type == Categorie::TYPE_SUPPLIER && $user->hasRight('societe', 'creer')) || ($type == Categorie::TYPE_TICKET && $user->rights->ticket->write) || ($type == Categorie::TYPE_PROJECT && $user->rights->projet->creer) || ($type == Categorie::TYPE_MEMBER && $user->hasRight('adherent', 'creer')) || - ($type == Categorie::TYPE_CONTACT && $user->rights->societe->creer) || - ($type == Categorie::TYPE_USER && $user->rights->user->user->creer) || + ($type == Categorie::TYPE_CONTACT && $user->hasRight('societe', 'creer')) || + ($type == Categorie::TYPE_USER && $user->hasRight('user', 'user', 'creer')) || ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer) )) { if ($type == Categorie::TYPE_PRODUCT) { diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index e6c4ac3060d..158cfc3aef0 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -155,7 +155,7 @@ $TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month') $result = restrictedArea($user, 'agenda', $object, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id'); -$usercancreate = $user->hasRight('agenda', 'allactions', 'create') || (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create); +$usercancreate = $user->hasRight('agenda', 'allactions', 'create') || (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->hasRight('agenda', 'myactions', 'create')); /* @@ -215,7 +215,7 @@ if (empty($reshook) && (GETPOST('addassignedtouser') || GETPOST('updateassignedt // Link to a project if (empty($reshook) && $action == 'classin' && ($user->hasRight('agenda', 'allactions', 'create') || - (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))) { + (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->hasRight('agenda', 'myactions', 'create')))) { //$object->fetch($id); $object->setProject(GETPOST('projectid', 'int')); } @@ -970,7 +970,7 @@ if (empty($reshook) && $action == 'confirm_delete' && GETPOST("confirm") == 'yes $object->fetch_userassigned(); $object->oldcopy = dol_clone($object); - if ($user->rights->agenda->myactions->delete + if ($user->hasRight('agenda', 'myactions', 'delete') || $user->rights->agenda->allactions->delete) { $result = $object->delete(); @@ -1089,7 +1089,7 @@ if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate') { // Actions to delete doc $upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref); -$permissiontoadd = ($user->hasRight('agenda', 'allactions', 'create') || (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->read)); +$permissiontoadd = ($user->hasRight('agenda', 'allactions', 'create') || (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->hasRight('agenda', 'myactions', 'read'))); if (empty($reshook)) { include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; } @@ -2478,21 +2478,21 @@ if ($id > 0) { if (empty($reshook)) { if ($action != 'edit') { if ($user->hasRight('agenda', 'allactions', 'create') || - (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)) { + (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->hasRight('agenda', 'myactions', 'create'))) { print ''; } else { print ''; } if ($user->hasRight('agenda', 'allactions', 'create') || - (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)) { + (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->hasRight('agenda', 'myactions', 'create'))) { print ''; } else { print ''; } if ($user->rights->agenda->allactions->delete || - (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->delete)) { + (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->hasRight('agenda', 'myactions', 'delete'))) { print ''; } else { print ''; diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php index 4f7a944070b..908b4cc1d9a 100644 --- a/htdocs/comm/action/class/api_agendaevents.class.php +++ b/htdocs/comm/action/class/api_agendaevents.class.php @@ -289,7 +289,7 @@ class AgendaEvents extends DolibarrApi */ public function delete($id) { - if (!DolibarrApiAccess::$user->rights->agenda->myactions->delete) { + if (!DolibarrApiAccess::$user->hasRight('agenda', 'myactions', 'delete')) { throw new RestException(401, "Insufficient rights to delete your Agenda Event"); } diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 851f4419179..66d115c171c 100644 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -92,7 +92,7 @@ if ($user->socid && $socid) { $result = restrictedArea($user, 'societe', $socid); } -$usercancreate = $user->hasRight('agenda', 'allactions', 'create') || (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create); +$usercancreate = $user->hasRight('agenda', 'allactions', 'create') || (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->hasRight('agenda', 'myactions', 'create')); $permissiontoadd = $usercancreate; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index d9089f03c14..461897ecab0 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -1875,7 +1875,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa } } else { if ($user->hasRight('agenda', 'allactions', 'create') || - (($event->authorid == $user->id || $event->userownerid == $user->id) && $user->rights->agenda->myactions->create)) { + (($event->authorid == $user->id || $event->userownerid == $user->id) && $user->hasRight('agenda', 'myactions', 'create'))) { $cssclass .= " movable cursormove"; } else { $cssclass .= " unmovable"; diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php index ee34d07ea4b..9d9baff3c3e 100644 --- a/htdocs/comm/action/info.php +++ b/htdocs/comm/action/info.php @@ -53,7 +53,7 @@ if ($user->socid && $socid) { $result = restrictedArea($user, 'societe', $socid); } -$usercancreate = $user->hasRight('agenda', 'allactions', 'create') || (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create); +$usercancreate = $user->hasRight('agenda', 'allactions', 'create') || (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->hasRight('agenda', 'myactions', 'create')); /* diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php index 342d0ba1a25..79330cd57bf 100644 --- a/htdocs/comm/action/list.php +++ b/htdocs/comm/action/list.php @@ -401,7 +401,7 @@ $arrayofmassactions = array( if ($user->rights->agenda->allactions->delete) { $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete"); } -if (isModEnabled('category') && $user->rights->agenda->myactions->create) { +if (isModEnabled('category') && $user->hasRight('agenda', 'myactions', 'create')) { $arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag"); } if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) { diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index 81e5cd0d9d2..fe6c733713b 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -54,7 +54,7 @@ $result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid * Actions */ -if ($action == 'setpricelevel' && $user->rights->societe->creer) { +if ($action == 'setpricelevel' && $user->hasRight('societe', 'creer')) { $soc = new Societe($db); $soc->fetch($id); $soc->setPriceLevel(GETPOST("price_level"), $user); diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php index 20be2b468b4..157e00c5c4a 100644 --- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php +++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php @@ -110,7 +110,7 @@ class ActionsContactCardDefault extends ActionsContactCardCommon $this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1); } else { // Confirm delete contact - if ($action == 'delete' && $user->rights->societe->contact->supprimer) { + if ($action == 'delete' && $user->hasRight('societe', 'contact', 'supprimer')) { $this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("DeleteContact"), $langs->trans("ConfirmDeleteContact"), "confirm_delete", '', 0, 1); } } diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php index adf5bb722d3..127375b8c92 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php @@ -142,7 +142,7 @@ if (empty($user->socid)) { print ''.$langs->trans('Modify').''; } - if (!$this->control->tpl['user_id'] && $user->rights->user->user->creer) { + if (!$this->control->tpl['user_id'] && $user->hasRight('user', 'user', 'creer')) { print ''.$langs->trans("CreateDolibarrLogin").''; } diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 739c4145db8..285201a574d 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -143,7 +143,7 @@ if (empty($reshook)) { } // Creation utilisateur depuis contact - if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer) { + if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->hasRight('user', 'user', 'creer')) { // Recuperation contact actuel $result = $object->fetch($id); @@ -313,7 +313,7 @@ if (empty($reshook)) { } } - if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->contact->supprimer) { + if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('societe', 'contact', 'supprimer')) { $result = $object->fetch($id); $object->oldcopy = clone $object; @@ -1390,7 +1390,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { print ''; } print '
'; 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).'
'; @@ -1491,7 +1491,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', 'class="pictofixedwidth"').$langs->trans("CreateDolibarrLogin").''; } } @@ -1527,11 +1527,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { } // Activer - if ($object->statut == 0 && $user->rights->societe->contact->creer) { + if ($object->statut == 0 && $user->hasRight('societe', 'contact', 'creer')) { print ''.$langs->trans("Reactivate").''; } // Desactiver - if ($object->statut == 1 && $user->rights->societe->contact->creer) { + if ($object->statut == 1 && $user->hasRight('societe', 'contact', 'creer')) { print ''.$langs->trans("DisableUser").''; } diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 2d64c5b8921..a9341cf5d63 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -847,7 +847,7 @@ $arrayofmassactions = array( if (!empty($permissiontodelete)) { $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete"); } -if (isModEnabled('category') && $user->rights->societe->creer) { +if (isModEnabled('category') && $user->hasRight('societe', 'creer')) { $arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag"); } if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) { diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index ba5fde87468..f2a05d0eb10 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -50,7 +50,7 @@ $errors = array(); * Action */ -if ($action == 'update' && !GETPOST("cancel") && $user->rights->societe->contact->creer) { +if ($action == 'update' && !GETPOST("cancel") && $user->hasRight('societe', 'contact', 'creer')) { $ret = $object->fetch($id); // Note: Correct date should be completed with location to have exact GM time of birth. diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php index f051fe5ade3..47ad55399ad 100644 --- a/htdocs/core/boxes/box_contacts.php +++ b/htdocs/core/boxes/box_contacts.php @@ -85,7 +85,7 @@ class box_contacts extends ModeleBoxes $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedContacts", $max)); - if ($user->hasRight('societe', 'lire') && $user->rights->societe->contact->lire) { + if ($user->hasRight('societe', 'lire') && $user->hasRight('societe', 'contact', 'lire')) { $sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status"; $sql .= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile, sp.email as spemail"; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 799b8f1b86b..dd89f104444 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3298,7 +3298,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor $htmllink .= '?chat" alt="'.$langs->trans("Chat").' '.$value.'" title="'.dol_escape_htmltag($langs->trans("Chat").' '.$value).'">'; $htmllink .= ''; $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 ''.$langs->trans('Prefix').''.$object->prefix_comm.''; } -//if (isModEnabled('agenda') && $user->rights->agenda->myactions->read) $elementTypeArray['action']=$langs->transnoentitiesnoconv('Events'); +//if (isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'read')) $elementTypeArray['action']=$langs->transnoentitiesnoconv('Events'); $elementTypeArray = array(); if ($object->client) { diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php index f626139abcb..03530c2449a 100644 --- a/htdocs/societe/societecontact.php +++ b/htdocs/societe/societecontact.php @@ -78,7 +78,7 @@ $hookmanager->initHooks(array('contactthirdparty', 'globalcard')); * Actions */ -if ($action == 'addcontact' && $user->rights->societe->creer) { +if ($action == 'addcontact' && $user->hasRight('societe', 'creer')) { $result = $object->fetch($id); if ($result > 0 && $id > 0) { @@ -98,14 +98,14 @@ if ($action == 'addcontact' && $user->rights->societe->creer) { $mesg = '
'.$object->error.'
'; } } -} elseif ($action == 'swapstatut' && $user->rights->societe->creer) { +} elseif ($action == 'swapstatut' && $user->hasRight('societe', 'creer')) { // bascule du statut d'un contact if ($object->fetch($id)) { $result = $object->swapContactStatus(GETPOST('ligne', 'int')); } else { dol_print_error($db); } -} elseif ($action == 'deletecontact' && $user->rights->societe->creer) { +} elseif ($action == 'deletecontact' && $user->hasRight('societe', 'creer')) { // Efface un contact $object->fetch($id); $result = $object->delete_contact(GETPOST("lineid", 'int')); diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php index 7923a4127c4..f594dd02176 100644 --- a/htdocs/user/agenda_extsites.php +++ b/htdocs/user/agenda_extsites.php @@ -61,7 +61,7 @@ $socid = 0; if ($user->socid > 0) { $socid = $user->socid; } -$feature2 = (($socid && $user->rights->user->self->creer) ? '' : 'user'); +$feature2 = (($socid && $user->hasRight('user', 'self', 'creer')) ? '' : 'user'); $result = restrictedArea($user, 'user', $id, 'user&user', $feature2); diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php index fc7efd23749..8038fab4ece 100644 --- a/htdocs/user/bank.php +++ b/htdocs/user/bank.php @@ -61,7 +61,7 @@ $socid = 0; if ($user->socid > 0) { $socid = $user->socid; } -$feature2 = (($socid && $user->rights->user->self->creer) ? '' : 'user'); +$feature2 = (($socid && $user->hasRight('user', 'self', 'creer')) ? '' : 'user'); $object = new User($db); if ($id > 0 || !empty($ref)) { @@ -287,7 +287,7 @@ if ($id && $bankid && $action == 'edit' && ($user->rights->user->user->creer || print ''; print ''; } -if ($id && $action == 'create' && $user->rights->user->user->creer) { +if ($id && $action == 'create' && $user->hasRight('user', 'user', 'creer')) { if ($conf->use_javascript_ajax) { print "\n