From dbbb0d0a5d3fbebcfed1fb86e3fe1cfda65e61d7 Mon Sep 17 00:00:00 2001
From: Luca <lucasalva87@users.noreply.github.com>
Date: Thu, 27 Dec 2018 19:08:23 +0100
Subject: [PATCH] =?UTF-8?q?Introduzione=20della=20possibilit=C3=A0=20di=20?=
 =?UTF-8?q?non=20verificare=20il=20certificato=20SSL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/anagrafiche/edit.php |  2 +-
 modules/smtp/edit.php        |  8 +++++++-
 src/Mail.php                 | 12 ++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/modules/anagrafiche/edit.php b/modules/anagrafiche/edit.php
index 4eb7e7583..debc763c3 100644
--- a/modules/anagrafiche/edit.php
+++ b/modules/anagrafiche/edit.php
@@ -510,7 +510,7 @@ if (!empty($google)) {
 
 if (setting('Azienda predefinita') == $id_record) {
     echo '
-<div class="alert alert-info text-center">'.tr('Per impostare il logo delle stampe, caricare un file specificando come nome dell\'allegato "Logo stampe" (Risoluzione consigliata 302x111 pixel)').'.</div>';
+<div class="alert alert-info text-center">'.tr('Per impostare il logo delle stampe, caricare un file ".jpg" specificando come nome dell\'allegato "Logo stampe" (Risoluzione consigliata 302x111 pixel)').'.</div>';
 }
 
 // Collegamenti diretti
diff --git a/modules/smtp/edit.php b/modules/smtp/edit.php
index 5102104a8..a9e4d5085 100644
--- a/modules/smtp/edit.php
+++ b/modules/smtp/edit.php
@@ -33,9 +33,15 @@ include_once __DIR__.'/../../core.php';
                     {[ "type": "text", "label": "<?php echo tr('Nome visualizzato'); ?>", "name": "from_name", "value": "$from_name$" ]}
                 </div>
 
-                <div class="col-md-6">
+                <div class="col-md-3">
                     {[ "type": "email", "label": "<?php echo tr('Email mittente'); ?>", "name": "from_address", "value": "$from_address$", "required": 1 ]}
                 </div>
+			
+				<div class="col-md-3">
+                    {[ "type": "checkbox", "label": "<?php echo tr('Non verificare il certificato SSL'); ?>", "name": "ssl_no_verify", "value": "$ssl_no_verify$" ]}
+                </div>
+				
+				
             </div>
 
             <div class="row">
diff --git a/src/Mail.php b/src/Mail.php
index d90f35440..2c41e691b 100644
--- a/src/Mail.php
+++ b/src/Mail.php
@@ -181,6 +181,18 @@ class Mail extends PHPMailer\PHPMailer\PHPMailer
             if (in_array(strtolower($config['encryption']), ['ssl', 'tls'])) {
                 $this->SMTPSecure = strtolower($config['encryption']);
             }
+			
+			if (!empty($config['ssl_no_verify'])){
+				$this->SMTPOptions = array (
+					'ssl' => array(
+						'verify_peer'  => false,
+						'verify_peer_name'  => false,
+						'allow_self_signed' => true
+						)
+				);
+			}
+			
+			
         }
 
         $this->From = $config['from_address'];