awesomemotive / google-analytics-for-wordpress

includes/admin/notice.php

Indentation +87 added lines, -87 removed lines

@@ -36,11 +36,11 @@ 
      */
     public function __construct() {
 
-        // Populate $notices
-        $this->notices = get_option( 'monsterinsights_notices' );
-        if ( ! is_array( $this->notices ) ) {
-            $this->notices = array();
-        }
+	// Populate $notices
+	$this->notices = get_option( 'monsterinsights_notices' );
+	if ( ! is_array( $this->notices ) ) {
+	    $this->notices = array();
+	}
 
     }
 
@@ -55,10 +55,10 @@ 
      */
 
     public function is_dismissed( $notice ) {
-        if ( ! isset( $this->notices[ $notice ] ) ) {
-            return false;
-        }
-        return true;
+	if ( ! isset( $this->notices[ $notice ] ) ) {
+	    return false;
+	}
+	return true;
 
     }
 
@@ -72,8 +72,8 @@ 
      * @return null
      */
     public function dismiss( $notice ) {
-        $this->notices[ $notice ] = true;
-        update_option( 'monsterinsights_notices', $this->notices );
+	$this->notices[ $notice ] = true;
+	update_option( 'monsterinsights_notices', $this->notices );
 
     }
 
@@ -88,8 +88,8 @@ 
      * @return null
      */
     public function undismiss( $notice ) {
-        unset( $this->notices[ $notice ] );
-        update_option( 'monsterinsights_notices', $this->notices );
+	unset( $this->notices[ $notice ] );
+	update_option( 'monsterinsights_notices', $this->notices );
 
     }
 
@@ -108,7 +108,7 @@ 
      * @param bool      $is_dismissible     User can Dismiss Message (default: false)
      */ 
     public function display_inline_notice( $name, $title, $message, $type = 'success', $is_dismissible = false, $args = array() ) {
-        /* Available/Planned $args options
+	/* Available/Planned $args options
          * $args = array(
          *  'primary'    => array(
          *      'text'   => '',
@@ -127,110 +127,110 @@ 
          */
 
 
-        // Check if the notice is dismissible, and if so has been dismissed.
-        if ( $is_dismissible && $this->is_dismissed( $name ) ) {
-            // Nothing to show here, return!
-            return '';
-        }
+	// Check if the notice is dismissible, and if so has been dismissed.
+	if ( $is_dismissible && $this->is_dismissed( $name ) ) {
+	    // Nothing to show here, return!
+	    return '';
+	}
 
-        $dismissible = ( $is_dismissible ) ? ' is-dismissible': '';
+	$dismissible = ( $is_dismissible ) ? ' is-dismissible': '';
 
-        // Display inline notice
-        ob_start();
-        ?>
+	// Display inline notice
+	ob_start();
+	?>
         <div class="monsterinsights-notice <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice' . $dismissible; ?>" data-notice="<?php echo esc_attr( $name ); ?>">
             <div class="monsterinsights-notice-icon <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice-icon'?>">
             </div>
             <div class="monsterinsights-notice-text <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice-text'?>">
                 <?php
-                // Title
-                if ( ! empty ( $title ) ) {
-                    ?>
+		// Title
+		if ( ! empty ( $title ) ) {
+		    ?>
                     <p class="monsterinsights-notice-title"><?php echo esc_html( $title ); ?></p>
                     <?php
-                }
+		}
 
-                // Message
-                if ( ! empty( $message ) ) {
-                    if ( empty( $args['skip_message_escape'] ) ) {
-                        ?>
+		// Message
+		if ( ! empty( $message ) ) {
+		    if ( empty( $args['skip_message_escape'] ) ) {
+			?>
                         <p class="monsterinsights-notice-message"><?php echo esc_html( $message ); ?></p>
                         <?php
-                    } else {
-                        ?>
+		    } else {
+			?>
                         <p class="monsterinsights-notice-message"><?php echo $message; ?></p>
                         <?php
-                    }
-                }
+		    }
+		}
                 
-                // Primary Button
-                if ( ! empty( $args['primary']['text'] ) ) {
+		// Primary Button
+		if ( ! empty( $args['primary']['text'] ) ) {
                     
-                    $text = '';
-                    if ( ! empty( $args['primary']['text'] ) ) {
-                        $text = $args['primary']['text'];
-                    }
-
-                    $url = '#';
-                    if ( ! empty( $args['primary']['url'] ) ) {
-                        $url = $args['primary']['url'];
-                    }
-
-                    $target = '';
-                    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank') {
-                        $target = ' target="_blank" rel="noopener noreferrer"';
-                    }
-
-                    $class = 'button button-primary';
-                    if ( ! empty( $args['primary']['class'] ) ) {
-                        $class = ' class="'. $args['primary']['class'] . '"';
-                    }
-                    ?>
+		    $text = '';
+		    if ( ! empty( $args['primary']['text'] ) ) {
+			$text = $args['primary']['text'];
+		    }
+
+		    $url = '#';
+		    if ( ! empty( $args['primary']['url'] ) ) {
+			$url = $args['primary']['url'];
+		    }
+
+		    $target = '';
+		    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank') {
+			$target = ' target="_blank" rel="noopener noreferrer"';
+		    }
+
+		    $class = 'button button-primary';
+		    if ( ! empty( $args['primary']['class'] ) ) {
+			$class = ' class="'. $args['primary']['class'] . '"';
+		    }
+		    ?>
                     <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
                     <?php
-                }
+		}
 
