WD Google Analytics - Version 1.1.7

Version Description

  • Changed: Deactivation popup.
Download this release

Release Info

Developer webdorado
Plugin Icon 128x128 WD Google Analytics
Version 1.1.7
Comparing to
See all releases

Code changes from version 1.1.6 to 1.1.7

admin/pages/custom_reports.php CHANGED
@@ -1,19 +1,15 @@
1
  <div class="wd-upgrade-pro-main-wrap">
2
- <div class="wd-text">This section lets add and manage custom reports.
3
- <a style="color: #00A0D2; text-decoration: none;" target="_blank" href="https://web-dorado.com/wordpress-google-analytics/quick-start/overview.html">Read more in User Guide.</a>
4
- </div>
5
  <div class="wd-ugrade-pro-wrap">
6
- <a href="https://web-dorado.com/files/fromGoogleAnalyticsWD.php" target="_blank">
7
- <div class="wd-ugrade-pro-image-wrap">
8
- <div class="wd-ugrade-pro-image">
9
- <img src="<?php echo GAWD_URL; ?>/assets/web-dorado.png">
10
- </div>
11
- <div class="wd-ugrade-pro-text">
12
- <?php _e("Upgrade to paid version", "gawd"); ?>
13
- </div>
14
- </div>
15
  </a>
16
- </div>
 
 
17
  </div>
18
  <img class="gawd_pro_img" data-attr="custom reports" style="margin-top:10px" src="<?php echo GAWD_URL . '/assets/freePages/custom_reports.png';?>"/>
19
 
1
  <div class="wd-upgrade-pro-main-wrap">
2
+ <span class="wd-text">This section lets add and manage custom reports.
3
+ <a style="color: #5CAEBD; text-decoration: none;border-bottom: 1px dotted;" target="_blank" href="https://web-dorado.com/wordpress-google-analytics/quick-start/overview.html">Read more in User Guide.</a>
4
+ </span>
5
  <div class="wd-ugrade-pro-wrap">
6
+ <a class="gawd_support_link" href="https://wordpress.org/support/plugin/wd-google-analytics" target="_blank">
7
+ <img src="<?php echo GAWD_URL; ?>/assets/i_support.png" >
8
+ <?php _e("Support Forum", "gmwd"); ?>
 
 
 
 
 
 
9
  </a>
10
+ <a class="gawd_update_pro_link" href="https://web-dorado.com/files/fromGoogleAnalyticsWD.php" target="_blank">
11
+ <?php _e("Upgrade to paid version", "gawd"); ?>
12
+ </a> </div>
13
  </div>
14
  <img class="gawd_pro_img" data-attr="custom reports" style="margin-top:10px" src="<?php echo GAWD_URL . '/assets/freePages/custom_reports.png';?>"/>
15
 
admin/pages/dashboard.php CHANGED
@@ -16,19 +16,16 @@ if($current_user != 1 && isset($saved_user_menues[$current_user])){
16
  }
17
  ?>
18
  <div class="wd-upgrade-pro-main-wrap">
19
- <div class="wd-text">Keep track of all Google Analytics reports on this page.
20
- <a style="color: #00A0D2; text-decoration: none;" target="_blank" href="https://web-dorado.com/wordpress-google-analytics/quick-start/overview.html">Read more in User Guide.</a>
21
- </div>
22
  <div class="wd-ugrade-pro-wrap">
23
- <a href="https://web-dorado.com/files/fromGoogleAnalyticsWD.php" target="_blank">
24
- <div class="wd-ugrade-pro-image-wrap">
25
- <div class="wd-ugrade-pro-image">
26
- <img src="<?php echo GAWD_URL; ?>/assets/web-dorado.png">
27
- </div>
28
- <div class="wd-ugrade-pro-text">
29
  <?php _e("Upgrade to paid version", "gawd"); ?>
30
- </div>
31
- </div>
32
  </a>
33
  </div>
34
  </div>
16
  }
17
  ?>
18
  <div class="wd-upgrade-pro-main-wrap">
19
+ <span class="wd-text">Keep track of all Google Analytics reports on this page.
20
+ <a style="color: #5CAEBD; text-decoration: none;border-bottom: 1px dotted;" target="_blank" href="https://web-dorado.com/wordpress-google-analytics/quick-start/overview.html">Read more in User Guide.</a>
21
+ </span>
22
  <div class="wd-ugrade-pro-wrap">
23
+ <a class="gawd_support_link" href="https://wordpress.org/support/plugin/wd-google-analytics" target="_blank">
24
+ <img src="<?php echo GAWD_URL; ?>/assets/i_support.png" >
25
+ <?php _e("Support Forum", "gmwd"); ?>
26
+ </a>
27
+ <a class="gawd_update_pro_link" href="https://web-dorado.com/files/fromGoogleAnalyticsWD.php" target="_blank">
 
28
  <?php _e("Upgrade to paid version", "gawd"); ?>
 
 
29
  </a>
30
  </div>
31
  </div>
admin/pages/goals.php CHANGED
@@ -15,25 +15,23 @@ if (!is_array($goals)) {
15
  $goals = array();
16
  }
17
  ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
18
  <div class="goal_wrap">
19
 
20
- <div class="wd-upgrade-pro-main-wrap">
21
- <div class="wd-text">This section allows you to add Google Analytics goals for current domain.
22
- <a style="color: #00A0D2; text-decoration: none;" target="_blank" href="https://web-dorado.com/wordpress-google-analytics/quick-start/overview.html">Read more in User Guide.</a>
23
- </div>
24
- <div class="wd-ugrade-pro-wrap">
25
- <a href="https://web-dorado.com/files/fromGoogleAnalyticsWD.php" target="_blank">
26
- <div class="wd-ugrade-pro-image-wrap">
27
- <div class="wd-ugrade-pro-image">
28
- <img src="<?php echo GAWD_URL; ?>/assets/web-dorado.png">
29
- </div>
30
- <div class="wd-ugrade-pro-text">
31
- <?php _e("Upgrade to paid version", "gawd"); ?>
32
- </div>
33
- </div>
34
- </a>
35
- </div>
36
- </div>
37
  <h3 class="gawd_page_titles">Goal Management</h3>
38
 
39
  <p>You can set and manage goals for your website tracking. Select the View that you’re going to track and configure these options based on the type of goal you would like to set.</p>
15
  $goals = array();
16
  }
17
  ?>
