Changeset 3442745

Timestamp:

01/19/2026 06:51:09 PM (2 months ago)

Author:

bgermann

Message:

import version 15.1.2

Location:

cforms2/trunk

Files:

• Email.php (modified) (4 diffs)
• cforms.php (modified) (2 diffs)
• lib_aux.php (modified) (1 diff)
• readme.txt (modified) (1 diff)

cforms2/trunk/Email.php

@@ -152 +152 @@
     }
 
-    private function mail_header() {
+    private function mail_header($boundary = '') {
         $r = array();
 
@@ -164 +164 @@
         $r[] = (count($this->replyto) > 0) ? $this->addr_add('Reply-to', $this->replyto) : '';
 
-        $r[] = sprintf("Content-Type: %s", $this->content_type);
+        if ($boundary !== '') {
+            $r[] = sprintf('Content-Type: multipart/alternative; boundary="%s"', $boundary);
+        } else {
+            $r[] = sprintf('Content-Type: %s', $this->content_type);
+        }
         return $r;
 
@@ -185 +189 @@
         }
 
-        $header = $this->mail_header();
         $body = $this->mail_body($this->body);
         $body_alt = $this->mail_body($this->body_alt);
@@ -199 +202 @@
         // 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);
+            $boundary = 'cforms2_' . md5(uniqid());
+
+            $header = $this->mail_header($boundary);
+            $mimebody = "--$boundary\r\n";
+            $mimebody .= "Content-Type: text/plain; charset=" . get_bloginfo('charset') . "\r\n\r\n";
+            $mimebody .= $body_alt . "\r\n\r\n";
+            $mimebody .= "--$boundary\r\n";
+            $mimebody .= "Content-Type: text/html; charset=" . get_bloginfo('charset') . "\r\n\r\n";
+            $mimebody .= $body . "\r\n\r\n";
+            $mimebody .= "--$boundary--";
+        } else {
+            $header = $this->mail_header();
+            $mimebody = $body;
+        }
+
+        $rt = wp_mail($to, $this->fix_header($this->subj), $mimebody, $header, $this->up);
 
         if (!$rt) {

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.1.1
+ * Version: 15.1.2
  * Requires at least: 6.9
  * Text Domain: cforms2
@@ -27 +27 @@
 namespace Cforms2;
 
-define('CFORMS2_VERSION', '15.1.1');
+define('CFORMS2_VERSION', '15.1.2');
 
 // Debug message handling.

cforms2/trunk/lib_aux.php

@@ -118 +118 @@
         } elseif (strpos($k, 'Fieldset') !== false) {
             $space = '-';
-            $n = ((($customspace * 2) + 2) - strlen(strip_tags($v))) / 2;
+            $n = (int) (((($customspace * 2) + 2) - strlen(strip_tags($v))) / 2);
             $n = ($n < 0) ? 0 : $n;
             if (strlen(strip_tags($v)) < (($customspace * 2) - 2))

cforms2/trunk/readme.txt

@@ -87 +87 @@
 == Upgrade Notice ==
 
-= 15.1.1 =
+= 15.1.2 =
 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.2 =
+
+* bugfix:   Construct multipart/alternative emails
 
 = 15.1.1 =