diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 349cf5e7b75..88e31ebffb6 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -89,8 +89,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
$form = new Form($db);
$title = $langs->trans("Member")." - ".$langs->trans("Documents");
-$helpurl = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros";
-llxHeader("", $title, $helpurl);
+
+$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
+
+llxHeader("", $title, $help_url);
if ($id > 0) {
$result = $membert->fetch($object->typeid);
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 515357df904..72d16569b25 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -677,17 +677,17 @@ if ($action == 'edit') {
// Domain
print '
| '.$langs->trans("MAIN_MAIL_EMAIL_DKIM_DOMAIN").' | ';
- print ''.$conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN;
+ print ' | '.getDolGlobalString('MAIN_MAIL_EMAIL_DKIM_DOMAIN');
print ' |
';
// Selector
print '| '.$langs->trans("MAIN_MAIL_EMAIL_DKIM_SELECTOR").' | ';
- print ''.$conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR;
+ print ' | '.getDolGlobalString('MAIN_MAIL_EMAIL_DKIM_SELECTOR');
print ' |
';
// PRIVATE KEY
print '| '.$langs->trans("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").' | ';
- print ''.$conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY;
+ print ' | '.getDolGlobalString('MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY');
print ' |
';
}
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 34da40010b5..cb5df373645 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -446,12 +446,12 @@ if ($action == 'edit') {
// SMTPS ID
if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer'))) {
- print '| '.$langs->trans("MAIN_MAIL_SMTPS_ID").' | '.$conf->global->MAIN_MAIL_SMTPS_ID_EMAILING.' |
';
+ print '| '.$langs->trans("MAIN_MAIL_SMTPS_ID").' | '.getDolGlobalString('MAIN_MAIL_SMTPS_ID_EMAILING').' |
';
}
// SMTPS PW
if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer'))) {
- print '| '.$langs->trans("MAIN_MAIL_SMTPS_PW").' | '.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW_EMAILING).' |
';
+ print '| '.$langs->trans("MAIN_MAIL_SMTPS_PW").' | '.preg_replace('/./', '*', getDolGlobalString('MAIN_MAIL_SMTPS_PW_EMAILING')).' |
';
}
// TLS
@@ -484,7 +484,7 @@ if ($action == 'edit') {
print '| '.$langs->trans("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").' | ';
if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer'))) {
if (function_exists('openssl_open')) {
- print yn($conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING);
+ print yn(getDolGlobalInt('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING'));
} else {
print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
}
@@ -503,11 +503,9 @@ if ($action == 'edit') {
print ' ';
/*
// Warning 1
- if ($linuxlike)
- {
+ if ($linuxlike) {
$sendmailoption=ini_get('mail.force_extra_parameters');
- if (empty($sendmailoption) || ! preg_match('/ba/',$sendmailoption))
- {
+ if (empty($sendmailoption) || ! preg_match('/ba/',$sendmailoption)) {
print info_admin($langs->trans("SendmailOptionNotComplete"));
}
}*/
|