diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 6f6bb746336..ab12d1419b6 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -20,7 +20,7 @@
/**
* \file htdocs/admin/mails.php
* \brief Page to setup emails sending
- * \version $Id: mails.php,v 1.70 2011/07/02 16:48:31 eldy Exp $
+ * \version $Id: mails.php,v 1.71 2011/07/09 05:28:41 hregis Exp $
*/
require("../main.inc.php");
@@ -61,7 +61,6 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["can
if (isset($_POST["MAIN_MAIL_SMTPS_ID"])) dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID", $_POST["MAIN_MAIL_SMTPS_ID"],'chaine',0,'',0);
if (isset($_POST["MAIN_MAIL_SMTPS_PW"])) dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", $_POST["MAIN_MAIL_SMTPS_PW"],'chaine',0,'',0);
if (isset($_POST["MAIN_MAIL_EMAIL_TLS"])) dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", $_POST["MAIN_MAIL_EMAIL_TLS"],'chaine',0,'',0);
- dolibarr_set_const($db, "MAIN_MAIL_EMAIL_INLINE_IMAGES", $_POST["MAIN_MAIL_EMAIL_INLINE_IMAGES"],'chaine',0,'',0);
dolibarr_set_const($db, "MAIN_MAIL_EMAIL_FROM", $_POST["MAIN_MAIL_EMAIL_FROM"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_MAIL_AUTOCOPY_TO", $_POST["MAIN_MAIL_AUTOCOPY_TO"],'chaine',0,'',$conf->entity);
@@ -283,8 +282,6 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
jQuery(".drag").hide();
jQuery("#MAIN_MAIL_EMAIL_TLS").val(0);
jQuery("#MAIN_MAIL_EMAIL_TLS").attr(\'disabled\', \'disabled\');
- jQuery("#MAIN_MAIL_EMAIL_INLINE_IMAGES").val('.$conf->global->MAIN_MAIL_EMAIL_INLINE_IMAGES.');
- jQuery("#MAIN_MAIL_EMAIL_INLINE_IMAGES").removeAttr(\'disabled\');
';
if ($linuxlike)
{
@@ -300,8 +297,6 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
jQuery("#MAIN_MAIL_EMAIL_TLS").removeAttr(\'disabled\');
jQuery("#MAIN_MAIL_SMTP_SERVER").removeAttr(\'disabled\');
jQuery("#MAIN_MAIL_SMTP_PORT").removeAttr(\'disabled\');
- jQuery("#MAIN_MAIL_EMAIL_INLINE_IMAGES").val(0);
- jQuery("#MAIN_MAIL_EMAIL_INLINE_IMAGES").attr(\'disabled\', \'disabled\');
}
}
initfields();
@@ -463,15 +458,6 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
else print yn(0).' ('.$langs->trans("NotSupported").')';
print '';
- // Inline images
- if ($conf->global->MAIN_FEATURES_LEVEL > 0)
- {
- $var=!$var;
- print '| '.$langs->trans("MAIN_MAIL_EMAIL_INLINE_IMAGES").' | ';
- print $html->selectyesno('MAIN_MAIL_EMAIL_INLINE_IMAGES',$conf->global->MAIN_MAIL_EMAIL_INLINE_IMAGES,1);
- print ' |
';
- }
-
// Separator
$var=!$var;
print '| |
';
@@ -571,15 +557,6 @@ else
else print yn(0).' ('.$langs->trans("NotSupported").')';
print '';
- // Inline images
- if ($conf->global->MAIN_FEATURES_LEVEL > 0)
- {
- $var=!$var;
- print '| '.$langs->trans("MAIN_MAIL_EMAIL_INLINE_IMAGES").' | ';
- print yn($conf->global->MAIN_MAIL_EMAIL_INLINE_IMAGES,1,0);
- print ' |
';
- }
-
// Separator
$var=!$var;
print '| |
';
@@ -746,5 +723,5 @@ else
$db->close();
-llxFooter('$Date: 2011/07/02 16:48:31 $ - $Revision: 1.70 $');
+llxFooter('$Date: 2011/07/09 05:28:41 $ - $Revision: 1.71 $');
?>
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 6cd0d6761b8..e9e0a507b7e 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -25,7 +25,7 @@
* \ingroup core
* \brief Fichier de la classe de stockage de la config courante
* \remarks La config est stockee dans le fichier conf/conf.php
- * \version $Id: conf.class.php,v 1.59 2011/07/01 23:06:06 eldy Exp $
+ * \version $Id: conf.class.php,v 1.60 2011/07/09 05:28:42 hregis Exp $
*/
@@ -363,7 +363,6 @@ class Conf
// Defini MAIN_GRAPH_LIBRARY
if (empty($this->global->MAIN_GRAPH_LIBRARY)) $this->global->MAIN_GRAPH_LIBRARY = 'artichow';
- if (! isset($this->global->MAIN_MAIL_EMAIL_INLINE_IMAGES)) $this->global->MAIN_MAIL_EMAIL_INLINE_IMAGES=1;
if (! isset($this->global->FCKEDITOR_EDITORNAME)) $this->global->FCKEDITOR_EDITORNAME='ckeditor'; // fckeditor to switch
// Format for date (used by default when not found or searched in lang)
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 69698125f47..848deab542a 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -236,7 +236,6 @@ MAIN_MAIL_SENDMODE=Mètode d'enviament d'e-mails
MAIN_MAIL_SMTPS_ID=ID d'autenticació SMTP si es requereix autenticació SMTP
MAIN_MAIL_SMTPS_PW=Contrasenya autentificació SMTP si es requereix autenticació SMTP
MAIN_MAIL_EMAIL_TLS=Ús d'encriptació TLS (SSL)
-MAIN_MAIL_EMAIL_INLINE_IMAGES=Possibilitat d'integrar les imatges en els correus electrònics
MAIN_DISABLE_ALL_SMS=Desactivar globalment tot enviament de SMS (per mode de proves o demo)
MAIN_SMS_SENDMODE=Mètode d'enviament de SMS
MAIN_MAIL_SMS_FROM=Número de telèfon per defecte per als enviaments SMS
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 3836ec79775..a9fe2695958 100755
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -1234,7 +1234,6 @@ RunCommandSummaryToLaunch=Backup μπορεί να ξεκινήσει με τη
ImportPostgreSqlDesc=Για την εισαγωγή ενός αντιγράφου ασφαλείας, πρέπει να χρησιμοποιήσετε pg_restore εντολή από την γραμμή εντολών:
ImportPostgreSqlCommand=Sssss sssss mybackupfile.sql
FullPathToPostgreSQLdumpCommand=Η πλήρης διαδρομή προς pg_dump εντολή
-MAIN_MAIL_EMAIL_INLINE_IMAGES=Δυνατότητα για την ενσωμάτωση εικόνων σε μηνύματα ηλεκτρονικού ταχυδρομείου
MAIN_DISABLE_ALL_SMS=Απενεργοποίηση όλων σας αποστολές SMS (για λόγους δοκιμής ή demos)
MAIN_SMS_SENDMODE=Μέθοδος να χρησιμοποιήσετε για την αποστολή SMS
MAIN_MAIL_SMS_FROM=Προεπιλογή αριθμού τηλεφώνου αποστολέα για την αποστολή SMS
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 2058244178c..9f153916ea5 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -235,7 +235,6 @@ 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/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 21869c2e3d2..5645bd6ff6f 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -236,7 +236,6 @@ MAIN_MAIL_SENDMODE=Método de envío de e-mails
MAIN_MAIL_SMTPS_ID=ID de autentificación SMTP si se requiere autenticación SMTP
MAIN_MAIL_SMTPS_PW=Contraseña autentificación SMTP si se requiere autentificación SMTP
MAIN_MAIL_EMAIL_TLS=Uso de encriptación TLS (SSL)
-MAIN_MAIL_EMAIL_INLINE_IMAGES=Posibilidad de integrar las imágenes en los e-mails
MAIN_DISABLE_ALL_SMS=Desactivar globalmente todo envío de SMS (para modo de pruebas o demo)
MAIN_SMS_SENDMODE=Método de envío de SMS
MAIN_MAIL_SMS_FROM=Número de teléfono por defecto para los envíos SMS
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index d03c568bef9..2729073a3b8 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -236,7 +236,6 @@ 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_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
@@ -854,6 +853,7 @@ MAIN_PROXY_USER=Login pour passer le serveur proxy mandataire
MAIN_PROXY_PASS=Mot de passe pour passer le serveur proxy mandataire
DefineHereComplementaryAttributes=Definissez ici la liste des attributs supplémentaire, non disponible en standard, et que vous voulez voir gérez sur les %s.
ExtraFields=Attributs suplémentaires
+SendingMailSetup=Configuration de l'envoi par mail
##### Module password generation= undefined
PasswordGenerationStandard= Renvoie un mot de passe généré selon algorithme interne Dolibarr: 8 caractères, chiffres et caractères en minuscules mélangés.
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 7293a1f5af7..776f38f948c 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -1250,7 +1250,6 @@ ImportPostgreSqlCommand=%s %s mybackupfile.sql
FullPathToPostgreSQLdumpCommand=Percorso completo pg_dump comando
CurrentMenuHandler=Menu gestore corrente
CurrentSmartphoneMenuHandler=Attuale gestore menu smartphone
-MAIN_MAIL_EMAIL_INLINE_IMAGES=Capacità di integrare le immagini nelle e-mail
MAIN_DISABLE_ALL_SMS=Disabilitare tutti spedizioni SMS (per scopi di test o demo)
MAIN_SMS_SENDMODE=Metodo da utilizzare per inviare SMS
MAIN_MAIL_SMS_FROM=Predefinito numero di telefono del mittente per l'invio di Sms