Changeset 3271598

Timestamp:

04/12/2025 07:20:23 PM (11 months ago)

Author:

marcusbs

Message:

3.0.3 - Fixed bugs

Location:

wp-mailing-group/trunk

Files:

• crons/wpmg_cron_send_email.php (modified) (2 diffs)
• mailing-group-module.php (modified) (7 diffs)
• readme.txt (modified) (2 diffs)

wp-mailing-group/trunk/crons/wpmg_cron_send_email.php

@@ -196 +196 @@
                             $footerText = str_replace("{%unsubscribe_url%}", get_bloginfo('wpurl').'?unsubscribe=1&userid='.$sendtouserId.'&group='.$receiverGroupId, $footerText);     
                             
-                            $body .= $footerText;       
+                            $body .= $footerText;   
+                            
+                            $body = wpmg_prepare_text_content($body);
 
                             $_ARRDB['user_id']   = $sendtouserId;       
@@ -390 +392 @@
 }
 }
+
+function wpmg_prepare_text_content($body) {
+    // Strip all tags except allowed ones
+    $body = strip_tags($body, '<br><br ><br/><br /><a>');
+
+    // Remove <br> tags that have unwanted attributes like clear="all"
+    $body = preg_replace('/<br[^>]*clear="all"[^>]*>/i', '', $body);
+
+    // Normalize all <br> tags (with or without space, slash, etc.) into PHP_EOL
+    $body = preg_replace('/<br\s*\/?>/i', PHP_EOL, $body);
+
+    return $body;
+}

wp-mailing-group/trunk/mailing-group-module.php

@@ -1 +1 @@
 <?php /**
 * @package Mailing_group_module
-* @version 3.0.2
+* @version 3.0.3
 */
 /*
@@ -9 +9 @@
 Author: Yamna Khawaja
 Author URI: https://www.wpmailinggroup.com/
-Version: 3.0.2
+Version: 3.0.3
 License: GPL v2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -39 +39 @@
 
 $WPMG_SETTINGS = get_option("WPMG_SETTINGS");
-$MG_VERSION_NO = '3.0.2';
+$MG_VERSION_NO = '3.0.3';
 $WPMG_SETTINGS['MG_VERSION_NO']  = $MG_VERSION_NO;
 $WPMG_SETTINGS['MG_PLUGIN_TYPE'] = 'FREE';
@@ -144 +144 @@
     $MG_SUPPORT_EMAIL    = (isset($wpmgs['MG_SUPPORT_EMAIL']) && $wpmgs['MG_SUPPORT_EMAIL']!=''?esc_html($wpmgs['MG_SUPPORT_EMAIL']):'[email protected]');
     $MG_SUPPORT_PHONE    = (isset($wpmgs['MG_SUPPORT_PHONE']) && $wpmgs['MG_SUPPORT_PHONE']!=''?esc_html($wpmgs['MG_SUPPORT_PHONE']):'1800-123-1234');
-    $MG_VERSION_NO       = (isset($wpmgs['MG_VERSION_NO'])    && $wpmgs['MG_VERSION_NO']!=''?esc_html($wpmgs['MG_VERSION_NO']):'3.0.2');
+    $MG_VERSION_NO       = (isset($wpmgs['MG_VERSION_NO'])    && $wpmgs['MG_VERSION_NO']!=''?esc_html($wpmgs['MG_VERSION_NO']):'3.0.3');
     
     $wpmg_setting = array(
@@ -272 +272 @@
     }
 
-    if ($wpdb->get_var("SHOW TABLES LIKE '$table_name_parsed_emails'") != $table_name_parsed_emails) {
-       $sql = "CREATE TABLE $table_name_parsed_emails (
-  id bigint(20) NOT NULL AUTO_INCREMENT,
-  type varchar(50) NOT NULL DEFAULT 'email',
-  email_bounced varchar(100) NOT NULL,
-  email_from varchar(255) NOT NULL,
-  email_from_name varchar(255) NOT NULL,
-  email_to varchar(255) NOT NULL,
-  email_to_name varchar(255) NOT NULL,
-  email_subject varchar(255) NOT NULL,
-  email_content longblob NOT NULL,
-  email_group_id int(11) NOT NULL,
-  status tinyint(2) NOT NULL DEFAULT 0,
-  PRIMARY KEY (id)
-) $charset_collate;";
-        require_once(ABSPATH . "wp-admin/includes/upgrade.php");
-        dbDelta($sql);
-    }else{
-        //dbdelta not updating old tables so this is a workaround
-        $wpdb->query("ALTER TABLE $table_name_parsed_emails CHARACTER SET utf8 COLLATE utf8_unicode_ci");
-        $wpdb->query("ALTER TABLE $table_name_parsed_emails MODIFY `email_subject` varchar(255) CHARACTER SET utf8");
-    }
+    $sql = "CREATE TABLE $table_name_parsed_emails (
+        id bigint NOT NULL AUTO_INCREMENT,
+        type varchar(50) NOT NULL DEFAULT 'email',
+        email_bounced varchar(100) NOT NULL,
+        email_from varchar(255) NOT NULL,
+        email_from_name varchar(255) NOT NULL,
+        email_to varchar(255) NOT NULL,
+        email_to_name varchar(255) NOT NULL,
+        email_subject varchar(255) NOT NULL,
+        email_content longblob NOT NULL,
+        email_group_id int NOT NULL,
+        email_date varchar(55) NOT NULL,
+        status tinyint(2) NOT NULL DEFAULT '0',
+        day_of_year int DEFAULT '0',
+        week_of_year int DEFAULT '0',
+        batch_offset int DEFAULT '0',
+        PRIMARY KEY (id)
+      ) $charset_collate;";
+  require_once(ABSPATH . "wp-admin/includes/upgrade.php");
+  dbDelta($sql);
 
     if ($wpdb->get_var("SHOW TABLES LIKE '$table_name_sent_emails'") != $table_name_sent_emails) {
@@ -344 +342 @@
     /* Add attachment table if not present. */
 
-    if ($wpdb->get_var("SHOW TABLES LIKE '$table_name_attachments'") != $table_name_attachments) {
   $sql = "CREATE TABLE $table_name_attachments (
   id bigint(20) NOT NULL AUTO_INCREMENT,
@@ -352 +349 @@
   date varchar(55) NOT NULL,
   PRIMARY KEY (id)
-) $charset_collate;";
-        require_once(ABSPATH . "wp-admin/includes/upgrade.php");
-        dbDelta($sql);
-    }       
+    ) $charset_collate;";
+    require_once(ABSPATH . "wp-admin/includes/upgrade.php");
+    dbDelta($sql);
+        
     /* Add attachments column if not present. */    
 $column_exists = $wpdb->get_results($wpdb->prepare(

wp-mailing-group/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 6.7
 Tested up to PHP: 8.2
-Stable tag: 3.0.2
+Stable tag: 3.0.3
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -132 +132 @@
 == Changelog ==
 
+=3.0.3 =
+*Fixed emails showing emails.
+
+=3.0.2 =
+*Fixed bugs from last release.
+
+=3.0.1 =
+*Fixed bugs from last release.
+
 =3.0.0 =
 *Fixed all problems in the plugin to comply to Wordpress coding standards.