18
+ <div class="wd-upgrade-pro-main-wrap">
19
+ <span class="wd-text">This section allows you to add Google Analytics goals for current domain.
20
+ <a style="color: #5CAEBD; text-decoration: none;border-bottom: 1px dotted;" target="_blank" href="https://web-dorado.com/wordpress-google-analytics/quick-start/overview.html">Read more in User Guide.</a>
21
+ </span>
22
+ <div class="wd-ugrade-pro-wrap">
23
+ <a class="gawd_support_link" href="https://wordpress.org/support/plugin/wd-google-analytics" target="_blank">
24
+ <img src="<?php echo GAWD_URL; ?>/assets/i_support.png" >
25
+ <?php _e("Support Forum", "gmwd"); ?>
26
+ </a>
27
+ <a class="gawd_update_pro_link" href="https://web-dorado.com/files/fromGoogleAnalyticsWD.php" target="_blank">
28
+ <?php _e("Upgrade to paid version", "gawd"); ?>
29
+ </a>
30
+ </div>
31
+ </div>
32
  <div class="goal_wrap">
33
 
34
+
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
35
  <h3 class="gawd_page_titles">Goal Management</h3>
36
 
37
  <p>You can set and manage goals for your website tracking. Select the View that you’re going to track and configure these options based on the type of goal you would like to set.</p>
admin/pages/overview.php CHANGED
@@ -13,19 +13,16 @@ $new_buttons_full = '<button data-hint="Click to navigate to Real Time report on
13
 
14
  <?php screen_icon('options-general'); ?>
15
  <div class="wd-upgrade-pro-main-wrap">
16
- <div class="wd-text">This section lets you check the audience overview of your website.
17
- <a style="color: #00A0D2; text-decoration: none;" target="_blank" href="https://web-dorado.com/wordpress-google-analytics/quick-start/overview.html">Read more in User Guide.</a>
18
- </div>
19
  <div class="wd-ugrade-pro-wrap">
20
- <a href="https://web-dorado.com/files/fromGoogleAnalyticsWD.php" target="_blank">
21
- <div class="wd-ugrade-pro-image-wrap">
22
- <div class="wd-ugrade-pro-image">
23
- <img src="<?php echo GAWD_URL; ?>/assets/web-dorado.png">
24
- </div>
25
- <div class="wd-ugrade-pro-text">
26
- <?php _e("Upgrade to paid version", "gawd"); ?>
27
- </div>
28
- </div>
29
  </a>
30
  </div>
31
  </div>
13
 
14
  <?php screen_icon('options-general'); ?>
15
  <div class="wd-upgrade-pro-main-wrap">
16
+ <span class="wd-text">This section lets you check the audience overview of your website.
17
+ <a style="color: #5CAEBD; text-decoration: none;border-bottom: 1px dotted;" target="_blank" href="https://web-dorado.com/wordpress-google-analytics/quick-start/overview.html">Read more in User Guide.</a>
18
+ </span>
19
  <div class="wd-ugrade-pro-wrap">
20
+ <a class="gawd_support_link" href="https://wordpress.org/support/plugin/wd-google-analytics" target="_blank">
21
+ <img src="<?php echo GAWD_URL; ?>/assets/i_support.png" >
22
+ <?php _e("Support Forum", "gmwd"); ?>
23
+ </a>
24
+ <a class="gawd_update_pro_link" href="https://web-dorado.com/files/fromGoogleAnalyticsWD.php" target="_blank">
25
+ <?php _e("Upgrade to paid version", "gawd"); ?>
 
 
 
26
  </a>
27
  </div>
28
  </div>
admin/pages/settings.php CHANGED
@@ -66,21 +66,17 @@ foreach($roles->role_names as $key => $name){
66
 
67
  <div id="gawd_body">
68
  <div class="wd-upgrade-pro-main-wrap">
69
- <div class="wd-text">Authenticate your Google account and customize Google Analytics settings in this section.
70
- <a style="color: #00A0D2; text-decoration: none;" target="_blank" href="https://web-dorado.com/wordpress-google-analytics/quick-start/overview.html">Read more in User Guide.</a>
71
- </div>
72
  <div class="wd-ugrade-pro-wrap">
73
- <a href="https://web-dorado.com/files/fromGoogleAnalyticsWD.php" target="_blank">
74
- <div class="wd-ugrade-pro-image-wrap">
75
- <div class="wd-ugrade-pro-image">
76
- <img src="<?php echo GAWD_URL; ?>/assets/web-dorado.png">
77
- </div>
78
- <div class="wd-ugrade-pro-text">
79
- <?php _e("Upgrade to paid version", "gawd"); ?>
80
- </div>
81
- </div>
82
  </a>
83
- </div>
 
 
84
  </div>
85
  <div class="resp_menu"><div class="menu_img"></div><div class="button_label">SETTINGS</div><div class="clear"></div></div>
86
  <div class="gawd_menu_coteiner gawd_settings_menu_coteiner">
66
 
67
  <div id="gawd_body">
68
  <div class="wd-upgrade-pro-main-wrap">
69
+ <span class="wd-text">Authenticate your Google account and customize settings.
70
+ <a style="color: #5CAEBD; text-decoration: none;border-bottom: 1px dotted;" target="_blank" href="https://web-dorado.com/wordpress-google-analytics/quick-start/overview.html">Read more in User Guide.</a>
71
+ </span>
72
  <div class="wd-ugrade-pro-wrap">
73
+ <a class="gawd_support_link" href="https://wordpress.org/support/plugin/wd-google-analytics" target="_blank">
74
+ <img src="<?php echo GAWD_URL; ?>/assets/i_support.png" >
75
+ <?php _e("Support Forum", "gmwd"); ?>
 
 
 
 
 
 
76
  </a>
77
+ <a class="gawd_update_pro_link" href="https://web-dorado.com/files/fromGoogleAnalyticsWD.php" target="_blank">
78
+ <?php _e("Upgrade to paid version", "gawd"); ?>
79
+ </a> </div>
80
  </div>
81
  <div class="resp_menu"><div class="menu_img"></div><div class="button_label">SETTINGS</div><div class="clear"></div></div>
82
  <div class="gawd_menu_coteiner gawd_settings_menu_coteiner">
admin/pages/tracking.php CHANGED
@@ -32,21 +32,17 @@ $domain = GAWD::get_domain(esc_html(get_option('siteurl')));
32
 
33
  <div id="gawd_body">
34
  <div class="wd-upgrade-pro-main-wrap">
35
- <div class="wd-text">Create a web property and manage tracking settings in this section.
36
- <a style="color: #00A0D2; text-decoration: none;" target="_blank" href="https://web-dorado.com/wordpress-google-analytics/quick-start/overview.html">Read more in User Guide.</a>
37
- </div>
38
  <div class="wd-ugrade-pro-wrap">
39
- <a href="https://web-dorado.com/files/fromGoogleAnalyticsWD.php" target="_blank">
40
- <div class="wd-ugrade-pro-image-wrap">
41
- <div class="wd-ugrade-pro-image">
42
- <img src="<?php echo GAWD_URL; ?>/assets/web-dorado.png">
43
- </div>
44
- <div class="wd-ugrade-pro-text">
45
- <?php _e("Upgrade to paid version", "gawd"); ?>
46
- </div>
47
- </div>
48
  </a>
49
- </div>
 
 
50
  </div>
51
  <div class="resp_menu"><div class="menu_img"></div><div class="button_label">TRACKING</div><div class="clear"></div></div>
52
  <div class="gawd_menu_coteiner gawd_settings_menu_coteiner">
32
 
33
  <div id="gawd_body">
34
  <div class="wd-upgrade-pro-main-wrap">
35
+ <span class="wd-text">Create a web property and manage tracking settings in this section.
36
+ <a style="color: #5CAEBD; text-decoration: none;border-bottom: 1px dotted;" target="_blank" href="https://web-dorado.com/wordpress-google-analytics/quick-start/overview.html">Read more in User Guide.</a>
37
+ </span>
38
  <div class="wd-ugrade-pro-wrap">
39
+ <a class="gawd_support_link" href="https://wordpress.org/support/plugin/wd-google-analytics" target="_blank">
40
+ <img src="<?php echo GAWD_URL; ?>/assets/i_support.png" >
41
+ <?php _e("Support Forum", "gmwd"); ?>
 
 
 
 
 
 
42
  </a>
43
+ <a class="gawd_update_pro_link" href="https://web-dorado.com/files/fromGoogleAnalyticsWD.php" target="_blank">
44
+ <?php _e("Upgrade to paid version", "gawd"); ?>
45
+ </a> </div>
46
  </div>
47
  <div class="resp_menu"><div class="menu_img"></div><div class="button_label">TRACKING</div><div class="clear"></div></div>
48
  <div class="gawd_menu_coteiner gawd_settings_menu_coteiner">
assets/i_support.png ADDED
Binary file
gawd_class.php CHANGED
@@ -831,8 +831,8 @@ class GAWD
831
  );