-                // Secondary Button
-                if ( ! empty( $args['secondary']['text'] ) ) {
+		// Secondary Button
+		if ( ! empty( $args['secondary']['text'] ) ) {
                     
-                    $text = '';
-                    if ( ! empty( $args['secondary']['text'] ) ) {
-                        $text = $args['secondary']['text'];
-                    }
-
-                    $url = '#';
-                    if ( ! empty( $args['secondary']['url'] ) ) {
-                        $url = $args['secondary']['url'];
-                    }           
-
-                    $target = '';
-                    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank') {
-                        $target = ' target="_blank" rel="noopener noreferrer"';
-                    }
-
-                    $class = 'button button-secondary';
-                    if ( ! empty( $args['secondary']['class'] ) ) {
-                        $class = ' class="'. $args['secondary']['class'] . '"';
-                    }
-                    ?>
+		    $text = '';
+		    if ( ! empty( $args['secondary']['text'] ) ) {
+			$text = $args['secondary']['text'];
+		    }
+
+		    $url = '#';
+		    if ( ! empty( $args['secondary']['url'] ) ) {
+			$url = $args['secondary']['url'];
+		    }           
+
+		    $target = '';
+		    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank') {
+			$target = ' target="_blank" rel="noopener noreferrer"';
+		    }
+
+		    $class = 'button button-secondary';
+		    if ( ! empty( $args['secondary']['class'] ) ) {
+			$class = ' class="'. $args['secondary']['class'] . '"';
+		    }
+		    ?>
                     <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
                     <?php
-                }
+		}
 
-                // Dismiss Button
-                if ( $is_dismissible ) {
-                    ?>
+		// Dismiss Button
+		if ( $is_dismissible ) {
+		    ?>
                     <button type="button" class="notice-dismiss<?php echo $dismissible; ?>">
                         <span class="screen-reader-text">
                             <?php esc_html_e( 'Dismiss this notice', 'google-analytics-for-wordpress' ); ?>
                         </span>
                     </button>
                     <?php
-                }
-                ?>
+		}
+		?>
             </div>
         </div>
         <?php
-        return ob_get_clean();
+	return ob_get_clean();
     }
 }
\ No newline at end of file

includes/admin/licensing/skin.php

Indentation +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
      */
     public function __construct( $args = array() ) {
 
-        parent::__construct();
+	parent::__construct();
 
     }
 
@@ -38,9 +38,9 @@ 
      */
     public function set_upgrader( &$upgrader ) {
 
-        if ( is_object( $upgrader ) ) {
-            $this->upgrader =& $upgrader;
-        }
+	if ( is_object( $upgrader ) ) {
+	    $this->upgrader =& $upgrader;
+	}
 
     }
 
@@ -53,7 +53,7 @@ 
      */
     public function set_result( $result ) {
 
-        $this->result = $result;
+	$this->result = $result;
 
     }
 
@@ -82,10 +82,10 @@ 
      */
     function error( $errors ) {
 
-        if ( ! empty( $errors ) ) {
-            echo json_encode( array( 'error' => esc_html__( 'There was an error installing the addon. Please try again.', 'google-analytics-for-wordpress' ) ) );
-            die;
-        }
+	if ( ! empty( $errors ) ) {
+	    echo json_encode( array( 'error' => esc_html__( 'There was an error installing the addon. Please try again.', 'google-analytics-for-wordpress' ) ) );
+	    die;
+	}
 
     }
 

includes/admin/licensing/autoupdate.php

Indentation +15 added lines, -15 removed lines

@@ -13,20 +13,20 @@ 
 
     // If this is multisite and is not on the main site, return early.
     if ( is_multisite() && ! is_main_site() ) {
-        return $update;
+	return $update;
     }
     
     // If we don't have everything we need, return early.
     $item = (array) $item;
     if ( ! isset( $item['new_version'] ) || ! isset( $item['slug'] ) ) {
-        return $update;
+	return $update;
     }
 
     // If the plugin isn't ours, return early.
     $is_free = 'google-analytics-for-wordpress' === $item['slug'];
     $is_paid = isset( $item['monsterinsights_plugin'] ); // see updater class
     if ( ! $is_free && ! $is_paid ) {
-        return $update;
+	return $update;
     }
 
     $version           = $is_free ? MONSTERINSIGHTS_LITE_VERSION : $item['old_version'];
