@@ -18,20 +18,20 @@ discard block |
||
18 | 18 | global $admin_page_hooks; |
19 | 19 | |
20 | 20 | if ( ! is_object( $current_screen ) || empty( $current_screen->id ) || empty( $admin_page_hooks ) ) { |
21 | - return false; |
|
21 | + return false; |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | $settings_page = false; |
25 | 25 | if ( ! empty( $admin_page_hooks['monsterinsights_dashboard'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_dashboard'] . '_page_monsterinsights_addons' ) { |
26 | - $settings_page = true; |
|
26 | + $settings_page = true; |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | if ( ! empty( $admin_page_hooks['monsterinsights_settings'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_settings'] . '_page_monsterinsights_addons' ) { |
30 | - $settings_page = true; |
|
30 | + $settings_page = true; |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | if ( ! empty( $admin_page_hooks['monsterinsights_network'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_network'] . '_page_monsterinsights_addons-network' ) { |
34 | - $settings_page = true; |
|
34 | + $settings_page = true; |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | return $settings_page; |
@@ -46,16 +46,16 @@ discard block |
||
46 | 46 | */ |
47 | 47 | function monsterinsights_maybe_refresh_addons() { |
48 | 48 | if ( ! monsterinsights_is_addons_page() ) { |
49 | - return; |
|
49 | + return; |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | |
53 | 53 | if ( empty( $_POST['google-analytics-for-wordpress-refresh-addons-submit'] ) ) { |
54 | - return; |
|
54 | + return; |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | if ( ! wp_verify_nonce( $_POST['google-analytics-for-wordpress-refresh-addons'], 'google-analytics-for-wordpress-refresh-addons' ) ) { |
58 | - return; |
|
58 | + return; |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | monsterinsights_get_addons_data( MonsterInsights()->license->get_valid_license_key() ); |
@@ -93,14 +93,14 @@ discard block |
||
93 | 93 | <div id="monsterinsights-addons" class="wrap"> |
94 | 94 | <div class="monsterinsights-clear"> |
95 | 95 | <?php |
96 | - /** |
|
97 | - * Developer Alert: |
|
98 | - * |
|
99 | - * Per the README, this is considered an internal hook and should |
|
100 | - * not be used by other developers. This hook's behavior may be modified |
|
101 | - * or the hook may be removed at any time, without warning. |
|
102 | - */ |
|
103 | - ?> |
|
96 | + /** |
|
97 | + * Developer Alert: |
|
98 | + * |
|
99 | + * Per the README, this is considered an internal hook and should |
|
100 | + * not be used by other developers. This hook's behavior may be modified |
|
101 | + * or the hook may be removed at any time, without warning. |
|
102 | + */ |
|
103 | + ?> |
|
104 | 104 | <?php do_action( 'monsterinsights_addons_section' ); ?> |
105 | 105 | </div> |
106 | 106 | </div> |
@@ -117,14 +117,14 @@ discard block |
||
117 | 117 | |
118 | 118 | // If error(s) occurred during license key verification, display them and exit now. |
119 | 119 | if ( monsterinsights_is_pro_version() && ! MonsterInsights()->license->get_valid_license_key() ) { |
120 | - ?> |
|
120 | + ?> |
|
121 | 121 | <div class="error below-h2"> |
122 | 122 | <p> |
123 | 123 | <?php esc_html_e( 'In order to get access to Addons, you need to resolve your license key errors.', 'google-analytics-for-wordpress' ); ?> |
124 | 124 | </p> |
125 | 125 | </div> |
126 | 126 | <?php |
127 | - return; |
|
127 | + return; |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | // Get Addons |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | // If no Addon(s) were returned, our API call returned an error. |
134 | 134 | // Show an error message with a button to reload the page, which will trigger another API call. |
135 | 135 | if ( ! $addons ) { |
136 | - ?> |
|
136 | + ?> |
|
137 | 137 | <form id="monsterinsights-addons-refresh-addons-form" method="post"> |
138 | 138 | <p> |
139 | 139 | <?php esc_html_e( 'There was an issue retrieving the addons for this site. Please click on the button below the refresh the addons data.', 'google-analytics-for-wordpress' ); ?> |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | </p> |
144 | 144 | </form> |
145 | 145 | <?php |
146 | - return; |
|
146 | + return; |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | // If here, we have Addons to display, so let's output them now. |
@@ -153,9 +153,9 @@ discard block |
||
153 | 153 | ?> |
154 | 154 | <div id="monsterinsights-addons"> |
155 | 155 | <?php |
156 | - // Output Addons the User is licensed to use. |
|
157 | - if ( count( $addons['licensed'] )> 0 ) { |
|
158 | - ?> |
|
156 | + // Output Addons the User is licensed to use. |
|
157 | + if ( count( $addons['licensed'] )> 0 ) { |
|
158 | + ?> |
|
159 | 159 | <div class="monsterinsights-addons-area licensed" class="monsterinsights-clear"> |
160 | 160 | <h3><?php esc_html_e( 'Available Addons:', 'google-analytics-for-wordpress' ); ?></h3> |
161 | 161 | |
@@ -163,19 +163,19 @@ discard block |
||
163 | 163 | <!-- list container class required for list.js --> |
164 | 164 | <div class="list"> |
165 | 165 | <?php |
166 | - foreach ( (array) $addons['licensed'] as $i => $addon ) { |
|
167 | - monsterinsights_get_addon_card( $addon, $i, true, $installed_plugins ); |
|
168 | - } |
|
169 | - ?> |
|
166 | + foreach ( (array) $addons['licensed'] as $i => $addon ) { |
|
167 | + monsterinsights_get_addon_card( $addon, $i, true, $installed_plugins ); |
|
168 | + } |
|
169 | + ?> |
|
170 | 170 | </div> |
171 | 171 | </div> |
172 | 172 | </div> |
173 | 173 | <?php |
174 | - } // Close licensed addons |
|
174 | + } // Close licensed addons |
|
175 | 175 | |
176 | - // Output Addons the User isn't licensed to use. |
|
177 | - if ( count( $addons['unlicensed'] ) > 0 ) { |
|
178 | - ?> |
|
176 | + // Output Addons the User isn't licensed to use. |
|
177 | + if ( count( $addons['unlicensed'] ) > 0 ) { |
|
178 | + ?> |
|
179 | 179 | <div class="monsterinsights-addons-area unlicensed" class="monsterinsights-clear"> |
180 | 180 | <h3><?php esc_html_e( 'Unlock More Addons', 'google-analytics-for-wordpress' ); ?></h3> |
181 | 181 | <p><?php echo sprintf( esc_html__( '%1$sWant even more addons?%2$sUpgrade your MonsterInsights account%3$s and unlock the following addons:', 'google-analytics-for-wordpress' ), '<strong>', '</strong> <a href="' . $upgrade_url. '">', '</a>' ); ?></p> |
@@ -184,16 +184,16 @@ discard block |
||
184 | 184 | <!-- list container class required for list.js --> |
185 | 185 | <div class="list"> |
186 | 186 | <?php |
187 | - foreach ( (array) $addons['unlicensed'] as $i => $addon ) { |
|
188 | - monsterinsights_get_addon_card( $addon, $i, false, $installed_plugins ); |
|
189 | - } |
|
190 | - ?> |
|
187 | + foreach ( (array) $addons['unlicensed'] as $i => $addon ) { |
|
188 | + monsterinsights_get_addon_card( $addon, $i, false, $installed_plugins ); |
|
189 | + } |
|
190 | + ?> |
|
191 | 191 | </div> |
192 | 192 | </div> |
193 | 193 | </div> |
194 | 194 | <?php |
195 | - } // Close unlicensed addons |
|
196 | - ?> |
|
195 | + } // Close unlicensed addons |
|
196 | + ?> |
|
197 | 197 | </div> |
198 | 198 | <?php |
199 | 199 | |
@@ -215,37 +215,37 @@ discard block |
||
215 | 215 | |
216 | 216 | // Get addons data from transient or perform API query if no transient. |
217 | 217 | if ( false === ( $addons = get_transient( '_monsterinsights_addons' ) ) ) { |
218 | - $addons = monsterinsights_get_addons_data( $key ); |
|
218 | + $addons = monsterinsights_get_addons_data( $key ); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | // If no Addons exist, return false |
222 | 222 | if ( ! $addons ) { |
223 | - return false; |
|
223 | + return false; |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | // Iterate through Addons, to build two arrays: |
227 | 227 | // - Addons the user is licensed to use, |
228 | 228 | // - Addons the user isn't licensed to use. |
229 | 229 | $results = array( |
230 | - 'licensed' => array(), |
|
231 | - 'unlicensed'=> array(), |
|
230 | + 'licensed' => array(), |
|
231 | + 'unlicensed'=> array(), |
|
232 | 232 | ); |
233 | 233 | foreach ( (array) $addons as $i => $addon ) { |
234 | 234 | |
235 | - // Determine whether the user is licensed to use this Addon or not. |
|
236 | - if ( |
|
237 | - empty( $type ) || |
|
238 | - ( in_array( 'Pro', $addon->categories ) && ( $type != 'pro' && $type != 'master' ) ) || |
|
239 | - ( in_array( 'Plus', $addon->categories ) && $type != 'plus' && $type != 'pro' && $type != 'master' ) || |
|
240 | - ( in_array( 'Basic', $addon->categories ) && ( $type != 'basic' && $type != 'plus' && $type != 'pro' && $type != 'master' ) ) |
|
241 | - ) { |
|
242 | - // Unlicensed |
|
243 | - $results['unlicensed'][] = $addon; |
|
244 | - continue; |
|
245 | - } |
|
246 | - |
|
247 | - // Licensed |
|
248 | - $results['licensed'][] = $addon; |
|
235 | + // Determine whether the user is licensed to use this Addon or not. |
|
236 | + if ( |
|
237 | + empty( $type ) || |
|
238 | + ( in_array( 'Pro', $addon->categories ) && ( $type != 'pro' && $type != 'master' ) ) || |
|
239 | + ( in_array( 'Plus', $addon->categories ) && $type != 'plus' && $type != 'pro' && $type != 'master' ) || |
|
240 | + ( in_array( 'Basic', $addon->categories ) && ( $type != 'basic' && $type != 'plus' && $type != 'pro' && $type != 'master' ) ) |
|
241 | + ) { |
|
242 | + // Unlicensed |
|
243 | + $results['unlicensed'][] = $addon; |
|
244 | + continue; |
|
245 | + } |
|
246 | + |
|
247 | + // Licensed |
|
248 | + $results['licensed'][] = $addon; |
|
249 | 249 | |
250 | 250 | } |
251 | 251 | |
@@ -268,21 +268,21 @@ discard block |
||
268 | 268 | // Get Addons |
269 | 269 | // If the key is valid, we'll get personalised upgrade URLs for each Addon (if necessary) and plugin update information. |
270 | 270 | if ( $key ) { |
271 | - $addons = MonsterInsights()->license_actions->perform_remote_request( 'get-addons-data-v600', array( 'tgm-updater-key' => $key ) ); |
|
271 | + $addons = MonsterInsights()->license_actions->perform_remote_request( 'get-addons-data-v600', array( 'tgm-updater-key' => $key ) ); |
|
272 | 272 | } else { |
273 | - $addons = MonsterInsights()->license_actions->perform_remote_request( 'get-all-addons-data', array() ); |
|
273 | + $addons = MonsterInsights()->license_actions->perform_remote_request( 'get-all-addons-data', array() ); |
|
274 | 274 | } |
275 | 275 | |
276 | 276 | // If there was an API error, set transient for only 10 minutes. |
277 | 277 | if ( ! $addons ) { |
278 | - set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS ); |
|
279 | - return false; |
|
278 | + set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS ); |
|
279 | + return false; |
|
280 | 280 | } |
281 | 281 | |
282 | 282 | // If there was an error retrieving the addons, set the error. |
283 | 283 | if ( isset( $addons->error ) ) { |
284 | - set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS ); |
|
285 | - return false; |
|
284 | + set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS ); |
|
285 | + return false; |
|
286 | 286 | } |
287 | 287 | |
288 | 288 | // Otherwise, our request worked. Save the data and return it. |
@@ -303,9 +303,9 @@ discard block |
||
303 | 303 | $keys = array_keys( get_plugins() ); |
304 | 304 | |
305 | 305 | foreach ( $keys as $key ) { |
306 | - if ( preg_match( '|^' . $slug . '|', $key ) ) { |
|
307 | - return $key; |
|
308 | - } |
|
306 | + if ( preg_match( '|^' . $slug . '|', $key ) ) { |
|
307 | + return $key; |
|
308 | + } |
|
309 | 309 | } |
310 | 310 | |
311 | 311 | return $slug; |
@@ -328,24 +328,24 @@ discard block |
||
328 | 328 | $slug = str_replace( 'monsterinsights-', '', $addon->slug ); |
329 | 329 | $slug = 'monsterinsights-' . $addon->slug; |
330 | 330 | if ( $slug === 'monsterinsights-ecommerce' ) { |
331 | - $slug = 'ga-ecommerce'; |
|
331 | + $slug = 'ga-ecommerce'; |
|
332 | 332 | } |
333 | 333 | |
334 | 334 | $plugin_basename = monsterinsights_get_plugin_basename_from_slug( $slug ); |
335 | 335 | $categories = implode( ',', $addon->categories ); |
336 | 336 | if ( ! $installed_plugins ) { |
337 | - $installed_plugins = get_plugins(); |
|
337 | + $installed_plugins = get_plugins(); |
|
338 | 338 | } |
339 | 339 | |
340 | 340 | // If the Addon doesn't supply an upgrade_url key, it's because the user hasn't provided a license |
341 | 341 | // get_upgrade_link() will return the Lite or Pro link as necessary for us. |
342 | 342 | if ( ! isset( $addon->upgrade_url ) ) { |
343 | - $addon->upgrade_url = monsterinsights_get_upgrade_link(); |
|
343 | + $addon->upgrade_url = monsterinsights_get_upgrade_link(); |
|
344 | 344 | } |
345 | 345 | |
346 | 346 | // Link user to doc to install MI pro to install addons |
347 | 347 | if ( ! monsterinsights_is_pro_version() && $is_licensed && ! isset( $installed_plugins[ $plugin_basename ] ) ) { |
348 | - $addon->url = monsterinsights_get_url( 'addons-page', 'install-addons-link', "https://www.monsterinsights.com/docs/install-monsterinsights-pro-to-use-addons" ); |
|
348 | + $addon->url = monsterinsights_get_url( 'addons-page', 'install-addons-link', "https://www.monsterinsights.com/docs/install-monsterinsights-pro-to-use-addons" ); |
|
349 | 349 | } |
350 | 350 | |
351 | 351 | // Output the card |
@@ -353,19 +353,19 @@ discard block |
||
353 | 353 | <div class="monsterinsights-addon"> |
354 | 354 | <h3 class="monsterinsights-addon-title"><?php echo esc_html( $addon->title ); ?></h3> |
355 | 355 | <?php |
356 | - if ( ! empty( $addon->image ) ) { |
|
357 | - ?> |
|
356 | + if ( ! empty( $addon->image ) ) { |
|
357 | + ?> |
|
358 | 358 | <img class="monsterinsights-addon-thumb" src="<?php echo esc_attr( esc_url( $addon->image ) ); ?>" alt="<?php echo esc_attr( $addon->title ); ?>" /> |
359 | 359 | <?php |
360 | - } |
|
361 | - ?> |
|
360 | + } |
|
361 | + ?> |
|
362 | 362 | |
363 | 363 | <p class="monsterinsights-addon-excerpt"><?php echo esc_html( $addon->excerpt ); ?></p> |
364 | 364 | |
365 | 365 | <?php |
366 | - // If the Addon is unlicensed, show the upgrade button |
|
367 | - if ( ! $is_licensed ) { |
|
368 | - ?> |
|
366 | + // If the Addon is unlicensed, show the upgrade button |
|
367 | + if ( ! $is_licensed ) { |
|
368 | + ?> |
|
369 | 369 | <div class="monsterinsights-addon-active monsterinsights-addon-message"> |
370 | 370 | <div class="interior"> |
371 | 371 | <div class="monsterinsights-addon-upgrade"> |
@@ -377,15 +377,15 @@ discard block |
||
377 | 377 | </div> |
378 | 378 | </div> |
379 | 379 | <?php |
380 | - } else { |
|
381 | - // Addon is licensed |
|
382 | - |
|
383 | - // If the plugin is not installed, display an install message and button. |
|
384 | - if ( ! isset( $installed_plugins[ $plugin_basename ] ) ) { |
|
385 | - if ( empty( $addon->url ) ) { |
|
386 | - $addon->url = ''; |
|
387 | - } |
|
388 | - ?> |
|
380 | + } else { |
|
381 | + // Addon is licensed |
|
382 | + |
|
383 | + // If the plugin is not installed, display an install message and button. |
|
384 | + if ( ! isset( $installed_plugins[ $plugin_basename ] ) ) { |
|
385 | + if ( empty( $addon->url ) ) { |
|
386 | + $addon->url = ''; |
|
387 | + } |
|
388 | + ?> |
|
389 | 389 | <div class="monsterinsights-addon-not-installed monsterinsights-addon-message"> |
390 | 390 | <div class="interior"> |
391 | 391 | <?php if ( monsterinsights_is_pro_version() ) { ?> |
@@ -408,22 +408,22 @@ discard block |
||
408 | 408 | </div> |
409 | 409 | </div> |
410 | 410 | <?php |
411 | - } else { |
|
412 | - // Plugin is installed. |
|
411 | + } else { |
|
412 | + // Plugin is installed. |
|
413 | 413 | |
414 | - $active = false; |
|
415 | - $ms_active = is_plugin_active_for_network( $plugin_basename ); |
|
416 | - $ss_active = is_plugin_active( $plugin_basename ); |
|
417 | - |
|
418 | - if ( is_multisite() && is_network_admin() ) { |
|
419 | - $active = is_plugin_active_for_network( $plugin_basename ); |
|
420 | - } else { |
|
421 | - $active = is_plugin_active( $plugin_basename ); |
|
422 | - } |
|
423 | - |
|
424 | - if ( $active ) { |
|
425 | - // Plugin is active. Display the active message and deactivate button. |
|
426 | - ?> |
|
414 | + $active = false; |
|
415 | + $ms_active = is_plugin_active_for_network( $plugin_basename ); |
|
416 | + $ss_active = is_plugin_active( $plugin_basename ); |
|
417 | + |
|
418 | + if ( is_multisite() && is_network_admin() ) { |
|
419 | + $active = is_plugin_active_for_network( $plugin_basename ); |
|
420 | + } else { |
|
421 | + $active = is_plugin_active( $plugin_basename ); |
|
422 | + } |
|
423 | + |
|
424 | + if ( $active ) { |
|
425 | + // Plugin is active. Display the active message and deactivate button. |
|
426 | + ?> |
|
427 | 427 | <div class="monsterinsights-addon-active monsterinsights-addon-message"> |
428 | 428 | <div class="interior"> |
429 | 429 | <?php if ( $ms_active ) { ?> |
@@ -449,9 +449,9 @@ discard block |
||
449 | 449 | </div> |
450 | 450 | </div> |
451 | 451 | <?php |
452 | - } else { |
|
453 | - // Plugin is inactivate. Display the inactivate mesage and activate button. |
|
454 | - ?> |
|
452 | + } else { |
|
453 | + // Plugin is inactivate. Display the inactivate mesage and activate button. |
|
454 | + ?> |
|
455 | 455 | <div class="monsterinsights-addon-inactive monsterinsights-addon-message"> |
456 | 456 | <div class="interior"> |
457 | 457 | <?php if ( $ms_active ) { ?> |
@@ -474,10 +474,10 @@ discard block |
||
474 | 474 | </div> |
475 | 475 | </div> |
476 | 476 | <?php |
477 | - } |
|
478 | - } |
|
479 | - } |
|
480 | - ?> |
|
477 | + } |
|
478 | + } |
|
479 | + } |
|
480 | + ?> |
|
481 | 481 | </div> |
482 | 482 | <?php |
483 | 483 | } |
484 | 484 | \ No newline at end of file |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * not be used by other developers. This hook's behavior may be modified |
77 | 77 | * or the hook may be removed at any time, without warning. |
78 | 78 | */ |
79 | - do_action('monsterinsights_head'); |
|
79 | + do_action( 'monsterinsights_head' ); |
|
80 | 80 | ?> |
81 | 81 | <?php echo monsterinsights_ublock_notice(); ?> |
82 | 82 | <div id="monsterinsights-addon-heading" class="monsterinsights-addons-subheading monsterinsights-clearfix-after"> |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | <div id="monsterinsights-addons"> |
155 | 155 | <?php |
156 | 156 | // Output Addons the User is licensed to use. |
157 | - if ( count( $addons['licensed'] )> 0 ) { |
|
157 | + if ( count( $addons['licensed'] ) > 0 ) { |
|
158 | 158 | ?> |
159 | 159 | <div class="monsterinsights-addons-area licensed" class="monsterinsights-clear"> |
160 | 160 | <h3><?php esc_html_e( 'Available Addons:', 'google-analytics-for-wordpress' ); ?></h3> |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | ?> |
179 | 179 | <div class="monsterinsights-addons-area unlicensed" class="monsterinsights-clear"> |
180 | 180 | <h3><?php esc_html_e( 'Unlock More Addons', 'google-analytics-for-wordpress' ); ?></h3> |
181 | - <p><?php echo sprintf( esc_html__( '%1$sWant even more addons?%2$sUpgrade your MonsterInsights account%3$s and unlock the following addons:', 'google-analytics-for-wordpress' ), '<strong>', '</strong> <a href="' . $upgrade_url. '">', '</a>' ); ?></p> |
|
181 | + <p><?php echo sprintf( esc_html__( '%1$sWant even more addons?%2$sUpgrade your MonsterInsights account%3$s and unlock the following addons:', 'google-analytics-for-wordpress' ), '<strong>', '</strong> <a href="' . $upgrade_url . '">', '</a>' ); ?></p> |
|
182 | 182 | |
183 | 183 | <div id="monsterinsights-addons-unlicensed" class="monsterinsights-addons"> |
184 | 184 | <!-- list container class required for list.js --> |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | $slug = 'ga-ecommerce'; |
332 | 332 | } |
333 | 333 | |
334 | - $plugin_basename = monsterinsights_get_plugin_basename_from_slug( $slug ); |
|
334 | + $plugin_basename = monsterinsights_get_plugin_basename_from_slug( $slug ); |
|
335 | 335 | $categories = implode( ',', $addon->categories ); |
336 | 336 | if ( ! $installed_plugins ) { |
337 | 337 | $installed_plugins = get_plugins(); |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | } |
345 | 345 | |
346 | 346 | // Link user to doc to install MI pro to install addons |
347 | - if ( ! monsterinsights_is_pro_version() && $is_licensed && ! isset( $installed_plugins[ $plugin_basename ] ) ) { |
|
347 | + if ( ! monsterinsights_is_pro_version() && $is_licensed && ! isset( $installed_plugins[$plugin_basename] ) ) { |
|
348 | 348 | $addon->url = monsterinsights_get_url( 'addons-page', 'install-addons-link', "https://www.monsterinsights.com/docs/install-monsterinsights-pro-to-use-addons" ); |
349 | 349 | } |
350 | 350 | |
@@ -381,7 +381,7 @@ discard block |
||
381 | 381 | // Addon is licensed |
382 | 382 | |
383 | 383 | // If the plugin is not installed, display an install message and button. |
384 | - if ( ! isset( $installed_plugins[ $plugin_basename ] ) ) { |
|
384 | + if ( ! isset( $installed_plugins[$plugin_basename] ) ) { |
|
385 | 385 | if ( empty( $addon->url ) ) { |
386 | 386 | $addon->url = ''; |
387 | 387 | } |
@@ -427,17 +427,17 @@ discard block |
||
427 | 427 | <div class="monsterinsights-addon-active monsterinsights-addon-message"> |
428 | 428 | <div class="interior"> |
429 | 429 | <?php if ( $ms_active ) { ?> |
430 | - <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNetwork Active%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span> |
|
430 | + <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNetwork Active%2$s', 'google-analytics-for-wordpress' ), '<span>', '</span>' ); ?></span> |
|
431 | 431 | <?php } else { ?> |
432 | - <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sActive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span> |
|
432 | + <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sActive%2$s', 'google-analytics-for-wordpress' ), '<span>', '</span>' ); ?></span> |
|
433 | 433 | <?php } ?> |
434 | - <?php if ( ( is_multisite() && is_network_admin() && $ms_active ) || ! is_multisite() || ( is_multisite() && !is_network_admin() && !$ms_active && $ss_active ) ) { ?> |
|
434 | + <?php if ( ( is_multisite() && is_network_admin() && $ms_active ) || ! is_multisite() || ( is_multisite() && ! is_network_admin() && ! $ms_active && $ss_active ) ) { ?> |
|
435 | 435 | <div class="monsterinsights-addon-action"> |
436 | 436 | <a class="button button-primary monsterinsights-addon-action-button monsterinsights-deactivate-addon" href="#" rel="<?php echo esc_attr( $plugin_basename ); ?>"> |
437 | 437 | <i class="monsterinsights-toggle-on"></i> |
438 | 438 | <?php if ( is_multisite() && is_network_admin() && $ms_active ) { ?> |
439 | 439 | <?php esc_html_e( 'Network deactivate', 'google-analytics-for-wordpress' ); ?> |
440 | - <?php } else if ( is_multisite() && !is_network_admin() && !$ms_active && $ss_active ) { ?> |
|
440 | + <?php } else if ( is_multisite() && ! is_network_admin() && ! $ms_active && $ss_active ) { ?> |
|
441 | 441 | <?php esc_html_e( 'Deactivate', 'google-analytics-for-wordpress' ); ?> |
442 | 442 | <?php } else { ?> |
443 | 443 | <?php esc_html_e( 'Deactivate', 'google-analytics-for-wordpress' ); ?> |
@@ -455,9 +455,9 @@ discard block |
||
455 | 455 | <div class="monsterinsights-addon-inactive monsterinsights-addon-message"> |
456 | 456 | <div class="interior"> |
457 | 457 | <?php if ( $ms_active ) { ?> |
458 | - <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNetwork Inactive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span> |
|
458 | + <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNetwork Inactive%2$s', 'google-analytics-for-wordpress' ), '<span>', '</span>' ); ?></span> |
|
459 | 459 | <?php } else { ?> |
460 | - <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sInactive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span> |
|
460 | + <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sInactive%2$s', 'google-analytics-for-wordpress' ), '<span>', '</span>' ); ?></span> |
|
461 | 461 | <?php } ?> |
462 | 462 | <div class="monsterinsights-addon-action"> |
463 | 463 | <a class="button button-primary monsterinsights-addon-action-button monsterinsights-activate-addon" href="#" rel="<?php echo esc_attr( $plugin_basename ); ?>"> |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | * not be used by other developers. This hook's behavior may be modified |
39 | 39 | * or the hook may be removed at any time, without warning. |
40 | 40 | */ |
41 | - $reports = apply_filters( 'monsterinsights_get_reports', array() ); |
|
41 | + $reports = apply_filters( 'monsterinsights_get_reports', array() ); |
|
42 | 42 | return $reports; |
43 | 43 | } |
44 | 44 | |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | <div id="monsterinsights-main-tab-<?php echo esc_attr( $report->name ); ?>" class="monsterinsights-main-nav-tab monsterinsights-nav-tab"> |
91 | 91 | <div class="monsterinsights-reports-action-bar monsterinsights-clear"> |
92 | 92 | <div class="monsterinsights-reports-action-bar-title"> |
93 | - <?php echo esc_html( sprintf( __( '%s Report', 'google-analytics-for-wordpress' ), $report->title ) ); ?> |
|
93 | + <?php echo esc_html( sprintf( __( '%s Report', 'google-analytics-for-wordpress' ), $report->title ) ); ?> |
|
94 | 94 | </div> |
95 | 95 | <div class="monsterinsights-reports-action-bar-actions"><?php |
96 | 96 | /** |
@@ -132,15 +132,15 @@ discard block |
||
132 | 132 | check_ajax_referer( 'mi-admin-nonce', 'security' ); |
133 | 133 | |
134 | 134 | // Get variables |
135 | - $start = ! empty( $_REQUEST['start'] ) ? $_REQUEST['start'] : ''; |
|
136 | - $end = ! empty( $_REQUEST['end'] ) ? $_REQUEST['end'] : ''; |
|
137 | - $name = ! empty( $_REQUEST['report'] ) ? $_REQUEST['report'] : ''; |
|
138 | - $isnetwork = ! empty( $_REQUEST['isnetwork'] ) ? $_REQUEST['isnetwork'] : ''; |
|
135 | + $start = ! empty( $_REQUEST['start'] ) ? $_REQUEST['start'] : ''; |
|
136 | + $end = ! empty( $_REQUEST['end'] ) ? $_REQUEST['end'] : ''; |
|
137 | + $name = ! empty( $_REQUEST['report'] ) ? $_REQUEST['report'] : ''; |
|
138 | + $isnetwork = ! empty( $_REQUEST['isnetwork'] ) ? $_REQUEST['isnetwork'] : ''; |
|
139 | 139 | |
140 | 140 | |
141 | 141 | // Current user can authenticate |
142 | 142 | if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) { |
143 | - wp_send_json_error( array( 'message' => __( "You don't have permission to view MonsterInsights reports.", 'google-analytics-for-wordpress' ) ) ); |
|
143 | + wp_send_json_error( array( 'message' => __( "You don't have permission to view MonsterInsights reports.", 'google-analytics-for-wordpress' ) ) ); |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) { |
@@ -148,15 +148,15 @@ discard block |
||
148 | 148 | } |
149 | 149 | |
150 | 150 | // Only for Pro users, require a license key to be entered first so we can link to things. |
151 | - if ( monsterinsights_is_pro_version() ) { |
|
151 | + if ( monsterinsights_is_pro_version() ) { |
|
152 | 152 | if ( ! MonsterInsights()->license->is_site_licensed() && ! MonsterInsights()->license->is_network_licensed() ) { |
153 | - wp_send_json_error( array( 'message' => __( "You can't view MonsterInsights reports because you are not licensed.", 'google-analytics-for-wordpress' ) ) ); |
|
153 | + wp_send_json_error( array( 'message' => __( "You can't view MonsterInsights reports because you are not licensed.", 'google-analytics-for-wordpress' ) ) ); |
|
154 | 154 | } else if ( MonsterInsights()->license->is_site_licensed() && ! MonsterInsights()->license->site_license_has_error() ) { |
155 | 155 | // good to go: site licensed |
156 | 156 | } else if ( MonsterInsights()->license->is_network_licensed() && ! MonsterInsights()->license->network_license_has_error() ) { |
157 | 157 | // good to go: network licensed |
158 | 158 | } else { |
159 | - wp_send_json_error( array( 'message' => __( "You can't view MonsterInsights reports due to license key errors.", 'google-analytics-for-wordpress' ) ) ); |
|
159 | + wp_send_json_error( array( 'message' => __( "You can't view MonsterInsights reports due to license key errors.", 'google-analytics-for-wordpress' ) ) ); |
|
160 | 160 | } |
161 | 161 | } |
162 | 162 | |
@@ -164,20 +164,20 @@ discard block |
||
164 | 164 | $site_auth = MonsterInsights()->auth->get_viewname(); |
165 | 165 | $ms_auth = is_multisite() && MonsterInsights()->auth->get_network_viewname(); |
166 | 166 | if ( ! $site_auth && ! $ms_auth ) { |
167 | - wp_send_json_error( array( 'message' => __( "You must authenticate with MonsterInsights before you can view reports.", 'google-analytics-for-wordpress' ) ) ); |
|
167 | + wp_send_json_error( array( 'message' => __( "You must authenticate with MonsterInsights before you can view reports.", 'google-analytics-for-wordpress' ) ) ); |
|
168 | 168 | } |
169 | 169 | |
170 | 170 | if ( empty( $name ) ) { |
171 | - wp_send_json_error( array( 'message' => __( "Unknown report. Try refreshing and retrying. Contact support if this issue persists.", 'google-analytics-for-wordpress' ) ) ); |
|
171 | + wp_send_json_error( array( 'message' => __( "Unknown report. Try refreshing and retrying. Contact support if this issue persists.", 'google-analytics-for-wordpress' ) ) ); |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | $report = MonsterInsights()->reporting->get_report( $name ); |
175 | 175 | |
176 | 176 | if ( empty( $report ) ) { |
177 | - wp_send_json_error( array( 'message' => __( "Unknown report. Try refreshing and retrying. Contact support if this issue persists.", 'google-analytics-for-wordpress' ) ) ); |
|
177 | + wp_send_json_error( array( 'message' => __( "Unknown report. Try refreshing and retrying. Contact support if this issue persists.", 'google-analytics-for-wordpress' ) ) ); |
|
178 | 178 | } |
179 | 179 | |
180 | - $args = array( 'start' => $start, 'end' => $end ); |
|
180 | + $args = array( 'start' => $start, 'end' => $end ); |
|
181 | 181 | if ( $isnetwork ) { |
182 | 182 | $args['network'] = true; |
183 | 183 | } |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | 'success' => true |
192 | 192 | ) |
193 | 193 | ); |
194 | - wp_send_json_success( array( 'html' => $data ) ); |
|
194 | + wp_send_json_success( array( 'html' => $data ) ); |
|
195 | 195 | } else { |
196 | 196 | wp_send_json_error( array( 'message' => $data['error'], 'data' => $data['data'] ) ); |
197 | 197 | } |
@@ -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,21 +175,21 @@ 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 | - $src = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' ); |
|
181 | + $src = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' ); |
|
182 | 182 | } |
183 | 183 | $compat = monsterinsights_get_option( 'gatracker_compatibility_mode', false ); |
184 | - $compat = $compat ? 'window.ga = __gaTracker;' : ''; |
|
184 | + $compat = $compat ? 'window.ga = __gaTracker;' : ''; |
|
185 | 185 | $track_user = monsterinsights_track_user(); |
186 | 186 | $ua = monsterinsights_get_ua(); |
187 | 187 | $output = ''; |
188 | 188 | $reason = ''; |
189 | - $attributes = apply_filters( 'monsterinsights_tracking_analytics_script_attributes', array( 'type' => "text/javascript", 'data-cfasync' => 'false' ) ); |
|
189 | + $attributes = apply_filters( 'monsterinsights_tracking_analytics_script_attributes', array( 'type' => "text/javascript", 'data-cfasync' => 'false' ) ); |
|
190 | 190 | $attr_string = ''; |
191 | 191 | if ( ! empty( $attributes ) ) { |
192 | - foreach( $attributes as $attr_name => $attr_value ) { |
|
192 | + foreach ( $attributes as $attr_name => $attr_value ) { |
|
193 | 193 | if ( ! empty( $attr_name ) ) { |
194 | 194 | $attr_string .= ' ' . sanitize_key( $attr_name ) . '="' . esc_attr( $attr_value ) . '"'; |
195 | 195 | } else { |
@@ -203,21 +203,21 @@ discard block |
||
203 | 203 | <?php if ( ! $track_user ) { |
204 | 204 | if ( empty( $ua ) ) { |
205 | 205 | $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' ); |
206 | - $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL; |
|
206 | + $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL; |
|
207 | 207 | } else if ( current_user_can( 'monsterinsights_save_settings' ) ) { |
208 | - $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' ); |
|
209 | - $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL; |
|
208 | + $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' ); |
|
209 | + $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL; |
|
210 | 210 | } else { |
211 | 211 | $reason = __( 'Note: The site owner has disabled Google Analytics tracking for your user role.', 'google-analytics-for-wordpress' ); |
212 | - $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL; |
|
212 | + $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL; |
|
213 | 213 | } |
214 | 214 | echo $output; |
215 | 215 | } ?> |
216 | 216 | <?php if ( $ua ) { ?> |
217 | -<script<?php echo $attr_string;?>> |
|
217 | +<script<?php echo $attr_string; ?>> |
|
218 | 218 | var mi_version = '<?php echo MONSTERINSIGHTS_VERSION; ?>'; |
219 | 219 | var mi_track_user = <?php echo ( $track_user ? 'true' : 'false' ); ?>; |
220 | - var mi_no_track_reason = <?php echo ( $reason ? "'" . esc_js( $reason) . "'": "''" ); ?>; |
|
220 | + var mi_no_track_reason = <?php echo ( $reason ? "'" . esc_js( $reason ) . "'" : "''" ); ?>; |
|
221 | 221 | <?php do_action( 'monsterinsights_tracking_analytics_frontend_output_after_mi_track_user' ); ?> |
222 | 222 | |
223 | 223 | <?php if ( $this->should_do_optout() ) { ?> |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | ?> |
266 | 266 | } else { |
267 | 267 | <?php if ( $this->should_do_optout() ) { ?> |
268 | - console.log( "<?php echo esc_js( $reason );?>" ); |
|
268 | + console.log( "<?php echo esc_js( $reason ); ?>" ); |
|
269 | 269 | (function() { |
270 | 270 | /* https://developers.google.com/analytics/devguides/collection/analyticsjs/ */ |
271 | 271 | var noopfn = function() { |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | } |
289 | 289 | var f = arguments[len-1]; |
290 | 290 | if ( typeof f !== 'object' || f === null || typeof f.hitCallback !== 'function' ) { |
291 | - console.log( '<?php echo esc_js( __("Not running function", "google-analytics-for-wordpress" ) );?> __gaTracker(' + arguments[0] + " ....) <?php echo esc_js( __( "because you are not being tracked.", 'google-analytics-for-wordpress' ) );?> " + mi_no_track_reason ); |
|
291 | + console.log( '<?php echo esc_js( __( "Not running function", "google-analytics-for-wordpress" ) ); ?> __gaTracker(' + arguments[0] + " ....) <?php echo esc_js( __( "because you are not being tracked.", 'google-analytics-for-wordpress' ) ); ?> " + mi_no_track_reason ); |
|
292 | 292 | return; |
293 | 293 | } |
294 | 294 | try { |
@@ -94,14 +94,14 @@ discard block |
||
94 | 94 | $data['usagetracking'] = get_option( 'monsterinsights_usage_tracking_config', false ); |
95 | 95 | $data['usercount'] = function_exists( 'get_user_count' ) ? get_user_count() : 'Not Set'; |
96 | 96 | $data['usesauth'] = $usesauth; |
97 | - $data['timezoneoffset']= date('P'); |
|
98 | - $data['installed_lite']= get_option( 'monsterinsights_installed_lite', array() ); |
|
97 | + $data['timezoneoffset'] = date( 'P' ); |
|
98 | + $data['installed_lite'] = get_option( 'monsterinsights_installed_lite', array() ); |
|
99 | 99 | $data['installed_pro'] = get_option( 'monsterinsights_installed_pro', array() ); |
100 | 100 | |
101 | 101 | |
102 | 102 | |
103 | 103 | // Retrieve current plugin information |
104 | - if( ! function_exists( 'get_plugins' ) ) { |
|
104 | + if ( ! function_exists( 'get_plugins' ) ) { |
|
105 | 105 | include ABSPATH . '/wp-admin/includes/plugin.php'; |
106 | 106 | } |
107 | 107 | |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | foreach ( $plugins as $key => $plugin ) { |
112 | 112 | if ( in_array( $plugin, $active_plugins ) ) { |
113 | 113 | // Remove active plugins from list so we can show active and inactive separately |
114 | - unset( $plugins[ $key ] ); |
|
114 | + unset( $plugins[$key] ); |
|
115 | 115 | } |
116 | 116 | } |
117 | 117 | |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | return false; |
130 | 130 | } |
131 | 131 | |
132 | - if( ! $this->tracking_allowed() && ! $override ) { |
|
132 | + if ( ! $this->tracking_allowed() && ! $override ) { |
|
133 | 133 | return false; |
134 | 134 | } |
135 | 135 | |
@@ -161,15 +161,15 @@ discard block |
||
161 | 161 | public function schedule_send() { |
162 | 162 | if ( ! wp_next_scheduled( 'monsterinsights_usage_tracking_cron' ) ) { |
163 | 163 | $tracking = array(); |
164 | - $tracking['day'] = rand( 0, 6 ); |
|
164 | + $tracking['day'] = rand( 0, 6 ); |
|
165 | 165 | $tracking['hour'] = rand( 0, 23 ); |
166 | 166 | $tracking['minute'] = rand( 0, 59 ); |
167 | 167 | $tracking['second'] = rand( 0, 59 ); |
168 | - $tracking['offset'] = ( $tracking['day'] * DAY_IN_SECONDS ) + |
|
169 | - ( $tracking['hour'] * HOUR_IN_SECONDS ) + |
|
168 | + $tracking['offset'] = ( $tracking['day'] * DAY_IN_SECONDS ) + |
|
169 | + ( $tracking['hour'] * HOUR_IN_SECONDS ) + |
|
170 | 170 | ( $tracking['minute'] * MINUTE_IN_SECONDS ) + |
171 | 171 | $tracking['second']; |
172 | - $tracking['initsend'] = strtotime("next sunday") + $tracking['offset']; |
|
172 | + $tracking['initsend'] = strtotime( "next sunday" ) + $tracking['offset']; |
|
173 | 173 | |
174 | 174 | wp_schedule_event( $tracking['initsend'], 'weekly', 'monsterinsights_usage_tracking_cron' ); |
175 | 175 | update_option( 'monsterinsights_usage_tracking_config', $tracking ); |
@@ -89,12 +89,12 @@ discard block |
||
89 | 89 | } |
90 | 90 | |
91 | 91 | $datapoints = array(); |
92 | - foreach ( $data[ $class ]['datapoints'] as $datapoint ) { |
|
92 | + foreach ( $data[$class]['datapoints'] as $datapoint ) { |
|
93 | 93 | $datapoints[] = esc_js( $datapoint ); |
94 | 94 | } |
95 | 95 | |
96 | 96 | $trendpoints = array(); |
97 | - foreach ( $data[ $class ]['trendpoints'] as $trendpoint ) { |
|
97 | + foreach ( $data[$class]['trendpoints'] as $trendpoint ) { |
|
98 | 98 | $trendpoints[] = esc_js( $trendpoint ); |
99 | 99 | } |
100 | 100 | |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | } |
133 | 133 | } ); |
134 | 134 | |
135 | - var ctx = document.getElementById( "monsterinsights-overview-<?php echo $class;?>" ); |
|
135 | + var ctx = document.getElementById( "monsterinsights-overview-<?php echo $class; ?>" ); |
|
136 | 136 | var data = { |
137 | 137 | labels: [<?php echo implode( ', ', $labels ); ?>], |
138 | 138 | datasets: [ |
@@ -157,8 +157,8 @@ discard block |
||
157 | 157 | pointHoverRadius: 6,//The radius of the point when hovered. |
158 | 158 | |
159 | 159 | |
160 | - labels: [<?php echo implode( ', ', $labels ); ?>], |
|
161 | - data: [<?php echo implode( ', ', $datapoints ); ?>], |
|
160 | + labels: [<?php echo implode( ', ', $labels ); ?>], |
|
161 | + data: [<?php echo implode( ', ', $datapoints ); ?>], |
|
162 | 162 | trend: [<?php echo implode( ', ', $trendpoints ); ?>], |
163 | 163 | }, |
164 | 164 | ] |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | } ); |
247 | 247 | }; |
248 | 248 | |
249 | - var MonsterInsightsOverview<?php echo time();?> = new Chart( ctx, { |
|
249 | + var MonsterInsightsOverview<?php echo time(); ?> = new Chart( ctx, { |
|
250 | 250 | type: 'LineWithLine', |
251 | 251 | data: data, |
252 | 252 | plugins: [ |
@@ -867,12 +867,12 @@ discard block |
||
867 | 867 | $countries = monsterinsights_get_country_list( true ); |
868 | 868 | $i = 1; |
869 | 869 | foreach ( $data['countries'] as $icountry => $countrydata ) { |
870 | - if ( ! empty( $countries[ $countrydata['iso'] ] ) ) { |
|
871 | - echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">' . $i . '.</span><span class="monsterinsights-reports-country-flag monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countries[ $countrydata['iso'] ] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>'; |
|
870 | + if ( ! empty( $countries[$countrydata['iso']] ) ) { |
|
871 | + echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">' . $i . '.</span><span class="monsterinsights-reports-country-flag monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countries[$countrydata['iso']] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>'; |
|
872 | 872 | } else { |
873 | 873 | echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">' . $i . '</span><span class="monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countrydata['iso'] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>'; |
874 | 874 | } |
875 | - $i ++; |
|
875 | + $i++; |
|
876 | 876 | } |
877 | 877 | ?> |
878 | 878 | </ul> |
@@ -913,7 +913,7 @@ discard block |
||
913 | 913 | . number_format_i18n( $referralsdata['sessions'] ) . |
914 | 914 | '</span>' . |
915 | 915 | '</li>'; |
916 | - $i ++; |
|
916 | + $i++; |
|
917 | 917 | } |
918 | 918 | ?> |
919 | 919 | </ul> |
@@ -959,7 +959,7 @@ discard block |
||
959 | 959 | number_format_i18n( $toppagesdata['sessions'] ) . |
960 | 960 | '</span>' . |
961 | 961 | '</li>'; |
962 | - $i ++; |
|
962 | + $i++; |
|
963 | 963 | } |
964 | 964 | ?> |
965 | 965 | </ul> |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | */ |
32 | 32 | public function __construct() { |
33 | 33 | // Allow dashboard widget to be hidden on multisite installs |
34 | - $show_widget = is_multisite() ? apply_filters( 'monsterinsights_show_dashboard_widget', true ) : true; |
|
34 | + $show_widget = is_multisite() ? apply_filters( 'monsterinsights_show_dashboard_widget', true ) : true; |
|
35 | 35 | if ( ! $show_widget ) { |
36 | 36 | return false; |
37 | 37 | } |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | |
62 | 62 | // Attept to place the widget at the top. |
63 | 63 | $normal_dashboard = $wp_meta_boxes['dashboard']['normal']['core']; |
64 | - $widget_instance = array( self::WIDGET_KEY => $normal_dashboard[ self::WIDGET_KEY ] ); |
|
65 | - unset( $normal_dashboard[ self::WIDGET_KEY ] ); |
|
64 | + $widget_instance = array( self::WIDGET_KEY => $normal_dashboard[self::WIDGET_KEY] ); |
|
65 | + unset( $normal_dashboard[self::WIDGET_KEY] ); |
|
66 | 66 | $sorted_dashboard = array_merge( $widget_instance, $normal_dashboard ); |
67 | 67 | $wp_meta_boxes['dashboard']['normal']['core'] = $sorted_dashboard; |
68 | 68 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | parent::__construct(); |
24 | 24 | } |
25 | 25 | |
26 | - protected function get_report_html( $data = array() ){ |
|
26 | + protected function get_report_html( $data = array() ) { |
|
27 | 27 | return $this->get_upsell_notice(); |
28 | 28 | } |
29 | 29 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | parent::__construct(); |
24 | 24 | } |
25 | 25 | |
26 | - protected function get_report_html( $data = array() ){ |
|
26 | + protected function get_report_html( $data = array() ) { |
|
27 | 27 | return $this->get_upsell_notice(); |
28 | 28 | } |
29 | 29 | } |
@@ -34,13 +34,13 @@ |
||
34 | 34 | $track_user = monsterinsights_track_user(); |
35 | 35 | |
36 | 36 | if ( $track_user && ( $events_mode === 'js' || $events_mode === 'php' ) ) { |
37 | - require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-analytics-events.php'; |
|
38 | - new MonsterInsights_Analytics_Events(); |
|
37 | + require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-analytics-events.php'; |
|
38 | + new MonsterInsights_Analytics_Events(); |
|
39 | 39 | |
40 | - // Let's run form tracking if we find it |
|
41 | - if ( function_exists( 'monsterinsights_forms_output_after_script' ) ) { |
|
42 | - monsterinsights_forms_output_after_script( array() ); |
|
43 | - } |
|
40 | + // Let's run form tracking if we find it |
|
41 | + if ( function_exists( 'monsterinsights_forms_output_after_script' ) ) { |
|
42 | + monsterinsights_forms_output_after_script( array() ); |
|
43 | + } |
|
44 | 44 | } |
45 | 45 | } |
46 | 46 | add_action( 'seedprod_monsterinsights_output_tracking', 'monsterinsights_seedprod_tracking', 6, 1 ); |
47 | 47 | \ No newline at end of file |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | self::$instance->notices = new MonsterInsights_Notice_Admin(); |
229 | 229 | self::$instance->license_actions = new MonsterInsights_License_Actions(); |
230 | 230 | self::$instance->reporting = new MonsterInsights_Reporting(); |
231 | - self::$instance->api_auth = new MonsterInsights_API_Auth(); |
|
231 | + self::$instance->api_auth = new MonsterInsights_API_Auth(); |
|
232 | 232 | if ( defined( 'DOING_CRON' ) && DOING_CRON ) { |
233 | 233 | self::$instance->require_updater(); |
234 | 234 | } else { |
@@ -352,19 +352,19 @@ discard block |
||
352 | 352 | } |
353 | 353 | |
354 | 354 | if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_DIR' ) ) { |
355 | - define( 'MONSTERINSIGHTS_PLUGIN_DIR', plugin_dir_path( $this->file ) ); |
|
355 | + define( 'MONSTERINSIGHTS_PLUGIN_DIR', plugin_dir_path( $this->file ) ); |
|
356 | 356 | } |
357 | 357 | |
358 | 358 | if ( ! defined( 'GAWP_PATH' ) ) { |
359 | - define( 'GAWP_PATH', MONSTERINSIGHTS_PLUGIN_DIR ); |
|
359 | + define( 'GAWP_PATH', MONSTERINSIGHTS_PLUGIN_DIR ); |
|
360 | 360 | } |
361 | 361 | |
362 | 362 | if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_URL' ) ) { |
363 | - define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file ) ); |
|
363 | + define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file ) ); |
|
364 | 364 | } |
365 | 365 | |
366 | 366 | if ( ! defined( 'GAWP_URL' ) ) { |
367 | - define( 'GAWP_URL', MONSTERINSIGHTS_PLUGIN_URL ); |
|
367 | + define( 'GAWP_URL', MONSTERINSIGHTS_PLUGIN_URL ); |
|
368 | 368 | } |
369 | 369 | } |
370 | 370 | |
@@ -384,7 +384,7 @@ discard block |
||
384 | 384 | } |
385 | 385 | |
386 | 386 | // Traditional WordPress plugin locale filter. |
387 | - $mi_locale = apply_filters( 'plugin_locale', $mi_locale, 'google-analytics-for-wordpress' ); |
|
387 | + $mi_locale = apply_filters( 'plugin_locale', $mi_locale, 'google-analytics-for-wordpress' ); |
|
388 | 388 | $mi_mofile = sprintf( '%1$s-%2$s.mo', 'google-analytics-for-wordpress', $mi_locale ); |
389 | 389 | |
390 | 390 | // Look for wp-content/languages/google-analytics-for-wordpress/google-analytics-for-wordpress-{lang}_{country}.mo |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | public function monsterinsights_wp_notice() { |
442 | 442 | $url = admin_url( 'plugins.php' ); |
443 | 443 | // Check for MS dashboard |
444 | - if( is_network_admin() ) { |
|
444 | + if ( is_network_admin() ) { |
|
445 | 445 | $url = network_admin_url( 'plugins.php' ); |
446 | 446 | } |
447 | 447 | ?> |
@@ -462,7 +462,7 @@ discard block |
||
462 | 462 | public function monsterinsights_pro_notice() { |
463 | 463 | $url = admin_url( 'plugins.php' ); |
464 | 464 | // Check for MS dashboard |
465 | - if( is_network_admin() ) { |
|
465 | + if ( is_network_admin() ) { |
|
466 | 466 | $url = network_admin_url( 'plugins.php' ); |
467 | 467 | } |
468 | 468 | ?> |
@@ -488,7 +488,7 @@ discard block |
||
488 | 488 | require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/options.php'; |
489 | 489 | require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/helpers.php'; |
490 | 490 | require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/deprecated.php'; |
491 | - $monsterinsights_settings = monsterinsights_get_options(); |
|
491 | + $monsterinsights_settings = monsterinsights_get_options(); |
|
492 | 492 | } |
493 | 493 | |
494 | 494 | |
@@ -502,7 +502,7 @@ discard block |
||
502 | 502 | * |
503 | 503 | * @return void |
504 | 504 | */ |
505 | - public function load_licensing(){ |
|
505 | + public function load_licensing() { |
|
506 | 506 | if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) { |
507 | 507 | require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/license.php'; |
508 | 508 | self::$instance->license = new MonsterInsights_License(); |
@@ -680,7 +680,7 @@ discard block |
||
680 | 680 | $instance->api_auth->delete_auth(); |
681 | 681 | |
682 | 682 | // Delete data |
683 | - $instance->reporting->delete_aggregate_data('site'); |
|
683 | + $instance->reporting->delete_aggregate_data( 'site' ); |
|
684 | 684 | |
685 | 685 | // Delete license |
686 | 686 | $instance->license->delete_site_license(); |
@@ -691,7 +691,7 @@ discard block |
||
691 | 691 | $instance->api_auth->uninstall_network_auth(); |
692 | 692 | |
693 | 693 | // Delete network data |
694 | - $instance->reporting->delete_aggregate_data('network'); |
|
694 | + $instance->reporting->delete_aggregate_data( 'network' ); |
|
695 | 695 | |
696 | 696 | // Delete network license |
697 | 697 | $instance->license->delete_network_license(); |
@@ -700,7 +700,7 @@ discard block |
||
700 | 700 | $instance->api_auth->delete_auth(); |
701 | 701 | |
702 | 702 | // Delete data |
703 | - $instance->reporting->delete_aggregate_data('site'); |
|
703 | + $instance->reporting->delete_aggregate_data( 'site' ); |
|
704 | 704 | |
705 | 705 | // Delete license |
706 | 706 | $instance->license->delete_site_license(); |
@@ -795,7 +795,7 @@ discard block |
||
795 | 795 | * |
796 | 796 | * @return void |
797 | 797 | */ |
798 | -function monsterinsights_lite_call_install_and_upgrade(){ |
|
798 | +function monsterinsights_lite_call_install_and_upgrade() { |
|
799 | 799 | add_action( 'wp_loaded', 'monsterinsights_lite_install_and_upgrade' ); |
800 | 800 | } |
801 | 801 |
@@ -502,7 +502,7 @@ discard block |
||
502 | 502 | * |
503 | 503 | * @return void |
504 | 504 | */ |
505 | - public function load_licensing(){ |
|
505 | + public function load_licensing() { |
|
506 | 506 | if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) { |
507 | 507 | require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/license.php'; |
508 | 508 | self::$instance->license = new MonsterInsights_License(); |
@@ -795,7 +795,7 @@ discard block |
||
795 | 795 | * |
796 | 796 | * @return void |
797 | 797 | */ |
798 | -function monsterinsights_lite_call_install_and_upgrade(){ |
|
798 | +function monsterinsights_lite_call_install_and_upgrade() { |
|
799 | 799 | add_action( 'wp_loaded', 'monsterinsights_lite_install_and_upgrade' ); |
800 | 800 | } |
801 | 801 |