832
  add_submenu_page(
833
  $parent_slug, //$parent_slug
834
- __('Get Pro', 'gawd'), //$page_title
835
- __('Get Pro', 'gawd'), //$menu_title
836
  $permission, //$capability
837
  'gawd_licensing', //$menu_slug
838
  array($this, 'gawd_display_licensing_page') //$function = '',
831
  );
832
  add_submenu_page(
833
  $parent_slug, //$parent_slug
834
+ __('Get Paid', 'gawd'), //$page_title
835
+ __('Get Paid', 'gawd'), //$menu_title
836
  $permission, //$capability
837
  'gawd_licensing', //$menu_slug
838
  array($this, 'gawd_display_licensing_page') //$function = '',
google-analytics-wd.php CHANGED
@@ -4,7 +4,7 @@
4
  * Plugin Name: Google Analytics
5
  * Plugin URI: https://web-dorado.com/products/wordpress-google-analytics-plugin.html
6
  * Description: Google Analytics WD is a user-friendly all in one plugin, which allows to manage and monitor your website analytics from WordPress dashboard.
7
- * Version: 1.1.6
8
  * Author: WebDorado
9
  * Author URI: https://web-dorado.com/wordpress-plugins-bundle.html
10
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -26,7 +26,7 @@ if (!defined('GAWD_INC')) {
26
  }
27
 
28
  if (!defined('GAWD_VERSION')) {
29
- define('GAWD_VERSION', '1.1.6');
30
  }
31
 
32
 
4
  * Plugin Name: Google Analytics
5
  * Plugin URI: https://web-dorado.com/products/wordpress-google-analytics-plugin.html
6
  * Description: Google Analytics WD is a user-friendly all in one plugin, which allows to manage and monitor your website analytics from WordPress dashboard.
7
+ * Version: 1.1.7
8
  * Author: WebDorado
9
  * Author URI: https://web-dorado.com/wordpress-plugins-bundle.html
10
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
26
  }
27
 
28
  if (!defined('GAWD_VERSION')) {
29
+ define('GAWD_VERSION', '1.1.7');
30
  }
31
 
32
 
inc/css/gawd_admin.css CHANGED
@@ -3017,21 +3017,21 @@ th.ui-th-column div {
3017
  }
3018
 
3019
  .wd-upgrade-pro-main-wrap {
3020
- font-size: 0
3021
- }
3022
-
3023
- .wd-text {
3024
- padding-right: 215px;
3025
- margin-right: -215px;
3026
- display: inline-block;
3027
  box-sizing: border-box;
 
 
3028
  font-size: 14px;
3029
- width: 100%;
3030
- padding: 15px 215px 15px 15px;
 
3031
  vertical-align: middle;
3032
- background: #fff;
3033
  }
3034
 
 
 
3035
  #gawd_auth_code_submit {
3036
  float: right;
3037
  padding: 5px 10px;
@@ -3059,16 +3059,39 @@ th.ui-th-column div {
3059
  }
3060
 
3061
  .wd-ugrade-pro-wrap {
3062
- width: 215px;
 
3063
  display: inline-block;
3064
  box-sizing: border-box;
3065
  vertical-align: middle;
3066
- background-color: #D8D8D8;
3067
  color: #175c8b;
3068
- font-size: 11px;
3069
  font-weight: bold;
 
3070
  }
3071
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3072
  .wd-ugrade-pro-wrap a {
3073
  text-decoration: none !important
3074
  }
3017
  }
3018
 
3019
  .wd-upgrade-pro-main-wrap {
3020
+ background-color: #ffffff;
3021
+ border: none;
 
 
 
 
 
3022
  box-sizing: border-box;
3023
+ clear: both;
3024
+ color: #6e7990;
3025
  font-size: 14px;
3026
+ font-weight: bold;
3027
+ line-height: 30px;
3028
+ padding: 15px;
3029
  vertical-align: middle;
3030
+ margin: 5px 15px 15px;
3031
  }
3032
 
3033
+
3034
+
3035
  #gawd_auth_code_submit {
3036
  float: right;
3037
  padding: 5px 10px;
3059
  }
3060
 
3061
  .wd-ugrade-pro-wrap {
3062
+ float: right;
3063
+ padding: 0;
3064
  display: inline-block;
3065
  box-sizing: border-box;
3066
  vertical-align: middle;
 
3067
  color: #175c8b;
3068
+ font-size: 14px;
3069
  font-weight: bold;
3070
+ line-height: 30px;
3071
  }
3072
 
3073
+
3074
+ .wd-ugrade-pro-wrap a{
3075
+ display: inline-block;
3076
+ font-weight: bold;
3077
+ font-size: 14px;
3078
+ vertical-align: middle;
3079
+ border: none;
3080
+ box-shadow: none !important;
3081
+ text-decoration: none;
3082
+ }
3083
+
3084
+ .wd-ugrade-pro-wrap .gawd_update_pro_link{
3085
+ background: #45A6B7;
3086
+ font-weight: bold;
3087
+ line-height: 30px;
3088
+ padding: 0 18px 0 18px;
3089
+ color: #fff !important;
3090
+ }
3091
+ .wd-ugrade-pro-wrap .gawd_support_link {
3092
+ color: #72777c !important;
3093
+ padding: 0 10px;
3094
+ }
3095
  .wd-ugrade-pro-wrap a {
3096
  text-decoration: none !important
3097
  }