@@ -36,20 +36,20 @@ 
     
     // If the opt in update allows major updates but there is no major version update, return early.
     if ( $current_major < $new_major ) {
-        if ( $automatic_updates === 'all' ) {
-            return true;
-        } else {
-            return $update;
-        }
+	if ( $automatic_updates === 'all' ) {
+	    return true;
+	} else {
+	    return $update;
+	}
     }
     
     // If the opt in update allows minor updates but there is no minor version update, return early.
     if ( $current_major == $new_major ) {
-        if ( $automatic_updates === 'all' || $automatic_updates === 'minor' ) {
-            return true;
-        } else {
-            return $update;
-        }
+	if ( $automatic_updates === 'all' || $automatic_updates === 'minor' ) {
+	    return true;
+	} else {
+	    return $update;
+	}
     }
 
     // All our checks have passed - this plugin can be updated!
@@ -87,8 +87,8 @@ 
 function monsterinsights_get_major_version( $version ) {
     $exploded_version = explode( '.', $version );
     if ( isset( $exploded_version[2] ) ) {
-        return $exploded_version[0] . '.' . $exploded_version[1] . '.' . $exploded_version[2];
+	return $exploded_version[0] . '.' . $exploded_version[1] . '.' . $exploded_version[2];
     } else {
-        return $exploded_version[0] . '.' . $exploded_version[1] . '.0';
+	return $exploded_version[0] . '.' . $exploded_version[1] . '.0';
     }
 }
\ No newline at end of file

includes/options.php

Indentation +16 added lines, -16 removed lines

