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

use isModEnabled

Browse Source
This commit is contained in:
Frédéric FRANCE 2023-04-18 20:23:34 +02:00
parent 15c60e29f4
commit a38a303e1c
11 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/commande/list_det.php
View File

@ -875,7 +875,7 @@ if ($resql) {
$moreforfilter .= '</div>'; $moreforfilter .= '</div>';
} }
// If the user can view prospects other than his' // If the user can view prospects other than his'
if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) { if (isModEnabled("categorie") && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$moreforfilter .= '<div class="divsearchfield">'; $moreforfilter .= '<div class="divsearchfield">';
$tmptitle = $langs->trans('IncludingProductWithTag'); $tmptitle = $langs->trans('IncludingProductWithTag');
@ -883,7 +883,7 @@ if ($resql) {
$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1); $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1);
$moreforfilter .= '</div>'; $moreforfilter .= '</div>';
} }
if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) { if (isModEnabled("categorie") && $user->rights->categorie->lire) {
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$moreforfilter .= '<div class="divsearchfield">'; $moreforfilter .= '<div class="divsearchfield">';
$tmptitle = $langs->trans('CustomersProspectsCategoriesShort'); $tmptitle = $langs->trans('CustomersProspectsCategoriesShort');

4
htdocs/contrat/list.php
View File

@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
if (!empty($conf->categorie->enabled)) { if (isModEnabled("categorie")) {
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
} }
@ -701,7 +701,7 @@ if (isModEnabled('categorie') && $user->rights->categorie->lire && ($user->right
$moreforfilter .= '</div>'; $moreforfilter .= '</div>';
} }
// Filter on customer categories // Filter on customer categories
if (!empty($conf->global->MAIN_SEARCH_CATEGORY_CUSTOMER_ON_CONTRACT_LIST) && !empty($conf->categorie->enabled) && $user->rights->categorie->lire) { if (!empty($conf->global->MAIN_SEARCH_CATEGORY_CUSTOMER_ON_CONTRACT_LIST) && isModEnabled("categorie") && $user->rights->categorie->lire) {
$moreforfilter .= '<div class="divsearchfield">'; $moreforfilter .= '<div class="divsearchfield">';
$tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort'); $tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"'); $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');

2
htdocs/core/modules/mailings/advthirdparties.modules.php
View File

@ -253,7 +253,7 @@ class mailing_advthirdparties extends MailingTargets
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
if (empty($conf->categorie->enabled)) { if (!isModEnabled("categorie")) {
$num = 0; // Force empty list if category module is not enabled $num = 0; // Force empty list if category module is not enabled
} }

2
htdocs/core/modules/mailings/thirdparties.modules.php
View File

@ -295,7 +295,7 @@ class mailing_thirdparties extends MailingTargets
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
if (empty($conf->categorie->enabled)) { if (!isModEnabled("categorie")) {
$num = 0; // Force empty list if category module is not enabled $num = 0; // Force empty list if category module is not enabled
} }

14
htdocs/core/modules/modTicket.class.php
View File

@ -157,7 +157,7 @@ class modTicket extends DolibarrModules
'tabfieldvalue' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public,fk_parent", "code,label,pos,use_default"), 'tabfieldvalue' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public,fk_parent", "code,label,pos,use_default"),
'tabfieldinsert' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public,fk_parent", "code,label,pos,use_default"), 'tabfieldinsert' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public,fk_parent", "code,label,pos,use_default"),
'tabrowid' => array("rowid", "rowid", "rowid", "rowid"), 'tabrowid' => array("rowid", "rowid", "rowid", "rowid"),
'tabcond' => array($conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled && getDolGlobalString('TICKET_ENABLE_RESOLUTION')), 'tabcond' => array(isModEnabled("ticket"), isModEnabled("ticket"), isModEnabled("ticket"), isModEnabled("ticket") && getDolGlobalString('TICKET_ENABLE_RESOLUTION')),
'tabhelp' => array( 'tabhelp' => array(
array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")),
array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")),
@ -238,7 +238,7 @@ class modTicket extends DolibarrModules
'url' => '/ticket/index.php', 'url' => '/ticket/index.php',
'langs' => 'ticket', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'langs' => 'ticket', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
'position' => 88, 'position' => 88,
'enabled' => '$conf->ticket->enabled', 'enabled' => 'isModEnabled("ticket")',
'perms' => '$user->rights->ticket->read', // Use 'perms'=>'$user->rights->ticket->level1->level2' if you want your menu with a permission rules 'perms' => '$user->rights->ticket->read', // Use 'perms'=>'$user->rights->ticket->level1->level2' if you want your menu with a permission rules
'target' => '', 'target' => '',
'user' => 2); // 0=Menu for internal users, 1=external users, 2=both 'user' => 2); // 0=Menu for internal users, 1=external users, 2=both
@ -253,7 +253,7 @@ class modTicket extends DolibarrModules
'url' => '/ticket/index.php', 'url' => '/ticket/index.php',
'langs' => 'ticket', 'langs' => 'ticket',
'position' => 101, 'position' => 101,
'enabled' => '$conf->ticket->enabled', 'enabled' => 'isModEnabled("ticket")',
'perms' => '$user->rights->ticket->read', 'perms' => '$user->rights->ticket->read',
'target' => '', 'target' => '',
'user' => 2); 'user' => 2);
@ -266,7 +266,7 @@ class modTicket extends DolibarrModules
'url' => '/ticket/card.php?action=create', 'url' => '/ticket/card.php?action=create',
'langs' => 'ticket', 'langs' => 'ticket',
'position' => 102, 'position' => 102,
'enabled' => '$conf->ticket->enabled', 'enabled' => 'isModEnabled("ticket")',
'perms' => '$user->rights->ticket->write', 'perms' => '$user->rights->ticket->write',
'target' => '', 'target' => '',
'user' => 2); 'user' => 2);
@ -280,7 +280,7 @@ class modTicket extends DolibarrModules
'url' => '/ticket/list.php?search_fk_status=non_closed', 'url' => '/ticket/list.php?search_fk_status=non_closed',
'langs' => 'ticket', 'langs' => 'ticket',
'position' => 103, 'position' => 103,
'enabled' => '$conf->ticket->enabled', 'enabled' => 'isModEnabled("ticket")',
'perms' => '$user->rights->ticket->read', 'perms' => '$user->rights->ticket->read',
'target' => '', 'target' => '',
'user' => 2); 'user' => 2);
@ -294,7 +294,7 @@ class modTicket extends DolibarrModules
'url' => '/ticket/list.php?mode=mine&search_fk_status=non_closed', 'url' => '/ticket/list.php?mode=mine&search_fk_status=non_closed',
'langs' => 'ticket', 'langs' => 'ticket',
'position' => 105, 'position' => 105,
'enabled' => '$conf->ticket->enabled', 'enabled' => 'isModEnabled("ticket")',
'perms' => '$user->rights->ticket->read', 'perms' => '$user->rights->ticket->read',
'target' => '', 'target' => '',
'user' => 0); 'user' => 0);
@ -307,7 +307,7 @@ class modTicket extends DolibarrModules
'url' => '/ticket/stats/index.php', 'url' => '/ticket/stats/index.php',
'langs' => 'ticket', 'langs' => 'ticket',
'position' => 107, 'position' => 107,
'enabled' => '$conf->ticket->enabled', 'enabled' => 'isModEnabled("ticket")',
'perms' => '$user->rights->ticket->read', 'perms' => '$user->rights->ticket->read',
'target' => '', 'target' => '',
'user' => 0); 'user' => 0);

