From c646b89f55e8662a4d8711f4e18ab7c1673029fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 1 Nov 2009 14:45:52 +0000
Subject: [PATCH] Fix: Sending mail with SMTPS was not working.
---
htdocs/admin/mails.php | 4 ++--
htdocs/lib/CMailFile.class.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 0a945a64e59..5a8881b656d 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -191,7 +191,7 @@ if (! $server) $server='127.0.0.1';
* View
*/
-$wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
+$wikihelp='EN:Setup EMails|FR:Paramétrage EMails|ES:Configuración EMails';
llxHeader($langs->trans("Setup"),'',$wikihelp);
print_fiche_titre($langs->trans("EMailsSetup"),'','setup');
@@ -481,7 +481,7 @@ else
print_titre($langs->trans("DoTestServerAvailability"));
// If we use SSL/TLS
- if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS)) $server='ssl://'.$server;
+ if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server;
include_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
$mail = new CMailFile('','','','');
diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php
index b275556befd..e27d5763b7a 100644
--- a/htdocs/lib/CMailFile.class.php
+++ b/htdocs/lib/CMailFile.class.php
@@ -524,7 +524,7 @@ class CMailFile
// If we use SSL/TLS
$server=$conf->global->MAIN_MAIL_SMTP_SERVER;
- if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS)) $server='ssl://'.$server;
+ if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server;
$this->smtps->setHost($server);
$this->smtps->setPort($conf->global->MAIN_MAIL_SMTP_PORT); // 25, 465...;
--
GitLab