Merge pull request #56 from Miller-Media/master

Getting develop up to date with master

README.md

@@ -7,10 +7,15 @@ Our plugin can be downloaded for free from the WordPress repository here:
 https://wordpress.org/plugins/send-emails-with-mandrill/
 
 Original wpMandrill plugin can be found here:  
-https://wordpress.org/plugins/wpmandrill/
+https://wordpress.org/plugins/wpmandrill/    
+
+Please help us gain visibility on this plugin by giving us a five-star rating on the WordPress plugin page here:    
+https://wordpress.org/support/plugin/send-emails-with-mandrill/reviews/#new-post .   
 
 # For developers contributing to this repository  
 For those of you forking this repository, please submit any pull requests to the `develop` branch. `develop` acts as the stable pre-release branch of the plugin. When new versions are released, `develop` will be merged into `master` where the code will then be tagged with the release's version number.  
+
+When submitting fixes to issues or new features/bug fixes, please make sure to branch and submit pull requests for each individually so we can effectively QA each one for accurately.
 
 Also, thank you! We need developers like you to help us make this a great plugin for the whole WordPress community.  
 

lib/wpMandrill.class.php

@@ -18,6 +18,7 @@ static function on_load() {
 
         add_action('admin_init', array(__CLASS__, 'adminInit'));
         add_action('admin_menu', array(__CLASS__, 'adminMenu'));
+        add_action('admin_notices', array(__CLASS__, 'adminNotices'));
 
         add_filter('contextual_help', array(__CLASS__, 'showContextualHelp'), 10, 3);
 
@@ -29,7 +30,6 @@ static function on_load() {
 
         if( function_exists('wp_mail') ) {
             self::$conflict = true;
-            add_action('admin_notices', array(__CLASS__, 'adminNotices'));
             return;
         }
 
@@ -196,6 +196,22 @@ static function adminNotices() {
         if ( self::$conflict ) {
             echo '<div class="error"><p>'.__('Mandrill: wp_mail has been declared by another process or plugin, so you won\'t be able to use Mandrill until the problem is solved.', 'wpmandrill') . '</p></div>';
         }
+
+        $et_timezone = new DateTimeZone( 'America/New_York' );
+        $now = date_create( 'now', $et_timezone );
+        $until = date_create( '2020-01-12 00:00:00', $et_timezone );
+
+        if ( $now < $until ) {
+            echo '<div class="notice notice-info">' .
+                '<p>' . __(
+                    'On Saturday, January 11th from 1am - 7am EST, the Mandrill email service will be upgrading its infrastructure ' .
+                    'and all emails sent through their service will fail. The \'Send Emails with Mandrill\' plugin is currently configured ' .
+                    'to send mail through your normal WordPress server without any additional configuration. As a precaution, we have ' .
+                    'posted a blog detailing additional details actions you can take as precautions during this outage.<br /><br />' .
+                    'Read more here: <a href="https://www.millermedia.io/mandrill-outage-details-and-actions/" target="_blank" rel="noopener">Mandrill Outage Details and Actions</a>.',
+                'wpmandrill') . '</p>' .
+            '</div>';
+        }
     }
 
     static function showAdminEnqueueScripts($hook_suffix) {
@@ -1002,7 +1018,7 @@ static function saveProcessedStats() {
         $stats = self::GetProcessedStats();
         if ( !empty($stats) ) {
             set_transient('wpmandrill-stats', $stats, 60 * 60);
-            update_option('wpmandrill-stats', $stats);
+            update_option('wpmandrill-stats', $stats, false);
         } else {
             error_log( date('Y-m-d H:i:s') . " wpMandrill::saveProcessedStats (Empty Response from ::GetProcessedStats)\n" );
         }

readme.txt

@@ -1,10 +1,10 @@
 === Send Emails with Mandrill ===
-Contributors: MillerMediaNow, mikemm01, MC_Will, MC_Amanda, cornelraiu-1, crstauf, bizmatebiz, andrewhilson
+Contributors: MillerMediaNow, mikemm01, MC_Will, MC_Amanda, cornelraiu-1, crstauf, bizmatebiz, andrewhilson, anthonywnz
 Tags: mandrill, mailchimp, transactional email, email, email reliability, smtp, wp_mail, email templates
 Requires PHP: 5.6
 Requires at least: 3.0
-Tested up to: 5.1.1
-Stable tag: 1.2.4
+Tested up to: 5.3
+Stable tag: 1.2.6
 License: GPLv2
 
 The Send Emails with Mandrill plugin sends emails that are generated by WordPress through Mandrill, a transactional email service powered by MailChimp.
@@ -108,6 +108,15 @@ If your account has more than 20 senders registered or more than 40 tags used, t
 4. Dashboard widget Settings
 
 == Changelog ==
+= 1.2.6 =
+* Updated messaging on how to handle the upcoming Mandrill outage
+* Bug fix for memcache overload when loading Mandrill reports page on high traffic sites
+
+= 1.2.5 =
+* Updated plugin screenshots for WordPress repository
+* Added support/setting for Mandrill subaccount
+* Removed discontinued Mandrill API endpoint support (URL tracking)
+
 = 1.2.4 =
 * Removed RSS Feeds due to WordPress core bugs (SimplePie library)
 * CSS adjustments

wpmandrill.php

@@ -4,7 +4,7 @@
 Description: Send e-mails using Mandrill. This is a forked version of the now unsupported plugin <a href="https://wordpress.org/plugins/wpmandrill/">wpMandrill</a>.
 Author: Miller Media ( Matt Miller )
 Author URI: http://www.millermedia.io
-Version: 1.2.4
+Version: 1.2.6
 Requires PHP: 5.6
 Text Domain: send-emails-with-mandrill
 */