Merge branch 'release/1.9.9.6.2'

Author: GITUSER

core/mailer/classes/class.mailer.php

@@ -56,7 +56,7 @@ public static function load_static_vars() {
         self::$table_name = $wpdb->prefix . "inbound_email_queue";
 
         /* Get now timestamp */
-        self::$timestamp = gmdate("Y-m-d\\TG:i:s\\Z");
+        self::$timestamp = date_i18n('Y-m-d G:i');
 
         /* Check if there is an error flag in db from previous processing run */
         self::$error_mode = Inbound_Options_API::get_option('inbound-email', 'errors-detected', false);
@@ -213,7 +213,7 @@ public static function send_automated_emails() {
                 case "sparkpost-eu":
                     Inbound_Mailer_SparkPost::send_email( true ); /* send immediately */
                     break;
-                case "wpmail":
+                case "wp_mail":
                     Inbound_Mailer_WPMail::send_email( true ); /* send immediately */
                     break;
             }
@@ -424,7 +424,6 @@ public static function send_solo_email($args) {
      */
     public static function delete_from_queue() {
         global $wpdb;
-
         $query = "delete from " . self::$table_name . " where `id` = '" . self::$row->id . "'";
         $wpdb->query($query);
 

core/mailer/classes/class.scheduling.php

@@ -94,6 +94,7 @@ public static function schedule_email($email_id , $tokens = array() , $action =
 
         /* Prepare Schedule time */
         $timestamp = Inbound_Mailer_Scheduling::get_timestamp();
+        $store_time = new DateTime($timestamp);
 
         /* prepare rule and action id if none are set */
         if (!isset($action['rule_id'])) {
@@ -117,7 +118,7 @@ public static function schedule_email($email_id , $tokens = array() , $action =
             $query_prefix .= "VALUES";
 
             foreach ($leads as $ID) {
-                $query_values_array[] = "( {$email_id} , {$vid} , {$ID} , '" . Inbound_Mailer_Scheduling::$settings['email_type'] . "' , '".$tokens_encoded."' ,'waiting' , '{$timestamp}' , '{$action['rule_id']}' , '{$action['job_id']}', '".json_encode(Inbound_Mailer_Scheduling::$recipients)."' , '".$post_id."')";
+                $query_values_array[] = "( {$email_id} , {$vid} , {$ID} , '" . Inbound_Mailer_Scheduling::$settings['email_type'] . "' , '".$tokens_encoded."' ,'waiting' , '{$store_time->format('Y-m-d G:i:s')}' , '{$action['rule_id']}' , '{$action['job_id']}', '".json_encode(Inbound_Mailer_Scheduling::$recipients)."' , '".$post_id."')";
             }
 
             $value_batches = array_chunk($query_values_array, 500);
@@ -135,6 +136,7 @@ public static function schedule_email($email_id , $tokens = array() , $action =
         if  ($email_service == "wp_mail" ) {
             $current_date_obj = new DateTime(date_i18n('Y-m-d G:i:s'));
             $scheduled_date_obj = new DateTime($timestamp);
+
             if ($scheduled_date_obj > $current_date_obj) {
                 wp_update_post(array(
                     'ID' => $email_id,
@@ -170,7 +172,7 @@ public static function get_timestamp() {
         $settings = Inbound_Mailer_Scheduling::$settings;
 
         if ($settings['email_type'] == 'automated') {
-            return gmdate("Y-m-d\\TG:i:s\\Z");
+            return date_i18n('Y-m-d G:i:s');
         }
 
         if (isset($settings['timezone'])) {
@@ -181,7 +183,7 @@ public static function get_timestamp() {
 
         /* add date if does not exist */
         if (!$settings['send_datetime']) {
-            $settings['send_datetime'] = date_i18n('Y-m-d G:i');
+            $settings['send_datetime'] = date_i18n('Y-m-d G:i:s');
         }
 
         /* add time if does not exist */
@@ -215,7 +217,7 @@ public static function get_timestamp() {
                 $timestamp = $schedule_date->format('Y-m-d\\TG:i:s\\Z');
                 break;
             case "wp_mail":
-                $timestamp = $schedule_date->format('Y-m-d\\TG:i:s\\Z');
+                $timestamp = $schedule_date->format('Y-m-d G:i:s');
                 break;
         }
 

inbound-pro.php

@@ -4,7 +4,7 @@
 Plugin URI: http://www.inboundnow.com/
 Description: Professional Inbound Marketing Suite for WordPress
 Author: InboundWP LLC
-Version: 1.9.9.6.1
+Version: 1.9.9.6.2
 Author URI: http://www.inboundnow.com/
 Text Domain: inbound-pro
 */
@@ -95,7 +95,7 @@ public function __construct() {
 		*/
 		private static function define_constants() {
 
-			define('INBOUND_PRO_CURRENT_VERSION', '1.9.9.6.1' );
+			define('INBOUND_PRO_CURRENT_VERSION', '1.9.9.6.2' );
 			define('INBOUND_PRO_STABLE_VERSION', '1.9.9.5' );
 			define('INBOUND_PRO_TRANSLATIONS_VERSION', '1.30.22' );
 			define('INBOUND_PRO_URLPATH', plugin_dir_url( __FILE__ ));