readme.txt CHANGED
@@ -1,10 +1,9 @@
1
  === Google Analytics WD - user-friendly Google Analytics integration plugin ===
2
  Contributors: webdorado
3
- Donate link: https://web-dorado.com/products/wordpress-google-analytics-plugin.html
4
  Tags: google analytics, statistics, tracking, analytics dashboard, ga, google analytics dashboard, analytics, stats, googleanalytics, ecommerce tracking, custom reports, custom dimensions
5
  Requires at least: 3.9
6
  Tested up to: 4.9
7
- Stable tag: 1.1.6
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -103,6 +102,9 @@ Upgrade to Google Analytics WD Pro for premium features:
103
 
104
  == Changelog ==
105
 
 
 
 
106
  = 1.1.6 =
107
  * Added: Links to Reviews and Support Forum
108
 
1
  === Google Analytics WD - user-friendly Google Analytics integration plugin ===
2
  Contributors: webdorado
 
3
  Tags: google analytics, statistics, tracking, analytics dashboard, ga, google analytics dashboard, analytics, stats, googleanalytics, ecommerce tracking, custom reports, custom dimensions
4
  Requires at least: 3.9
5
  Tested up to: 4.9
6
+ Stable tag: 1.1.7
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
102
 
103
  == Changelog ==
104
 
105
+ = 1.1.7 =
106
+ * Changed: Deactivation popup.
107
+
108
  = 1.1.6 =
109
  * Added: Links to Reviews and Support Forum
110
 
wd/README.md CHANGED
@@ -1,4 +1,4 @@
1
- Version: 1.0.11
2
 
3
 
4
 
1
+ Version: 1.0.13
2
 
3
 
4
 