@@ -195,14 +195,14 @@ 
 }
 
  /**
- * Helper method for deleting a setting's value.
- *
- * @since 6.0.0
- * @access public
- *
- * @param string $key   The setting key.
- * @return boolean True if removed, false if not.
- */
+  * Helper method for deleting a setting's value.
+  *
+  * @since 6.0.0
+  * @access public
+  *
+  * @param string $key   The setting key.
+  * @return boolean True if removed, false if not.
+  */
 function monsterinsights_delete_option( $key = '' ) {
 	// If no key, exit
 	if ( empty( $key ) ){
@@ -245,14 +245,14 @@ 
 }
 
  /**
- * Helper method for deleting multiple settings value.
- *
- * @since 6.0.0
- * @access public
- *
- * @param string $key   The setting key.
- * @return boolean True if removed, false if not.
- */
+  * Helper method for deleting multiple settings value.
+  *
+  * @since 6.0.0
+  * @access public
+  *
+  * @param string $key   The setting key.
+  * @return boolean True if removed, false if not.
+  */
 function monsterinsights_delete_options( $keys = array() ) {
 	// If no keys, exit
 	if ( empty( $keys ) || ! is_array( $keys ) ){

includes/frontend/class-tracking-abstract.php

Indentation +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
      * @return array Array of the options to use.
      */
     public function frontend_tracking_options( ) {
-        return array();
+	return array();
     }
 
     /**
@@ -74,6 +74,6 @@ 
      * @return string Javascript to output.
      */
     public function frontend_output( ) {
-         return "<!-- MonsterInsights Abstract Tracking class -->";
+	 return "<!-- MonsterInsights Abstract Tracking class -->";
     }
 }
\ No newline at end of file

includes/frontend/tracking/class-tracking-preview.php

Indentation +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
      * @return array Array of the options to use.
      */
     public function frontend_tracking_options( ) {
-        return array();
+	return array();
     }
 
     /**
@@ -73,9 +73,9 @@ 
      * @return string Javascript to output.
      */
     public function frontend_output( ) {
-        $output  = '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION .' - https://www.monsterinsights.com/ -->';
-        $output .=  '<!-- ' . esc_html__( "You are currently in a preview window. MonsterInsights doesn't track preview window traffic to avoid false visit reports.", 'google-analytics-for-wordpress' ) . ' -->';
-        $output .=  '<!-- / Google Analytics by MonsterInsights -->';
-        return $output;
+	$output  = '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION .' - https://www.monsterinsights.com/ -->';
+	$output .=  '<!-- ' . esc_html__( "You are currently in a preview window. MonsterInsights doesn't track preview window traffic to avoid false visit reports.", 'google-analytics-for-wordpress' ) . ' -->';
+	$output .=  '<!-- / Google Analytics by MonsterInsights -->';
+	return $output;
     }
 }
\ No newline at end of file

includes/admin/capabilities.php

Indentation +42 added lines, -42 removed lines

@@ -35,54 +35,54 @@
 function monsterinsights_add_capabilities( $caps, $cap, $user_id, $args ) {
  
     switch( $cap ) {
-        case 'monsterinsights_view_dashboard' :
-            $roles = monsterinsights_get_option( 'view_reports', array() );
+	case 'monsterinsights_view_dashboard' :
+	    $roles = monsterinsights_get_option( 'view_reports', array() );
 
-            $user_can_via_settings = false;
-            if ( ! empty( $roles ) && is_array( $roles ) ) {
-                foreach ( $roles as $role ) {
-                    if ( is_string( $role ) ) {
-                        if ( user_can( $user_id, $role ) ) {
-                            $user_can_via_settings = true;
-                            break;
-                        }
-                    }
-                }
-            } else if ( ! empty( $roles ) && is_string( $roles ) ) {
-                if ( user_can( $user_id, $roles ) ) {
-                    $user_can_via_settings = true;
-                }
-            }
+	    $user_can_via_settings = false;
+	    if ( ! empty( $roles ) && is_array( $roles ) ) {
+		foreach ( $roles as $role ) {
+		    if ( is_string( $role ) ) {
+			if ( user_can( $user_id, $role ) ) {
+			    $user_can_via_settings = true;
+			    break;
+			}
+		    }
+		}
+	    } else if ( ! empty( $roles ) && is_string( $roles ) ) {
+		if ( user_can( $user_id, $roles ) ) {
+		    $user_can_via_settings = true;
+		}
+	    }
 
-            if ( user_can( $user_id, 'manage_options' ) || $user_can_via_settings ) {
-                $caps = array();
-            }
+	    if ( user_can( $user_id, 'manage_options' ) || $user_can_via_settings ) {
+		$caps = array();
+	    }
             
-            break;
-         case 'monsterinsights_save_settings' :
-            $roles = monsterinsights_get_option( 'save_settings', array() );
+	    break;
+	 case 'monsterinsights_save_settings' :
+	    $roles = monsterinsights_get_option( 'save_settings', array() );
 
-            $user_can_via_settings = false;
-            if ( ! empty( $roles ) && is_array( $roles ) ) {
-                foreach ( $roles as $role ) {
-                    if ( is_string( $role ) ) {
-                        if ( user_can( $user_id, $role ) ) {
-                            $user_can_via_settings = true;
-                            break;
-                        }
-                    }
-                }
-            } else if ( ! empty( $roles ) && is_string( $roles ) ) {
-                 if ( user_can( $user_id, $roles ) ) {
-                    $user_can_via_settings = true;
-                }
-            }
+	    $user_can_via_settings = false;
+	    if ( ! empty( $roles ) && is_array( $roles ) ) {
+		foreach ( $roles as $role ) {
+		    if ( is_string( $role ) ) {
+			if ( user_can( $user_id, $role ) ) {
+			    $user_can_via_settings = true;
+			    break;
+			}
+		    }
+		}
+	    } else if ( ! empty( $roles ) && is_string( $roles ) ) {
+		 if ( user_can( $user_id, $roles ) ) {
+		    $user_can_via_settings = true;
+		}
+	    }
 
-            if ( user_can( $user_id, 'manage_options' ) || $user_can_via_settings ) {
-                $caps = array();
-            }
+	    if ( user_can( $user_id, 'manage_options' ) || $user_can_via_settings ) {
+		$caps = array();
+	    }
 
-            break;
+	    break;
     }
     return $caps;
 }

includes/admin/ajax.php

Indentation +71 added lines, -71 removed lines

@@ -51,60 +51,60 @@ 
     check_ajax_referer( 'monsterinsights-install', 'nonce' );
 
     if ( ! current_user_can( 'install_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Install the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        $download_url = $_POST['plugin'];
-        global $hook_suffix;
-
-        // Set the current screen to avoid undefined notices.
-        set_current_screen();
-
-        // Prepare variables.
-        $method = '';
-        $url    = add_query_arg(
-            array(
-                'page' => 'monsterinsights-settings'
-            ),
-            admin_url( 'admin.php' )
-        );
-        $url = esc_url( $url );
-
-        // Start output bufferring to catch the filesystem form if credentials are needed.
-        ob_start();
-        if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {
-            $form = ob_get_clean();
-            echo json_encode( array( 'form' => $form ) );
-            wp_die();
-        }
-
-        // If we are not authenticated, make it happen now.
-        if ( ! WP_Filesystem( $creds ) ) {
-            ob_start();
-            request_filesystem_credentials( $url, $method, true, false, null );
-            $form = ob_get_clean();
-            echo json_encode( array( 'form' => $form ) );
-            wp_die();
-        }
-
-        // We do not need any extra credentials if we have gotten this far, so let's install the plugin.
-        require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-        $base = MonsterInsights();
-        require_once plugin_dir_path( $base->file ) . '/includes/admin/licensing/skin.php';
+	$download_url = $_POST['plugin'];
+	global $hook_suffix;
+
+	// Set the current screen to avoid undefined notices.
+	set_current_screen();
+
+	// Prepare variables.
+	$method = '';
+	$url    = add_query_arg(
+	    array(
+		'page' => 'monsterinsights-settings'
+	    ),
+	    admin_url( 'admin.php' )
+	);
+	$url = esc_url( $url );
+
+	// Start output bufferring to catch the filesystem form if credentials are needed.
+	ob_start();
+	if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {
+	    $form = ob_get_clean();
+	    echo json_encode( array( 'form' => $form ) );
+	    wp_die();
+	}
+
+	// If we are not authenticated, make it happen now.
+	if ( ! WP_Filesystem( $creds ) ) {
+	    ob_start();
+	    request_filesystem_credentials( $url, $method, true, false, null );
+	    $form = ob_get_clean();
+	    echo json_encode( array( 'form' => $form ) );
+	    wp_die();
+	}
+
+	// We do not need any extra credentials if we have gotten this far, so let's install the plugin.
+	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+	$base = MonsterInsights();
+	require_once plugin_dir_path( $base->file ) . '/includes/admin/licensing/skin.php';
         
-        // Create the plugin upgrader with our custom skin.
-        $installer = new Plugin_Upgrader( $skin = new MonsterInsights_Skin() );
-        $installer->install( $download_url );
-
-        // Flush the cache and return the newly installed plugin basename.
-        wp_cache_flush();
-        if ( $installer->plugin_info() ) {
-            $plugin_basename = $installer->plugin_info();
-            echo json_encode( array( 'plugin' => $plugin_basename ) );
-            wp_die();
-        }
+	// Create the plugin upgrader with our custom skin.
+	$installer = new Plugin_Upgrader( $skin = new MonsterInsights_Skin() );
+	$installer->install( $download_url );
+
+	// Flush the cache and return the newly installed plugin basename.
+	wp_cache_flush();
+	if ( $installer->plugin_info() ) {
+	    $plugin_basename = $installer->plugin_info();
+	    echo json_encode( array( 'plugin' => $plugin_basename ) );
+	    wp_die();
+	}
     }
 
     // Send back a response.
@@ -126,21 +126,21 @@ 
     check_ajax_referer( 'monsterinsights-activate', 'nonce' );
 
     if ( ! current_user_can( 'activate_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Activate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
-            $activate = activate_plugin( $_POST['plugin'], NULL, true );
-        } else {
-            $activate = activate_plugin( $_POST['plugin'] );
-        }
-
-        if ( is_wp_error( $activate ) ) {
-            echo json_encode( array( 'error' => $activate->get_error_message() ) );
-            wp_die();
-        }
+	if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
+	    $activate = activate_plugin( $_POST['plugin'], NULL, true );
+	} else {
+	    $activate = activate_plugin( $_POST['plugin'] );
+	}
+
+	if ( is_wp_error( $activate ) ) {
+	    echo json_encode( array( 'error' => $activate->get_error_message() ) );
+	    wp_die();
+	}
     }
 
     echo json_encode( true );
@@ -161,16 +161,16 @@ 
     check_ajax_referer( 'monsterinsights-deactivate', 'nonce' );
 
     if ( ! current_user_can( 'activate_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Deactivate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) { 
-            $deactivate = deactivate_plugins( $_POST['plugin'], false, true );
-        } else {
-            $deactivate = deactivate_plugins( $_POST['plugin'] );
-        }
+	if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) { 
+	    $deactivate = deactivate_plugins( $_POST['plugin'], false, true );
+	} else {
+	    $deactivate = deactivate_plugins( $_POST['plugin'] );
+	}
     }
 
     echo json_encode( true );
