From 90eaab6ea718d6cea485046256ce2b410111a066 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 26 Mar 2011 09:48:31 +0000
Subject: [PATCH] Fix: view this in development status

---
 htdocs/admin/mails.php        | 15 +++++++++------
 htdocs/langs/en_US/admin.lang |  1 +
 htdocs/langs/fr_FR/admin.lang |  3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 4e2f7ce67aa..772d9b1117a 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -569,12 +569,15 @@ else
 	else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
-    // Inline images
-/*  	$var=!$var;
-    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>';
-*/
+	// Inline images
+	if ($conf->global->MAIN_FEATURES_LEVEL > 0)
+	{
+		$var=!$var;
+		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
 	$var=!$var;
 	print '<tr '.$bc[$var].'><td colspan="2">&nbsp;</td></tr>';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b438827ea7e..df85680bb8e 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -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_PW=SMTP Password if authentication required
 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_SMS_SENDMODE=Method to use to send SMS
 MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index fc6a0245174..716aa2937d7 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -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_SMTPS_ID= SMTP Authentification ID 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_SMS_SENDMODE=Méthode d'envoi des SMS
 MAIN_MAIL_SMS_FROM=Numéro de téléphone par défaut pour envoi Sms