@@ -33,24 +33,24 @@ discard block |
||
33 | 33 | $hook = 'monsterinsights_settings'; |
34 | 34 | |
35 | 35 | if ( $dashboards_disabled || ! $is_authed || ( current_user_can( 'monsterinsights_save_settings' ) && ! current_user_can( 'monsterinsights_view_dashboard' ) ) ) { |
36 | - // If dashboards disabled, first settings page |
|
37 | - add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', plugins_url( 'assets/css/images/[email protected]', $base->file ), '100.00013467543' ); |
|
38 | - $hook = 'monsterinsights_settings'; |
|
36 | + // If dashboards disabled, first settings page |
|
37 | + add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', plugins_url( 'assets/css/images/[email protected]', $base->file ), '100.00013467543' ); |
|
38 | + $hook = 'monsterinsights_settings'; |
|
39 | 39 | |
40 | - add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' ); |
|
41 | - add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' ); |
|
40 | + add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' ); |
|
41 | + add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' ); |
|
42 | 42 | } else { |
43 | - // if dashboards enabled, first dashboard |
|
44 | - add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', plugins_url( 'assets/css/images/[email protected]', $base->file ), '100.00013467543' ); |
|
43 | + // if dashboards enabled, first dashboard |
|
44 | + add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', plugins_url( 'assets/css/images/[email protected]', $base->file ), '100.00013467543' ); |
|
45 | 45 | |
46 | - $hook = 'monsterinsights_reports'; |
|
46 | + $hook = 'monsterinsights_reports'; |
|
47 | 47 | |
48 | - add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' ); |
|
48 | + add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' ); |
|
49 | 49 | |
50 | - // then settings page |
|
51 | - add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page' ); |
|
50 | + // then settings page |
|
51 | + add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page' ); |
|
52 | 52 | |
53 | - add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' ); |
|
53 | + add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' ); |
|
54 | 54 | |
55 | 55 | } |
56 | 56 | |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | // then addons |
61 | 61 | $network_key = MonsterInsights()->license->get_network_license_key(); |
62 | 62 | if ( ! monsterinsights_is_network_active() || ( monsterinsights_is_network_active() && empty( $network_key ) ) ) { |
63 | - add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:#7cc048"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', 'monsterinsights_addons', 'monsterinsights_addons_page' ); |
|
63 | + add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:#7cc048"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', 'monsterinsights_addons', 'monsterinsights_addons_page' ); |
|
64 | 64 | } |
65 | 65 | } |
66 | 66 | add_action( 'admin_menu', 'monsterinsights_admin_menu' ); |
@@ -74,12 +74,12 @@ discard block |
||
74 | 74 | // First, let's see if this is an MS network enabled plugin. If it is, we should load the license |
75 | 75 | // menu page and the updater on the network panel |
76 | 76 | if ( ! function_exists( 'is_plugin_active_for_network' ) ) { |
77 | - require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); |
|
77 | + require_once( ABSPATH . '/wp-admin/includes/plugin.php' ); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | $plugin = plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE ); |
81 | 81 | if ( ! is_plugin_active_for_network( $plugin ) ) { |
82 | - return; |
|
82 | + return; |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | $hook = 'monsterinsights_network'; |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | function monsterinsights_add_admin_body_class( $classes ) { |
104 | 104 | $screen = get_current_screen(); |
105 | 105 | if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) { |
106 | - return $classes; |
|
106 | + return $classes; |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | return "$classes monsterinsights_page "; |
@@ -123,17 +123,17 @@ discard block |
||
123 | 123 | |
124 | 124 | // If lite, show a link where they can get pro from |
125 | 125 | if ( ! monsterinsights_is_pro_version() ) { |
126 | - $get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="https://www.monsterinsights.com/lite/">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'; |
|
127 | - array_unshift( $links, $get_pro ); |
|
126 | + $get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="https://www.monsterinsights.com/lite/">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'; |
|
127 | + array_unshift( $links, $get_pro ); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | // If Lite, support goes to forum. If pro, it goes to our website |
131 | 131 | if ( monsterinsights_is_pro_version() ) { |
132 | - $support = '<a title="MonsterInsights Pro Support" href="https://www.monsterinsights.com/my-account/support/">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>'; |
|
133 | - array_unshift( $links, $support ); |
|
132 | + $support = '<a title="MonsterInsights Pro Support" href="https://www.monsterinsights.com/my-account/support/">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>'; |
|
133 | + array_unshift( $links, $support ); |
|
134 | 134 | } else { |
135 | - $support = '<a title="MonsterInsights Lite Support" href="https://wordpress.org/support/plugin/google-analytics-for-wordpress">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>'; |
|
136 | - array_unshift( $links, $support ); |
|
135 | + $support = '<a title="MonsterInsights Lite Support" href="https://wordpress.org/support/plugin/google-analytics-for-wordpress">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>'; |
|
136 | + array_unshift( $links, $support ); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | $settings_link = '<a href="' . esc_url( admin_url( 'admin.php?page=monsterinsights_settings' ) ) . '">' . esc_html__( 'Settings', 'google-analytics-for-wordpress' ) . '</a>'; |
@@ -158,26 +158,26 @@ discard block |
||
158 | 158 | function monsterinsights_load_admin_partial( $template, $data = array() ) { |
159 | 159 | |
160 | 160 | if ( monsterinsights_is_pro_version() ) { |
161 | - $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' ); |
|
161 | + $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' ); |
|
162 | 162 | |
163 | - if ( file_exists( $dir . $template . '.php' ) ) { |
|
164 | - require_once( $dir . $template . '.php' ); |
|
165 | - return true; |
|
166 | - } |
|
163 | + if ( file_exists( $dir . $template . '.php' ) ) { |
|
164 | + require_once( $dir . $template . '.php' ); |
|
165 | + return true; |
|
166 | + } |
|
167 | 167 | } else { |
168 | - $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' ); |
|
168 | + $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' ); |
|
169 | 169 | |
170 | - if ( file_exists( $dir . $template . '.php' ) ) { |
|
171 | - require_once( $dir . $template . '.php' ); |
|
172 | - return true; |
|
173 | - } |
|
170 | + if ( file_exists( $dir . $template . '.php' ) ) { |
|
171 | + require_once( $dir . $template . '.php' ); |
|
172 | + return true; |
|
173 | + } |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'includes/admin/partials' ); |
177 | 177 | |
178 | 178 | if ( file_exists( $dir . $template . '.php' ) ) { |
179 | - require_once( $dir . $template . '.php' ); |
|
180 | - return true; |
|
179 | + require_once( $dir . $template . '.php' ); |
|
180 | + return true; |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | return false; |
@@ -193,15 +193,15 @@ discard block |
||
193 | 193 | // Get the current screen, and check whether we're viewing a MonsterInsights screen; |
194 | 194 | $screen = get_current_screen(); |
195 | 195 | if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) { |
196 | - return; |
|
196 | + return; |
|
197 | 197 | } |
198 | 198 | |
199 | 199 | // If here, we're on an MonsterInsights screen, so output the header. |
200 | 200 | monsterinsights_load_admin_partial( 'header', array( |
201 | - 'mascot' => plugins_url( 'assets/css/images/mascot.png', MonsterInsights()->file ), |
|
202 | - 'logo' => plugins_url( 'assets/css/images/logo.png', MonsterInsights()->file ), |
|
203 | - '2xmascot' => plugins_url( 'assets/css/images/[email protected]', MonsterInsights()->file ), |
|
204 | - '2xlogo' => plugins_url( 'assets/css/images/[email protected]', MonsterInsights()->file ), |
|
201 | + 'mascot' => plugins_url( 'assets/css/images/mascot.png', MonsterInsights()->file ), |
|
202 | + 'logo' => plugins_url( 'assets/css/images/logo.png', MonsterInsights()->file ), |
|
203 | + '2xmascot' => plugins_url( 'assets/css/images/[email protected]', MonsterInsights()->file ), |
|
204 | + '2xlogo' => plugins_url( 'assets/css/images/[email protected]', MonsterInsights()->file ), |
|
205 | 205 | ) ); |
206 | 206 | } |
207 | 207 | add_action( 'in_admin_header','monsterinsights_admin_header', 100 ); |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | function monsterinsights_welcome_redirect() { |
210 | 210 | // Bail if no activation redirect |
211 | 211 | if ( ! get_transient( '_monsterinsights_activation_redirect' ) ) { |
212 | - return; |
|
212 | + return; |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | // Delete the redirect transient |
@@ -217,15 +217,15 @@ discard block |
||
217 | 217 | |
218 | 218 | // Bail if activating from network, or bulk |
219 | 219 | if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { |
220 | - return; |
|
220 | + return; |
|
221 | 221 | } |
222 | 222 | |
223 | 223 | $upgrade = get_option( 'monsterinsights_version_upgraded_from' ); |
224 | 224 | if( ! $upgrade ) { // First time install |
225 | - //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit; |
|
225 | + //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit; |
|
226 | 226 | } else { // Update |
227 | - return; |
|
228 | - //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit; |
|
227 | + return; |
|
228 | + //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit; |
|
229 | 229 | } |
230 | 230 | } |
231 | 231 | //add_action( 'admin_init', 'monsterinsights_welcome_redirect', 11 ); @todo: Investigate |
@@ -241,8 +241,8 @@ discard block |
||
241 | 241 | function monsterinsights_admin_footer( $text ) { |
242 | 242 | global $current_screen; |
243 | 243 | if ( ! empty( $current_screen->id ) && strpos( $current_screen->id, 'monsterinsights' ) !== false ) { |
244 | - $url = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5'; |
|
245 | - $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%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">★★★★★</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' ); |
|
244 | + $url = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5'; |
|
245 | + $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%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">★★★★★</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' ); |
|
246 | 246 | } |
247 | 247 | return $text; |
248 | 248 | } |
@@ -253,12 +253,12 @@ discard block |
||
253 | 253 | // Don't show on MonsterInsights pages |
254 | 254 | $screen = get_current_screen(); |
255 | 255 | if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) !== false ) { |
256 | - return; |
|
256 | + return; |
|
257 | 257 | } |
258 | 258 | |
259 | 259 | // Make sure they have the permissions to do something |
260 | 260 | if ( ! current_user_can( 'monsterinsights_save_settings' ) ) { |
261 | - return; |
|
261 | + return; |
|
262 | 262 | } |
263 | 263 | |
264 | 264 | // Priority: |
@@ -271,45 +271,45 @@ discard block |
||
271 | 271 | |
272 | 272 | // 1. Google Analytics not authenticated |
273 | 273 | if ( ! is_network_admin() && ! monsterinsights_get_ua() ) { |
274 | - $page = admin_url( 'admin.php?page=monsterinsights_settings' ); |
|
275 | - $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),'<a href="' . $page . '">', '</a>' ); |
|
276 | - echo '<div class="error"><p>'. $message.'</p></div>'; |
|
277 | - return; |
|
274 | + $page = admin_url( 'admin.php?page=monsterinsights_settings' ); |
|
275 | + $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),'<a href="' . $page . '">', '</a>' ); |
|
276 | + echo '<div class="error"><p>'. $message.'</p></div>'; |
|
277 | + return; |
|
278 | 278 | } |
279 | 279 | |
280 | 280 | // 2. License key not entered for pro |
281 | 281 | $key = monsterinsights_is_pro_version() ? MonsterInsights()->license->get_license_key() : ''; |
282 | 282 | if ( monsterinsights_is_pro_version() && empty( $key ) ) { |
283 | - $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' ); |
|
284 | - $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>' ); |
|
285 | - echo '<div class="error"><p>'. $message.'</p></div>'; |
|
286 | - return; |
|
283 | + $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' ); |
|
284 | + $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>' ); |
|
285 | + echo '<div class="error"><p>'. $message.'</p></div>'; |
|
286 | + return; |
|
287 | 287 | } |
288 | 288 | |
289 | 289 | // 3. License key not valid/okay for pro |
290 | 290 | if ( monsterinsights_is_pro_version() ) { |
291 | - $message = ''; |
|
292 | - if ( MonsterInsights()->license->get_site_license_key() ){ |
|
293 | - if ( MonsterInsights()->license->site_license_expired() ) { |
|
294 | - $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="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ); |
|
295 | - } else if ( MonsterInsights()->license->site_license_disabled() ) { |
|
296 | - $message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' ); |
|
297 | - } else if ( MonsterInsights()->license->site_license_invalid() ) { |
|
298 | - $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' ); |
|
299 | - } |
|
300 | - } else if ( MonsterInsights()->license->get_network_license_key() ) { |
|
301 | - if ( MonsterInsights()->license->network_license_expired() ) { |
|
302 | - $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="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ); |
|
303 | - } else if ( MonsterInsights()->license->network_license_disabled() ) { |
|
304 | - $message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' ); |
|
305 | - } else if ( MonsterInsights()->license->network_license_invalid() ) { |
|
306 | - $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' ); |
|
307 | - } |
|
308 | - } |
|
309 | - if ( ! empty( $message ) ) { |
|
310 | - echo '<div class="error"><p>'. $message.'</p></div>'; |
|
311 | - return; |
|
312 | - } |
|
291 | + $message = ''; |
|
292 | + if ( MonsterInsights()->license->get_site_license_key() ){ |
|
293 | + if ( MonsterInsights()->license->site_license_expired() ) { |
|
294 | + $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="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ); |
|
295 | + } else if ( MonsterInsights()->license->site_license_disabled() ) { |
|
296 | + $message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' ); |
|
297 | + } else if ( MonsterInsights()->license->site_license_invalid() ) { |
|
298 | + $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' ); |
|
299 | + } |
|
300 | + } else if ( MonsterInsights()->license->get_network_license_key() ) { |
|
301 | + if ( MonsterInsights()->license->network_license_expired() ) { |
|
302 | + $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="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ); |
|
303 | + } else if ( MonsterInsights()->license->network_license_disabled() ) { |
|
304 | + $message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' ); |
|
305 | + } else if ( MonsterInsights()->license->network_license_invalid() ) { |
|
306 | + $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' ); |
|
307 | + } |
|
308 | + } |
|
309 | + if ( ! empty( $message ) ) { |
|
310 | + echo '<div class="error"><p>'. $message.'</p></div>'; |
|
311 | + return; |
|
312 | + } |
|
313 | 313 | } |
314 | 314 | |
315 | 315 | // 4. Optin setting not configured |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | |
340 | 340 | $notices = get_option( 'monsterinsights_notices' ); |
341 | 341 | if ( ! is_array( $notices ) ) { |
342 | - $notices = array(); |
|
342 | + $notices = array(); |
|
343 | 343 | } |
344 | 344 | |
345 | 345 | // 5. Authenticate, not manual |
@@ -347,12 +347,12 @@ discard block |
||
347 | 347 | $url = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' ); |
348 | 348 | |
349 | 349 | if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) { |
350 | - echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">'; |
|
351 | - echo '<p>'; |
|
352 | - echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); |
|
353 | - echo '</p>'; |
|
354 | - echo '</div>'; |
|
355 | - return; |
|
350 | + echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">'; |
|
351 | + echo '<p>'; |
|
352 | + echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); |
|
353 | + echo '</p>'; |
|
354 | + echo '</div>'; |
|
355 | + return; |
|
356 | 356 | } |
357 | 357 | |
358 | 358 | // 6. Automatic updates not configured |
@@ -372,64 +372,64 @@ discard block |
||
372 | 372 | |
373 | 373 | // 7. WooUpsell |
374 | 374 | if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) { |
375 | - if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { |
|
376 | - echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">'; |
|
377 | - echo '<div class="monsterinsights-wooedd-upsell-left">'; |
|
378 | - echo '<p><strong>'; |
|
379 | - echo esc_html( 'Enhanced Ecommerce Analytics for Your WooCommerce Store', 'google-analytics-for-wordpress' ); |
|
380 | - echo '</strong></p>'; |
|
381 | - echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
382 | - echo '<p>'; |
|
383 | - echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' ); |
|
384 | - echo '</p>'; |
|
385 | - echo '<p>'; |
|
386 | - 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' ); |
|
387 | - echo '</p>'; |
|
388 | - echo '<p>'; |
|
389 | - echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' ); |
|
390 | - echo '</p>'; |
|
391 | - echo '<p>'; |
|
392 | - echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' ); |
|
393 | - echo '</p>'; |
|
394 | - echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="https://www.monsterinsights.com/lite/?utm_source=wpdashboard&utm_campaign=woocommercelite">', ' »</a>' ); |
|
395 | - echo '</p>'; |
|
396 | - echo '</div><div class="monsterinsights-wooedd-upsell-right">'; |
|
397 | - echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
398 | - echo '</div>'; |
|
399 | - echo '</div>'; |
|
400 | - return; |
|
401 | - } |
|
375 | + if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { |
|
376 | + echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">'; |
|
377 | + echo '<div class="monsterinsights-wooedd-upsell-left">'; |
|
378 | + echo '<p><strong>'; |
|
379 | + echo esc_html( 'Enhanced Ecommerce Analytics for Your WooCommerce Store', 'google-analytics-for-wordpress' ); |
|
380 | + echo '</strong></p>'; |
|
381 | + echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
382 | + echo '<p>'; |
|
383 | + echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' ); |
|
384 | + echo '</p>'; |
|
385 | + echo '<p>'; |
|
386 | + 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' ); |
|
387 | + echo '</p>'; |
|
388 | + echo '<p>'; |
|
389 | + echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' ); |
|
390 | + echo '</p>'; |
|
391 | + echo '<p>'; |
|
392 | + echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' ); |
|
393 | + echo '</p>'; |
|
394 | + echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="https://www.monsterinsights.com/lite/?utm_source=wpdashboard&utm_campaign=woocommercelite">', ' »</a>' ); |
|
395 | + echo '</p>'; |
|
396 | + echo '</div><div class="monsterinsights-wooedd-upsell-right">'; |
|
397 | + echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
398 | + echo '</div>'; |
|
399 | + echo '</div>'; |
|
400 | + return; |
|
401 | + } |
|
402 | 402 | } |
403 | 403 | |
404 | 404 | // 8. EDDUpsell |
405 | 405 | if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) { |
406 | - if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { |
|
407 | - echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">'; |
|
408 | - echo '<div class="monsterinsights-wooedd-upsell-left">'; |
|
409 | - echo '<p><strong>'; |
|
410 | - echo esc_html( 'Enhanced Ecommerce Analytics for Your Easy Digital Downloads Store', 'google-analytics-for-wordpress' ); |
|
411 | - echo '</strong></p>'; |
|
412 | - echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
413 | - echo '<p>'; |
|
414 | - echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' ); |
|
415 | - echo '</p>'; |
|
416 | - echo '<p>'; |
|
417 | - 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' ); |
|
418 | - echo '</p>'; |
|
419 | - echo '<p>'; |
|
420 | - echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' ); |
|
421 | - echo '</p>'; |
|
422 | - echo '<p>'; |
|
423 | - echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' ); |
|
424 | - echo '</p>'; |
|
425 | - echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="https://www.monsterinsights.com/lite/?utm_source=wpdashboard&utm_campaign=eddlite">', ' »</a>' ); |
|
426 | - echo '</p>'; |
|
427 | - echo '</div><div class="monsterinsights-wooedd-upsell-right">'; |
|
428 | - echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
429 | - echo '</div>'; |
|
430 | - echo '</div>'; |
|
431 | - return; |
|
432 | - } |
|
406 | + if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { |
|
407 | + echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">'; |
|
408 | + echo '<div class="monsterinsights-wooedd-upsell-left">'; |
|
409 | + echo '<p><strong>'; |
|
410 | + echo esc_html( 'Enhanced Ecommerce Analytics for Your Easy Digital Downloads Store', 'google-analytics-for-wordpress' ); |
|
411 | + echo '</strong></p>'; |
|
412 | + echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
413 | + echo '<p>'; |
|
414 | + echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' ); |
|
415 | + echo '</p>'; |
|
416 | + echo '<p>'; |
|
417 | + 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' ); |
|
418 | + echo '</p>'; |
|
419 | + echo '<p>'; |
|
420 | + echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' ); |
|
421 | + echo '</p>'; |
|
422 | + echo '<p>'; |
|
423 | + echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' ); |
|
424 | + echo '</p>'; |
|
425 | + echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="https://www.monsterinsights.com/lite/?utm_source=wpdashboard&utm_campaign=eddlite">', ' »</a>' ); |
|
426 | + echo '</p>'; |
|
427 | + echo '</div><div class="monsterinsights-wooedd-upsell-right">'; |
|
428 | + echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">'; |
|
429 | + echo '</div>'; |
|
430 | + echo '</div>'; |
|
431 | + return; |
|
432 | + } |
|
433 | 433 | } |
434 | 434 | } |
435 | 435 | add_action( 'admin_notices', 'monsterinsights_admin_setup_notices' ); |
@@ -34,14 +34,14 @@ discard block |
||
34 | 34 | |
35 | 35 | if ( $dashboards_disabled || ! $is_authed || ( current_user_can( 'monsterinsights_save_settings' ) && ! current_user_can( 'monsterinsights_view_dashboard' ) ) ) { |
36 | 36 | // If dashboards disabled, first settings page |
37 | - add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', plugins_url( 'assets/css/images/[email protected]', $base->file ), '100.00013467543' ); |
|
37 | + add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', plugins_url( 'assets/css/images/[email protected]', $base->file ), '100.00013467543' ); |
|
38 | 38 | $hook = 'monsterinsights_settings'; |
39 | 39 | |
40 | 40 | add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' ); |
41 | 41 | add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' ); |
42 | 42 | } else { |
43 | 43 | // if dashboards enabled, first dashboard |
44 | - add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', plugins_url( 'assets/css/images/[email protected]', $base->file ), '100.00013467543' ); |
|
44 | + add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', plugins_url( 'assets/css/images/[email protected]', $base->file ), '100.00013467543' ); |
|
45 | 45 | |
46 | 46 | $hook = 'monsterinsights_reports'; |
47 | 47 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | } |
84 | 84 | |
85 | 85 | $hook = 'monsterinsights_network'; |
86 | - add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page', plugins_url( 'assets/css/images/[email protected]', $base->file ), '100.00013467543' ); |
|
86 | + add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page', plugins_url( 'assets/css/images/[email protected]', $base->file ), '100.00013467543' ); |
|
87 | 87 | |
88 | 88 | add_submenu_page( $hook, __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Network Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page' ); |
89 | 89 | |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | |
124 | 124 | // If lite, show a link where they can get pro from |
125 | 125 | if ( ! monsterinsights_is_pro_version() ) { |
126 | - $get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="https://www.monsterinsights.com/lite/">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'; |
|
126 | + $get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '" href="https://www.monsterinsights.com/lite/">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>'; |
|
127 | 127 | array_unshift( $links, $get_pro ); |
128 | 128 | } |
129 | 129 | |
@@ -161,14 +161,14 @@ discard block |
||
161 | 161 | $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' ); |
162 | 162 | |
163 | 163 | if ( file_exists( $dir . $template . '.php' ) ) { |
164 | - require_once( $dir . $template . '.php' ); |
|
164 | + require_once( $dir . $template . '.php' ); |
|
165 | 165 | return true; |
166 | 166 | } |
167 | 167 | } else { |
168 | 168 | $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' ); |
169 | 169 | |
170 | 170 | if ( file_exists( $dir . $template . '.php' ) ) { |
171 | - require_once( $dir . $template . '.php' ); |
|
171 | + require_once( $dir . $template . '.php' ); |
|
172 | 172 | return true; |
173 | 173 | } |
174 | 174 | } |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'includes/admin/partials' ); |
177 | 177 | |
178 | 178 | if ( file_exists( $dir . $template . '.php' ) ) { |
179 | - require_once( $dir . $template . '.php' ); |
|
179 | + require_once( $dir . $template . '.php' ); |
|
180 | 180 | return true; |
181 | 181 | } |
182 | 182 | |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | '2xlogo' => plugins_url( 'assets/css/images/[email protected]', MonsterInsights()->file ), |
205 | 205 | ) ); |
206 | 206 | } |
207 | -add_action( 'in_admin_header','monsterinsights_admin_header', 100 ); |
|
207 | +add_action( 'in_admin_header', 'monsterinsights_admin_header', 100 ); |
|
208 | 208 | |
209 | 209 | function monsterinsights_welcome_redirect() { |
210 | 210 | // Bail if no activation redirect |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | } |
222 | 222 | |
223 | 223 | $upgrade = get_option( 'monsterinsights_version_upgraded_from' ); |
224 | - if( ! $upgrade ) { // First time install |
|
224 | + if ( ! $upgrade ) { // First time install |
|
225 | 225 | //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit; |
226 | 226 | } else { // Update |
227 | 227 | return; |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | global $current_screen; |
243 | 243 | if ( ! empty( $current_screen->id ) && strpos( $current_screen->id, 'monsterinsights' ) !== false ) { |
244 | 244 | $url = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5'; |
245 | - $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%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">★★★★★</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' ); |
|
245 | + $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%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">★★★★★</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' ); |
|
246 | 246 | } |
247 | 247 | return $text; |
248 | 248 | } |
@@ -272,8 +272,8 @@ discard block |
||
272 | 272 | // 1. Google Analytics not authenticated |
273 | 273 | if ( ! is_network_admin() && ! monsterinsights_get_ua() ) { |
274 | 274 | $page = admin_url( 'admin.php?page=monsterinsights_settings' ); |
275 | - $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),'<a href="' . $page . '">', '</a>' ); |
|
276 | - echo '<div class="error"><p>'. $message.'</p></div>'; |
|
275 | + $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ), '<a href="' . $page . '">', '</a>' ); |
|
276 | + echo '<div class="error"><p>' . $message . '</p></div>'; |
|
277 | 277 | return; |
278 | 278 | } |
279 | 279 | |
@@ -281,15 +281,15 @@ discard block |
||
281 | 281 | $key = monsterinsights_is_pro_version() ? MonsterInsights()->license->get_license_key() : ''; |
282 | 282 | if ( monsterinsights_is_pro_version() && empty( $key ) ) { |
283 | 283 | $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' ); |
284 | - $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>' ); |
|
285 | - echo '<div class="error"><p>'. $message.'</p></div>'; |
|
284 | + $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>' ); |
|
285 | + echo '<div class="error"><p>' . $message . '</p></div>'; |
|
286 | 286 | return; |
287 | 287 | } |
288 | 288 | |
289 | 289 | // 3. License key not valid/okay for pro |
290 | 290 | if ( monsterinsights_is_pro_version() ) { |
291 | 291 | $message = ''; |
292 | - if ( MonsterInsights()->license->get_site_license_key() ){ |
|
292 | + if ( MonsterInsights()->license->get_site_license_key() ) { |
|
293 | 293 | if ( MonsterInsights()->license->site_license_expired() ) { |
294 | 294 | $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="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ); |
295 | 295 | } else if ( MonsterInsights()->license->site_license_disabled() ) { |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | } |
308 | 308 | } |
309 | 309 | if ( ! empty( $message ) ) { |
310 | - echo '<div class="error"><p>'. $message.'</p></div>'; |
|
310 | + echo '<div class="error"><p>' . $message . '</p></div>'; |
|
311 | 311 | return; |
312 | 312 | } |
313 | 313 | } |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | // } |
338 | 338 | // } |
339 | 339 | |
340 | - $notices = get_option( 'monsterinsights_notices' ); |
|
340 | + $notices = get_option( 'monsterinsights_notices' ); |
|
341 | 341 | if ( ! is_array( $notices ) ) { |
342 | 342 | $notices = array(); |
343 | 343 | } |
@@ -346,10 +346,10 @@ discard block |
||
346 | 346 | $authed = MonsterInsights()->auth->is_authed() || MonsterInsights()->auth->is_network_authed(); |
347 | 347 | $url = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' ); |
348 | 348 | |
349 | - if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) { |
|
349 | + if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual'] ) ) { |
|
350 | 350 | echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">'; |
351 | 351 | echo '<p>'; |
352 | - echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); |
|
352 | + echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url . '">', '</a>' ); |
|
353 | 353 | echo '</p>'; |
354 | 354 | echo '</div>'; |
355 | 355 | return; |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | |
373 | 373 | // 7. WooUpsell |
374 | 374 | if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) { |
375 | - if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { |
|
375 | + if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available'] ) ) { |
|
376 | 376 | echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">'; |
377 | 377 | echo '<div class="monsterinsights-wooedd-upsell-left">'; |
378 | 378 | echo '<p><strong>'; |
@@ -403,7 +403,7 @@ discard block |
||
403 | 403 | |
404 | 404 | // 8. EDDUpsell |
405 | 405 | if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) { |
406 | - if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { |
|
406 | + if ( ! isset( $notices['monsterinsights_edd_tracking_available'] ) ) { |
|
407 | 407 | echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">'; |
408 | 408 | echo '<div class="monsterinsights-wooedd-upsell-left">'; |
409 | 409 | echo '<p><strong>'; |
@@ -221,9 +221,11 @@ discard block |
||
221 | 221 | } |
222 | 222 | |
223 | 223 | $upgrade = get_option( 'monsterinsights_version_upgraded_from' ); |
224 | - if( ! $upgrade ) { // First time install |
|
224 | + if( ! $upgrade ) { |
|
225 | +// First time install |
|
225 | 226 | //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit; |
226 | - } else { // Update |
|
227 | + } else { |
|
228 | +// Update |
|
227 | 229 | return; |
228 | 230 | //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit; |
229 | 231 | } |
@@ -289,7 +291,7 @@ discard block |
||
289 | 291 | // 3. License key not valid/okay for pro |
290 | 292 | if ( monsterinsights_is_pro_version() ) { |
291 | 293 | $message = ''; |
292 | - if ( MonsterInsights()->license->get_site_license_key() ){ |
|
294 | + if ( MonsterInsights()->license->get_site_license_key() ) { |
|
293 | 295 | if ( MonsterInsights()->license->site_license_expired() ) { |
294 | 296 | $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="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ); |
295 | 297 | } else if ( MonsterInsights()->license->site_license_disabled() ) { |
@@ -346,7 +348,7 @@ discard block |
||
346 | 348 | $authed = MonsterInsights()->auth->is_authed() || MonsterInsights()->auth->is_network_authed(); |
347 | 349 | $url = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' ); |
348 | 350 | |
349 | - if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) { |
|
351 | + if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) { |
|
350 | 352 | echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">'; |
351 | 353 | echo '<p>'; |
352 | 354 | echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); |
@@ -372,7 +374,7 @@ discard block |
||
372 | 374 | |
373 | 375 | // 7. WooUpsell |
374 | 376 | if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) { |
375 | - if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { |
|
377 | + if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { |
|
376 | 378 | echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">'; |
377 | 379 | echo '<div class="monsterinsights-wooedd-upsell-left">'; |
378 | 380 | echo '<p><strong>'; |
@@ -403,7 +405,7 @@ discard block |
||
403 | 405 | |
404 | 406 | // 8. EDDUpsell |
405 | 407 | if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) { |
406 | - if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { |
|
408 | + if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { |
|
407 | 409 | echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">'; |
408 | 410 | echo '<div class="monsterinsights-wooedd-upsell-left">'; |
409 | 411 | echo '<p><strong>'; |
@@ -98,8 +98,8 @@ discard block |
||
98 | 98 | |
99 | 99 | if ( $create && ! empty( $create ) && is_array( $create ) ) { |
100 | 100 | $create = json_encode( $create ); |
101 | - $create = str_replace( '"', "'", $create ); |
|
102 | - $options['create'] = "'create', '" . esc_js( $ua_code ). "', '" . esc_js( $domain ) . "', " . $create; |
|
101 | + $create = str_replace( '"', "'", $create ); |
|
102 | + $options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "', " . $create; |
|
103 | 103 | } else { |
104 | 104 | $options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "'"; |
105 | 105 | } |
@@ -175,8 +175,8 @@ discard block |
||
175 | 175 | */ |
176 | 176 | public function frontend_output( ) { |
177 | 177 | $options = $this->frontend_tracking_options(); |
178 | - $is_debug_mode = monsterinsights_is_debug_mode(); |
|
179 | - $src = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' ); |
|
178 | + $is_debug_mode = monsterinsights_is_debug_mode(); |
|
179 | + $src = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' ); |
|
180 | 180 | if ( current_user_can( 'manage_options' ) && $is_debug_mode ) { |
181 | 181 | $src = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' ); |
182 | 182 | } |
@@ -192,13 +192,13 @@ discard block |
||
192 | 192 | <?php if ( ! $track_user ) { |
193 | 193 | if ( empty( $ua ) ) { |
194 | 194 | $reason = __( 'Note: MonsterInsights is not currently configured on this site. The site owner needs to authenticate with Google Analytics in the MonsterInsights settings panel.', 'google-analytics-for-wordpress' ); |
195 | - $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL; |
|
195 | + $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL; |
|
196 | 196 | } else if ( current_user_can( 'monsterinsights_save_settings' ) ) { |
197 | - $reason = __( 'Note: MonsterInsights does not track you as a logged in site administrator to prevent site owners from accidentally skewing their own Google Analytics data.'. PHP_EOL . 'If you are testing Google Analytics code, please do so either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' ); |
|
198 | - $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL; |
|
197 | + $reason = __( 'Note: MonsterInsights does not track you as a logged in site administrator to prevent site owners from accidentally skewing their own Google Analytics data.' . PHP_EOL . 'If you are testing Google Analytics code, please do so either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' ); |
|
198 | + $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL; |
|
199 | 199 | } else { |
200 | 200 | $reason = __( 'Note: The site owner has disabled Google Analytics tracking for your user role.', 'google-analytics-for-wordpress' ); |
201 | - $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL; |
|
201 | + $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL; |
|
202 | 202 | } |
203 | 203 | echo $output; |
204 | 204 | } ?> |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | } |
250 | 250 | ?> |
251 | 251 | } else { |
252 | - console.log( '%c' + "<?php echo esc_js( $reason );?>", 'color:#F74C2F;font-size: 1.5em;font-weight:800;'); |
|
252 | + console.log( '%c' + "<?php echo esc_js( $reason ); ?>", 'color:#F74C2F;font-size: 1.5em;font-weight:800;'); |
|
253 | 253 | (function() { |
254 | 254 | /* https://developers.google.com/analytics/devguides/collection/analyticsjs/ */ |
255 | 255 | var noopfn = function() { |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | } |
273 | 273 | var f = arguments[len-1]; |
274 | 274 | if ( typeof f !== 'object' || f === null || typeof f.hitCallback !== 'function' ) { |
275 | - console.log( '<?php echo esc_js( __('Not running function', 'google-analytics-for-wordpress' ) );?> __gaTracker(' + arguments[0] + " ....) <?php echo esc_js( sprintf( __( "because you're not being tracked. %s", 'google-analytics-for-wordpress' ), $reason ) );?>"); |
|
275 | + console.log( '<?php echo esc_js( __( 'Not running function', 'google-analytics-for-wordpress' ) ); ?> __gaTracker(' + arguments[0] + " ....) <?php echo esc_js( sprintf( __( "because you're not being tracked. %s", 'google-analytics-for-wordpress' ), $reason ) ); ?>"); |
|
276 | 276 | return; |
277 | 277 | } |
278 | 278 | try { |