@@ -193,12 +193,12 @@ 
 
     // Deactivate the notice
     if ( isset( $_POST['notice'] ) ) {
-        // Init the notice class and mark notice as deactivated
-        MonsterInsights()->notices->dismiss( $_POST['notice'] );
+	// Init the notice class and mark notice as deactivated
+	MonsterInsights()->notices->dismiss( $_POST['notice'] );
 
-        // Return true
-        echo json_encode( true );
-        wp_die();
+	// Return true
+	echo json_encode( true );
+	wp_die();
     }
 
     // If here, an error occurred

includes/admin/licensing/updater.php

Indentation +180 added lines, -180 removed lines

@@ -105,39 +105,39 @@ 
      * @param array $config Array of updater config args.
      */
     public function __construct( array $config ) {
-        // Set class properties.
-        $accepted_args = array(
-            'plugin_name',
-            'plugin_slug',
-            'plugin_path',
-            'plugin_url',
-            'remote_url',
-            'version',
-            'key'
-        );
-        foreach ( $accepted_args as $arg ) {
-            $this->$arg = $config[$arg];
-        }
-
-        // If the user cannot update plugins, stop processing here.
-        if ( ! current_user_can( 'update_plugins' ) && ( ! defined( 'DOING_CRON' ) || ! DOING_CRON ) ) {
-            return;
-        }
-
-        // If it's our site, then return so we don't redirect loop.
-        if ( strpos( site_url(), 'monsterinsights.com' ) !== false ) {
-            return;
-        }
-
-        // Load the updater hooks and filters.
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'update_plugins_filter' ) );
-
-        add_filter( 'http_request_args', array( $this, 'http_request_args' ), 10, 2 );
-        add_filter( 'plugins_api', array( $this, 'plugins_api' ), 10, 3 );
-
-        // ManageWP premium update filters
-        //add_filter( 'mwp_premium_update_notification', array( $this, 'premium_update_push' ) );
-        //add_filter( 'mwp_premium_perform_update', array( $this, 'premium_update' ) );
+	// Set class properties.
+	$accepted_args = array(
+	    'plugin_name',
+	    'plugin_slug',
+	    'plugin_path',
+	    'plugin_url',
+	    'remote_url',
+	    'version',
+	    'key'
+	);
+	foreach ( $accepted_args as $arg ) {
+	    $this->$arg = $config[$arg];
+	}
+
+	// If the user cannot update plugins, stop processing here.
+	if ( ! current_user_can( 'update_plugins' ) && ( ! defined( 'DOING_CRON' ) || ! DOING_CRON ) ) {
+	    return;
+	}
+
+	// If it's our site, then return so we don't redirect loop.
+	if ( strpos( site_url(), 'monsterinsights.com' ) !== false ) {
+	    return;
+	}
+
+	// Load the updater hooks and filters.
+	add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'update_plugins_filter' ) );
+
+	add_filter( 'http_request_args', array( $this, 'http_request_args' ), 10, 2 );
+	add_filter( 'plugins_api', array( $this, 'plugins_api' ), 10, 3 );
+
+	// ManageWP premium update filters
+	//add_filter( 'mwp_premium_update_notification', array( $this, 'premium_update_push' ) );
+	//add_filter( 'mwp_premium_perform_update', array( $this, 'premium_update' ) );
 
 	    // Add additional info if the license is expired.
 	    add_action( 'in_plugin_update_message-'. $this->plugin_path, array( $this, 'maybe_show_license_expired_message' ), 10, 2 );
