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

Fix: view this in development status

Browse Source
This commit is contained in:
Regis Houssin 2011-03-26 09:48:31 +00:00
parent 71d2d4e931
commit 90eaab6ea7
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/admin/mails.php
View File

@ -569,12 +569,15 @@ else
else print yn(0).' ('.$langs->trans("NotSupported").')'; else print yn(0).' ('.$langs->trans("NotSupported").')';
print '</td></tr>'; print '</td></tr>';
// Inline images // Inline images
/* $var=!$var; if ($conf->global->MAIN_FEATURES_LEVEL > 0)
print '<tr '.$bcnd[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_INLINE_IMAGES").'</td><td>'; {
print yn($conf->global->MAIN_MAIL_EMAIL_INLINE_IMAGES,1,0); $var=!$var;
print '</td></tr>'; print '<tr '.$bcnd[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_INLINE_IMAGES").'</td><td>';
*/ print yn($conf->global->MAIN_MAIL_EMAIL_INLINE_IMAGES,1,0);
print '</td></tr>';
}
// Separator // Separator
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>'; print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';

1
htdocs/langs/en_US/admin.lang
View File

@ -231,6 +231,7 @@ MAIN_MAIL_SENDMODE=Method to use to send EMails
MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
MAIN_MAIL_EMAIL_INLINE_IMAGES= Ability to integrate images in emails
MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos) MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
MAIN_SMS_SENDMODE=Method to use to send SMS MAIN_SMS_SENDMODE=Method to use to send SMS
MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending

3
htdocs/langs/fr_FR/admin.lang
View File

@ -231,7 +231,8 @@ MAIN_DISABLE_ALL_MAILS= Désactiver globalement tout envoi de mails (pour mode t
MAIN_MAIL_SENDMODE= Méthode d'envoi des mails MAIN_MAIL_SENDMODE= Méthode d'envoi des mails
MAIN_MAIL_SMTPS_ID= SMTP Authentification ID si authentification SMTP requise MAIN_MAIL_SMTPS_ID= SMTP Authentification ID si authentification SMTP requise
MAIN_MAIL_SMTPS_PW= SMTP Authentification Password si authentification SMTP requise MAIN_MAIL_SMTPS_PW= SMTP Authentification Password si authentification SMTP requise
MAIN_MAIL_EMAIL_TLS= Utilisation du cryptage TLS (SSL) MAIN_MAIL_EMAIL_TLS= Utilisation du cryptage TLS (SSL)
MAIN_MAIL_EMAIL_INLINE_IMAGES= Possibilité d'intégrer les images dans les mails
MAIN_DISABLE_ALL_SMS=Désactiver globalement tout envoi de Sms (pour mode test ou démos) MAIN_DISABLE_ALL_SMS=Désactiver globalement tout envoi de Sms (pour mode test ou démos)
MAIN_SMS_SENDMODE=Méthode d'envoi des SMS MAIN_SMS_SENDMODE=Méthode d'envoi des SMS
MAIN_MAIL_SMS_FROM=Numéro de téléphone par défaut pour envoi Sms MAIN_MAIL_SMS_FROM=Numéro de téléphone par défaut pour envoi Sms