WordPress.org
Get WordPress

Plugin Directory

Changeset 2554946


Ignore:
Timestamp:
06/28/2021 06:45:51 AM (5 years ago)
Author:
eighty20results
Message:

Update to version v3.0.3 from GitHub

Location:
pmpro-import-members-from-csv
Files:
12 edited
1 copied

Legend:

Unmodified
Added
Removed

  • pmpro-import-members-from-csv/tags/v3.0.3/ActivateUtilitiesPlugin.php

    r2554806 r2554946  
    6161
    6262            if ( self::is_active( $plugin ) ) {
    63                 return null;
     63                return true;
    6464            }
    6565
    … …  
    109109            }
    110110
    111             return null;
     111            return self::is_active( $plugin );
    112112        }
    113113
    … …  
    147147
    148148            $path = trim( $path );
     149            error_log( "Notice: Using {$path}" );
    149150
    150151            if ( ! file_exists( $path ) ) {
    151                 error_log( "Didn't find the plugin file for the Utilities plugin" );
    152152                add_action(
    153153                    'admin_notices',
    … …  
    167167            }
    168168
    169             if ( ! self::is_active( $path ) ) {
    170 
    171                 $result = self::activate_plugin( $path );
     169            if ( ! self::is_active( self::$plugin_slug ) ) {
     170
     171                $result = self::activate_plugin( self::$plugin_slug );
    172172
    173173                if ( ! is_wp_error( $result ) ) {
    … …  
    203203            }
    204204
    205             if ( self::is_active( $path ) ) {
     205            if ( self::is_active( self::$plugin_slug ) ) {
    206206                return true;
    207207            }

  • pmpro-import-members-from-csv/tags/v3.0.3/CHANGELOG.md

    r2554818 r2554946  
    66
    77## [Unreleased]
     8
     9## v3.0.3 - 2021-06-28
     10- BUG FIX: Refactored utilities module filter location (Thomas Sjolshagen)
     11- BUG FIX: PHP Notice warnings (Thomas Sjolshagen)
     12- BUG FIX: Didn't recognise the utilities module when it's active (Thomas Sjolshagen)
    813
    914## v3.0.2 - 2021-06-27

  • pmpro-import-members-from-csv/tags/v3.0.3/README.txt

    r2554818 r2554946  
    44Requires at least: 5.0
    55Tested up to: 5.7.2
    6 Stable tag: 3.0.2
     6Stable tag: 3.0.3
    77License: GPLv2
    88License URI: http://www.gnu.org/licenses/gpl

  • pmpro-import-members-from-csv/tags/v3.0.3/class.pmpro-import-members.php

    r2554818 r2554946  
    44Plugin URI: http://wordpress.org/plugins/pmpro-import-members-from-csv/
    55Description: Import Users and their metadata from a csv file.
    6 Version: 3.0.2
     6Version: 3.0.3
    77Requires PHP: 7.0
    88Author: <a href="https://eighty20results.com/thomas-sjolshagen/">Thomas Sjolshagen <[email protected]></a>
    … …  
    5555
    5656if ( ! defined( 'E20R_IMPORT_VERSION' ) ) {
    57     define( 'E20R_IMPORT_VERSION', '3.0' );
     57    define( 'E20R_IMPORT_VERSION', '3.0.3' );
    5858}
    5959
    … …  
    191191// Load this plugin
    192192add_action( 'plugins_loaded', array( Import_Members::get_instance(), 'load_hooks' ), 10 );
    193 
    194 if ( false === apply_filters( 'e20r_utilities_module_installed', false ) ) {
    195     add_action( 'init', '\E20R\Import\Loader::is_utilities_module_active', 10 );
    196 }

  • pmpro-import-members-from-csv/tags/v3.0.3/src/class-import-members.php

    r2554806 r2554946  
    143143    public function load_hooks() {
    144144
     145        if ( false === apply_filters( 'e20r_utilities_module_installed', false ) ) {
     146            add_action( 'init', '\E20R\Import\Loader::is_utilities_module_active', 10 );
     147        }
    145148        add_action( 'plugins_loaded', array( Email_Templates::get_instance(), 'load_hooks' ), 99 );
    146149        add_action( 'plugins_loaded', array( Ajax::get_instance(), 'load_hooks' ), 99 );
    … …  
    182185
    183186        if ( class_exists( 'E20R\Utilities\Licensing\Licensing' ) ) {
    184 
    185187            $licensing = new Licensing( self::E20R_LICENSE_SKU );
    186188
    187             if (
    188                 class_exists( 'E20R\Utilities\Licensing\Licensing' ) &&
    189                 $licensing->is_licensed( self::E20R_LICENSE_SKU, false )
    190             ) {
     189            if ( $licensing->is_licensed( self::E20R_LICENSE_SKU, false ) ) {
    191190                do_action( 'e20r_import_load_licensed_modules' );
    192191            }

  • pmpro-import-members-from-csv/tags/v3.0.3/src/import/class-ajax.php

    r2554806 r2554946  
    134134    public function get_client_ip() {
    135135
    136         $client    = @$_SERVER['HTTP_CLIENT_IP'];
    137         $forward   = @$_SERVER['HTTP_X_FORWARDED_FOR'];
     136        $client    = $_SERVER['HTTP_CLIENT_IP'] ?? null;
     137        $forward   = $_SERVER['HTTP_X_FORWARDED_FOR'] ?? null;
    138138        $remote    = $_SERVER['REMOTE_ADDR'];
    139139        $client_ip = null;

  • pmpro-import-members-from-csv/trunk/ActivateUtilitiesPlugin.php

    r2554806 r2554946  
    6161
    6262            if ( self::is_active( $plugin ) ) {
    63                 return null;
     63                return true;
    6464            }
    6565
    … …  
    109109            }
    110110
    111             return null;
     111            return self::is_active( $plugin );
    112112        }
    113113
    … …  
    147147
    148148            $path = trim( $path );
     149            error_log( "Notice: Using {$path}" );
    149150
    150151            if ( ! file_exists( $path ) ) {
    151                 error_log( "Didn't find the plugin file for the Utilities plugin" );
    152152                add_action(
    153153                    'admin_notices',
    … …  
    167167            }
    168168
    169             if ( ! self::is_active( $path ) ) {
    170 
    171                 $result = self::activate_plugin( $path );
     169            if ( ! self::is_active( self::$plugin_slug ) ) {
     170
     171                $result = self::activate_plugin( self::$plugin_slug );
    172172
    173173                if ( ! is_wp_error( $result ) ) {
    … …  
    203203            }
    204204
    205             if ( self::is_active( $path ) ) {
     205            if ( self::is_active( self::$plugin_slug ) ) {
    206206                return true;
    207207            }

  • pmpro-import-members-from-csv/trunk/CHANGELOG.md

    r2554818 r2554946  
    66
    77## [Unreleased]
     8
     9## v3.0.3 - 2021-06-28
     10- BUG FIX: Refactored utilities module filter location (Thomas Sjolshagen)
     11- BUG FIX: PHP Notice warnings (Thomas Sjolshagen)
     12- BUG FIX: Didn't recognise the utilities module when it's active (Thomas Sjolshagen)
    813
    914## v3.0.2 - 2021-06-27

  • pmpro-import-members-from-csv/trunk/README.txt

    r2554818 r2554946  
    44Requires at least: 5.0
    55Tested up to: 5.7.2
    6 Stable tag: 3.0.2
     6Stable tag: 3.0.3
    77License: GPLv2
    88License URI: http://www.gnu.org/licenses/gpl

  • pmpro-import-members-from-csv/trunk/class.pmpro-import-members.php

    r2554818 r2554946  
    44Plugin URI: http://wordpress.org/plugins/pmpro-import-members-from-csv/
    55Description: Import Users and their metadata from a csv file.
    6 Version: 3.0.2
     6Version: 3.0.3
    77Requires PHP: 7.0
    88Author: <a href="https://eighty20results.com/thomas-sjolshagen/">Thomas Sjolshagen <[email protected]></a>
    … …  
    5555
    5656if ( ! defined( 'E20R_IMPORT_VERSION' ) ) {
    57     define( 'E20R_IMPORT_VERSION', '3.0' );
     57    define( 'E20R_IMPORT_VERSION', '3.0.3' );
    5858}
    5959
    … …  
    191191// Load this plugin
    192192add_action( 'plugins_loaded', array( Import_Members::get_instance(), 'load_hooks' ), 10 );
    193 
    194 if ( false === apply_filters( 'e20r_utilities_module_installed', false ) ) {
    195     add_action( 'init', '\E20R\Import\Loader::is_utilities_module_active', 10 );
    196 }

  • pmpro-import-members-from-csv/trunk/src/class-import-members.php

    r2554806 r2554946  
    143143    public function load_hooks() {
    144144
     145        if ( false === apply_filters( 'e20r_utilities_module_installed', false ) ) {
     146            add_action( 'init', '\E20R\Import\Loader::is_utilities_module_active', 10 );
     147        }
    145148        add_action( 'plugins_loaded', array( Email_Templates::get_instance(), 'load_hooks' ), 99 );
    146149        add_action( 'plugins_loaded', array( Ajax::get_instance(), 'load_hooks' ), 99 );
    … …  
    182185
    183186        if ( class_exists( 'E20R\Utilities\Licensing\Licensing' ) ) {
    184 
    185187            $licensing = new Licensing( self::E20R_LICENSE_SKU );
    186188
    187             if (
    188                 class_exists( 'E20R\Utilities\Licensing\Licensing' ) &&
    189                 $licensing->is_licensed( self::E20R_LICENSE_SKU, false )
    190             ) {
     189            if ( $licensing->is_licensed( self::E20R_LICENSE_SKU, false ) ) {
    191190                do_action( 'e20r_import_load_licensed_modules' );
    192191            }

  • pmpro-import-members-from-csv/trunk/src/import/class-ajax.php

    r2554806 r2554946  
    134134    public function get_client_ip() {
    135135
    136         $client    = @$_SERVER['HTTP_CLIENT_IP'];
    137         $forward   = @$_SERVER['HTTP_X_FORWARDED_FOR'];
     136        $client    = $_SERVER['HTTP_CLIENT_IP'] ?? null;
     137        $forward   = $_SERVER['HTTP_X_FORWARDED_FOR'] ?? null;
    138138        $remote    = $_SERVER['REMOTE_ADDR'];
    139139        $client_ip = null;
Note: See TracChangeset for help on using the changeset viewer.