@@ -162,33 +162,33 @@ 
      */
     public function update_plugins_filter( $value ) {
 
-        // If no update object exists, return early.
-        if ( empty( $value ) ) {
-            return $value;
-        }
-
-        // Run update check by pinging the external API. If it fails, return the default update object.
-        if ( ! $this->update ) {
-            $this->update = $this->perform_remote_request( 'get-plugin-update', array( 'tgm-updater-plugin' => $this->plugin_slug ) );
-            if ( ! $this->update || ! empty( $this->update->error ) ) {
-                $this->update = false;
-                return $value;
-            }
-        }
-
-        // Infuse the update object with our data if the version from the remote API is newer.
-        if ( isset( $this->update->new_version ) && version_compare( $this->version, $this->update->new_version, '<' ) ) {
-            // The $plugin_update object contains new_version, package, slug and last_update keys.
-            //$this->update->full_slug             = $this->plugin_slug;
-            //$this->update->name                  = $this->plugin_name;
-            $this->update->monsterinsights_plugin  = true;
-            $this->update->old_version             = $this->version;
-            $this->update->plugin                  = $this->plugin_path;
-            $value->response[$this->plugin_path]   = $this->update;
-        }
-
-        // Return the update object.
-        return $value;
+	// If no update object exists, return early.
+	if ( empty( $value ) ) {
+	    return $value;
+	}
+
+	// Run update check by pinging the external API. If it fails, return the default update object.
+	if ( ! $this->update ) {
+	    $this->update = $this->perform_remote_request( 'get-plugin-update', array( 'tgm-updater-plugin' => $this->plugin_slug ) );
+	    if ( ! $this->update || ! empty( $this->update->error ) ) {
+		$this->update = false;
+		return $value;
+	    }
+	}
+
+	// Infuse the update object with our data if the version from the remote API is newer.
+	if ( isset( $this->update->new_version ) && version_compare( $this->version, $this->update->new_version, '<' ) ) {
+	    // The $plugin_update object contains new_version, package, slug and last_update keys.
+	    //$this->update->full_slug             = $this->plugin_slug;
+	    //$this->update->name                  = $this->plugin_name;
+	    $this->update->monsterinsights_plugin  = true;
+	    $this->update->old_version             = $this->version;
+	    $this->update->plugin                  = $this->plugin_path;
+	    $value->response[$this->plugin_path]   = $this->update;
+	}
+
+	// Return the update object.
+	return $value;
 
     }
 
@@ -203,12 +203,12 @@ 
      */
     public function http_request_args( $args, $url ) {
 
-        // If this is an SSL request and we are performing an upgrade routine, disable SSL verification.
-        if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'tgm-updater-action=get-plugin-update' ) ) {
-            $args['sslverify'] = false;
-        }
+	// If this is an SSL request and we are performing an upgrade routine, disable SSL verification.
+	if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'tgm-updater-action=get-plugin-update' ) ) {
+	    $args['sslverify'] = false;
+	}
 
-        return $args;
+	return $args;
 
     }
 
@@ -225,14 +225,14 @@ 
      */
     public function plugins_api( $api, $action = '', $args = null ) {
 
-        $plugin = ( 'plugin_information' == $action ) && isset( $args->slug ) && ( $this->plugin_slug == $args->slug );
+	$plugin = ( 'plugin_information' == $action ) && isset( $args->slug ) && ( $this->plugin_slug == $args->slug );
 
-        // If our plugin matches the request, set our own plugin data, else return the default response.
-        if ( $plugin ) {
-            return $this->set_plugins_api( $api );
-        } else {
-            return $api;
-        }
+	// If our plugin matches the request, set our own plugin data, else return the default response.
+	if ( $plugin ) {
+	    return $this->set_plugins_api( $api );
+	} else {
+	    return $api;
+	}
 
     }
 
