From 297ca205ae44218b9cb0d15c1c2de532a72a3a44 Mon Sep 17 00:00:00 2001 From: GITUSER Date: Wed, 13 Feb 2019 12:06:36 -0600 Subject: [PATCH 01/11] Updating call to action links for free and pro. --- classes/admin/class.settings.php | 4 +- core/cta/calls-to-action.php | 4 +- core/cta/classes/class.settings.php | 48 ++++++++++-- core/landing-pages/classes/class.settings.php | 74 +++++++++++-------- core/landing-pages/classes/class.store.php | 2 +- core/landing-pages/landing-pages.php | 6 +- core/leads/classes/class.settings.php | 62 ++++++++++++---- core/leads/leads.php | 4 +- 8 files changed, 145 insertions(+), 59 deletions(-) diff --git a/classes/admin/class.settings.php b/classes/admin/class.settings.php index 242f1d68..547ab42b 100644 --- a/classes/admin/class.settings.php +++ b/classes/admin/class.settings.php @@ -880,8 +880,8 @@ public static function render_fields( $page ) { case false: /* WPEngine advertisement here */ echo '
-

Sponsored Moment: Inbound PRO works great on WPEngine.

- +

Sponsored Moment: Inbound PRO works great on WPEngine. Get 4 months free on annual Startup, Growth, and Scale plans when you use our coupon code WPE20OFF.

+
'; echo ' '; break; diff --git a/core/cta/calls-to-action.php b/core/cta/calls-to-action.php index 8254db43..7530b7a6 100644 --- a/core/cta/calls-to-action.php +++ b/core/cta/calls-to-action.php @@ -3,7 +3,7 @@ Plugin Name: Calls to Action Plugin URI: http://www.inboundnow.com/cta/ Description: Display Targeted Calls to Action on your WordPress site. -Version: 3.3.10 +Version: 3.3.11 Author: Inbound Now Author URI: https://www.inboundnow.com/ Text Domain: cta @@ -34,7 +34,7 @@ public function __construct() { */ private static function define_constants() { - define('WP_CTA_CURRENT_VERSION', '3.3.10' ); + define('WP_CTA_CURRENT_VERSION', '3.3.11' ); define('WP_CTA_URLPATH', plugins_url( '/' , __FILE__ ) ); define('WP_CTA_PATH', plugin_dir_path( __FILE__ ) ); define('WP_CTA_SLUG', 'cta' ); diff --git a/core/cta/classes/class.settings.php b/core/cta/classes/class.settings.php index c51a642d..cbb522ce 100644 --- a/core/cta/classes/class.settings.php +++ b/core/cta/classes/class.settings.php @@ -161,7 +161,7 @@ public static function display_navigation() { self::$active_tab = sanitize_text_field($_REQUEST['open-tab']); } - echo '

'; + echo '

'; foreach (self::$core_settings as $key => $data) { ?> @@ -170,7 +170,7 @@ public static function display_navigation() { } echo "

"; - echo "
+ echo " "; @@ -232,7 +232,7 @@ public static function display_stand_alone_settings() { self::inline_js(); self::save_stand_alone_settings(); - self::display_sidebar(); + //self::display_sidebar(); self::display_navigation(); foreach (self::$core_settings as $key => $data) { @@ -242,7 +242,7 @@ public static function display_stand_alone_settings() { } - echo '
+ echo '
'; echo ""; @@ -323,6 +323,42 @@ public static function display_stand_alone_settings() {
+
+
+ +

Sponsored Moment: Need to hire WordPress assistance? Agents at Codeable are ready to help.

+ + + +
'; + echo ' '; + break; + case 1: + echo '
+

This plugin works great on WPEngine! Use our special offer below to receive 20% off the first annual payment.

+ +
'; + echo ' '; + break; + case 2: + echo '
+

Did you know we offer an enhanced version of this free plugin? - Read more about our Inbound Now PRO plugin.

+
'; + echo ' '; + break; + case 3: + echo '
+

Thanks for using our free plugin! - Rate us 5 stars to help us grow!

+
'; + echo ' '; + break; + } + ?> + "; // Begin the field table and loop - echo ''; + echo '
'; foreach ($custom_fields as $field) { // get value of this field if it exists for this post @@ -659,4 +695,4 @@ function load_CTA_Settings() { add_action('admin_init', 'load_CTA_Settings'); -} \ No newline at end of file +} diff --git a/core/landing-pages/classes/class.settings.php b/core/landing-pages/classes/class.settings.php index 152b2b42..bf0fbd88 100644 --- a/core/landing-pages/classes/class.settings.php +++ b/core/landing-pages/classes/class.settings.php @@ -103,7 +103,7 @@ public static function get_stand_alone_settings() { array( 'id' => 'lp_global_settings_main_header', 'type' => 'header', - 'default' => __('Landing Pages Core Settings' , 'inbound-pro') , + 'default' => __('Core Settings' , 'inbound-pro') , 'options' => null ), array( @@ -262,7 +262,7 @@ public static function display_settings() { } } - + $active_tab = 'lp-main'; if (isset($_REQUEST['open-tab'])) { $active_tab = sanitize_title($_REQUEST['open-tab']); @@ -286,12 +286,8 @@ class="lp-nav-tab nav-tab nav-tab-special
"; - echo "

Like the Plugin? Leave us a review

Leave a Quick Review
Reviews help constantly improve the plugin & keep us motivated! Thank you for your support!

Help keep the plugin up to date, awesome & free!

- - - - - Spare some change? Buy us a coffee/beer. We appreciate your continued support.

Follow Updates on Facebook

"; + echo "
"; + echo ""; echo ""; @@ -308,19 +304,39 @@ class="lp-nav-tab nav-tab nav-tab-special
-
-
- - -
-
-
-
- -
-
+ +

Sponsored Moment: Need to hire WordPress assistance? Agents at Codeable are ready to help.

+ + + +
'; + echo ' '; + break; + case 1: + echo '
+

This plugin works great on WPEngine! Use our special offer below to receive 20% off the first annual payment.

+ +
'; + echo ' '; + break; + case 2: + echo '
+

Did you know we offer an enhanced version of this plugin? - Read more about our Inbound Now PRO plugin.

+
'; + echo ' '; + break; + case 3: + echo '
+

Thanks for using our free plugin! - Rate us 5 stars to help us grow!

+
'; + echo ' '; + break; + } + ?> Label format - */ + * Gets array of pages with ID => Label format + */ public static function leads_get_pages_array() { $pages = get_pages(); @@ -334,12 +334,8 @@ public static function display_stand_alone_settings() { } echo "
"; - echo "

Like the Plugin? Leave us a review

Leave a Quick Review
Reviews help constantly improve the plugin & keep us motivated! Thank you for your support!

Help keep the plugin up to date, awesome & free!

- - - - - Spare some change? Buy us a coffee/beer. We appreciate your continued support.

Follow Updates on Facebook

"; + echo "
"; + echo ""; echo ""; echo ""; echo ""; @@ -356,7 +352,40 @@ public static function display_stand_alone_settings() { '; echo ""; - + echo '
'; + echo '
'; + $rand = rand(0,3); + switch ($rand) { + case 0: + echo '
+

Sponsored Moment: Need to hire WordPress assistance? Agents at Codeable are ready to help.

+ + + +
'; + echo '
'; + break; + case 1: + echo '
+

This plugin works great on WPEngine! Use our special offer below to receive 20% off the first annual payment.

+ +
'; + echo ' '; + break; + case 2: + echo '
+

Did you know we offer an enhanced version of this plugin? - Read more about our Inbound Now PRO plugin.

+
'; + echo ' '; + break; + case 3: + echo '
+

Thanks for using our free plugin! - Rate us 5 stars to help us grow!

+
'; + echo ' '; + break; + } + echo ''; self::render_inline_js(); } @@ -453,13 +482,18 @@ public static function render_inline_js() { global $wpleads_global_settings; ?> + - Date: Fri, 22 Feb 2019 03:25:57 -0600 Subject: [PATCH 08/11] removing unused methods --- core/leads/classes/class.post-type.wp-lead.php | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/core/leads/classes/class.post-type.wp-lead.php b/core/leads/classes/class.post-type.wp-lead.php index 40fdfa6e..e21c0fbd 100644 --- a/core/leads/classes/class.post-type.wp-lead.php +++ b/core/leads/classes/class.post-type.wp-lead.php @@ -519,16 +519,6 @@ public static function process_bulk_actions() { } - /** - * Prepare nice names for custom fields - * @return array - */ - public static function prepare_nice_names() { - $nice_names = array("wpleads_company_name" => "Company Name", "wpleads_city" => "City", "wpleads_areaCode" => "Area Code", "wpleads_country_name" => "Country Name", "wpleads_region_code" => "State Abbreviation", "wpleads_region_name" => "State Name", "wp_lead_status" => "Lead Status", "events_triggered" => "Number of Events Triggered", "lp_page_views_count" => "Page View Count"); - - $nice_names = apply_filters('wpleads_sort_by_custom_field_nice_names', $nice_names); - return $nice_names; - } /** * Listens for a change to a leads meta data and update the change timestamp @@ -540,13 +530,11 @@ public static function prepare_nice_names() { public static function record_meta_update($meta_id, $lead_id, $meta_key, $meta_value) { $ignore = array('_edit_lock', '_edit_last'); $post_type = get_post_type($lead_id); + if ($post_type != 'wp-lead' || in_array($meta_key, $ignore)) { return; } - remove_action('updated_post_meta', 'wpleads_after_post_meta_change', 10); - remove_action('added_post_meta', 'wpleads_after_post_meta_change', 10); - $timezone_format = _x('Y-m-d G:i:s', 'timezone date format'); $wordpress_date_time = date_i18n($timezone_format); From 55ff0e4fd5a1f716737cc4ca87ed7c15fd520c66 Mon Sep 17 00:00:00 2001 From: GITUSER Date: Fri, 22 Feb 2019 03:26:13 -0600 Subject: [PATCH 09/11] HTML 5 datepicker now default --- core/mailer/classes/class.settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/mailer/classes/class.settings.php b/core/mailer/classes/class.settings.php index 24742855..e08ad102 100644 --- a/core/mailer/classes/class.settings.php +++ b/core/mailer/classes/class.settings.php @@ -53,7 +53,7 @@ public static function define_pro_settings( $settings ) { 'label' => __('Datepicker Style', 'inbound-pro' ), 'description' => __( 'Sometimes jQuery\'s datepicker malfunctions.' , 'inbound-pro' ), 'type' => 'dropdown', - 'default' => 'jquery_datepicker', + 'default' => 'use_alternative', 'options' => array( 'jquery_datepicker' => __( 'jQuery Datepicker' , 'inbound-pro' ), 'use_alternative' => __( 'HTML5 Datepicker' , 'inbound-pro' ) From ee6100e8725938bc45b2309799f60b95bb96bd95 Mon Sep 17 00:00:00 2001 From: GITUSER Date: Fri, 22 Feb 2019 03:26:43 -0600 Subject: [PATCH 10/11] including lead ID in new lead creation hook to fix issue with unsubscribe link on automation email series. --- core/shared/classes/class.lead-storage.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/shared/classes/class.lead-storage.php b/core/shared/classes/class.lead-storage.php index f466a914..7b5687ad 100644 --- a/core/shared/classes/class.lead-storage.php +++ b/core/shared/classes/class.lead-storage.php @@ -322,6 +322,9 @@ static function store_new_lead($lead){ /* set lead save count */ update_post_meta( $id , 'inbound_update_count' , 1 ); + $lead['lead_id'] = $id; + $lead['id'] = $id; + do_action('wpleads_new_lead_insert', $lead ); /* action hook on new leads only */ return $id; } From 04f2185a56f3ea9331048fc75f02f60d0f386ef3 Mon Sep 17 00:00:00 2001 From: GITUSER Date: Fri, 22 Feb 2019 03:27:09 -0600 Subject: [PATCH 11/11] Preparing release --- inbound-pro.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inbound-pro.php b/inbound-pro.php index c7715d15..f939b4b6 100644 --- a/inbound-pro.php +++ b/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.5 +Version: 1.9.9.6 Author URI: http://www.inboundnow.com/ Text Domain: inbound-pro */ @@ -95,8 +95,8 @@ public function __construct() { */ private static function define_constants() { - define('INBOUND_PRO_CURRENT_VERSION', '1.9.9.5' ); - define('INBOUND_PRO_STABLE_VERSION', '1.9.9.4' ); + define('INBOUND_PRO_CURRENT_VERSION', '1.9.9.6' ); + 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__ )); define('INBOUND_PRO_PATH', plugin_dir_path( __FILE__ ) );