@@ -27,22 +27,22 @@ discard block |
||
27 | 27 | $menu_icon_inline = monsterinsights_get_inline_menu_icon(); |
28 | 28 | |
29 | 29 | if ( $hook === 'monsterinsights_settings' ) { |
30 | - // If dashboards disabled, first settings page |
|
31 | - add_menu_page( __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', $menu_icon_inline, '100.00013467543' ); |
|
32 | - $hook = 'monsterinsights_settings'; |
|
30 | + // If dashboards disabled, first settings page |
|
31 | + add_menu_page( __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', $menu_icon_inline, '100.00013467543' ); |
|
32 | + $hook = 'monsterinsights_settings'; |
|
33 | 33 | |
34 | - add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' ); |
|
34 | + add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' ); |
|
35 | 35 | } else { |
36 | - // if dashboards enabled, first dashboard |
|
37 | - add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', $menu_icon_inline, '100.00013467543' ); |
|
36 | + // if dashboards enabled, first dashboard |
|
37 | + add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', $menu_icon_inline, '100.00013467543' ); |
|
38 | 38 | |
39 | - add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' ); |
|
39 | + add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' ); |
|
40 | 40 | |
41 | - // then settings page |
|
42 | - add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page' ); |
|
41 | + // then settings page |
|
42 | + add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page' ); |
|
43 | 43 | |
44 | - // Add dashboard submenu. |
|
45 | - add_submenu_page( 'index.php', __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'admin.php?page=monsterinsights_reports' ); |
|
44 | + // Add dashboard submenu. |
|
45 | + add_submenu_page( 'index.php', __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'admin.php?page=monsterinsights_reports' ); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | $submenu_base = add_query_arg( 'page', 'monsterinsights_settings', admin_url( 'admin.php' ) ); |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | // then addons |
54 | 54 | $network_key = monsterinsights_is_pro_version() ? MonsterInsights()->license->get_network_license_key() : ''; |
55 | 55 | if ( ! monsterinsights_is_network_active() || ( monsterinsights_is_network_active() && empty( $network_key ) ) ) { |
56 | - add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:' . monsterinsights_menu_highlight_color() . '"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', $submenu_base . '#/addons' ); |
|
56 | + add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:' . monsterinsights_menu_highlight_color() . '"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', $submenu_base . '#/addons' ); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | // Add About us page. |
@@ -64,9 +64,9 @@ discard block |
||
64 | 64 | function monsterinsights_get_menu_hook() { |
65 | 65 | $dashboards_disabled = monsterinsights_get_option( 'dashboards_disabled', false ); |
66 | 66 | if ( $dashboards_disabled || ( current_user_can( 'monsterinsights_save_settings' ) && ! current_user_can( 'monsterinsights_view_dashboard' ) ) ) { |
67 | - return 'monsterinsights_settings'; |
|
67 | + return 'monsterinsights_settings'; |
|
68 | 68 | } else { |
69 | - return 'monsterinsights_reports'; |
|
69 | + return 'monsterinsights_reports'; |
|
70 | 70 | } |
71 | 71 | } |
72 | 72 | |
@@ -77,12 +77,12 @@ discard block |
||
77 | 77 | // First, let's see if this is an MS network enabled plugin. If it is, we should load the license |
78 | 78 | // menu page and the updater on the network panel |
79 | 79 | if ( ! function_exists( 'is_plugin_active_for_network' ) ) { |
80 | - require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); |
|
80 | + require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | $plugin = plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE ); |
84 | 84 | if ( ! is_plugin_active_for_network( $plugin ) ) { |
85 | - return; |
|
85 | + return; |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | $menu_icon_inline = monsterinsights_get_inline_menu_icon(); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | function monsterinsights_add_admin_body_class( $classes ) { |
114 | 114 | $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false; |
115 | 115 | if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) { |
116 | - return $classes; |
|
116 | + return $classes; |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | return "$classes monsterinsights_page "; |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false; |
131 | 131 | |
132 | 132 | if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_tools' ) === false || 'insights_page_monsterinsights_tools' === $screen->id ) { |
133 | - return $classes; |
|
133 | + return $classes; |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | return "$classes insights_page_monsterinsights_tools "; |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | function monsterinsights_add_admin_body_class_addons_page( $classes ) { |
147 | 147 | $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false; |
148 | 148 | if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_addons' ) === false || 'insights_page_monsterinsights_addons' === $screen->id ) { |
149 | - return $classes; |
|
149 | + return $classes; |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | return "$classes insights_page_monsterinsights_addons "; |
@@ -166,17 +166,17 @@ discard block |
||
166 | 166 | |
167 | 167 | // If lite, show a link where they can get pro from |
168 | 168 | if ( ! monsterinsights_is_pro_version() ) { |
169 | - $get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="'. monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/docs/" ) .'">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'; |
|
170 | - array_unshift( $links, $get_pro ); |
|
169 | + $get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="'. monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/docs/" ) .'">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'; |
|
170 | + array_unshift( $links, $get_pro ); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | // If Lite, support goes to forum. If pro, it goes to our website |
174 | 174 | if ( monsterinsights_is_pro_version() ) { |
175 | - $support = '<a title="MonsterInsights Pro Support" href="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>'; |
|
176 | - array_unshift( $links, $support ); |
|
175 | + $support = '<a title="MonsterInsights Pro Support" href="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>'; |
|
176 | + array_unshift( $links, $support ); |
|
177 | 177 | } else { |
178 | - $support = '<a title="MonsterInsights Lite Support" href="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>'; |
|
179 | - array_unshift( $links, $support ); |
|
178 | + $support = '<a title="MonsterInsights Lite Support" href="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>'; |
|
179 | + array_unshift( $links, $support ); |
|
180 | 180 | } |
181 | 181 | |
182 | 182 | if ( is_network_admin() ) { |
@@ -207,26 +207,26 @@ discard block |
||
207 | 207 | function monsterinsights_load_admin_partial( $template, $data = array() ) { |
208 | 208 | |
209 | 209 | if ( monsterinsights_is_pro_version() ) { |
210 | - $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' ); |
|
210 | + $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' ); |
|
211 | 211 | |
212 | - if ( file_exists( $dir . $template . '.php' ) ) { |
|
213 | - require_once( $dir . $template . '.php' ); |
|
214 | - return true; |
|
215 | - } |
|
212 | + if ( file_exists( $dir . $template . '.php' ) ) { |
|
213 | + require_once( $dir . $template . '.php' ); |
|
214 | + return true; |
|
215 | + } |
|
216 | 216 | } else { |
217 | - $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' ); |
|
217 | + $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' ); |
|
218 | 218 | |
219 | - if ( file_exists( $dir . $template . '.php' ) ) { |
|
220 | - require_once( $dir . $template . '.php' ); |
|
221 | - return true; |
|
222 | - } |
|
219 | + if ( file_exists( $dir . $template . '.php' ) ) { |
|
220 | + require_once( $dir . $template . '.php' ); |
|
221 | + return true; |
|
222 | + } |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'includes/admin/partials' ); |
226 | 226 | |
227 | 227 | if ( file_exists( $dir . $template . '.php' ) ) { |
228 | - require_once( $dir . $template . '.php' ); |
|
229 | - return true; |
|
228 | + require_once( $dir . $template . '.php' ); |
|
229 | + return true; |
|
230 | 230 | } |
231 | 231 | |
232 | 232 | return false; |
@@ -243,9 +243,9 @@ discard block |
||
243 | 243 | function monsterinsights_admin_footer( $text ) { |
244 | 244 | global $current_screen; |
245 | 245 | if ( ! empty( $current_screen->id ) && strpos( $current_screen->id, 'monsterinsights' ) !== false ) { |
246 | - $url = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5'; |
|
247 | - // Translators: Placeholders add a link to the wordpress.org repository. |
|
248 | - $text = sprintf( esc_html__( 'Please rate %1$sMonsterInsights%2$s on %3$s %4$sWordPress.org%5$s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' . $url . '" target="_blank" rel="noopener noreferrer"><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i></a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' ); |
|
246 | + $url = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5'; |
|
247 | + // Translators: Placeholders add a link to the wordpress.org repository. |
|
248 | + $text = sprintf( esc_html__( 'Please rate %1$sMonsterInsights%2$s on %3$s %4$sWordPress.org%5$s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' . $url . '" target="_blank" rel="noopener noreferrer"><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i></a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' ); |
|
249 | 249 | } |
250 | 250 | return $text; |
251 | 251 | } |
@@ -256,12 +256,12 @@ discard block |
||
256 | 256 | // Don't show on MonsterInsights pages |
257 | 257 | $screen = get_current_screen(); |
258 | 258 | if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) !== false ) { |
259 | - return; |
|
259 | + return; |
|
260 | 260 | } |
261 | 261 | |
262 | 262 | // Make sure they have the permissions to do something |
263 | 263 | if ( ! current_user_can( 'monsterinsights_save_settings' ) ) { |
264 | - return; |
|
264 | + return; |
|
265 | 265 | } |
266 | 266 | |
267 | 267 | // Priority: |
@@ -279,89 +279,89 @@ discard block |
||
279 | 279 | // 1. Google Analytics not authenticated |
280 | 280 | if ( ! is_network_admin() && ! monsterinsights_get_ua() && ! defined( 'MONSTERINSIGHTS_DISABLE_TRACKING' ) ) { |
281 | 281 | |
282 | - $submenu_base = is_network_admin() ? add_query_arg( 'page', 'monsterinsights_network', network_admin_url( 'admin.php' ) ) : add_query_arg( 'page', 'monsterinsights_settings', admin_url( 'admin.php' ) ); |
|
283 | - $title = esc_html__( 'Please Setup Website Analytics to See Audience Insights', 'google-analytics-for-wordpress' ); |
|
284 | - $primary = esc_html__( 'Connect MonsterInsights and Setup Website Analytics', 'google-analytics-for-wordpress' ); |
|
285 | - $urlone = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights-onboarding' ) : admin_url( 'admin.php?page=monsterinsights-onboarding' ); |
|
286 | - $secondary = esc_html__( 'Learn More', 'google-analytics-for-wordpress' ); |
|
287 | - $urltwo = $submenu_base . '#/about/getting-started'; |
|
288 | - $message = esc_html__( 'MonsterInsights, WordPress analytics plugin, helps you connect your website with Google Analytics, so you can see how people find and use your website. Over 2 million website owners use MonsterInsights to see the stats that matter and grow their business.', 'google-analytics-for-wordpress' ); |
|
289 | - echo '<div class="notice notice-info"><p style="font-weight:700">'. $title .'</p><p>'. $message.'</p><p><a href="'. $urlone .'" class="button-primary">'. $primary .'</a> <a href="'. $urltwo .'" class="button-secondary">'. $secondary .'</a></p></div>'; |
|
290 | - return; |
|
282 | + $submenu_base = is_network_admin() ? add_query_arg( 'page', 'monsterinsights_network', network_admin_url( 'admin.php' ) ) : add_query_arg( 'page', 'monsterinsights_settings', admin_url( 'admin.php' ) ); |
|
283 | + $title = esc_html__( 'Please Setup Website Analytics to See Audience Insights', 'google-analytics-for-wordpress' ); |
|
284 | + $primary = esc_html__( 'Connect MonsterInsights and Setup Website Analytics', 'google-analytics-for-wordpress' ); |
|
285 | + $urlone = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights-onboarding' ) : admin_url( 'admin.php?page=monsterinsights-onboarding' ); |
|
286 | + $secondary = esc_html__( 'Learn More', 'google-analytics-for-wordpress' ); |
|
287 | + $urltwo = $submenu_base . '#/about/getting-started'; |
|
288 | + $message = esc_html__( 'MonsterInsights, WordPress analytics plugin, helps you connect your website with Google Analytics, so you can see how people find and use your website. Over 2 million website owners use MonsterInsights to see the stats that matter and grow their business.', 'google-analytics-for-wordpress' ); |
|
289 | + echo '<div class="notice notice-info"><p style="font-weight:700">'. $title .'</p><p>'. $message.'</p><p><a href="'. $urlone .'" class="button-primary">'. $primary .'</a> <a href="'. $urltwo .'" class="button-secondary">'. $secondary .'</a></p></div>'; |
|
290 | + return; |
|
291 | 291 | } |
292 | 292 | |
293 | 293 | // 2. License key not entered for pro |
294 | 294 | $key = monsterinsights_is_pro_version() ? MonsterInsights()->license->get_license_key() : ''; |
295 | 295 | if ( monsterinsights_is_pro_version() && empty( $key ) ) { |
296 | - $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' ); |
|
297 | - // Translators: Adds a link to retrieve the license. |
|
298 | - $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' ); |
|
299 | - echo '<div class="error"><p>'. $message.'</p></div>'; |
|
300 | - return; |
|
296 | + $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' ); |
|
297 | + // Translators: Adds a link to retrieve the license. |
|
298 | + $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' ); |
|
299 | + echo '<div class="error"><p>'. $message.'</p></div>'; |
|
300 | + return; |
|
301 | 301 | } |
302 | 302 | |
303 | 303 | // 3. License key not valid/okay for pro |
304 | 304 | if ( monsterinsights_is_pro_version() ) { |
305 | - $message = ''; |
|
306 | - if ( MonsterInsights()->license->get_site_license_key() ){ |
|
307 | - if ( MonsterInsights()->license->site_license_expired() ) { |
|
308 | - // Translators: Adds a link to the license renewal. |
|
309 | - $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ); |
|
310 | - } else if ( MonsterInsights()->license->site_license_disabled() ) { |
|
311 | - $message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' ); |
|
312 | - } else if ( MonsterInsights()->license->site_license_invalid() ) { |
|
313 | - $message = esc_html__( 'Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' ); |
|
314 | - } |
|
315 | - } else if ( MonsterInsights()->license->get_network_license_key() ) { |
|
316 | - if ( MonsterInsights()->license->network_license_expired() ) { |
|
317 | - // Translators: Adds a link to renew license. |
|
318 | - $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ); |
|
319 | - } else if ( MonsterInsights()->license->network_license_disabled() ) { |
|
320 | - $message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' ); |
|
321 | - } else if ( MonsterInsights()->license->network_license_invalid() ) { |
|
322 | - $message = esc_html__( 'Your network license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' ); |
|
323 | - } |
|
324 | - } |
|
325 | - if ( ! empty( $message ) ) { |
|
326 | - echo '<div class="error"><p>'. $message.'</p></div>'; |
|
327 | - return; |
|
328 | - } |
|
305 | + $message = ''; |
|
306 | + if ( MonsterInsights()->license->get_site_license_key() ){ |
|
307 | + if ( MonsterInsights()->license->site_license_expired() ) { |
|
308 | + // Translators: Adds a link to the license renewal. |
|
309 | + $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ); |
|
310 | + } else if ( MonsterInsights()->license->site_license_disabled() ) { |
|
311 | + $message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' ); |
|
312 | + } else if ( MonsterInsights()->license->site_license_invalid() ) { |
|
313 | + $message = esc_html__( 'Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' ); |
|
314 | + } |
|
315 | + } else if ( MonsterInsights()->license->get_network_license_key() ) { |
|
316 | + if ( MonsterInsights()->license->network_license_expired() ) { |
|
317 | + // Translators: Adds a link to renew license. |
|
318 | + $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ); |
|
319 | + } else if ( MonsterInsights()->license->network_license_disabled() ) { |
|
320 | + $message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' ); |
|
321 | + } else if ( MonsterInsights()->license->network_license_invalid() ) { |
|
322 | + $message = esc_html__( 'Your network license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' ); |
|
323 | + } |
|
324 | + } |
|
325 | + if ( ! empty( $message ) ) { |
|
326 | + echo '<div class="error"><p>'. $message.'</p></div>'; |
|
327 | + return; |
|
328 | + } |
|
329 | 329 | } |
330 | 330 | |
331 | 331 | // 4. Notices for PHP/WP version deprecations |
332 | 332 | if ( current_user_can( 'update_core' ) ) { |
333 | - global $wp_version; |
|
334 | - |
|
335 | - // PHP 5.2/5.3 |
|
336 | - if ( version_compare( phpversion(), '5.4', '<' ) ) { |
|
337 | - $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-php/' ); |
|
338 | - // Translators: Placeholders add the PHP version, a link to the MonsterInsights blog and a line break. |
|
339 | - $message = sprintf( esc_html__( 'Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress will stop supporting your PHP version in April, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress' ), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>' ); |
|
340 | - echo '<div class="error"><p>'. $message.'</p></div>'; |
|
341 | - return; |
|
342 | - } |
|
343 | - // WordPress 3.0 - 4.5 |
|
344 | - else if ( version_compare( $wp_version, '4.6', '<' ) ) { |
|
345 | - $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-wordpress/' ); |
|
346 | - // Translators: Placeholders add the current WordPress version and links to the MonsterInsights blog |
|
347 | - $message = sprintf( esc_html__( 'Your site is running an outdated version of WordPress (%1$s).%4$sMonsterInsights will stop supporting WordPress versions lower than 4.6 in April, 2019.%4$sUpdating WordPress takes just a few minutes and will also solve many bugs that exist in your WordPress install.%4$s%2$sLearn more about updating WordPress%3$s', 'google-analytics-for-wordpress' ), $wp_version, '<a href="' . $url . '" target="_blank">', '</a>', '<br>' ); |
|
348 | - echo '<div class="error"><p>'. $message.'</p></div>'; |
|
349 | - return; |
|
350 | - } |
|
351 | - // PHP 5.4/5.5 |
|
352 | - // else if ( version_compare( phpversion(), '5.6', '<' ) ) { |
|
353 | - // $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-php/' ); |
|
354 | - // $message = sprintf( esc_html__( 'Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress will stop supporting your PHP version in April, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress' ), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>' ); |
|
355 | - // echo '<div class="error"><p>'. $message.'</p></div>'; |
|
356 | - // return; |
|
357 | - // } |
|
358 | - // // WordPress 4.6 - 4.8 |
|
359 | - // else if ( version_compare( $wp_version, '4.9', '<' ) ) { |
|
360 | - // $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-wordpress/' ); |
|
361 | - // $message = sprintf( esc_html__( 'Your site is running an outdated version of WordPress (%1$s).%4$sMonsterInsights will stop supporting WordPress versions lower than 4.9 in October, 2019.%4$sUpdating WordPress takes just a few minutes and will also solve many bugs that exist in your WordPress install.%4$s%2$sLearn more about updating WordPress%3$s', 'google-analytics-for-wordpress' ), $wp_version, '<a href="' . $url . '" target="_blank">', '</a>', '<br>' ); |
|
362 | - // echo '<div class="error"><p>'. $message.'</p></div>'; |
|
363 | - // return; |
|
364 | - // } |
|
333 | + global $wp_version; |
|
334 | + |
|
335 | + // PHP 5.2/5.3 |
|
336 | + if ( version_compare( phpversion(), '5.4', '<' ) ) { |
|
337 | + $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-php/' ); |
|
338 | + // Translators: Placeholders add the PHP version, a link to the MonsterInsights blog and a line break. |
|
339 | + $message = sprintf( esc_html__( 'Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress will stop supporting your PHP version in April, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress' ), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>' ); |
|
340 | + echo '<div class="error"><p>'. $message.'</p></div>'; |
|
341 | + return; |
|
342 | + } |
|
343 | + // WordPress 3.0 - 4.5 |
|
344 | + else if ( version_compare( $wp_version, '4.6', '<' ) ) { |
|
345 | + $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-wordpress/' ); |
|
346 | + // Translators: Placeholders add the current WordPress version and links to the MonsterInsights blog |
|
347 | + $message = sprintf( esc_html__( 'Your site is running an outdated version of WordPress (%1$s).%4$sMonsterInsights will stop supporting WordPress versions lower than 4.6 in April, 2019.%4$sUpdating WordPress takes just a few minutes and will also solve many bugs that exist in your WordPress install.%4$s%2$sLearn more about updating WordPress%3$s', 'google-analytics-for-wordpress' ), $wp_version, '<a href="' . $url . '" target="_blank">', '</a>', '<br>' ); |
|
348 | + echo '<div class="error"><p>'. $message.'</p></div>'; |
|
349 | + return; |
|
350 | + } |
|
351 | + // PHP 5.4/5.5 |
|
352 | + // else if ( version_compare( phpversion(), '5.6', '<' ) ) { |
|
353 | + // $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-php/' ); |
|
354 | + // $message = sprintf( esc_html__( 'Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress will stop supporting your PHP version in April, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress' ), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>' ); |
|
355 | + // echo '<div class="error"><p>'. $message.'</p></div>'; |
|
356 | + // return; |
|
357 | + // } |
|
358 | + // // WordPress 4.6 - 4.8 |
|
359 | + // else if ( version_compare( $wp_version, '4.9', '<' ) ) { |
|
360 | + // $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-wordpress/' ); |
|
361 | + // $message = sprintf( esc_html__( 'Your site is running an outdated version of WordPress (%1$s).%4$sMonsterInsights will stop supporting WordPress versions lower than 4.9 in October, 2019.%4$sUpdating WordPress takes just a few minutes and will also solve many bugs that exist in your WordPress install.%4$s%2$sLearn more about updating WordPress%3$s', 'google-analytics-for-wordpress' ), $wp_version, '<a href="' . $url . '" target="_blank">', '</a>', '<br>' ); |
|
362 | + // echo '<div class="error"><p>'. $message.'</p></div>'; |
|
363 | + // return; |
|
364 | + // } |
|
365 | 365 | } |
366 | 366 | |
367 | 367 | // 5. Optin setting not configured |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | |
392 | 392 | $notices = get_option( 'monsterinsights_notices' ); |
393 | 393 | if ( ! is_array( $notices ) ) { |
394 | - $notices = array(); |
|
394 | + $notices = array(); |
|
395 | 395 | } |
396 | 396 | |
397 | 397 | // 6. Authenticate, not manual |
@@ -435,74 +435,74 @@ discard block |
||
435 | 435 | |
436 | 436 | // 8. WooUpsell |
437 | 437 | if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) { |
438 | - if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { |
|
439 | - echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">'; |
|
440 | - echo '<div class="monsterinsights-wooedd-upsell-left">'; |
|
441 | - echo '<p><strong>'; |
|
442 | - echo esc_html( 'Enhanced Ecommerce Analytics for Your WooCommerce Store', 'google-analytics-for-wordpress' ); |
|
443 | - echo '</strong></p>'; |
|
444 | - echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
445 | - echo '<p>'; |
|
446 | - echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' ); |
|
447 | - echo '</p>'; |
|
448 | - echo '<p>'; |
|
449 | - echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' ); |
|
450 | - echo '</p>'; |
|
451 | - echo '<p>'; |
|
452 | - echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' ); |
|
453 | - echo '</p>'; |
|
454 | - echo '<p>'; |
|
455 | - echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' ); |
|
456 | - echo '</p>'; |
|
457 | - // Translators: Placeholders add a link to the MonsterInsights website. |
|
458 | - echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' »</a>' ); |
|
459 | - echo '</p>'; |
|
460 | - echo '</div><div class="monsterinsights-wooedd-upsell-right">'; |
|
461 | - echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
462 | - echo '</div>'; |
|
463 | - echo '</div>'; |
|
464 | - return; |
|
465 | - } |
|
438 | + if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { |
|
439 | + echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">'; |
|
440 | + echo '<div class="monsterinsights-wooedd-upsell-left">'; |
|
441 | + echo '<p><strong>'; |
|
442 | + echo esc_html( 'Enhanced Ecommerce Analytics for Your WooCommerce Store', 'google-analytics-for-wordpress' ); |
|
443 | + echo '</strong></p>'; |
|
444 | + echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
445 | + echo '<p>'; |
|
446 | + echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' ); |
|
447 | + echo '</p>'; |
|
448 | + echo '<p>'; |
|
449 | + echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' ); |
|
450 | + echo '</p>'; |
|
451 | + echo '<p>'; |
|
452 | + echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' ); |
|
453 | + echo '</p>'; |
|
454 | + echo '<p>'; |
|
455 | + echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' ); |
|
456 | + echo '</p>'; |
|
457 | + // Translators: Placeholders add a link to the MonsterInsights website. |
|
458 | + echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' »</a>' ); |
|
459 | + echo '</p>'; |
|
460 | + echo '</div><div class="monsterinsights-wooedd-upsell-right">'; |
|
461 | + echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
462 | + echo '</div>'; |
|
463 | + echo '</div>'; |
|
464 | + return; |
|
465 | + } |
|
466 | 466 | } |
467 | 467 | |
468 | 468 | // 9. EDDUpsell |
469 | 469 | if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) { |
470 | - if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { |
|
471 | - echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">'; |
|
472 | - echo '<div class="monsterinsights-wooedd-upsell-left">'; |
|
473 | - echo '<p><strong>'; |
|
474 | - echo esc_html( 'Enhanced Ecommerce Analytics for Your Easy Digital Downloads Store', 'google-analytics-for-wordpress' ); |
|
475 | - echo '</strong></p>'; |
|
476 | - echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
477 | - echo '<p>'; |
|
478 | - echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' ); |
|
479 | - echo '</p>'; |
|
480 | - echo '<p>'; |
|
481 | - echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' ); |
|
482 | - echo '</p>'; |
|
483 | - echo '<p>'; |
|
484 | - echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' ); |
|
485 | - echo '</p>'; |
|
486 | - echo '<p>'; |
|
487 | - echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' ); |
|
488 | - echo '</p>'; |
|
489 | - echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' »</a>' ); |
|
490 | - echo '</p>'; |
|
491 | - echo '</div><div class="monsterinsights-wooedd-upsell-right">'; |
|
492 | - echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
493 | - echo '</div>'; |
|
494 | - echo '</div>'; |
|
495 | - return; |
|
496 | - } |
|
470 | + if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { |
|
471 | + echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">'; |
|
472 | + echo '<div class="monsterinsights-wooedd-upsell-left">'; |
|
473 | + echo '<p><strong>'; |
|
474 | + echo esc_html( 'Enhanced Ecommerce Analytics for Your Easy Digital Downloads Store', 'google-analytics-for-wordpress' ); |
|
475 | + echo '</strong></p>'; |
|
476 | + echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
477 | + echo '<p>'; |
|
478 | + echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' ); |
|
479 | + echo '</p>'; |
|
480 | + echo '<p>'; |
|
481 | + echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' ); |
|
482 | + echo '</p>'; |
|
483 | + echo '<p>'; |
|
484 | + echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' ); |
|
485 | + echo '</p>'; |
|
486 | + echo '<p>'; |
|
487 | + echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' ); |
|
488 | + echo '</p>'; |
|
489 | + echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' »</a>' ); |
|
490 | + echo '</p>'; |
|
491 | + echo '</div><div class="monsterinsights-wooedd-upsell-right">'; |
|
492 | + echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
493 | + echo '</div>'; |
|
494 | + echo '</div>'; |
|
495 | + return; |
|
496 | + } |
|
497 | 497 | } |
498 | 498 | |
499 | 499 | if ( isset( $notices['monsterinsights_cross_domains_extracted'] ) && false === $notices['monsterinsights_cross_domains_extracted'] ) { |
500 | - $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' ); |
|
501 | - $page = $page . '#/advanced'; |
|
502 | - // Translators: Adds a link to the settings panel. |
|
503 | - $message = sprintf( esc_html__( 'Warning: MonsterInsights found cross-domain settings in the custom code field and converted them to the new settings structure. %1$sPlease click here to review and remove the code no longer needed.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' ); |
|
504 | - echo '<div class="notice notice-success is-dismissible monsterinsights-notice" data-notice="monsterinsights_cross_domains_extracted"><p>'. $message.'</p></div>'; |
|
505 | - return; |
|
500 | + $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' ); |
|
501 | + $page = $page . '#/advanced'; |
|
502 | + // Translators: Adds a link to the settings panel. |
|
503 | + $message = sprintf( esc_html__( 'Warning: MonsterInsights found cross-domain settings in the custom code field and converted them to the new settings structure. %1$sPlease click here to review and remove the code no longer needed.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' ); |
|
504 | + echo '<div class="notice notice-success is-dismissible monsterinsights-notice" data-notice="monsterinsights_cross_domains_extracted"><p>'. $message.'</p></div>'; |
|
505 | + return; |
|
506 | 506 | } |
507 | 507 | } |
508 | 508 | add_action( 'admin_notices', 'monsterinsights_admin_setup_notices' ); |
@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | // AM Notices |
513 | 513 | function monsterinsights_am_notice_optout( $super_admin ) { |
514 | 514 | if ( monsterinsights_get_option( 'hide_am_notices', false ) || monsterinsights_get_option( 'network_hide_am_notices', false ) ) { |
515 | - return false; |
|
515 | + return false; |
|
516 | 516 | } |
517 | 517 | return $super_admin; |
518 | 518 | } |