@@ -246,82 +246,82 @@ 
      */
     public function set_plugins_api( $default_api ) {
 
-        // Perform the remote request to retrieve our plugin information. If it fails, return the default object.
-        if ( ! $this->info ) {
-            $this->info = $this->perform_remote_request( 'get-plugin-info', array( 'tgm-updater-plugin' => $this->plugin_slug ) );
-            if ( ! $this->info || ! empty( $this->info->error ) ) {
-                $this->info = false;
-                return $default_api;
-            }
-        }
-
-        // Create a new stdClass object and populate it with our plugin information.
-        $api                        = new stdClass;
-        $api->name                  = isset( $this->info->name )           ? $this->info->name           : '';
-        $api->slug                  = isset( $this->info->slug )           ? $this->info->slug           : '';
-        $api->version               = isset( $this->info->version )        ? $this->info->version        : '';
-        $api->author                = isset( $this->info->author )         ? $this->info->author         : '';
-        $api->author_profile        = isset( $this->info->author_profile ) ? $this->info->author_profile : '';
-        $api->requires              = isset( $this->info->requires )       ? $this->info->requires       : '';
-        $api->tested                = isset( $this->info->tested )         ? $this->info->tested         : '';
-        $api->last_updated          = isset( $this->info->last_updated )   ? $this->info->last_updated   : '';
-        $api->homepage              = isset( $this->info->homepage )       ? $this->info->homepage       : '';
-
-        $changelog                  = isset( $this->info->changelog )      ? $this->info->changelog       : '';
-        $description                = isset( $this->info->description )    ? $this->info->description     : '';
-
-        if ( ! empty( $changelog ) ) {
-             if ( ! empty( $description ) ) {
-                $api->sections['description'] = $description;
-                $api->sections['changelog']   = $changelog;
-             } else {
-                $api->sections['changelog']   = $changelog;
-             }
-        } else if ( ! empty( $description ) ) {
-            $api->sections['description'] = $description;
-        } else {
-            $api->sections = array();
-        }
-
-        $api->download_link         = isset( $this->info->download_link )  ? $this->info->download_link  : '';
-
-        // Return the new API object with our custom data.
-        return $api;
+	// Perform the remote request to retrieve our plugin information. If it fails, return the default object.
+	if ( ! $this->info ) {
+	    $this->info = $this->perform_remote_request( 'get-plugin-info', array( 'tgm-updater-plugin' => $this->plugin_slug ) );
+	    if ( ! $this->info || ! empty( $this->info->error ) ) {
+		$this->info = false;
+		return $default_api;
+	    }
+	}
+
+	// Create a new stdClass object and populate it with our plugin information.
+	$api                        = new stdClass;
+	$api->name                  = isset( $this->info->name )           ? $this->info->name           : '';
+	$api->slug                  = isset( $this->info->slug )           ? $this->info->slug           : '';
+	$api->version               = isset( $this->info->version )        ? $this->info->version        : '';
+	$api->author                = isset( $this->info->author )         ? $this->info->author         : '';
+	$api->author_profile        = isset( $this->info->author_profile ) ? $this->info->author_profile : '';
+	$api->requires              = isset( $this->info->requires )       ? $this->info->requires       : '';
+	$api->tested                = isset( $this->info->tested )         ? $this->info->tested         : '';
+	$api->last_updated          = isset( $this->info->last_updated )   ? $this->info->last_updated   : '';
+	$api->homepage              = isset( $this->info->homepage )       ? $this->info->homepage       : '';
+
+	$changelog                  = isset( $this->info->changelog )      ? $this->info->changelog       : '';
+	$description                = isset( $this->info->description )    ? $this->info->description     : '';
+
+	if ( ! empty( $changelog ) ) {
+	     if ( ! empty( $description ) ) {
+		$api->sections['description'] = $description;
+		$api->sections['changelog']   = $changelog;
+	     } else {
+		$api->sections['changelog']   = $changelog;
+	     }
+	} else if ( ! empty( $description ) ) {
+	    $api->sections['description'] = $description;
+	} else {
+	    $api->sections = array();
+	}
+
+	$api->download_link         = isset( $this->info->download_link )  ? $this->info->download_link  : '';
+
+	// Return the new API object with our custom data.
+	return $api;
 
     }
 
     // Integration with ManageWP
     public function premium_update_push( $premium_update ) {
-        if ( ! function_exists( 'get_plugin_data' ) ) {
-            include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-        }
-
-        $update = $this->set_plugins_api( array() );
-        if ( ! empty( $update ) && version_compare( MONSTERINSIGHTS_VERSION, $update->version, '<' ) ) {
-            $plugin_data                = get_plugin_data( $update->slug );
-            $plugin_data['type']        = 'plugin';
-            $plugin_data['slug']        = $update->slug;
-            $plugin_data['new_version'] = $update->version;
-            $premium_update[]           = $plugin_data;
-        }
-        return $premium_update;
+	if ( ! function_exists( 'get_plugin_data' ) ) {
+	    include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+	}
+
+	$update = $this->set_plugins_api( array() );
+	if ( ! empty( $update ) && version_compare( MONSTERINSIGHTS_VERSION, $update->version, '<' ) ) {
+	    $plugin_data                = get_plugin_data( $update->slug );
+	    $plugin_data['type']        = 'plugin';
+	    $plugin_data['slug']        = $update->slug;
+	    $plugin_data['new_version'] = $update->version;
+	    $premium_update[]           = $plugin_data;
+	}
+	return $premium_update;
     }
 
     // Integration with ManageWP
     public function premium_update( $premium_update ) {
-        if ( ! function_exists( 'get_plugin_data' ) ) {
-            include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-        }
-
-        $update = $this->set_plugins_api( array() );
-        if ( ! empty( $update ) && version_compare( MONSTERINSIGHTS_VERSION, $update->version, '<' ) ) {
-            $plugin_data                = get_plugin_data( $update->slug );
-            $plugin_data['type']        = 'plugin';
-            $plugin_data['slug']        = $update->slug;
-            $plugin_data['url']         = $update->download_link; // OR provide your own callback function for managing the update
-            array_push( $premium_update, $plugin_data );
-        }
-        return $premium_update;
+	if ( ! function_exists( 'get_plugin_data' ) ) {
+	    include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+	}
+
+	$update = $this->set_plugins_api( array() );
+	if ( ! empty( $update ) && version_compare( MONSTERINSIGHTS_VERSION, $update->version, '<' ) ) {
+	    $plugin_data                = get_plugin_data( $update->slug );
+	    $plugin_data['type']        = 'plugin';
+	    $plugin_data['slug']        = $update->slug;
+	    $plugin_data['url']         = $update->download_link; // OR provide your own callback function for managing the update
+	    array_push( $premium_update, $plugin_data );
+	}
+	return $premium_update;
     }
 
     /**
@@ -337,47 +337,47 @@ 
      */
     public function perform_remote_request( $action, $body = array(), $headers = array(), $return_format = 'json' ) {
 
-        // Build the body of the request.
-        $body = wp_parse_args(
-            $body,
-            array(
-                'tgm-updater-action'     => $action,
-                'tgm-updater-key'        => $this->key,
-                'tgm-updater-wp-version' => get_bloginfo( 'version' ),
-                'tgm-updater-referer'    => site_url(),
-                'tgm-updater-mi-version' => MONSTERINSIGHTS_VERSION,
-                'tgm-updater-is-pro'     => monsterinsights_is_pro_version(),
-            )
-        );
-        $body = http_build_query( $body, '', '&' );
-
-        // Build the headers of the request.
-        $headers = wp_parse_args(
-            $headers,
-            array(
-                'Content-Type'   => 'application/x-www-form-urlencoded',
-                'Content-Length' => strlen( $body )
-            )
-        );
-
-        // Setup variable for wp_remote_post.
-        $post = array(
-            'headers' => $headers,
-            'body'    => $body
-        );
-
-        // Perform the query and retrieve the response.
-        $response      = wp_remote_post( esc_url_raw( $this->remote_url ), $post );
-        $response_code = wp_remote_retrieve_response_code( $response );
-        $response_body = wp_remote_retrieve_body( $response );
-
-        // Bail out early if there are any errors.
-        if ( 200 != $response_code || is_wp_error( $response_body ) ) {
-            return false;
-        }
-
-        // Return the json decoded content.
-        return json_decode( $response_body );
+	// Build the body of the request.
+	$body = wp_parse_args(
+	    $body,
+	    array(
+		'tgm-updater-action'     => $action,
+		'tgm-updater-key'        => $this->key,
+		'tgm-updater-wp-version' => get_bloginfo( 'version' ),
+		'tgm-updater-referer'    => site_url(),
+		'tgm-updater-mi-version' => MONSTERINSIGHTS_VERSION,
+		'tgm-updater-is-pro'     => monsterinsights_is_pro_version(),
+	    )
+	);
+	$body = http_build_query( $body, '', '&' );
+
+	// Build the headers of the request.
+	$headers = wp_parse_args(
+	    $headers,
+	    array(
+		'Content-Type'   => 'application/x-www-form-urlencoded',
+		'Content-Length' => strlen( $body )
+	    )
+	);
+
+	// Setup variable for wp_remote_post.
+	$post = array(
+	    'headers' => $headers,
+	    'body'    => $body
+	);
+
+	// Perform the query and retrieve the response.
+	$response      = wp_remote_post( esc_url_raw( $this->remote_url ), $post );
+	$response_code = wp_remote_retrieve_response_code( $response );
+	$response_body = wp_remote_retrieve_body( $response );
+
+	// Bail out early if there are any errors.
+	if ( 200 != $response_code || is_wp_error( $response_body ) ) {
+	    return false;
+	}
+
+	// Return the json decoded content.
+	return json_decode( $response_body );
 
     }
 }