Merged PR 11720: 6.4.10 Release

Related work items: #54896, #81881

README.md

@@ -1,4 +1,4 @@
-dotmailer for Magento
+Engagement Cloud for Magento
 ==========================================
 
 Full support documentation and setup guides available here - https://support.dotmailer.com/hc/en-gb/categories/202610368-Magento
@@ -29,22 +29,28 @@ Compatibility
 
 # Contribution
 
-You are welcome to contribute to dotmailer for Magento! You can either:
+You are welcome to contribute to Engagement Cloud for Magento! You can either:
 - Report a bug: create a [GitHub issue](https://github.com/dotmailer/dotmailer-magento-extension/issues/new) including description, repro steps, Magento and extension version numbers
 - Fix a bug: please fork this repo and submit the Pull Request to our [Develop branch](https://github.com/dotmailer/dotmailer-magento-extension/tree/develop)
-- Request a feature on our [community forum](https://support.dotmailer.com/hc/en-gb/community/topics/200432508-Feedback-and-feature-requests)
+Request a feature on our [roadmap](https://roadmap.dotdigital.com)
+
+# V6.4.10
+
+###### Improvements
+- 'dotmailer' has been renamed to 'dotdigital Engagement Cloud' (see why [here](https://blog.dotdigital.com/the-story-behind-dotdigital/))
+- Email addresses are now validated against the syntax of RFC 822 (FILTER_VALIDATE_EMAIL) by the guest abandoned cart process
 
 # V6.4.9
 ##### Bug fixes
 - Guest subscribers were being synced with Website_Name instead of Store_view name ; this has now been corrected.
-- We've fixed an issue whereby the automation cron would attempt to enrol on the wrong dotmailer account in a multi-website context
+- We've fixed an issue whereby the automation cron would attempt to enrol on the wrong Engagement Cloud account in a multi-website context
 - We've fixed an issue related to accessing the email_review table when the instance database is using a prefix
 
 # V6.4.8
 
 ##### Bug fixes
 - Transactional emails weren't being sent using Magento's queuing system (and Cronjob) introduced in Magento EE 1.14.1 and Magento CE 1.9.1; they are now.
-- Saving dotmailer email template settings with no changes would reset any previously configured email to the default templates; this has now been fixed.
+- Saving Engagement Cloud email template settings with no changes would reset any previously configured email to the default templates; this has now been fixed.
 - We've fixed an issue which caused products to have incorrect URLs when the catalog was synced at store level
 - We've fixed an issue which stopped the product image ALT tag from being properly set in the abandoned cart's external dynamics content.
 - We are now properly disabling the deprecated CURLOPT_SAFE_UPLOAD method in PHP 7
@@ -54,7 +60,7 @@ You are welcome to contribute to dotmailer for Magento! You can either:
 ##### Bug fixes
 - Import contacts api call now times out after 600 seconds
 - We only add items to the importer queue for enabled websites
-- Customers that were created by an admin user in a Magento Enterprise Edition account can now be synchronised to dotmailer
+- Customers that were created by an admin user in a Magento Enterprise Edition account can now be synchronised to Engagement Cloud
 
 ###### Improvements
 - In email campaigns, you can now link to either the standard review page or the product page with an anchor of your choice
@@ -90,7 +96,7 @@ You are welcome to contribute to dotmailer for Magento! You can either:
 # V6.4.2 
 
 ###### Features
-- You’re now able to record your customers and guests’ consent and store it using dotmailer’s new ConsentInsight.
+- You’re now able to record your customers and guests’ consent and store it using Engagement Cloud’s new ConsentInsight.
 
 ###### Improvements
 - We've optimised the way our install script imports data into the extension tables, so it now imports small batches rather than all in one go.
@@ -100,7 +106,7 @@ You are welcome to contribute to dotmailer for Magento! You can either:
 
 ###### Features
 - Users can now import only those Magento contacts who've opted-in (customer subscribers, guest subscribers, and other subscribers).
-- Users now get warned when they're about to sync non-subscribers into their dotmailer account. 
+- Users now get warned when they're about to sync non-subscribers into their Engagement Cloud account. 
 
 ###### Improvements
 - We've added a new option in 'Configuration' > 'Abandoned Carts' that allows to send abandoned cart emails to subscribed contacts only. On fresh installation contacts who haven't opted in will no longer be included.
@@ -112,13 +118,13 @@ You are welcome to contribute to dotmailer for Magento! You can either:
 # V6.4.0
 
 ###### Features
-- Transactional email templates: You're now able to create, edit, translate and test Magento transactional emails in dotmailer and map them at default, website or store level.
+- Transactional email templates: You're now able to create, edit, translate and test Magento transactional emails in Engagement Cloud and map them at default, website or store level.
 
 ###### Improvements
 - We now import new subscribers with the correct opt-in type (single or double) depending upon Magento's "Need to confirm" setting
 
 ###### Bug fixes
-- Deleted contacts in Magento weren't being correctly marked as imported when removed from dotmailer;they are now
+- Deleted contacts in Magento weren't being correctly marked as imported when removed from Engagement Cloud;they are now
 - An error could occur while creating a trial account in the US and APAC regions; this is now fixed
 - We've fixed an issue which caused an error when displaying the wishlist dynamics content on PHP 5.4
 - Some products with individual visibilities were getting ignored by the importer; this has been fixed.
@@ -179,7 +185,7 @@ You are welcome to contribute to dotmailer for Magento! You can either:
 
 # V6.3.3 Release Notes
 ###### Improvements
-- Syncing sales data for guest subscribers is now optional and is managed with a new setting in 'DOTMAILER' > 'Developer' > 'Import settings'.
+- Syncing sales data for guest subscribers is now optional and is managed with a new setting in 'Engagement Cloud' > 'Developer' > 'Import settings'.
 - Corrupted and missing payment methods no longer stop the importer from running.
 ###### Bug fixes
 - Removing subscribers now correctly removes them from both the contact table and subscriber address book.
@@ -193,7 +199,7 @@ You are welcome to contribute to dotmailer for Magento! You can either:
  - Trial account enhancements that we’ve already implemented in our Magento 2 connector are now also implemented for Magento 1.
  - We’ve fixed the collection filter for flat products.
  - External dynamic content wasn’t aligning centrally on mobile devices; it does now.
- - Changes in 'Subscriber' status weren't being sent back to Magento from dotmailer; this has been fixed.
+ - Changes in 'Subscriber' status weren't being sent back to Magento from Engagement Cloud; this has been fixed.
  - We’ve implemented an IP address change.
  - Before creating a contact, an automatic check is made to ensure the API is enabled.
  - The class Zend_DB_Expr is now used for columns with expressions.
@@ -202,7 +208,7 @@ You are welcome to contribute to dotmailer for Magento! You can either:
 # V6.3.1
 ###### Bug fixes
  - Unsubscribers from Magento weren’t being removed successfully from the subscriber address book; they are again now(#233).
- - Contact datafields weren't getting updated in dotmailer for existing customers in Magento whose data changed; this has been fixed.(#244)
+ - Contact datafields weren't getting updated in Engagement Cloud for existing customers in Magento whose data changed; this has been fixed.(#244)
 
 # V6.3.0
 ###### Features
@@ -281,7 +287,7 @@ You are welcome to contribute to dotmailer for Magento! You can either:
 
 # V5.3.0
 ## Features
- - Support for dotmailer regions
+ - Support for Engagement Cloud regions
 ## Bug fixes
  - Bug fixed for fatal error on manual sync
 ## Improvments
@@ -403,7 +409,7 @@ You are welcome to contribute to dotmailer for Magento! You can either:
  - Raygun control to disable and enable.
  - Sweetooth refferal link.
  - Custom OAUTH domain/redirect link options.
- - Use dotmailer template for transactional emails.
+ - Use Engagement Cloud template for transactional emails.
  - Wishlist EDC with related, upsell and crosssell.
  - Customer trend data.
 
@@ -566,7 +572,7 @@ You are welcome to contribute to dotmailer for Magento! You can either:
 # V.2.0.4 
 * Reset subscriber_imported for reimport.
 * Suppressed contacts button in admin settings.
-* Cleaned the dotmailer_order_imported from db.
+* Cleaned the Engagement Cloud from db.
 * Fix for table prefix names.
 * Duplicate email address.
 * Website id table update for null values.

code/Dotdigitalgroup/Email/Block/Adminhtml/Dashboard/Tabs/Analysis.php

@@ -63,7 +63,7 @@ protected function _prepareLayout()
      */
     public function getTitle()
     {
-        return Mage::helper('ddg')->__("Marketing Automation Data Analysis");
+        return Mage::helper('ddg')->__("Engagement Cloud Data Analysis");
     }
 
     /**

code/Dotdigitalgroup/Email/Block/Adminhtml/Dashboard/Tabs/General.php

@@ -107,7 +107,7 @@ protected function initiateGroupArray()
      */
     public function getTitle()
     {
-        return Mage::helper('ddg')->__("Connector Account Information");
+        return Mage::helper('ddg')->__("Engagement Cloud Account Information");
     }
 
     /**

code/Dotdigitalgroup/Email/Block/Adminhtml/Dashboard/Tabs/Logs.php

@@ -27,11 +27,11 @@ public function isHidden()
 
     public function getTabLabel()
     {
-        return Mage::helper('ddg')->__('Marketing Automation Logs');
+        return Mage::helper('ddg')->__('Engagement Cloud Logs');
     }
 
     public function getTabTitle()
     {
-        return Mage::helper('ddg')->__('Marketing Automation Logs');
+        return Mage::helper('ddg')->__('Engagement Cloud Logs');
     }
 }

code/Dotdigitalgroup/Email/Block/Adminhtml/Dashboard/Tabs/Status.php

@@ -68,15 +68,15 @@ public function isHidden()
      */
     public function getTabLabel()
     {
-        return Mage::helper('ddg')->__('Marketing Automation System Status');
+        return Mage::helper('ddg')->__('Engagement Cloud System Status');
     }
 
     /**
      * @return string
      */
     public function getTabTitle()
     {
-        return Mage::helper('ddg')->__('Marketing Automation System Status');
+        return Mage::helper('ddg')->__('Engagement Cloud System Status');
     }
 
     /**

code/Dotdigitalgroup/Email/Block/Adminhtml/System/Config/Trial.php

@@ -2,7 +2,7 @@
 
 class Dotdigitalgroup_Email_Block_Adminhtml_System_Config_Trial extends Mage_Adminhtml_Block_System_Config_Form_Fieldset
 {
-    const TRIAL_EXTERNAL_URL = 'https://www.dotmailer.com/trial/';
+    const TRIAL_EXTERNAL_URL = 'https://dotdigital.com/trial/';
 
     /**
      * @codingStandardsIgnoreStart

code/Dotdigitalgroup/Email/Helper/Transactional.php

@@ -127,7 +127,7 @@ public function isStringCompressed($string)
     }
 
     /**
-     * Check if the template code is containing dotmailer.
+     * Check if the template code is containing Engagement Cloud.
      *
      * @param $templateCode
      * @return bool

code/Dotdigitalgroup/Email/Model/Adminhtml/Backend/Template.php

@@ -55,7 +55,7 @@ protected function _beforeSave()
                 $this->getScope(),
                 $this->getScopeId()
             );
-            //remove the config for dotmailer template
+            //remove the config for Engagement Cloud template
             Mage::getConfig()->deleteConfig(
                 $dotTemplate->templateConfigMapping[$this->getField()],
                 $this->getScope(),

code/Dotdigitalgroup/Email/Model/Email/Template.php

@@ -107,7 +107,7 @@ public function send($email, $name = null, array $variables = array())
 
         $mail->setSubject('=?utf-8?B?' . base64_encode($this->getProcessedTemplateSubject($variables)) . '?=');
 
-        //sender name and sender email if the template is from dotmailer
+        //sender name and sender email if the template is from Engagement Cloud
         if ($helper->isDotmailerTemplate($this->getTemplateCode())) {
             $mail->setFrom($this->getTemplateSenderEmail(), $this->getTemplateSenderName());
         } else {

code/Dotdigitalgroup/Email/Model/Resource/Contact.php

@@ -118,7 +118,7 @@ public function resetAllTables()
     {
         $conn = $this->_getWriteAdapter();
         try {
-            //remove dotmailer code from core_resource table
+            //remove Engagement Cloud code from core_resource table
             $cond = $conn->quoteInto('code = ?', 'email_connector_setup');
             $conn->delete(
                 Mage::getSingleton('core/resource')->getTableName('core_resource'), $cond

code/Dotdigitalgroup/Email/Model/Resource/Coupon.php

@@ -42,7 +42,7 @@ public function updateSpecificCoupons(Mage_SalesRule_Model_Rule $rule)
             );
         }
 
-        //update coupons added by dotmailer. not to change expiration date
+        //update coupons added by Engagement Cloud. not to change expiration date
         $dotmailerUpdateArray = $updateArray;
         unset($dotmailerUpdateArray['expiration_date']);
         if (!empty($dotmailerUpdateArray)) {

code/Dotdigitalgroup/Email/Model/Template.php

@@ -131,7 +131,7 @@ class Dotdigitalgroup_Email_Model_Template extends Mage_Core_Model_Abstract
     ];
 
     /**
-     * Mapping for template code = dotmailer path templates.
+     * Mapping for template code = Engagement Cloud path templates.
      *
      * @var array
      */
@@ -302,7 +302,7 @@ public function saveTemplate($template, $dmCampaign, $campaignId, $origTemplateC
      */
     private function updateTemplateById($dmCampaign, $campaignId, $templateId, $origTemplateCode = '')
     {
-        //dotmailer template name (campaign name _ campaign id)
+        //Engagement Cloud template name (campaign name _ campaign id)
         $templateName = $dmCampaign->name . '_' . $campaignId;
 
         try {

code/Dotdigitalgroup/Email/controllers/Adminhtml/Email/StudioController.php

@@ -9,7 +9,7 @@ class Dotdigitalgroup_Email_Adminhtml_Email_StudioController
      */
     public function indexAction()
     {
-        $this->_title($this->__('Automation Studio'));
+        $this->_title($this->__('Engagement Cloud'));
         $this->loadLayout();
         $this->_setActiveMenu('email_connector');
 

code/Dotdigitalgroup/Email/controllers/AjaxController.php

@@ -16,10 +16,8 @@ public function emailcaptureAction()
         ) {
             $email = $this->getRequest()->getParam('email');
             $email = filter_var($email, FILTER_SANITIZE_EMAIL);
-
-            //regular expressions from http://regexlib.com.
-            // Match formats joe@aol.com | joe@wrox.co.uk | joe@domain.info
-            if (!preg_match('/^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$/', $email)) {
+
+            if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
                 Mage::helper('ddg')->log(
                     'ajax emailCapture fail for given email. Failed by regex'
                 );