From 11500fb8d9871847b17c025e4dc3fff4074f6e58 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 4 Nov 2019 15:33:49 +0100 Subject: [PATCH] FIX confusion between permto... and permisstionto... --- htdocs/accountancy/customer/list.php | 4 +- htdocs/accountancy/expensereport/list.php | 4 +- htdocs/accountancy/supplier/list.php | 4 +- htdocs/adherents/list.php | 4 +- htdocs/admin/emailcollector_list.php | 4 +- htdocs/admin/mails_senderprofile_list.php | 4 +- htdocs/asset/list.php | 4 +- htdocs/bom/bom_list.php | 8 +-- htdocs/comm/mailing/list.php | 4 +- htdocs/comm/propal/list.php | 4 +- htdocs/commande/list.php | 4 +- htdocs/compta/bank/bankentries_list.php | 4 +- .../compta/cashcontrol/cashcontrol_list.php | 4 +- htdocs/compta/facture/card-rec.php | 4 +- .../compta/facture/invoicetemplate_list.php | 4 +- htdocs/compta/facture/list.php | 6 +- htdocs/contact/list.php | 4 +- htdocs/contrat/list.php | 4 +- htdocs/core/actions_massactions.inc.php | 71 +++++++++++++++++-- htdocs/core/class/html.formfile.class.php | 12 ++-- htdocs/cron/list.php | 8 +-- htdocs/expedition/list.php | 6 +- htdocs/expensereport/list.php | 4 +- htdocs/fichinter/list.php | 4 +- htdocs/fourn/commande/list.php | 4 +- htdocs/fourn/facture/list.php | 6 +- htdocs/holiday/define_holiday.php | 4 +- htdocs/holiday/list.php | 4 +- htdocs/holiday/view_log.php | 4 +- htdocs/margin/checkMargins.php | 4 +- .../modulebuilder/template/myobject_list.php | 8 +-- htdocs/mrp/mo_list.php | 4 +- htdocs/opensurvey/list.php | 4 +- htdocs/product/inventory/list.php | 4 +- htdocs/product/list.php | 4 +- htdocs/product/stock/list.php | 4 +- htdocs/product/stock/movement_card.php | 4 +- htdocs/product/stock/productlot_list.php | 4 +- htdocs/projet/list.php | 4 +- htdocs/projet/tasks.php | 4 +- htdocs/projet/tasks/list.php | 4 +- htdocs/societe/list.php | 4 +- htdocs/societe/website.php | 4 +- htdocs/supplier_proposal/list.php | 4 +- htdocs/ticket/list.php | 4 +- htdocs/zapier/hook_list.php | 4 +- 46 files changed, 169 insertions(+), 108 deletions(-) diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 2969f2ff0a1..ae076a414cb 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -129,8 +129,8 @@ if (empty($reshook)) // Mass actions $objectclass='AccountingAccount'; - $permtoread = $user->rights->accounting->read; - $permtodelete = $user->rights->accounting->delete; + $permissiontoread = $user->rights->accounting->read; + $permissiontodelete = $user->rights->accounting->delete; $uploaddir = $conf->accounting->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php index f0e545f7853..a1c354f010b 100644 --- a/htdocs/accountancy/expensereport/list.php +++ b/htdocs/accountancy/expensereport/list.php @@ -112,8 +112,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x' // Mass actions $objectclass='ExpenseReport'; $objectlabel='ExpenseReport'; -$permtoread = $user->rights->expensereport->read; -$permtodelete = $user->rights->expensereport->delete; +$permissiontoread = $user->rights->expensereport->read; +$permissiontodelete = $user->rights->expensereport->delete; $uploaddir = $conf->expensereport->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index 27cd97dfea3..249cb920c47 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -133,8 +133,8 @@ if (empty($reshook)) // Mass actions $objectclass='AccountingAccount'; - $permtoread = $user->rights->accounting->read; - $permtodelete = $user->rights->accounting->delete; + $permissiontoread = $user->rights->accounting->read; + $permissiontodelete = $user->rights->accounting->delete; $uploaddir = $conf->accounting->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 0bcc11bf351..a66323654d8 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -232,8 +232,8 @@ if (empty($reshook)) // Mass actions $objectclass='Adherent'; $objectlabel='Members'; - $permtoread = $user->rights->adherent->lire; - $permtodelete = $user->rights->adherent->supprimer; + $permissiontoread = $user->rights->adherent->lire; + $permissiontodelete = $user->rights->adherent->supprimer; $uploaddir = $conf->adherent->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php index e8b2e280a7f..5145f5dd083 100644 --- a/htdocs/admin/emailcollector_list.php +++ b/htdocs/admin/emailcollector_list.php @@ -156,8 +156,8 @@ if (empty($reshook)) // Mass actions $objectclass='EmailCollector'; $objectlabel='EmailCollector'; - $permtoread = $user->rights->emailcollector->read; - $permtodelete = $user->rights->emailcollector->delete; + $permissiontoread = $user->rights->emailcollector->read; + $permissiontodelete = $user->rights->emailcollector->delete; $uploaddir = $conf->emailcollector->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php index eb432b0dc72..139c6815072 100644 --- a/htdocs/admin/mails_senderprofile_list.php +++ b/htdocs/admin/mails_senderprofile_list.php @@ -148,8 +148,8 @@ if (empty($reshook)) // Mass actions $objectclass='EmailSenderProfile'; $objectlabel='EmailSenderProfile'; - $permtoread = $user->admin; - $permtodelete = $user->admin; + $permissiontoread = $user->admin; + $permissiontodelete = $user->admin; $uploaddir = $conf->admin->dir_output.'/senderprofiles'; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php index 8ea4f46c89d..9c9b8d12bff 100644 --- a/htdocs/asset/list.php +++ b/htdocs/asset/list.php @@ -152,8 +152,8 @@ if (empty($reshook)) // Mass actions $objectclass='Asset'; $objectlabel='Asset'; - $permtoread = $user->rights->asset->read; - $permtodelete = $user->rights->asset->delete; + $permissiontoread = $user->rights->asset->read; + $permissiontodelete = $user->rights->asset->delete; $uploaddir = $conf->asset->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php index 0775c2cc370..1f6fa300129 100644 --- a/htdocs/bom/bom_list.php +++ b/htdocs/bom/bom_list.php @@ -1,6 +1,5 @@ - * Copyright (C) ---Put here your own copyright and developer email--- * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -151,8 +150,8 @@ if (empty($reshook)) // Mass actions $objectclass='BOM'; $objectlabel='BillOfMaterials'; - $permtoread = $user->rights->bom->read; - $permtodelete = $user->rights->bom->delete; + $permissiontoread = $user->rights->bom->read; + $permissiontodelete = $user->rights->bom->delete; $uploaddir = $conf->bom->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } @@ -303,7 +302,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // List of mass actions available $arrayofmassactions = array( //'presend'=>$langs->trans("SendByMail"), - //'builddoc'=>$langs->trans("PDFMerge"), + 'disable'=>$langs->trans("Disable"), ); if ($user->rights->bom->delete) $arrayofmassactions['predelete']=''.$langs->trans("Delete"); if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions=array(); @@ -539,6 +538,7 @@ print ''."\n"; print ''."\n"; + if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) { $hidegeneratedfilelistifempty=1; diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php index ff69bd00c0c..0e3d7a7725e 100644 --- a/htdocs/comm/mailing/list.php +++ b/htdocs/comm/mailing/list.php @@ -102,8 +102,8 @@ if (empty($reshook)) // Mass actions /*$objectclass='MyObject'; $objectlabel='MyObject'; - $permtoread = $user->rights->mymodule->read; - $permtodelete = $user->rights->mymodule->delete; + $permissiontoread = $user->rights->mymodule->read; + $permissiontodelete = $user->rights->mymodule->delete; $uploaddir = $conf->mymodule->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; */ diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index a83d7ee5161..0eb3b947391 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -241,8 +241,8 @@ if (empty($reshook)) { $objectclass='Propal'; $objectlabel='Proposals'; - $permtoread = $user->rights->propal->lire; - $permtodelete = $user->rights->propal->supprimer; + $permissiontoread = $user->rights->propal->lire; + $permissiontodelete = $user->rights->propal->supprimer; $permtoclose = $user->rights->propal->cloturer; $uploaddir = $conf->propal->multidir_output[$conf->entity]; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 5f9906b58dc..23af81ab24e 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -220,8 +220,8 @@ if (empty($reshook)) // Mass actions $objectclass='Commande'; $objectlabel='Orders'; - $permtoread = $user->rights->commande->lire; - $permtodelete = $user->rights->commande->supprimer; + $permissiontoread = $user->rights->commande->lire; + $permissiontodelete = $user->rights->commande->supprimer; $uploaddir = $conf->commande->multidir_output[$conf->entity]; $trigger_name='ORDER_SENTBYMAIL'; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 773ee1e9255..4a9d0947b1e 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -209,8 +209,8 @@ if (empty($reshook)) { $objectclass='Account'; $objectlabel='BankTransaction'; - $permtoread = $user->rights->banque->lire; - $permtodelete = $user->rights->banque->supprimer; + $permissiontoread = $user->rights->banque->lire; + $permissiontodelete = $user->rights->banque->supprimer; $uploaddir = $conf->bank->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php index e0461d35368..45129b6ee19 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_list.php +++ b/htdocs/compta/cashcontrol/cashcontrol_list.php @@ -168,8 +168,8 @@ if (empty($reshook)) // Mass actions $objectclass='CashControl'; $objectlabel='CashControl'; - $permtoread = ($user->rights->cashdesk->use || $user->rights->takepos->use); - $permtodelete = ($user->rights->cashdesk->use || $user->rights->takepos->use); + $permissiontoread = ($user->rights->cashdesk->use || $user->rights->takepos->use); + $permissiontodelete = ($user->rights->cashdesk->use || $user->rights->takepos->use); //$uploaddir = ''; //include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php index 10eb2ac03c8..49cb9529c71 100644 --- a/htdocs/compta/facture/card-rec.php +++ b/htdocs/compta/facture/card-rec.php @@ -146,8 +146,8 @@ if (empty($reshook)) // Mass actions /*$objectclass='MyObject'; $objectlabel='MyObject'; - $permtoread = $user->rights->mymodule->read; - $permtodelete = $user->rights->mymodule->delete; + $permissiontoread = $user->rights->mymodule->read; + $permissiontodelete = $user->rights->mymodule->delete; $uploaddir = $conf->mymodule->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';*/ diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php index 09873f5ee61..941aa0723ef 100644 --- a/htdocs/compta/facture/invoicetemplate_list.php +++ b/htdocs/compta/facture/invoicetemplate_list.php @@ -191,8 +191,8 @@ if (empty($reshook)) // Mass actions /*$objectclass='MyObject'; $objectlabel='MyObject'; - $permtoread = $user->rights->mymodule->read; - $permtodelete = $user->rights->mymodule->delete; + $permissiontoread = $user->rights->mymodule->read; + $permissiontodelete = $user->rights->mymodule->delete; $uploaddir = $conf->mymodule->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';*/ } diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 74c27c1e467..43f8d41db10 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -265,9 +265,9 @@ if (empty($reshook)) { $objectclass='Facture'; $objectlabel='Invoices'; - $permtoread = $user->rights->facture->lire; - $permtocreate = $user->rights->facture->creer; - $permtodelete = $user->rights->facture->supprimer; + $permissiontoread = $user->rights->facture->lire; + $permissiontoadd = $user->rights->facture->creer; + $permissiontodelete = $user->rights->facture->supprimer; $uploaddir = $conf->facture->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index f8d92d19b34..d23963fde0a 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -254,8 +254,8 @@ if (empty($reshook)) // Mass actions $objectclass='Contact'; $objectlabel='Contact'; - $permtoread = $user->rights->societe->lire; - $permtodelete = $user->rights->societe->supprimer; + $permissiontoread = $user->rights->societe->lire; + $permissiontodelete = $user->rights->societe->supprimer; $uploaddir = $conf->societe->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 3df193d53d2..983f37caa7f 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -188,8 +188,8 @@ if (empty($reshook)) { $objectclass='Contrat'; $objectlabel='Contracts'; - $permtoread = $user->rights->contrat->lire; - $permtodelete = $user->rights->contrat->supprimer; + $permissiontoread = $user->rights->contrat->lire; + $permissiontodelete = $user->rights->contrat->supprimer; $uploaddir = $conf->contrat->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php index febcba244c0..752e8dcc352 100644 --- a/htdocs/core/actions_massactions.inc.php +++ b/htdocs/core/actions_massactions.inc.php @@ -30,7 +30,7 @@ // $objectclass and $objectlabel must be defined // $parameters, $object, $action must be defined for the hook. -// $permtoread, $permtocreate and $permtodelete may be defined +// $permissiontoread, $permissiontoadd and $permissiontodelete may be defined // $uploaddir may be defined (example to $conf->projet->dir_output."/";) // $toselect may be defined // $diroutputmassaction may be defined @@ -43,6 +43,11 @@ if (empty($objectclass) || empty($uploaddir)) exit; } +// For backward compatibility +if (! empty($permtoread) && empty($permissiontoread)) $permissiontoread = $permtoread; +if (! empty($permtocreate) && empty($permissiontoadd)) $permissiontoadd = $permtocreate; +if (! empty($permtodelete) && empty($permissiontodelete)) $permissiontoread = $permtodelete; + // Mass actions. Controls on number of lines checked. $maxformassaction=(empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS)?1000:$conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS); @@ -924,7 +929,7 @@ if (!$error && $massaction == 'cancelorders') } -if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_search')) +if (! $error && $massaction == "builddoc" && $permissiontoread && ! GETPOST('button_search')) { if (empty($diroutputmassaction)) { @@ -1105,7 +1110,7 @@ if ($action == 'remove_file') } // Validate records -if (! $error && $massaction == 'validate' && $permtocreate) +if (! $error && $massaction == 'validate' && $permissiontoadd) { $objecttmp=new $objectclass($db); @@ -1170,6 +1175,62 @@ if (! $error && $massaction == 'validate' && $permtocreate) //var_dump($listofobjectthirdparties);exit; } } +var_dump($permissiontoadd); +// Validate records +if (! $error && $massaction == 'disable' && $permissiontocreate) +{ + $objecttmp=new $objectclass($db); + + if (! $error) + { + $db->begin(); + + $nbok = 0; + foreach($toselect as $toselectid) + { + $result=$objecttmp->fetch($toselectid); + if ($result > 0) + { + //if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1); + //else + $result = $objecttmp->close($user); + if ($result == $objecttmp::STATUS_VALIDATED) + { + $langs->load("errors"); + setEventMessages($langs->trans("ErrorObjectMustHaveStatusValidatedToBeDisabled", $objecttmp->ref), null, 'errors'); + $error++; + break; + } + elseif ($result < 0) + { + setEventMessages($objecttmp->error, $objecttmp->errors, 'errors'); + $error++; + break; + } + else $nbok++; + } + else + { + setEventMessages($objecttmp->error, $objecttmp->errors, 'errors'); + $error++; + break; + } + } + + if (! $error) + { + if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs'); + else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs'); + $db->commit(); + } + else + { + $db->rollback(); + } + //var_dump($listofobjectthirdparties);exit; + } +} + // Closed records if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permtoclose) { $db->begin(); @@ -1206,7 +1267,7 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permtoclo } } // Delete record from mass action (massaction = 'delete' for direct delete, action/confirm='delete'/'yes' with a confirmation step before) -if (! $error && ($massaction == 'delete' || ($action == 'delete' && $confirm == 'yes')) && $permtodelete) +if (! $error && ($massaction == 'delete' || ($action == 'delete' && $confirm == 'yes')) && $permissiontodelete) { $db->begin(); @@ -1272,7 +1333,7 @@ if (! $error && ($massaction == 'delete' || ($action == 'delete' && $confirm == // Generate document foreach object according to model linked to object // @TODO : propose model selection -if (! $error && $massaction == 'generate_doc' && $permtoread) +if (! $error && $massaction == 'generate_doc' && $permissiontoread) { $db->begin(); diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 5f8a9cb51e3..4a55fa24bb3 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -1471,7 +1471,7 @@ class FormFile * @param string $param Parameters on sort links * @param int $forcedownload Force to open dialog box "Save As" when clicking on file * @param string $relativepath Relative path of docs (autodefined if not provided) - * @param int $permtodelete Permission to delete + * @param int $permissiontodelete Permission to delete * @param int $useinecm Change output for use in ecm module * @param int $textifempty Text to show if filearray is empty * @param int $maxlength Maximum length of file name shown @@ -1480,7 +1480,7 @@ class FormFile * @return int <0 if KO, nb of files shown if OK * @see list_of_documents() */ - public function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload = 0, $relativepath = '', $permtodelete = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $url = '', $addfilterfields = 0) + public function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload = 0, $relativepath = '', $permissiontodelete = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $url = '', $addfilterfields = 0) { // phpcs:enable global $user, $conf, $langs, $form; @@ -1703,7 +1703,7 @@ class FormFile //if ($forcedownload) print '&attachment=1'; //print '&file='.urlencode($relativefile).'">'; //print img_view().'   '; - //if ($permtodelete) print ''.img_delete().''; + //if ($permissiontodelete) print ''.img_delete().''; //else print ' '; print "\n"; } @@ -1758,13 +1758,13 @@ class FormFile * Show array with linked files * * @param Object $object Object - * @param int $permtodelete Deletion is allowed + * @param int $permissiontodelete Deletion is allowed * @param string $action Action * @param string $selected ??? * @param string $param More param to add into URL * @return int Number of links */ - public function listOfLinks($object, $permtodelete = 1, $action = null, $selected = null, $param = '') + public function listOfLinks($object, $permissiontodelete = 1, $action = null, $selected = null, $param = '') { global $user, $conf, $langs, $user; global $sortfield, $sortorder; @@ -1878,7 +1878,7 @@ class FormFile print ''; print ''; print '' . img_edit() . ''; // id= is included into $param - if ($permtodelete) { + if ($permissiontodelete) { print '   ' . img_delete() . ''; // id= is included into $param } else { print ' '; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index d83e6f4e258..f395475faf7 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -178,12 +178,12 @@ if (empty($reshook)) // Mass actions $objectclass='CronJob'; $objectlabel='CronJob'; - $permtoread = $user->rights->cron->read; - $permtocreate = $user->rights->cron->create?$user->rights->cron->create:$user->rights->cron->write; - $permtodelete = $user->rights->cron->delete; + $permissiontoread = $user->rights->cron->read; + $permissiontoadd = $user->rights->cron->create?$user->rights->cron->create:$user->rights->cron->write; + $permissiontodelete = $user->rights->cron->delete; $uploaddir = $conf->cron->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; - if ($permtocreate) + if ($permissiontoadd) { $tmpcron = new Cronjob($db); foreach($toselect as $id) diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 888f7037efb..eeb05e8926c 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -165,9 +165,9 @@ if (empty($reshook)) { $objectclass = 'Expedition'; $objectlabel = 'Sendings'; - $permtoread = $user->rights->expedition->lire; - $permtocreate = $user->rights->expedition->creer; - $permtodelete = $user->rights->expedition->supprimer; + $permissiontoread = $user->rights->expedition->lire; + $permissiontoadd = $user->rights->expedition->creer; + $permissiontodelete = $user->rights->expedition->supprimer; $uploaddir = $conf->expedition->dir_output . '/sending'; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 6f837fb866c..73331228f2f 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -195,8 +195,8 @@ if (empty($reshook)) // Mass actions $objectclass='ExpenseReport'; $objectlabel='ExpenseReport'; - $permtoread = $user->rights->expensereport->lire; - $permtodelete = $user->rights->expensereport->supprimer; + $permissiontoread = $user->rights->expensereport->lire; + $permissiontodelete = $user->rights->expensereport->supprimer; $uploaddir = $conf->expensereport->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 9cee1ec691c..028fd3f717b 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -160,8 +160,8 @@ if (empty($reshook)) // Mass actions $objectclass='Fichinter'; $objectlabel='Interventions'; - $permtoread = $user->rights->ficheinter->lire; - $permtodelete = $user->rights->ficheinter->supprimer; + $permissiontoread = $user->rights->ficheinter->lire; + $permissiontodelete = $user->rights->ficheinter->supprimer; $uploaddir = $conf->ficheinter->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index f8325ce8b0f..f14a8d92c66 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -223,8 +223,8 @@ if (empty($reshook)) // Mass actions $objectclass='CommandeFournisseur'; $objectlabel='SupplierOrders'; - $permtoread = $user->rights->fournisseur->commande->lire; - $permtodelete = $user->rights->fournisseur->commande->supprimer; + $permissiontoread = $user->rights->fournisseur->commande->lire; + $permissiontodelete = $user->rights->fournisseur->commande->supprimer; $uploaddir = $conf->fournisseur->commande->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index b13e283ea65..c06c070d45e 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -241,9 +241,9 @@ if (empty($reshook)) // Mass actions $objectclass='FactureFournisseur'; $objectlabel='SupplierInvoices'; - $permtoread = $user->rights->fournisseur->facture->lire; - $permtocreate = $user->rights->fournisseur->facture->creer; - $permtodelete = $user->rights->fournisseur->facture->supprimer; + $permissiontoread = $user->rights->fournisseur->facture->lire; + $permissiontoadd = $user->rights->fournisseur->facture->creer; + $permissiontodelete = $user->rights->fournisseur->facture->supprimer; $uploaddir = $conf->fournisseur->facture->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 3419d663e30..586617a79d6 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -95,8 +95,8 @@ if (empty($reshook)) /* $objectclass='Skeleton'; $objectlabel='Skeleton'; - $permtoread = $user->rights->skeleton->read; - $permtodelete = $user->rights->skeleton->delete; + $permissiontoread = $user->rights->skeleton->read; + $permissiontodelete = $user->rights->skeleton->delete; $uploaddir = $conf->skeleton->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; */ diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 8b30c03a1a9..273c3cf9133 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -196,8 +196,8 @@ if (empty($reshook)) // Mass actions $objectclass='Holiday'; $objectlabel='Holiday'; - $permtoread = $user->rights->holiday->read; - $permtodelete = $user->rights->holiday->delete; + $permissiontoread = $user->rights->holiday->read; + $permissiontodelete = $user->rights->holiday->delete; $uploaddir = $conf->holiday->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index 9e5f0ad0cba..813fe245cc1 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -110,8 +110,8 @@ if (empty($reshook)) // Mass actions /*$objectclass='MyObject'; $objectlabel='MyObject'; - $permtoread = $user->rights->mymodule->read; - $permtodelete = $user->rights->mymodule->delete; + $permissiontoread = $user->rights->mymodule->read; + $permissiontodelete = $user->rights->mymodule->delete; $uploaddir = $conf->mymodule->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; */ diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php index a1bf67cb8c5..776bec4171c 100644 --- a/htdocs/margin/checkMargins.php +++ b/htdocs/margin/checkMargins.php @@ -120,8 +120,8 @@ if (empty($reshook)) if ((string) $type == '1') { $objectlabel='Services'; } if ((string) $type == '0') { $objectlabel='Products'; } - $permtoread = $user->rights->produit->lire; - $permtodelete = $user->rights->produit->supprimer; + $permissiontoread = $user->rights->produit->lire; + $permissiontodelete = $user->rights->produit->supprimer; $uploaddir = $conf->product->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; */ diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index 08fbcbaa98e..bc5bab684dc 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -153,9 +153,9 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count $object->fields = dol_sort_array($object->fields, 'position'); $arrayfields = dol_sort_array($arrayfields, 'position'); -$permtoread = $user->rights->mymodule->myobject->read; +$permissiontoread = $user->rights->mymodule->myobject->read; $permtowrite = $user->rights->mymodule->myobject->write; -$permtodelete = $user->rights->mymodule->myobject->delete; +$permissiontodelete = $user->rights->mymodule->myobject->delete; /* @@ -347,7 +347,7 @@ $arrayofmassactions = array( //'builddoc'=>$langs->trans("PDFMerge"), //'presend'=>$langs->trans("SendByMail"), ); -if ($permtodelete) $arrayofmassactions['predelete']=''.$langs->trans("Delete"); +if ($permissiontodelete) $arrayofmassactions['predelete']=''.$langs->trans("Delete"); if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array(); $massactionbutton=$form->selectMassAction('', $arrayofmassactions); @@ -594,7 +594,7 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n $urlsource.=str_replace('&', '&', $param); $filedir=$diroutputmassaction; - $genallowed=$permtoread; + $genallowed=$permissiontoread; $delallowed=$permtowrite; print $formfile->showdocuments('massfilesarea_mymodule', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty); diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php index b91affe403f..7612700e4e5 100644 --- a/htdocs/mrp/mo_list.php +++ b/htdocs/mrp/mo_list.php @@ -177,8 +177,8 @@ if (empty($reshook)) // Mass actions $objectclass='Mo'; $objectlabel='Mo'; - $permtoread = $user->rights->mrp->read; - $permtodelete = $user->rights->mrp->delete; + $permissiontoread = $user->rights->mrp->read; + $permissiontodelete = $user->rights->mrp->delete; $uploaddir = $conf->mrp->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index 30bdae7787c..c99525f5740 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -133,8 +133,8 @@ if (empty($reshook)) // Mass actions $objectclass='Opensurveysondage'; $objectlabel='Opensurveysondage'; - $permtoread = $user->rights->opensurvey->read; - $permtodelete = $user->rights->opensurvey->write; + $permissiontoread = $user->rights->opensurvey->read; + $permissiontodelete = $user->rights->opensurvey->write; $uploaddir = $conf->opensurvey->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php index 9a20f00341b..de1fa138f81 100644 --- a/htdocs/product/inventory/list.php +++ b/htdocs/product/inventory/list.php @@ -153,8 +153,8 @@ if (empty($reshook)) // Mass actions $objectclass='Inventory'; $objectlabel='Inventory'; - $permtoread = $user->rights->stock->lire; - $permtodelete = $user->rights->stock->supprimer; + $permissiontoread = $user->rights->stock->lire; + $permissiontodelete = $user->rights->stock->supprimer; $uploaddir = $conf->stock->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 2f13c4921a9..d9369fcb148 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -253,8 +253,8 @@ if (empty($reshook)) if ((string) $search_type == '1') { $objectlabel='Services'; } if ((string) $search_type == '0') { $objectlabel='Products'; } - $permtoread = $user->rights->produit->lire; - $permtodelete = $user->rights->produit->supprimer; + $permissiontoread = $user->rights->produit->lire; + $permissiontodelete = $user->rights->produit->supprimer; $uploaddir = $conf->product->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index b38888be9bb..a87f1a28621 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -144,8 +144,8 @@ if (empty($reshook)) // Mass actions $objectclass='Entrepot'; $objectlabel='Warehouse'; - $permtoread = $user->rights->stock->lire; - $permtodelete = $user->rights->stock->supprimer; + $permissiontoread = $user->rights->stock->lire; + $permissiontodelete = $user->rights->stock->supprimer; $uploaddir = $conf->stock->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php index 5f4e1b97aa6..ecffe32483e 100644 --- a/htdocs/product/stock/movement_card.php +++ b/htdocs/product/stock/movement_card.php @@ -421,8 +421,8 @@ if (empty($reshook) && $action != 'remove_file') { $objectclass='MouvementStock'; $objectlabel='Movements'; - $permtoread = $user->rights->stock->lire; - $permtodelete = $user->rights->stock->supprimer; + $permissiontoread = $user->rights->stock->lire; + $permissiontodelete = $user->rights->stock->supprimer; $uploaddir = $conf->stock->dir_output . "/movement/"; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php index 3be66f6acfe..88949818698 100644 --- a/htdocs/product/stock/productlot_list.php +++ b/htdocs/product/stock/productlot_list.php @@ -158,8 +158,8 @@ if (empty($reshook)) { $objectclass='ProductLot'; $objectlabel='LotSerial'; - $permtoread = $user->rights->stock->read; - $permtodelete = $user->rights->stock->delete; + $permissiontoread = $user->rights->stock->read; + $permissiontodelete = $user->rights->stock->delete; $uploaddir = $conf->stock->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 6cbe9d68127..b4e17377add 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -202,8 +202,8 @@ if (empty($reshook)) // Mass actions $objectclass='Project'; $objectlabel='Project'; - $permtoread = $user->rights->projet->lire; - $permtodelete = $user->rights->projet->supprimer; + $permissiontoread = $user->rights->projet->lire; + $permissiontodelete = $user->rights->projet->supprimer; $uploaddir = $conf->projet->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 0bffd50ce62..f16a9070325 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -163,8 +163,8 @@ if (empty($reshook)) // Mass actions $objectclass='Task'; $objectlabel='Tasks'; - $permtoread = $user->rights->projet->lire; - $permtodelete = $user->rights->projet->supprimer; + $permissiontoread = $user->rights->projet->lire; + $permissiontodelete = $user->rights->projet->supprimer; $uploaddir = $conf->projet->dir_output.'/tasks'; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 8718806004b..326782f5a55 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -184,8 +184,8 @@ if (empty($reshook)) // Mass actions $objectclass='Task'; $objectlabel='Tasks'; - $permtoread = $user->rights->projet->lire; - $permtodelete = $user->rights->projet->supprimer; + $permissiontoread = $user->rights->projet->lire; + $permissiontodelete = $user->rights->projet->supprimer; $uploaddir = $conf->projet->dir_output.'/tasks'; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 8f0d1895c1b..260c165064e 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -304,8 +304,8 @@ if (empty($reshook)) // Mass actions $objectclass='Societe'; $objectlabel='ThirdParty'; - $permtoread = $user->rights->societe->lire; - $permtodelete = $user->rights->societe->supprimer; + $permissiontoread = $user->rights->societe->lire; + $permissiontodelete = $user->rights->societe->supprimer; $uploaddir = $conf->societe->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index 5e199722961..81698820eb8 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -156,8 +156,8 @@ if (empty($reshook)) // Mass actions $objectclass='WebsiteAccount'; $objectlabel='WebsiteAccount'; - $permtoread = $user->rights->societe->lire; - $permtodelete = $user->rights->societe->supprimer; + $permissiontoread = $user->rights->societe->lire; + $permissiontodelete = $user->rights->societe->supprimer; $uploaddir = $conf->societe->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index c48f3756611..e8cad1541ed 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -214,8 +214,8 @@ if (empty($reshook)) { $objectclass='SupplierProposal'; $objectlabel='SupplierProposals'; - $permtoread = $user->rights->supplier_proposal->lire; - $permtodelete = $user->rights->supplier_proposal->supprimer; + $permissiontoread = $user->rights->supplier_proposal->lire; + $permissiontodelete = $user->rights->supplier_proposal->supprimer; $uploaddir = $conf->supplier_proposal->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index 2d4fe3d146f..4ca9140145b 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -176,8 +176,8 @@ if (empty($reshook)) // Mass actions $objectclass='Ticket'; $objectlabel='Ticket'; - $permtoread = $user->rights->ticket->read; - $permtodelete = $user->rights->ticket->delete; + $permissiontoread = $user->rights->ticket->read; + $permissiontodelete = $user->rights->ticket->delete; $uploaddir = $conf->ticket->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } diff --git a/htdocs/zapier/hook_list.php b/htdocs/zapier/hook_list.php index e622ce8bcff..2132cd5da25 100644 --- a/htdocs/zapier/hook_list.php +++ b/htdocs/zapier/hook_list.php @@ -191,8 +191,8 @@ if (empty($reshook)) { // Mass actions $objectclass='Hook'; $objectlabel='Hook'; - $permtoread = $user->rights->mymodule->read; - $permtodelete = $user->rights->mymodule->delete; + $permissiontoread = $user->rights->mymodule->read; + $permissiontodelete = $user->rights->mymodule->delete; $uploaddir = $conf->mymodule->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; }