3
htdocs/projet/activity/perday.php
View File

@ -495,8 +495,7 @@ print '<div class="clearboth" style="padding-bottom: 20px;"></div>';
$moreforfilter = ''; $moreforfilter = '';
// Filter on categories // Filter on categories
/*if (!empty($conf->categorie->enabled)) /*if (isModEnabled("categorie")) {
{
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
$moreforfilter.='<div class="divsearchfield">'; $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('ProjectCategories'). ': '; $moreforfilter.=$langs->trans('ProjectCategories'). ': ';

3
htdocs/projet/activity/permonth.php
View File

@ -410,8 +410,7 @@ $moreforfilter = '';
// Filter on categories // Filter on categories
/* /*
if (!empty($conf->categorie->enabled)) if (isModEnabled("categorie")) {
{
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
$moreforfilter.='<div class="divsearchfield">'; $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('ProjectCategories'). ': '; $moreforfilter.=$langs->trans('ProjectCategories'). ': ';

3
htdocs/projet/activity/perweek.php
View File

@ -546,8 +546,7 @@ $moreforfilter = '';
// Filter on categories // Filter on categories
/* /*
if (!empty($conf->categorie->enabled)) if (isModEnabled("categorie")) {
{
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
$moreforfilter.='<div class="divsearchfield">'; $moreforfilter.='<div class="divsearchfield">';
$moreforfilter.=$langs->trans('ProjectCategories'). ': '; $moreforfilter.=$langs->trans('ProjectCategories'). ': ';

2
htdocs/projet/list.php
View File

@ -1006,7 +1006,7 @@ if (isModEnabled('categorie') && $user->rights->categorie->lire) {
$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array, 'minwidth300imp widthcentpercentminusx'); $moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array, 'minwidth300imp widthcentpercentminusx');
} }
// Filter on customer categories // Filter on customer categories
if (!empty($conf->global->MAIN_SEARCH_CATEGORY_CUSTOMER_ON_PROJECT_LIST) && !empty($conf->categorie->enabled) && $user->rights->categorie->lire) { if (!empty($conf->global->MAIN_SEARCH_CATEGORY_CUSTOMER_ON_PROJECT_LIST) && isModEnabled("categorie") && $user->rights->categorie->lire) {
$moreforfilter .= '<div class="divsearchfield">'; $moreforfilter .= '<div class="divsearchfield">';
$tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort'); $tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"'); $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');

2
htdocs/projet/tasks/list.php
View File

@ -806,7 +806,7 @@ $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form-
$moreforfilter .= '</div>'; $moreforfilter .= '</div>';
// Filter on customer categories // Filter on customer categories
if (!empty($conf->global->MAIN_SEARCH_CATEGORY_CUSTOMER_ON_TASK_LIST) && !empty($conf->categorie->enabled) && $user->rights->categorie->lire) { if (!empty($conf->global->MAIN_SEARCH_CATEGORY_CUSTOMER_ON_TASK_LIST) && isModEnabled("categorie") && $user->rights->categorie->lire) {
$moreforfilter .= '<div class="divsearchfield">'; $moreforfilter .= '<div class="divsearchfield">';
$tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort'); $tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"'); $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');

2
htdocs/user/card.php
View File

@ -353,7 +353,7 @@ if (empty($reshook)) {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
$action = "create"; // Go back to create page $action = "create"; // Go back to create page
} else { } else {
if (!empty($conf->categorie->enabled)) { if (isModEnabled("categorie")) {
// Categories association // Categories association
$usercats = GETPOST('usercats', 'array'); $usercats = GETPOST('usercats', 'array');
$object->setCategories($usercats); $object->setCategories($usercats);