diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 0504315075d..94c396f049d 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -404,7 +404,7 @@ if ($action == 'edit') {
}
print '
';
// SuperAdministrator access only
- if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+ if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
print '';
print '';
print ''.$langs->trans("SeeLocalSendMailSetup").'';
@@ -435,7 +435,7 @@ if ($action == 'edit') {
}
print ' | ';
// SuperAdministrator access only
- if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+ if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
print '';
print '';
print ''.$langs->trans("SeeLocalSendMailSetup").'';
@@ -453,7 +453,7 @@ if ($action == 'edit') {
$mainstmpid = (!empty($conf->global->MAIN_MAIL_SMTPS_ID) ? $conf->global->MAIN_MAIL_SMTPS_ID : '');
print ' | | '.$langs->trans("MAIN_MAIL_SMTPS_ID").' | ';
// SuperAdministrator access only
- if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+ if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
print '';
} else {
$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -467,7 +467,7 @@ if ($action == 'edit') {
// OAUTH
if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) {
print ' |
| '.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").' | ';
- if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+ if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
print ' ';
print '';
print ' ';
@@ -489,7 +489,7 @@ if ($action == 'edit') {
print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_PW"), $langs->trans("WithGMailYouCanCreateADedicatedPassword"));
print ' | ';
// SuperAdministrator access only
- if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+ if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
print '';
} else {
$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -911,7 +911,7 @@ if ($action == 'edit') {
print ''.$langs->trans("DoTestSend").'';
- if (!empty($conf->fckeditor->enabled)) {
+ if (isModEnabled('fckeditor')) {
print ''.$langs->trans("DoTestSendHTML").'';
}
}
|