From f3c623d403f5827f70dbfc8a6dc8a8ae97c64d93 Mon Sep 17 00:00:00 2001
From: Lai Power <kawaiipunk@posteo.net>
Date: Mon, 5 May 2025 12:50:58 +0000
Subject: [PATCH] updated plugin `SMTP Mailer` version 1.1.18

---
 wp-content/plugins/smtp-mailer/main.php   | 11 ++++++-----
 wp-content/plugins/smtp-mailer/readme.txt | 17 +++++++++++++----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/wp-content/plugins/smtp-mailer/main.php b/wp-content/plugins/smtp-mailer/main.php
index 562c1bad..abe0bed2 100644
--- a/wp-content/plugins/smtp-mailer/main.php
+++ b/wp-content/plugins/smtp-mailer/main.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: SMTP Mailer
-Version: 1.1.15
+Version: 1.1.18
 Plugin URI: https://wphowto.net/smtp-mailer-plugin-for-wordpress-1482
 Author: naa986
 Author URI: https://wphowto.net/
@@ -16,8 +16,8 @@ if (!defined('ABSPATH')){
 
 class SMTP_MAILER {
     
-    var $plugin_version = '1.1.15';
-    var $phpmailer_version = '6.9.1';
+    var $plugin_version = '1.1.18';
+    var $phpmailer_version = '6.9.3';
     var $plugin_url;
     var $plugin_path;
     
@@ -218,7 +218,7 @@ class SMTP_MAILER {
     function server_info_settings()
     {
         $server_info = '';
-        $server_info .= sprintf('OS: %s%s', php_uname(), PHP_EOL);
+        //$server_info .= sprintf('OS: %s%s', php_uname(), PHP_EOL);  //undefined fatal error on some servers
         $server_info .= sprintf('PHP version: %s%s', PHP_VERSION, PHP_EOL);
         $server_info .= sprintf('WordPress version: %s%s', get_bloginfo('version'), PHP_EOL);
         $server_info .= sprintf('WordPress multisite: %s%s', (is_multisite() ? 'Yes' : 'No'), PHP_EOL);
@@ -583,7 +583,8 @@ function smtp_mailer_pre_wp_mail($null, $atts)
             require_once ABSPATH . WPINC . '/PHPMailer/PHPMailer.php';
             require_once ABSPATH . WPINC . '/PHPMailer/SMTP.php';
             require_once ABSPATH . WPINC . '/PHPMailer/Exception.php';
-            $phpmailer = new PHPMailer\PHPMailer\PHPMailer( true );
+            require_once ABSPATH . WPINC . '/class-wp-phpmailer.php';
+            $phpmailer = new WP_PHPMailer( true );
 
             $phpmailer::$validator = static function ( $email ) {
                     return (bool) is_email( $email );
diff --git a/wp-content/plugins/smtp-mailer/readme.txt b/wp-content/plugins/smtp-mailer/readme.txt
index 9e83612f..b507150a 100644
--- a/wp-content/plugins/smtp-mailer/readme.txt
+++ b/wp-content/plugins/smtp-mailer/readme.txt
@@ -2,11 +2,11 @@
 Contributors: naa986
 Donate link: https://wphowto.net/
 Tags: email, mail, smtp, phpmailer
-Requires at least: 6.5
-Tested up to: 6.5
-Stable tag: 1.1.15
+Requires at least: 6.8
+Tested up to: 6.8
+Stable tag: 1.1.18
 License: GPLv2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
+License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
 Configure a SMTP server to send email from your WordPress site. Configure the wp_mail() function to use SMTP instead of the PHP mail() function.
 
@@ -73,6 +73,15 @@ none
 
 == Changelog ==
 
+= 1.1.18 =
+* WordPress 6.8 compatibility update.
+
+= 1.1.17 =
+* WordPress 6.7 compatibility update.
+
+= 1.1.16 =
+* Removed php_uname from server info.
+
 = 1.1.15 =
 * Updated the code for sanitizing password.