Changeset 3441570

Timestamp:

01/17/2026 12:42:46 PM (2 months ago)

Author:

bgermann

Message:

import version 15.1

Location:

cforms2/trunk

Files:

• Email.php (modified) (3 diffs)
• cforms.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)

cforms2/trunk/Email.php

@@ -187 +187 @@
         $header = $this->mail_header();
         $body = $this->mail_body($this->body);
+        $body_alt = $this->mail_body($this->body_alt);
 
         // bail out
@@ -196 +197 @@
             $to .= (($i != 0) ? ', ' : '' ) . $this->addr_fmt($this->to[$i]);
         }
-        add_action('phpmailer_init', array($this, 'phpmailer_init'));
+        // Use multipart/alternative format if both HTML and plain text are available
+        if ($body_alt !== '') {
+            $body = array('html' => $body, 'text' => $body_alt);
+        }
         $rt = wp_mail($to, $this->fix_header($this->subj), $body, $header, $this->up);
-        remove_action('phpmailer_init', array($this, 'phpmailer_init'));
 
         if (!$rt) {
@@ -209 +212 @@
     }
 
-    /**
-     * Sets the line ending and the multipart/alternative text/plain part.
-     * This is only functional if the built-in wp_mail function is not replaced.
-     * 
-     * TODO When https://core.trac.wordpress.org/ticket/15448 is resolved,
-     * use wp_mail's new multipart detection and do not depend on PHPMailer.
-     * 
-     * @param PHPMailer $phpmailer the object in use
-     */
-    public function phpmailer_init($phpmailer) {
-        $phpmailer->AltBody = $this->mail_body($this->body_alt);
-
-    }
-
     public function add_file($path) {
         if (!is_file($path)) {

cforms2/trunk/cforms.php

@@ -21 +21 @@
  * Description: cformsII is a customizable, flexible and powerful form plugin including simple spam protection, multi-step forms, role manager support and custom themes.
  * Author: Oliver Seidel, Bastian Germann
- * Version: 15.0.10
- * Requires at least: 5.2
+ * Version: 15.1
+ * Requires at least: 6.9
  * Text Domain: cforms2
  */
 namespace Cforms2;
 
-define('CFORMS2_VERSION', '15.0.10');
+define('CFORMS2_VERSION', '15.1');
 
 // Debug message handling.

cforms2/trunk/readme.txt

@@ -12 +12 @@
 This is a fork of cformsII, a highly customizable, flexible and powerful form builder plugin, covering a variety of use cases and features.
 
-Oliver, the original author, discontinued developing the plugin. This fork is an effort to keep it up to date.
-
 If you want to use plugin versions older than 14.6.3, you should rename the directory containing the plugin from "cforms2" to "cforms". But bear in mind that old versions should not be used in public systems, because they contain [known serious vulnerabilities](https://wpvulndb.com/plugins/cforms) that are exploited in the wild.
 
@@ -70 +68 @@
 That function was removed. The WordPress function [wp_mail](https://codex.wordpress.org/Function_Reference/wp_mail) is used for mails now, which makes use of built-in PHPMailer by default. If you want to configure it to use an external SMTP server, use an appropriate plugin, e.g. [WP Mail SMTP](https://wordpress.org/plugins/wp-mail-smtp/).
 
-If wp_mail is replaced by some plugin, multipart/alternative emails may not be sent properly, which is the case with e.g. Postman SMTP Mailer/Email Log.
-
 = Why is the Form Settings page broken? =
 
@@ -91 +87 @@
 == Upgrade Notice ==
 
-= 15.0.10 =
+= 15.1 =
 The tracking database feature and its view are removed with cformsII 15.0+. Your data still exists in the database. Please have a look at CFDB plugin as a replacement.
 
 
 == Changelog ==
+
+= 15.1 =
+
+* bugfix:   get rid of wp_mail workaround
 
 = 15.0.10 =