wd/assets/css/deactivate_popup.css CHANGED
@@ -1,3 +1,7 @@
 
 
 
 
1
  .wd-opacity{
2
  position: fixed;
3
  top: 0px;
1
+ .wd-bwg-reasons:nth-child(3) {
2
+ display: none;
3
+ }
4
+
5
  .wd-opacity{
6
  position: fixed;
7
  top: 0px;
wd/assets/img/cfm_main_plugin.png ADDED
Binary file
wd/assets/js/overview.js CHANGED
@@ -12,7 +12,7 @@
12
  ////////////////////////////////////////////////////////////////////////////////////////
13
  jQuery(document).ready(function () {
14
  jQuery(".overview_content > div:not(#welcome)").hide();
15
- jQuery(".overview_tabs li a:not(.not_tab)").click(function(){
16
  jQuery(".overview_tabs li a").removeClass("overview_tab_active");
17
  jQuery(this).addClass("overview_tab_active");
18
  jQuery(".overview_content > div").hide();
@@ -31,7 +31,7 @@ jQuery(document).ready(function () {
31
  // jQuery("body").append('<style>.stars-' + rate.toString() + ':after{width:' + rate + '%;}</style>');
32
  // });
33
 
34
- jQuery("#wd-copy").click(function(){
35
  var selector = document.querySelector('#wd-site-deatils-textarea');
36
  selector.select();
37
  document.execCommand('copy');
12
  ////////////////////////////////////////////////////////////////////////////////////////
13
  jQuery(document).ready(function () {
14
  jQuery(".overview_content > div:not(#welcome)").hide();
15
+ jQuery(".overview_tabs li a:not(.not_tab)").on("click", function(){
16
  jQuery(".overview_tabs li a").removeClass("overview_tab_active");
17
  jQuery(this).addClass("overview_tab_active");
18
  jQuery(".overview_content > div").hide();
31
  // jQuery("body").append('<style>.stars-' + rate.toString() + ':after{width:' + rate + '%;}</style>');
32
  // });
33
 
34
+ jQuery("#wd-copy").on("click", function(){
35
  var selector = document.querySelector('#wd-site-deatils-textarea');
36
  selector.select();
37
  document.execCommand('copy');
wd/assets/js/subsribe.js CHANGED
@@ -10,13 +10,13 @@
10
  ////////////////////////////////////////////////////////////////////////////////////////
11
  // Constructor & Destructor //
12
  ////////////////////////////////////////////////////////////////////////////////////////
13
- jQuery(document).ready(function () {
14
- jQuery(".permissions").click(function(){
15
  jQuery(".list").toggle();
16
  return false;
17
  });
18
 
19
- jQuery(".allow_and_continue").click(function(){
20
  jQuery(this).css("opacity", "0.5");
21
  jQuery(".wd_loader").css("visibility", "visible");
22
  });
10
  ////////////////////////////////////////////////////////////////////////////////////////
11
  // Constructor & Destructor //
12
  ////////////////////////////////////////////////////////////////////////////////////////
13
+ jQuery(document).on("ready", function () {
14
+ jQuery(".permissions").on("click", function(){
15
  jQuery(".list").toggle();
16
  return false;
17
  });
18
 
19
+ jQuery(".allow_and_continue").on("click", function(){
20
  jQuery(this).css("opacity", "0.5");
21
  jQuery(".wd_loader").css("visibility", "visible");
22
  });
wd/includes/notices.php CHANGED
@@ -1,96 +1,96 @@
1
  <?php
2
- if ( !defined( 'ABSPATH' ) ) {
3
- exit;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
4
  }
5
 
6
- class DoradoWebNotices {
7
-
8
- protected $promo_link = '';
9
-
10
- public $config;
11
- public $notice_spam = 0;
12
- public $notice_spam_max = 2;
13
-
14
- // Basic actions to run
15
- public function __construct( $config = array() ) {
16
- $this->config = $config;
17
- // Runs the admin notice ignore function incase a dismiss button has been clicked
18
- add_action( 'admin_init', array( $this, 'admin_notice_ignore' ) );
19
- // Runs the admin notice temp ignore function incase a temp dismiss link has been clicked
20
- add_action( 'admin_init', array( $this, 'admin_notice_temp_ignore' ) );
21
- add_action( 'admin_notices', array( $this, 'wd_admin_notices' ) );
22
  }
 
 
23
 
24
- // Checks to ensure notices aren't disabled and the user has the correct permissions.
25
- public function wd_admin_notice() {
26
- $wd_options = $this->config;
27
- $settings = get_option($wd_options->prefix . '_admin_notice');
28
- if ( !isset( $settings['disable_admin_notices'] ) || ( isset( $settings['disable_admin_notices'] ) && $settings['disable_admin_notices'] == 0 ) ) {
29
- if ( current_user_can( 'manage_options' ) ) {
30
- return true;
31
- }
32
- }
33
  return false;
34
  }
35
-
36
- // Primary notice function that can be called from an outside function sending necessary variables
37
- public function admin_notice( $admin_notices ) {
38
- $wd_options = $this->config;
39
- // Check options
40
- if ( !$this->wd_admin_notice() ) {
41
  return false;
42
  }
43
- foreach ( $admin_notices as $slug => $admin_notice ) {
44
- // Call for spam protection
45
- if ( $this->anti_notice_spam() ) {
 
46
  return false;
47
  }
 
48
 
49
- // Check for proper page to display on
50
- if (isset( $admin_notices[$slug]['pages']) && is_array( $admin_notices[$slug]['pages'])) {
51
- if ( !$this->admin_notice_pages( $admin_notices[$slug]['pages'] ) ) {
52
- return false;
53
- }
54
- }
55
 
56
- // Check for required fields
57
- if ( !$this->required_fields( $admin_notices[$slug] ) ) {
58
-
59
- // Get the current date then set start date to either passed value or current date value and add interval
60
- $current_date = current_time( "n/j/Y" );
61
- $start = ( isset( $admin_notices[$slug]['start'] ) ? $admin_notices[$slug]['start'] : $current_date );
62
- $start = date( "n/j/Y", strtotime( $start ) );
63
- $date_array = explode( '/', $start );
64
- $interval = ( isset( $admin_notices[$slug]['int'] ) ? $admin_notices[$slug]['int'] : 0 );
65
-
66
- $date_array[1] += $interval;
67
- $start = date( "n/j/Y", mktime( 0, 0, 0, $date_array[0], $date_array[1], $date_array[2] ) );
68
-
69
- // This is the main notices storage option
70
- $admin_notices_option = get_option( $wd_options->prefix . '_admin_notice', array() );
71
- // Check if the message is already stored and if so just grab the key otherwise store the message and its associated date information
72
- if ( !array_key_exists( $slug, $admin_notices_option ) ) {
73
- $admin_notices_option[$slug]['start'] = $start;
74
- $admin_notices_option[$slug]['int'] = $interval;
75
- update_option( $wd_options->prefix . '_admin_notice', $admin_notices_option );
76
- }
77
 
78
- // Sanity check to ensure we have accurate information
79
- // New date information will not overwrite old date information
80
- $admin_display_check = ( isset( $admin_notices_option[$slug]['dismissed'] ) ? $admin_notices_option[$slug]['dismissed'] : 0 );
81
- $admin_display_start = ( isset( $admin_notices_option[$slug]['start'] ) ? $admin_notices_option[$slug]['start'] : $start );
82
- $admin_display_interval = ( isset($admin_notices_option[$slug]['int'] ) ? $admin_notices_option[$slug]['int'] : $interval );
83
- $admin_display_msg = ( isset($admin_notices[$slug]['msg'] ) ? $admin_notices[$slug]['msg'] : '' );
84
- $admin_display_title = ( isset($admin_notices[$slug]['title'] ) ? $admin_notices[$slug]['title'] : '' );
85
- $admin_display_link = ( isset( $admin_notices[$slug]['link'] ) ? $admin_notices[$slug]['link'] : '' );
86
- $output_css = false;
87
-
88
- // Ensure the notice hasn't been hidden and that the current date is after the start date
89
- if ( $admin_display_check == 0 && strtotime($admin_display_start) <= strtotime($current_date ) ) {
90
-
91
- // Get remaining query string
92
- $query_str = ( isset( $admin_notices[$slug]['later_link'] ) ? $admin_notices[$slug]['later_link'] : esc_url(add_query_arg( $wd_options->prefix . '_admin_notice_ignore', $slug ) ) );
93
- if ( strpos($slug, 'promo' ) === FALSE ) {
 
 
 
 
 
 
 
 
 
 
 
 
94
  // Admin notice display output
95
  echo '<div class="update-nag wd-admin-notice">
96
  <div class="wd-notice-logo" style="background-image: url(' . $wd_options->wd_url_img . '/' . $wd_options->prefix . '_main_plugin.png);"></div>
@@ -99,8 +99,8 @@
99
  <ul class="wd-notice-body wd-blue">' . $admin_display_link . '</ul>
100
  <a href="' . $query_str . '" class="dashicons dashicons-dismiss"></a>
101
  </div>';
102
- }
103
- else {
104
  echo '<div class="admin-notice-promo">';
105
  echo $admin_display_msg;
106
  echo '<ul class="notice-body-promo blue">
@@ -108,116 +108,116 @@
108
  </ul>';
109
  echo '<a href="' . $query_str . '" class="dashicons dashicons-dismiss close-promo"></a>';
110
  echo '</div>';
111
- }
112
- $this->notice_spam += 1;
113
- $output_css = true;
114
- }
115
- if ( $output_css ) {
116
- wp_enqueue_style( $wd_options->prefix . '-admin-notices', $wd_options->wd_url_css . '/notices.css', array(), get_option($wd_options->prefix . "_version" ) );
117
  }
 
 
 
 
 
118
  }
119
  }
120
  }
 
121
 
122
- // Spam protection check
123
- public function anti_notice_spam() {
124
- if ( $this->notice_spam >= $this->notice_spam_max ) {
125
- return true;
126
- }
127
- return false;
128
  }
 
 
129
 
130
- // Ignore function that gets ran at admin init to ensure any messages that were dismissed get marked
131
- public function admin_notice_ignore() {
132
- $wd_options = $this->config;
133
- // If user clicks to ignore the notice, update the option to not show it again
134
- if ( isset( $_GET[$wd_options->prefix . '_admin_notice_ignore'] ) ) {
135
- $admin_notices_option = get_option( $wd_options->prefix . '_admin_notice', array() );
136
- $admin_notices_option[$_GET[$wd_options->prefix . '_admin_notice_ignore']]['dismissed'] = 1;
137
- update_option( $wd_options->prefix . '_admin_notice', $admin_notices_option );
138
- $query_str = remove_query_arg( $wd_options->prefix . '_admin_notice_ignore' );
139
- wp_redirect( $query_str );
140
- exit;
141
- }
142
  }
 
143
 
144
- // Temp Ignore function that gets ran at admin init to ensure any messages that were temp dismissed get their start date changed
145
- public function admin_notice_temp_ignore() {
146
- $wd_options = $this->config;
147
- // If user clicks to temp ignore the notice, update the option to change the start date - default interval of 14 days
148
- if ( isset( $_GET[$wd_options->prefix . '_admin_notice_temp_ignore'] ) ) {
149
- $admin_notices_option = get_option( $wd_options->prefix . '_admin_notice', array() );
150
- $current_date = current_time( "n/j/Y" );
151
- $date_array = explode( '/', $current_date );
152
- $interval = (isset($_GET['wd_int']) ? $_GET['wd_int'] : 14);
153
- $date_array[1] += $interval;
154
- $new_start = date( "n/j/Y", mktime( 0, 0, 0, $date_array[0], $date_array[1], $date_array[2] ) );
155
-
156
- $admin_notices_option[$_GET[$wd_options->prefix . '_admin_notice_temp_ignore']]['start'] = $new_start;
157
- $admin_notices_option[$_GET[$wd_options->prefix . '_admin_notice_temp_ignore']]['dismissed'] = 0;
158
- update_option( $wd_options->prefix . '_admin_notice', $admin_notices_option );
159
- $query_str = remove_query_arg( array( $wd_options->prefix . '_admin_notice_temp_ignore', 'wd_int' ) );
160
- wp_redirect( $query_str );
161
- exit;
162
- }
163
  }
 
164
 
165
- public function admin_notice_pages($pages) {
166
- $wd_options = $this->config;
167
- foreach ( $pages as $key => $page ) {
168
- if (is_array($page)) {
169
- if ( isset( $_GET['page'] ) && $_GET['page'] == $page[0] && isset($_GET['tab']) && $_GET['tab'] == $page[1] ) {
170
- return true;
171
- }
172
- }
173
- else {
174
- if ( $page == 'all' ) {
175
- return true;
176
- }
177
- if ( get_current_screen()->id === $page ) {
178
- return true;
179
- }
180
- if ( isset($_GET['page']) && $_GET['page'] == $page ) {
181
- return true;
182
- }
183
  }
184
- return false;
185
  }
186
- }
187
-
188
- // Required fields check
189
- public function required_fields( $fields ) {
190
- if ( !isset( $fields['msg'] ) || ( isset($fields['msg'] ) && empty( $fields['msg'] ) ) ) {
191
- return true;
192
- }
193
- if ( !isset( $fields['title'] ) || ( isset( $fields['title'] ) && empty( $fields['title'] ) ) ) {
194
- return true;
 
195
  }
196
  return false;
197
  }
 
198
 
199
- // Special parameters function that is to be used in any extension of this class
200
- public function special_parameters($admin_notices) {
201
- // Intentionally left blank
 
 
 
 
202
  }
 
 
203
 
204
- public function wd_admin_notices() {
205
- $wd_options = $this->config;
206
- $two_week_review_ignore = add_query_arg( array( $wd_options->prefix . '_admin_notice_ignore' => 'two_week_review' ) );
207
- $two_week_review_temp = add_query_arg( array( $wd_options->prefix . '_admin_notice_temp_ignore' => 'two_week_review', 'int' => 14 ) );
208
- $promo_close = add_query_arg( array( $wd_options->prefix . '_admin_notice_ignore' => 'ecommerce_promo' ) );
209
 
210
- $notices['two_week_review'] = array(
211
- 'title' => __('Leave A Review?', $wd_options->prefix),
212
- 'msg' => sprintf(__('We hope you\'ve enjoyed using WordPress %s! Would you consider leaving us a review on WordPress.org?', $wd_options->prefix), $wd_options->plugin_title),
213
- 'link' => '<li><span class="dashicons dashicons-external"></span><a href="https://wordpress.org/support/view/plugin-reviews/' . $wd_options->plugin_wordpress_slug . '?filter=5" target="_blank">' . __('Sure! I\'d love to!', $wd_options->prefix) . '</a></li>
 
 
 
 
 
 
214
  <li><span class="dashicons dashicons-smiley"></span><a href="' . $two_week_review_ignore . '"> ' . __('I\'ve already left a review', $wd_options->prefix) . '</a></li>
215
  <li><span class="dashicons dashicons-calendar-alt"></span><a href="' . $two_week_review_temp . '">' . __('Maybe Later', $wd_options->prefix) . '</a></li>
216
  <li><span class="dashicons dashicons-dismiss"></span><a href="' . $two_week_review_ignore . '">' . __('Never show again', $wd_options->prefix) . '</a></li>',
217
- 'later_link' => $two_week_review_temp,
218
- 'int' => 14
219
- );
220
-
221
- $this->admin_notice($notices);
222
- }
223
  }
 
1
  <?php
2
+ if ( !defined( 'ABSPATH' ) ) {
3
+ exit;
4
+ }
5
+
6
+ class DoradoWebNotices {
7
+
8
+ protected $promo_link = '';
9
+
10
+ public $config;
11
+ public $notice_spam = 0;
12
+ public $notice_spam_max = 2;
13
+
14
+ // Basic actions to run
15
+ public function __construct( $config = array() ) {
16
+ $this->config = $config;
17
+ // Runs the admin notice ignore function incase a dismiss button has been clicked
18
+ add_action( 'admin_init', array( $this, 'admin_notice_ignore' ) );
19
+ // Runs the admin notice temp ignore function incase a temp dismiss link has been clicked
20
+ add_action( 'admin_init', array( $this, 'admin_notice_temp_ignore' ) );
21
+ add_action( 'admin_notices', array( $this, 'wd_admin_notices' ) );
22
  }
23
 
24
+ // Checks to ensure notices aren't disabled and the user has the correct permissions.
25
+ public function wd_admin_notice() {
26
+ $wd_options = $this->config;
27
+ $settings = get_option($wd_options->prefix . '_admin_notice');
28
+ if ( !isset( $settings['disable_admin_notices'] ) || ( isset( $settings['disable_admin_notices'] ) && $settings['disable_admin_notices'] == 0 ) ) {
29
+ if ( current_user_can( 'manage_options' ) ) {
30
+ return true;
31
+ }
 
 
 
 
 
 
 
 
32
  }
33
+ return false;
34
+ }
35
 
36
+ // Primary notice function that can be called from an outside function sending necessary variables
37
+ public function admin_notice( $admin_notices ) {
38
+ $wd_options = $this->config;
39
+ // Check options
40
+ if ( !$this->wd_admin_notice() ) {
 
 
 
 
41
  return false;
42
  }
43
+ foreach ( $admin_notices as $slug => $admin_notice ) {
44
+ // Call for spam protection
45
+ if ( $this->anti_notice_spam() ) {
 
 
 
46
  return false;
47
  }
48
+
49
+ // Check for proper page to display on
50
+ if (isset( $admin_notices[$slug]['pages']) && is_array( $admin_notices[$slug]['pages'])) {
51
+ if ( !$this->admin_notice_pages( $admin_notices[$slug]['pages'] ) ) {
52
  return false;
53
  }
54
+ }
55
 
56
+ // Check for required fields
57
+ if ( !$this->required_fields( $admin_notices[$slug] ) ) {
 
 
 
 
58
 
59
+ // Get the current date then set start date to either passed value or current date value and add interval
60
+ $current_date = current_time( "n/j/Y" );
61
+ $start = ( isset( $admin_notices[$slug]['start'] ) ? $admin_notices[$slug]['start'] : $current_date );
62
+ $start = date( "n/j/Y", strtotime( $start ) );
63
+ $date_array = explode( '/', $start );
64
+ $interval = ( isset( $admin_notices[$slug]['int'] ) ? $admin_notices[$slug]['int'] : 0 );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
65
 
66
+ $date_array[1] += $interval;
67
+ $start = date( "n/j/Y", mktime( 0, 0, 0, $date_array[0], $date_array[1], $date_array[2] ) );
68
+
69
+ // This is the main notices storage option
70
+ $admin_notices_option = get_option( $wd_options->prefix . '_admin_notice', array() );
71
+ // Check if the message is already stored and if so just grab the key otherwise store the message and its associated date information
72
+ if ( !array_key_exists( $slug, $admin_notices_option ) ) {
73
+ $admin_notices_option[$slug]['start'] = $start;
74
+ $admin_notices_option[$slug]['int'] = $interval;
75
+ update_option( $wd_options->prefix . '_admin_notice', $admin_notices_option );
76
+ }
77
+
78
+ // Sanity check to ensure we have accurate information
79
+ // New date information will not overwrite old date information
80
+ $admin_display_check = ( isset( $admin_notices_option[$slug]['dismissed'] ) ? $admin_notices_option[$slug]['dismissed'] : 0 );
81
+ $admin_display_start = ( isset( $admin_notices_option[$slug]['start'] ) ? $admin_notices_option[$slug]['start'] : $start );
82
+ $admin_display_interval = ( isset($admin_notices_option[$slug]['int'] ) ? $admin_notices_option[$slug]['int'] : $interval );
83
+ $admin_display_msg = ( isset($admin_notices[$slug]['msg'] ) ? $admin_notices[$slug]['msg'] : '' );
84
+ $admin_display_title = ( isset($admin_notices[$slug]['title'] ) ? $admin_notices[$slug]['title'] : '' );
85
+ $admin_display_link = ( isset( $admin_notices[$slug]['link'] ) ? $admin_notices[$slug]['link'] : '' );
86
+ $output_css = false;
87
+
88
+ // Ensure the notice hasn't been hidden and that the current date is after the start date
89
+ if ( $admin_display_check == 0 && strtotime($admin_display_start) <= strtotime($current_date ) ) {
90
+
91
+ // Get remaining query string
92
+ $query_str = ( isset( $admin_notices[$slug]['later_link'] ) ? $admin_notices[$slug]['later_link'] : esc_url(add_query_arg( $wd_options->prefix . '_admin_notice_ignore', $slug ) ) );
93
+ if ( strpos($slug, 'promo' ) === FALSE ) {
94
  // Admin notice display output
95
  echo '<div class="update-nag wd-admin-notice">
96
  <div class="wd-notice-logo" style="background-image: url(' . $wd_options->wd_url_img . '/' . $wd_options->prefix . '_main_plugin.png);"></div>
99
  <ul class="wd-notice-body wd-blue">' . $admin_display_link . '</ul>
100
  <a href="' . $query_str . '" class="dashicons dashicons-dismiss"></a>
101
  </div>';
102
+ }
103
+ else {
104
  echo '<div class="admin-notice-promo">';
105
  echo $admin_display_msg;
106
  echo '<ul class="notice-body-promo blue">
108
  </ul>';
109
  echo '<a href="' . $query_str . '" class="dashicons dashicons-dismiss close-promo"></a>';
110
  echo '</div>';
 
 
 
 
 
 
111
  }
112
+ $this->notice_spam += 1;
113
+ $output_css = true;
114
+ }
115
+ if ( $output_css ) {
116
+ wp_enqueue_style( $wd_options->prefix . '-admin-notices', $wd_options->wd_url_css . '/notices.css', array(), get_option($wd_options->prefix . "_version" ) );
117
  }
118
  }
119
  }
120
+ }
121
 
122
+ // Spam protection check
123
+ public function anti_notice_spam() {
124
+ if ( $this->notice_spam >= $this->notice_spam_max ) {
125
+ return true;
 
 
126
  }
127
+ return false;
128
+ }
129
 
130
+ // Ignore function that gets ran at admin init to ensure any messages that were dismissed get marked
131
+ public function admin_notice_ignore() {
132
+ $wd_options = $this->config;
133
+ // If user clicks to ignore the notice, update the option to not show it again
134
+ if ( isset( $_GET[$wd_options->prefix . '_admin_notice_ignore'] ) ) {
135
+ $admin_notices_option = get_option( $wd_options->prefix . '_admin_notice', array() );
136
+ $admin_notices_option[$_GET[$wd_options->prefix . '_admin_notice_ignore']]['dismissed'] = 1;
137
+ update_option( $wd_options->prefix . '_admin_notice', $admin_notices_option );
138
+ $query_str = remove_query_arg( $wd_options->prefix . '_admin_notice_ignore' );
139
+ wp_redirect( $query_str );
140
+ exit;
 
141
  }
142
+ }
143
 
144
+ // Temp Ignore function that gets ran at admin init to ensure any messages that were temp dismissed get their start date changed
145
+ public function admin_notice_temp_ignore() {
146
+ $wd_options = $this->config;
147
+ // If user clicks to temp ignore the notice, update the option to change the start date - default interval of 14 days
148
+ if ( isset( $_GET[$wd_options->prefix . '_admin_notice_temp_ignore'] ) ) {
149
+ $admin_notices_option = get_option( $wd_options->prefix . '_admin_notice', array() );
150
+ $current_date = current_time( "n/j/Y" );
151
+ $date_array = explode( '/', $current_date );
152
+ $interval = (isset($_GET['wd_int']) ? $_GET['wd_int'] : 14);
153
+ $date_array[1] += $interval;
154
+ $new_start = date( "n/j/Y", mktime( 0, 0, 0, $date_array[0], $date_array[1], $date_array[2] ) );
155
+
156
+ $admin_notices_option[$_GET[$wd_options->prefix . '_admin_notice_temp_ignore']]['start'] = $new_start;
157
+ $admin_notices_option[$_GET[$wd_options->prefix . '_admin_notice_temp_ignore']]['dismissed'] = 0;
158
+ update_option( $wd_options->prefix . '_admin_notice', $admin_notices_option );
159
+ $query_str = remove_query_arg( array( $wd_options->prefix . '_admin_notice_temp_ignore', 'wd_int' ) );
160
+ wp_redirect( $query_str );
161
+ exit;
 
162
  }
163
+ }
164
 
165
+ public function admin_notice_pages($pages) {
166
+ $wd_options = $this->config;
167
+ foreach ( $pages as $key => $page ) {
168
+ if (is_array($page)) {
169
+ if ( isset( $_GET['page'] ) && $_GET['page'] == $page[0] && isset($_GET['tab']) && $_GET['tab'] == $page[1] ) {
170
+ return true;
 
 
 
 
 
 
 
 
 
 
 
 
171
  }
 
172
  }
173
+ else {
174
+ if ( $page == 'all' ) {
175
+ return true;
176
+ }
177
+ if ( get_current_screen()->id === $page ) {
178
+ return true;
179
+ }
180
+ if ( isset($_GET['page']) && $_GET['page'] == $page ) {
181
+ return true;
182
+ }
183
  }
184
  return false;
185
  }
186
+ }
187
 
188
+ // Required fields check
189
+ public function required_fields( $fields ) {
190
+ if ( !isset( $fields['msg'] ) || ( isset($fields['msg'] ) && empty( $fields['msg'] ) ) ) {
191
+ return true;
192
+ }
193
+ if ( !isset( $fields['title'] ) || ( isset( $fields['title'] ) && empty( $fields['title'] ) ) ) {
194
+ return true;
195
  }
196
+ return false;
197
+ }
198
 
199
+ // Special parameters function that is to be used in any extension of this class
200
+ public function special_parameters($admin_notices) {
201
+ // Intentionally left blank
202
+ }
 
203
 
204
+ public function wd_admin_notices() {
205
+ $wd_options = $this->config;
206
+ $two_week_review_ignore = add_query_arg( array( $wd_options->prefix . '_admin_notice_ignore' => 'two_week_review' ) );
207
+ $two_week_review_temp = add_query_arg( array( $wd_options->prefix . '_admin_notice_temp_ignore' => 'two_week_review', 'int' => 14 ) );
208
+ $promo_close = add_query_arg( array( $wd_options->prefix . '_admin_notice_ignore' => 'ecommerce_promo' ) );
209
+
210
+ $notices['two_week_review'] = array(
211
+ 'title' => __('Leave A Review?', $wd_options->prefix),
212
+ 'msg' => sprintf(__('We hope you\'ve enjoyed using WordPress %s! Would you consider leaving us a review on WordPress.org?', $wd_options->prefix), $wd_options->plugin_title),
213
+ 'link' => '<li><span class="dashicons dashicons-external"></span><a href="https://wordpress.org/support/plugin/' . $wd_options->plugin_wordpress_slug . '/reviews?filter=5&rate=5#new-post" target="_blank">' . __('Sure! I\'d love to!', $wd_options->prefix) . '</a></li>
214
  <li><span class="dashicons dashicons-smiley"></span><a href="' . $two_week_review_ignore . '"> ' . __('I\'ve already left a review', $wd_options->prefix) . '</a></li>
215
  <li><span class="dashicons dashicons-calendar-alt"></span><a href="' . $two_week_review_temp . '">' . __('Maybe Later', $wd_options->prefix) . '</a></li>
216
  <li><span class="dashicons dashicons-dismiss"></span><a href="' . $two_week_review_ignore . '">' . __('Never show again', $wd_options->prefix) . '</a></li>',
217
+ 'later_link' => $two_week_review_temp,
218
+ 'int' => 14
219
+ );
220
+
221
+ $this->admin_notice($notices);
 
222
  }
223
+ }
wd/templates/display_deactivation_popup.php CHANGED
@@ -5,7 +5,7 @@
5
  </div>
6
  <form method="post" id="<?php echo $wd_options->prefix; ?>_deactivate_form">
7
  <div class="wd-deactivate-popup-header">
8
- <?php _e( "Please let us know why you are deactivating. Your answer will help us to serve you better", $wd_options->prefix ); ?>:
9
  </div>
10
 
11
  <div class="wd-deactivate-popup-body">
@@ -18,9 +18,8 @@
18
  <div class="<?php echo $wd_options->prefix; ?>_additional_details_wrap"></div>
19
  </div>
20
  <div class="wd-btns">
21
- <a href="<?php echo $deactivate_url; ?>" data-val="1" class="button button-secondary button-close wd-<?php echo $wd_options->prefix; ?>-deactivate" id="wd-<?php echo $wd_options->prefix; ?>-deactivate"><?php _e( "Deactivate" , $wd_options->prefix ); ?></a>
22
- <a href="<?php echo $deactivate_url; ?>" data-val="2" class="button button-secondary button-close wd-<?php echo $wd_options->prefix; ?>-deactivate" id="wd-<?php echo $wd_options->prefix; ?>-submit-and-deactivate" style="display:none;"><?php _e( "Submit and deactivate" , $wd_options->prefix ); ?></a>
23
- <a href="<?php echo admin_url( 'plugins.php' ); ?>" class="button button-primary wd-<?php echo $wd_options->prefix; ?>-cancel"><?php _e( "Cancel" , $wd_options->prefix ); ?></a>
24
  </div>
25
  <input type="hidden" name="<?php echo $wd_options->prefix . "_submit_and_deactivate"; ?>" value="" >
26
  <?php wp_nonce_field( $wd_options->prefix . '_save_form', $wd_options->prefix . '_save_form_fild'); ?>
5
  </div>
6
  <form method="post" id="<?php echo $wd_options->prefix; ?>_deactivate_form">
7
  <div class="wd-deactivate-popup-header">
8
+ <?php _e( "Please let us know why you are deactivating. Your answer will help us to serve you better (Optional)", $wd_options->prefix ); ?>:
9
  </div>
10
 
11
  <div class="wd-deactivate-popup-body">
18
  <div class="<?php echo $wd_options->prefix; ?>_additional_details_wrap"></div>
19
  </div>
20
  <div class="wd-btns">
21
+ <a href="<?php echo $deactivate_url; ?>" data-val="1" class="button button-primary button-close wd-<?php echo $wd_options->prefix; ?>-deactivate" id="wd-<?php echo $wd_options->prefix; ?>-deactivate"><?php _e( "Skip and Deactivate" , $wd_options->prefix ); ?></a>
22
+ <a href="<?php echo $deactivate_url; ?>" data-val="2" class="button button-primary button-close wd-<?php echo $wd_options->prefix; ?>-deactivate" id="wd-<?php echo $wd_options->prefix; ?>-submit-and-deactivate" style="display:none;"><?php _e( "Submit and Deactivate" , $wd_options->prefix ); ?></a>
 
23
  </div>
24
  <input type="hidden" name="<?php echo $wd_options->prefix . "_submit_and_deactivate"; ?>" value="" >
25
  <?php wp_nonce_field( $wd_options->prefix . '_save_form', $wd_options->prefix . '_save_form_fild'); ?>
wd/wd.php CHANGED
@@ -17,7 +17,7 @@
17
  public $overview_instance;
18
  public $subscribe_instance;
19
  public $config;
20
- private $version = "1.0.11";
21
 
22
  ////////////////////////////////////////////////////////////////////////////////////////
23
  // Constructor & Destructor //
17
  public $overview_instance;
18
  public $subscribe_instance;
19
  public $config;
20
+ private $version = "1.0.13";
21
 
22
  ////////////////////////////////////////////////////////////////////////////////////////
23
  // Constructor & Destructor //