WordPoints / importer

src/importer.php

Indentation +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
  */
 
 wordpoints_register_extension(
-	'
+    '
 		Extension Name: Importer
 		Author:         J.D. Grimes
 		Author URI:     https://codesymphony.co/
@@ -41,7 +41,7 @@ 
 		ID:             430
 		Namespace:      Importer
 	'
-	, __FILE__
+    , __FILE__
 );
 
 WordPoints_Class_Autoloader::register_dir( dirname( __FILE__ ) . '/includes' );
@@ -55,12 +55,12 @@ 
 
 if ( is_admin() ) {
 
-	/**
-	 * The extension's admin-side code.
-	 *
-	 * @since 1.0.0
-	 */
-	require_once dirname( __FILE__ ) . '/admin/admin.php';
+    /**
+     * The extension's admin-side code.
+     *
+     * @since 1.0.0
+     */
+    require_once dirname( __FILE__ ) . '/admin/admin.php';
 }
 
 // EOF

Spacing +4 added lines, -4 removed lines

@@ -44,23 +44,23 @@
 	, __FILE__
 );
 
-WordPoints_Class_Autoloader::register_dir( dirname( __FILE__ ) . '/includes' );
+WordPoints_Class_Autoloader::register_dir(dirname(__FILE__).'/includes');
 
 /**
  * The extension's general functions.
  *
  * @since 1.0.0
  */
-require_once dirname( __FILE__ ) . '/includes/functions.php';
+require_once dirname(__FILE__).'/includes/functions.php';
 
-if ( is_admin() ) {
+if (is_admin()) {
 
 	/**
 	 * The extension's admin-side code.
 	 *
 	 * @since 1.0.0
 	 */
-	require_once dirname( __FILE__ ) . '/admin/admin.php';
+	require_once dirname(__FILE__).'/admin/admin.php';
 }
 
 // EOF

src/admin/admin.php

Indentation +107 added lines, -107 removed lines

@@ -14,23 +14,23 @@ 
  */
 function wordpoints_importer_admin_menu() {
 
-	add_submenu_page(
-		wordpoints_get_main_admin_menu()
-		,__( 'WordPoints — Import', 'wordpoints-importer' )
-		,__( 'Import', 'wordpoints-importer' )
-		,'manage_options'
-		,'wordpoints_import'
-		,'wordpoints_import_admin_screen'
-	);
-
-	add_submenu_page(
-		'_wordpoints_import' // Fake.
-		,__( 'WordPoints — Importing', 'wordpoints-importer' )
-		,__( 'Importing', 'wordpoints-importer' )
-		,'manage_options'
-		,'wordpoints_importing'
-		,'wordpoints_importing_admin_screen'
-	);
+    add_submenu_page(
+        wordpoints_get_main_admin_menu()
+        ,__( 'WordPoints — Import', 'wordpoints-importer' )
+        ,__( 'Import', 'wordpoints-importer' )
+        ,'manage_options'
+        ,'wordpoints_import'
+        ,'wordpoints_import_admin_screen'
+    );
+
+    add_submenu_page(
+        '_wordpoints_import' // Fake.
+        ,__( 'WordPoints — Importing', 'wordpoints-importer' )
+        ,__( 'Importing', 'wordpoints-importer' )
+        ,'manage_options'
+        ,'wordpoints_importing'
+        ,'wordpoints_importing_admin_screen'
+    );
 }
 add_action( 'admin_menu', 'wordpoints_importer_admin_menu' );
 add_action( 'network_admin_menu', 'wordpoints_importer_admin_menu' );
@@ -42,12 +42,12 @@ 
  */
 function wordpoints_import_admin_screen() {
 
-	/**
-	 * The importer admin screen.
-	 *
-	 * @since 1.0.0
-	 */
-	require dirname( __FILE__ ) . '/screens/import.php';
+    /**
+     * The importer admin screen.
+     *
+     * @since 1.0.0
+     */
+    require dirname( __FILE__ ) . '/screens/import.php';
 }
 
 /**
@@ -57,12 +57,12 @@ 
  */
 function wordpoints_importing_admin_screen() {
 
-	/**
-	 * The importer admin screen.
-	 *
-	 * @since 1.0.0
-	 */
-	require dirname( __FILE__ ) . '/screens/importing.php';
+    /**
+     * The importer admin screen.
+     *
+     * @since 1.0.0
+     */
+    require dirname( __FILE__ ) . '/screens/importing.php';
 }
 
 /**
@@ -72,17 +72,17 @@ 
  */
 function wordpoints_importer_register_admin_scripts() {
 
-	$assets_url = wordpoints_extensions_url(
-		'admin/assets'
-		, dirname( dirname( __FILE__ ) ) . '/importer.php'
-	);
+    $assets_url = wordpoints_extensions_url(
+        'admin/assets'
+        , dirname( dirname( __FILE__ ) ) . '/importer.php'
+    );
 
-	$suffix = SCRIPT_DEBUG ? '' : '.min';
+    $suffix = SCRIPT_DEBUG ? '' : '.min';
 
-	wp_register_style(
-		'wordpoints-importer-feedback'
-		, "{$assets_url}/css/feedback{$suffix}.css"
-	);
+    wp_register_style(
+        'wordpoints-importer-feedback'
+        , "{$assets_url}/css/feedback{$suffix}.css"
+    );
 }
 add_action( 'init', 'wordpoints_importer_register_admin_scripts' );
 
@@ -93,41 +93,41 @@ 
  */
 function wordpoints_importer_do_import() {
 
-	if ( ! defined( 'IFRAME_REQUEST' ) ) {
-		define( 'IFRAME_REQUEST', true );
-	}
+    if ( ! defined( 'IFRAME_REQUEST' ) ) {
+        define( 'IFRAME_REQUEST', true );
+    }
 
-	if ( ! current_user_can( 'manage_options' ) ) {
-		wp_die( esc_html__( 'Sorry, you are not allowed to import to WordPoints.', 'wordpoints-importer' ) );
-	}
+    if ( ! current_user_can( 'manage_options' ) ) {
+        wp_die( esc_html__( 'Sorry, you are not allowed to import to WordPoints.', 'wordpoints-importer' ) );
+    }
 
-	check_admin_referer( 'wordpoints_import' );
+    check_admin_referer( 'wordpoints_import' );
 
-	if ( ! isset( $_GET['importer'] ) ) {
-		wp_die( esc_html__( 'No importer selected.', 'wordpoints-importer' ) );
-	}
+    if ( ! isset( $_GET['importer'] ) ) {
+        wp_die( esc_html__( 'No importer selected.', 'wordpoints-importer' ) );
+    }
 
-	$importer = WordPoints_Importers::get_importer(
-		sanitize_key( $_GET['importer'] )
-	);
+    $importer = WordPoints_Importers::get_importer(
+        sanitize_key( $_GET['importer'] )
+    );
 
-	if ( ! ( $importer instanceof WordPoints_Importer ) ) {
-		wp_die( esc_html__( 'Importer not installed.', 'wordpoints-importer' ) );
-	}
+    if ( ! ( $importer instanceof WordPoints_Importer ) ) {
+        wp_die( esc_html__( 'Importer not installed.', 'wordpoints-importer' ) );
+    }
 
-	wp_enqueue_style( 'wordpoints-importer-feedback' );
+    wp_enqueue_style( 'wordpoints-importer-feedback' );
 
-	$args = array();
+    $args = array();
 
-	if ( isset( $_GET['wordpoints_import'] ) && is_array( $_GET['wordpoints_import'] ) ) {
-		$args = wp_unslash( $_GET['wordpoints_import'] ); // WPCS: sanitization OK.
-	}
+    if ( isset( $_GET['wordpoints_import'] ) && is_array( $_GET['wordpoints_import'] ) ) {
+        $args = wp_unslash( $_GET['wordpoints_import'] ); // WPCS: sanitization OK.
+    }
 
-	iframe_header();
+    iframe_header();
 
-	$importer->do_import( $args );
+    $importer->do_import( $args );
 
-	iframe_footer();
+    iframe_footer();
 }
 add_action( 'update-custom_wordpoints_import', 'wordpoints_importer_do_import' );
 
@@ -138,9 +138,9 @@ 
  */
 function wordpoints_importer_admin_screen_points_type_select() {
 
-	$args = array( 'name' => 'wordpoints_import[points][_data][points_type]' );
+    $args = array( 'name' => 'wordpoints_import[points][_data][points_type]' );
 
-	?>
+    ?>
 
 	<p>
 		<label for="wordpoints_import[points][_data][points_type]">
@@ -152,8 +152,8 @@ 
 	<?php
 }
 add_action(
-	'wordpoints_importer_before_component_options-points'
-	, 'wordpoints_importer_admin_screen_points_type_select'
+    'wordpoints_importer_before_component_options-points'
+    , 'wordpoints_importer_admin_screen_points_type_select'
 );
 
 /**
@@ -169,24 +169,24 @@ 
  */
 function wordpoints_importer_validate_points_type_setting( $valid, $settings, $feedback ) {
 
-	if ( $valid ) {
+    if ( $valid ) {
 
-		if ( ! isset( $settings['points_type'] ) ) {
-			$feedback->warning( __( 'Skipping Points component—no points type specified.', 'wordpoints-importer' ) );
-			$valid = false;
-		} elseif ( ! wordpoints_is_points_type( $settings['points_type'] ) ) {
-			$feedback->warning( __( 'Skipping Points component—invalid points type selected.', 'wordpoints-importer' ) );
-			$valid = false;
-		}
-	}
+        if ( ! isset( $settings['points_type'] ) ) {
+            $feedback->warning( __( 'Skipping Points component—no points type specified.', 'wordpoints-importer' ) );
+            $valid = false;
+        } elseif ( ! wordpoints_is_points_type( $settings['points_type'] ) ) {
+            $feedback->warning( __( 'Skipping Points component—invalid points type selected.', 'wordpoints-importer' ) );
+            $valid = false;
+        }
+    }
 
-	return $valid;
+    return $valid;
 }
 add_action(
-	'wordpoints_import_settings_valid-points'
-	, 'wordpoints_importer_validate_points_type_setting'
-	, 10
-	, 3
+    'wordpoints_import_settings_valid-points'
+    , 'wordpoints_importer_validate_points_type_setting'
+    , 10
+    , 3
 );
 
 /**
@@ -196,20 +196,20 @@ 
  */
 function wordpoints_importer_admin_screen_rank_group_select() {
 
-	$rank_groups = WordPoints_Rank_Groups::get();
+    $rank_groups = WordPoints_Rank_Groups::get();
 
-	// See https://github.com/WordPoints/wordpoints/issues/310.
-	$options = array();
-	foreach ( $rank_groups as $rank_group ) {
-		$options[ $rank_group->slug ] = $rank_group->name;
-	}
+    // See https://github.com/WordPoints/wordpoints/issues/310.
+    $options = array();
+    foreach ( $rank_groups as $rank_group ) {
+        $options[ $rank_group->slug ] = $rank_group->name;
+    }
 
-	$dropdown = new WordPoints_Dropdown_Builder(
-		$options
-		, array( 'name' => 'wordpoints_import[ranks][_data][rank_group]' )
-	);
+    $dropdown = new WordPoints_Dropdown_Builder(
+        $options
+        , array( 'name' => 'wordpoints_import[ranks][_data][rank_group]' )
+    );
 
-	?>
+    ?>
 
 	<p>
 		<label for="wordpoints_import[ranks][_data][rank_group]">
@@ -221,8 +221,8 @@ 
 <?php
 }
 add_action(
-	'wordpoints_importer_before_component_options-ranks'
-	, 'wordpoints_importer_admin_screen_rank_group_select'
+    'wordpoints_importer_before_component_options-ranks'
+    , 'wordpoints_importer_admin_screen_rank_group_select'
 );
 
 /**
@@ -238,24 +238,24 @@ 
  */
 function wordpoints_importer_validate_rank_group_setting( $valid, $settings, $feedback ) {
 
-	if ( $valid ) {
+    if ( $valid ) {
 
-		if ( ! isset( $settings['rank_group'] ) ) {
-			$feedback->warning( __( 'Skipping Ranks component—no rank group specified.', 'wordpoints-importer' ) );
-			$valid = false;
-		} elseif ( ! WordPoints_Rank_Groups::is_group_registered( $settings['rank_group'] ) ) {
-			$feedback->warning( __( 'Skipping Ranks component—invalid rank group selected.', 'wordpoints-importer' ) );
-			$valid = false;
-		}
-	}
+        if ( ! isset( $settings['rank_group'] ) ) {
+            $feedback->warning( __( 'Skipping Ranks component—no rank group specified.', 'wordpoints-importer' ) );
+            $valid = false;
+        } elseif ( ! WordPoints_Rank_Groups::is_group_registered( $settings['rank_group'] ) ) {
+            $feedback->warning( __( 'Skipping Ranks component—invalid rank group selected.', 'wordpoints-importer' ) );
+            $valid = false;
+        }
+    }
 
-	return $valid;
+    return $valid;
 }
 add_action(
-	'wordpoints_import_settings_valid-ranks'
-	, 'wordpoints_importer_validate_rank_group_setting'
-	, 10
-	, 3
+    'wordpoints_import_settings_valid-ranks'
+    , 'wordpoints_importer_validate_rank_group_setting'
+    , 10
+    , 3
 );
 
 // EOF

Spacing +44 added lines, -44 removed lines

@@ -16,8 +16,8 @@ 
 
 	add_submenu_page(
 		wordpoints_get_main_admin_menu()
-		,__( 'WordPoints — Import', 'wordpoints-importer' )
-		,__( 'Import', 'wordpoints-importer' )
+		,__('WordPoints — Import', 'wordpoints-importer')
+		,__('Import', 'wordpoints-importer')
 		,'manage_options'
 		,'wordpoints_import'
 		,'wordpoints_import_admin_screen'
@@ -25,15 +25,15 @@ 
 
 	add_submenu_page(
 		'_wordpoints_import' // Fake.
-		,__( 'WordPoints — Importing', 'wordpoints-importer' )
-		,__( 'Importing', 'wordpoints-importer' )
+		,__('WordPoints — Importing', 'wordpoints-importer')
+		,__('Importing', 'wordpoints-importer')
 		,'manage_options'
 		,'wordpoints_importing'
 		,'wordpoints_importing_admin_screen'
 	);
 }
-add_action( 'admin_menu', 'wordpoints_importer_admin_menu' );
-add_action( 'network_admin_menu', 'wordpoints_importer_admin_menu' );
+add_action('admin_menu', 'wordpoints_importer_admin_menu');
+add_action('network_admin_menu', 'wordpoints_importer_admin_menu');
 
 /**
  * Display the importer administration screen.
@@ -47,7 +47,7 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	require dirname( __FILE__ ) . '/screens/import.php';
+	require dirname(__FILE__).'/screens/import.php';
 }
 
 /**
@@ -62,7 +62,7 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	require dirname( __FILE__ ) . '/screens/importing.php';
+	require dirname(__FILE__).'/screens/importing.php';
 }
 
 /**
@@ -74,7 +74,7 @@ 
 
 	$assets_url = wordpoints_extensions_url(
 		'admin/assets'
-		, dirname( dirname( __FILE__ ) ) . '/importer.php'
+		, dirname(dirname(__FILE__)).'/importer.php'
 	);
 
 	$suffix = SCRIPT_DEBUG ? '' : '.min';
@@ -84,7 +84,7 @@ 
 		, "{$assets_url}/css/feedback{$suffix}.css"
 	);
 }
-add_action( 'init', 'wordpoints_importer_register_admin_scripts' );
+add_action('init', 'wordpoints_importer_register_admin_scripts');
 
 /**
  * Handle an import request.
@@ -93,43 +93,43 @@ 
  */
 function wordpoints_importer_do_import() {
 
-	if ( ! defined( 'IFRAME_REQUEST' ) ) {
-		define( 'IFRAME_REQUEST', true );
+	if (!defined('IFRAME_REQUEST')) {
+		define('IFRAME_REQUEST', true);
 	}
 
-	if ( ! current_user_can( 'manage_options' ) ) {
-		wp_die( esc_html__( 'Sorry, you are not allowed to import to WordPoints.', 'wordpoints-importer' ) );
+	if (!current_user_can('manage_options')) {
+		wp_die(esc_html__('Sorry, you are not allowed to import to WordPoints.', 'wordpoints-importer'));
 	}
 
-	check_admin_referer( 'wordpoints_import' );
+	check_admin_referer('wordpoints_import');
 
-	if ( ! isset( $_GET['importer'] ) ) {
-		wp_die( esc_html__( 'No importer selected.', 'wordpoints-importer' ) );
+	if (!isset($_GET['importer'])) {
+		wp_die(esc_html__('No importer selected.', 'wordpoints-importer'));
 	}
 
 	$importer = WordPoints_Importers::get_importer(
-		sanitize_key( $_GET['importer'] )
+		sanitize_key($_GET['importer'])
 	);
 
-	if ( ! ( $importer instanceof WordPoints_Importer ) ) {
-		wp_die( esc_html__( 'Importer not installed.', 'wordpoints-importer' ) );
+	if (!($importer instanceof WordPoints_Importer)) {
+		wp_die(esc_html__('Importer not installed.', 'wordpoints-importer'));
 	}
 
-	wp_enqueue_style( 'wordpoints-importer-feedback' );
+	wp_enqueue_style('wordpoints-importer-feedback');
 
 	$args = array();
 
-	if ( isset( $_GET['wordpoints_import'] ) && is_array( $_GET['wordpoints_import'] ) ) {
-		$args = wp_unslash( $_GET['wordpoints_import'] ); // WPCS: sanitization OK.
+	if (isset($_GET['wordpoints_import']) && is_array($_GET['wordpoints_import'])) {
+		$args = wp_unslash($_GET['wordpoints_import']); // WPCS: sanitization OK.
 	}
 
 	iframe_header();
 
-	$importer->do_import( $args );
+	$importer->do_import($args);
 
 	iframe_footer();
 }
-add_action( 'update-custom_wordpoints_import', 'wordpoints_importer_do_import' );
+add_action('update-custom_wordpoints_import', 'wordpoints_importer_do_import');
 
 /**
  * Display a points type dropdown above the points component settings.
@@ -138,14 +138,14 @@ 
  */
 function wordpoints_importer_admin_screen_points_type_select() {
 
-	$args = array( 'name' => 'wordpoints_import[points][_data][points_type]' );
+	$args = array('name' => 'wordpoints_import[points][_data][points_type]');
 
 	?>
 
 	<p>
 		<label for="wordpoints_import[points][_data][points_type]">
-			<?php esc_html_e( 'Import to points type:', 'wordpoints-importer' ); ?>
-			<?php wordpoints_points_types_dropdown( $args ); ?>
+			<?php esc_html_e('Import to points type:', 'wordpoints-importer'); ?>
+			<?php wordpoints_points_types_dropdown($args); ?>
 		</label>
 	</p>
 
@@ -167,15 +167,15 @@ 
  *
  * @return bool Whether the settings are valid.
  */
-function wordpoints_importer_validate_points_type_setting( $valid, $settings, $feedback ) {
+function wordpoints_importer_validate_points_type_setting($valid, $settings, $feedback) {
 
-	if ( $valid ) {
+	if ($valid) {
 
-		if ( ! isset( $settings['points_type'] ) ) {
-			$feedback->warning( __( 'Skipping Points component—no points type specified.', 'wordpoints-importer' ) );
+		if (!isset($settings['points_type'])) {
+			$feedback->warning(__('Skipping Points component—no points type specified.', 'wordpoints-importer'));
 			$valid = false;
-		} elseif ( ! wordpoints_is_points_type( $settings['points_type'] ) ) {
-			$feedback->warning( __( 'Skipping Points component—invalid points type selected.', 'wordpoints-importer' ) );
+		} elseif (!wordpoints_is_points_type($settings['points_type'])) {
+			$feedback->warning(__('Skipping Points component—invalid points type selected.', 'wordpoints-importer'));
 			$valid = false;
 		}
 	}
@@ -200,20 +200,20 @@ 
 
 	// See https://github.com/WordPoints/wordpoints/issues/310.
 	$options = array();
-	foreach ( $rank_groups as $rank_group ) {
-		$options[ $rank_group->slug ] = $rank_group->name;
+	foreach ($rank_groups as $rank_group) {
+		$options[$rank_group->slug] = $rank_group->name;
 	}
 
 	$dropdown = new WordPoints_Dropdown_Builder(
 		$options
-		, array( 'name' => 'wordpoints_import[ranks][_data][rank_group]' )
+		, array('name' => 'wordpoints_import[ranks][_data][rank_group]')
 	);
 
 	?>
 
 	<p>
 		<label for="wordpoints_import[ranks][_data][rank_group]">
-			<?php esc_html_e( 'Import to rank group:', 'wordpoints-importer' ); ?>
+			<?php esc_html_e('Import to rank group:', 'wordpoints-importer'); ?>
 			<?php $dropdown->display(); ?>
 		</label>
 	</p>
@@ -236,15 +236,15 @@ 
  *
  * @return bool Whether the settings are valid.
  */
-function wordpoints_importer_validate_rank_group_setting( $valid, $settings, $feedback ) {
+function wordpoints_importer_validate_rank_group_setting($valid, $settings, $feedback) {
 
-	if ( $valid ) {
+	if ($valid) {
 
-		if ( ! isset( $settings['rank_group'] ) ) {
-			$feedback->warning( __( 'Skipping Ranks component—no rank group specified.', 'wordpoints-importer' ) );
+		if (!isset($settings['rank_group'])) {
+			$feedback->warning(__('Skipping Ranks component—no rank group specified.', 'wordpoints-importer'));
 			$valid = false;
-		} elseif ( ! WordPoints_Rank_Groups::is_group_registered( $settings['rank_group'] ) ) {
-			$feedback->warning( __( 'Skipping Ranks component—invalid rank group selected.', 'wordpoints-importer' ) );
+		} elseif (!WordPoints_Rank_Groups::is_group_registered($settings['rank_group'])) {
+			$feedback->warning(__('Skipping Ranks component—invalid rank group selected.', 'wordpoints-importer'));
 			$valid = false;
 		}
 	}

src/admin/screens/import.php

Indentation +47 added lines, -47 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( true !== current_user_can( 'manage_options' ) ) {
-	wp_die();
+    wp_die();
 }
 
 $tabs = array( 'unavailable' => __( 'Unavailable', 'wordpoints-importer' ) );
@@ -16,19 +16,19 @@ 
 
 foreach ( WordPoints_Importers::get() as $slug => $args ) {
 
-	$importer = WordPoints_Importers::get_importer( $slug );
+    $importer = WordPoints_Importers::get_importer( $slug );
 
-	$is_available = $importer->is_available();
+    $is_available = $importer->is_available();
 
-	if ( is_wp_error( $is_available ) ) {
-		$unavailable[ $args['name'] ] = $is_available;
-	} else {
-		$tabs[ $slug ] = $args['name'];
-	}
+    if ( is_wp_error( $is_available ) ) {
+        $unavailable[ $args['name'] ] = $is_available;
+    } else {
+        $tabs[ $slug ] = $args['name'];
+    }
 }
 
 if ( empty( $unavailable ) ) {
-	unset( $tabs['unavailable'] );
+    unset( $tabs['unavailable'] );
 }
 
 $current_tab = wordpoints_admin_get_current_tab( $tabs );
@@ -51,14 +51,14 @@ 
 				<li>
 					<?php
 
-					printf(
-						/* translators: 1 is an importer name, 2 is the reason that it is unavailable. */
-						esc_html__( '%1$s — %2$s', 'wordpoints-importer' )
-						, '<strong>' . esc_html( $name ) . '</strong>'
-						, esc_html( $error->get_error_message() )
-					);
+                    printf(
+                        /* translators: 1 is an importer name, 2 is the reason that it is unavailable. */
+                        esc_html__( '%1$s — %2$s', 'wordpoints-importer' )
+                        , '<strong>' . esc_html( $name ) . '</strong>'
+                        , esc_html( $error->get_error_message() )
+                    );
 
-					?>
+                    ?>
 				</li>
 			<?php endforeach; ?>
 		</ul>
@@ -74,39 +74,39 @@ 
 
 				<?php
 
-				if ( ! $importer->supports_component( $slug ) ) {
-					continue;
-				}
+                if ( ! $importer->supports_component( $slug ) ) {
+                    continue;
+                }
 
-				$supported = true;
+                $supported = true;
 
-				?>
+                ?>
 
 				<h3><?php echo esc_html( $component['name'] ); ?></h3>
 
 				<?php
 
-				/**
-				 * Before the import option fields for a component.
-				 *
-				 * @since 1.0.0
-				 */
-				do_action( "wordpoints_importer_before_component_options-{$slug}" );
+                /**
+                 * Before the import option fields for a component.
+                 *
+                 * @since 1.0.0
+                 */
+                do_action( "wordpoints_importer_before_component_options-{$slug}" );
 
-				?>
+                ?>
 
 				<?php foreach ( $importer->get_options_for_component( $slug ) as $name => $option ) : ?>
 
 					<?php
 
-					$can_import = true;
+                    $can_import = true;
 
-					// Check if this option is available.
-					if ( isset( $option['can_import'] ) ) {
-						$can_import = call_user_func( $option['can_import'], array() );
-					}
+                    // Check if this option is available.
+                    if ( isset( $option['can_import'] ) ) {
+                        $can_import = call_user_func( $option['can_import'], array() );
+                    }
 
-					?>
+                    ?>
 
 					<label for="wordpoints_import[<?php echo esc_attr( $slug ); ?>][<?php echo esc_attr( $name ); ?>]">
 						<input type="checkbox" value="1" id="wordpoints_import[<?php echo esc_attr( $slug ); ?>][<?php echo esc_attr( $name ); ?>]" name="wordpoints_import[<?php echo esc_attr( $slug ); ?>][<?php echo esc_attr( $name ); ?>]" <?php disabled( is_wp_error( $can_import ), true ); ?> />
@@ -116,10 +116,10 @@ 
 							<em>
 								<?php
 
-								// translators: Error message explaining the reason why the importer is disabled.
-								printf( esc_html__( 'Disabled (%s)', 'wordpoints-importer' ), esc_html( $can_import->get_error_message() ) );
+                                // translators: Error message explaining the reason why the importer is disabled.
+                                printf( esc_html__( 'Disabled (%s)', 'wordpoints-importer' ), esc_html( $can_import->get_error_message() ) );
 
-								?>
+                                ?>
 							</em>
 						<?php endif; ?>
 					</label>
@@ -140,20 +140,20 @@ 
 
 			<?php
 
-			if ( ! isset( $supported ) ) {
+            if ( ! isset( $supported ) ) {
 
-				esc_html_e(
-					'This importer does not support any of the installed components.'
-					, 'wordpoints-importer'
-				);
+                esc_html_e(
+                    'This importer does not support any of the installed components.'
+                    , 'wordpoints-importer'
+                );
 
-			} else {
+            } else {
 
-				wp_nonce_field( 'wordpoints_import' );
-				submit_button( __( 'Import', 'wordpoints-importer' ) );
-			}
+                wp_nonce_field( 'wordpoints_import' );
+                submit_button( __( 'Import', 'wordpoints-importer' ) );
+            }
 
-			?>
+            ?>
 		</form>
 	<?php endif; ?>
 </div>

Spacing +39 added lines, -39 removed lines

@@ -7,55 +7,55 @@ 
  * @since 1.0.0
  */
 
-if ( true !== current_user_can( 'manage_options' ) ) {
+if (true !== current_user_can('manage_options')) {
 	wp_die();
 }
 
-$tabs = array( 'unavailable' => __( 'Unavailable', 'wordpoints-importer' ) );
+$tabs = array('unavailable' => __('Unavailable', 'wordpoints-importer'));
 $unavailable = array();
 
-foreach ( WordPoints_Importers::get() as $slug => $args ) {
+foreach (WordPoints_Importers::get() as $slug => $args) {
 
-	$importer = WordPoints_Importers::get_importer( $slug );
+	$importer = WordPoints_Importers::get_importer($slug);
 
 	$is_available = $importer->is_available();
 
-	if ( is_wp_error( $is_available ) ) {
-		$unavailable[ $args['name'] ] = $is_available;
+	if (is_wp_error($is_available)) {
+		$unavailable[$args['name']] = $is_available;
 	} else {
-		$tabs[ $slug ] = $args['name'];
+		$tabs[$slug] = $args['name'];
 	}
 }
 
-if ( empty( $unavailable ) ) {
-	unset( $tabs['unavailable'] );
+if (empty($unavailable)) {
+	unset($tabs['unavailable']);
 }
 
-$current_tab = wordpoints_admin_get_current_tab( $tabs );
+$current_tab = wordpoints_admin_get_current_tab($tabs);
 
 $components = WordPoints_Components::instance()->get();
 
 ?>
 
-<h2><?php esc_html_e( 'WordPoints Importer', 'wordpoints-importer' ); ?></h2>
+<h2><?php esc_html_e('WordPoints Importer', 'wordpoints-importer'); ?></h2>
 
 <div class="wrap">
-	<?php wordpoints_admin_show_tabs( $tabs, false ); ?>
+	<?php wordpoints_admin_show_tabs($tabs, false); ?>
 
-	<?php if ( 'unavailable' === $current_tab ) : ?>
+	<?php if ('unavailable' === $current_tab) : ?>
 
-		<p><?php esc_html_e( 'The below importers are not currently available.', 'wordpoints-importer' ); ?></p>
+		<p><?php esc_html_e('The below importers are not currently available.', 'wordpoints-importer'); ?></p>
 
 		<ul>
-			<?php foreach ( $unavailable as $name => $error ) : ?>
+			<?php foreach ($unavailable as $name => $error) : ?>
 				<li>
 					<?php
 
 					printf(
 						/* translators: 1 is an importer name, 2 is the reason that it is unavailable. */
-						esc_html__( '%1$s — %2$s', 'wordpoints-importer' )
-						, '<strong>' . esc_html( $name ) . '</strong>'
-						, esc_html( $error->get_error_message() )
+						esc_html__('%1$s — %2$s', 'wordpoints-importer')
+						, '<strong>'.esc_html($name).'</strong>'
+						, esc_html($error->get_error_message())
 					);
 
 					?>
@@ -65,16 +65,16 @@ 
 
 	<?php else : ?>
 
-		<?php $importer = WordPoints_Importers::get_importer( $current_tab ); ?>
+		<?php $importer = WordPoints_Importers::get_importer($current_tab); ?>
 
-		<p><?php esc_html_e( 'Select which items you would like imported.', 'wordpoints-importer' ); ?></p>
+		<p><?php esc_html_e('Select which items you would like imported.', 'wordpoints-importer'); ?></p>
 
-		<form method="post" action="<?php echo esc_url( self_admin_url( 'admin.php?page=wordpoints_importing' ) ); ?>">
-			<?php foreach ( $components as $slug => $component ) : ?>
+		<form method="post" action="<?php echo esc_url(self_admin_url('admin.php?page=wordpoints_importing')); ?>">
+			<?php foreach ($components as $slug => $component) : ?>
 
 				<?php
 
-				if ( ! $importer->supports_component( $slug ) ) {
+				if (!$importer->supports_component($slug)) {
 					continue;
 				}
 
@@ -82,7 +82,7 @@ 
 
 				?>
 
-				<h3><?php echo esc_html( $component['name'] ); ?></h3>
+				<h3><?php echo esc_html($component['name']); ?></h3>
 
 				<?php
 
@@ -91,42 +91,42 @@ 
 				 *
 				 * @since 1.0.0
 				 */
-				do_action( "wordpoints_importer_before_component_options-{$slug}" );
+				do_action("wordpoints_importer_before_component_options-{$slug}");
 
 				?>
 
-				<?php foreach ( $importer->get_options_for_component( $slug ) as $name => $option ) : ?>
+				<?php foreach ($importer->get_options_for_component($slug) as $name => $option) : ?>
 
 					<?php
 
 					$can_import = true;
 
 					// Check if this option is available.
-					if ( isset( $option['can_import'] ) ) {
-						$can_import = call_user_func( $option['can_import'], array() );
+					if (isset($option['can_import'])) {
+						$can_import = call_user_func($option['can_import'], array());
 					}
 
 					?>
 
-					<label for="wordpoints_import[<?php echo esc_attr( $slug ); ?>][<?php echo esc_attr( $name ); ?>]">
-						<input type="checkbox" value="1" id="wordpoints_import[<?php echo esc_attr( $slug ); ?>][<?php echo esc_attr( $name ); ?>]" name="wordpoints_import[<?php echo esc_attr( $slug ); ?>][<?php echo esc_attr( $name ); ?>]" <?php disabled( is_wp_error( $can_import ), true ); ?> />
-						<?php echo esc_html( $option['label'] ); ?>
-						<?php if ( is_wp_error( $can_import ) ) : ?>
+					<label for="wordpoints_import[<?php echo esc_attr($slug); ?>][<?php echo esc_attr($name); ?>]">
+						<input type="checkbox" value="1" id="wordpoints_import[<?php echo esc_attr($slug); ?>][<?php echo esc_attr($name); ?>]" name="wordpoints_import[<?php echo esc_attr($slug); ?>][<?php echo esc_attr($name); ?>]" <?php disabled(is_wp_error($can_import), true); ?> />
+						<?php echo esc_html($option['label']); ?>
+						<?php if (is_wp_error($can_import)) : ?>
 							&nbsp;&nbsp;
 							<em>
 								<?php
 
 								// translators: Error message explaining the reason why the importer is disabled.
-								printf( esc_html__( 'Disabled (%s)', 'wordpoints-importer' ), esc_html( $can_import->get_error_message() ) );
+								printf(esc_html__('Disabled (%s)', 'wordpoints-importer'), esc_html($can_import->get_error_message()));
 
 								?>
 							</em>
 						<?php endif; ?>
 					</label>
 
-					<?php if ( isset( $option['description'] ) ) : ?>
+					<?php if (isset($option['description'])) : ?>
 						<p class="description" style="margin-bottom: 10px; margin-left: 25px;">
-							<?php echo esc_html( $option['description'] ); ?>
+							<?php echo esc_html($option['description']); ?>
 						</p>
 					<?php else : ?>
 						<br style="margin-bottom: 10px" />
@@ -136,11 +136,11 @@ 
 
 			<?php endforeach; ?>
 
-			<input type="hidden" value="<?php echo esc_attr( $current_tab ); ?>" name="importer" />
+			<input type="hidden" value="<?php echo esc_attr($current_tab); ?>" name="importer" />
 
 			<?php
 
-			if ( ! isset( $supported ) ) {
+			if (!isset($supported)) {
 
 				esc_html_e(
 					'This importer does not support any of the installed components.'
@@ -149,8 +149,8 @@ 
 
 			} else {
 
-				wp_nonce_field( 'wordpoints_import' );
-				submit_button( __( 'Import', 'wordpoints-importer' ) );
+				wp_nonce_field('wordpoints_import');
+				submit_button(__('Import', 'wordpoints-importer'));
 			}
 
 			?>

src/includes/class-importer.php

Indentation +231 added lines, -231 removed lines

@@ -14,237 +14,237 @@
  */
 abstract class WordPoints_Importer {
 
-	/**
-	 * The name of the importer.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @type string $name
-	 */
-	protected $name;
-
-	/**
-	 * The components supported by this importer.
-	 *
-	 * The keys are the component slugs, the values arrays of options for importing
-	 * to that component.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @type array[] $components
-	 */
-	protected $components = array();
-
-	/**
-	 * The feedback provider object.
-	 *
-	 * This is only set by self::do_import().
-	 *
-	 * @since 1.0.0
-	 *
-	 * @type WordPoints_Importer_Feedback $feedback
-	 */
-	protected $feedback;
-
-	/**
-	 * Check if this importer is available.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return true|WP_Error A WP_Error if the importer is not available.
-	 */
-	abstract public function is_available();
-
-	/**
-	 * Construct the importer.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $name The name of the importer.
-	 */
-	public function __construct( $name ) {
-
-		$this->name = $name;
-	}
-
-	/**
-	 * Check if this importer supports a specific component.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $component The slug of a component.
-	 *
-	 * @return bool True if the component is supported, otherwise false.
-	 */
-	public function supports_component( $component ) {
-
-		return isset( $this->components[ $component ] );
-	}
-
-	/**
-	 * Get the import options for a component.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $component The slug of a component.
-	 *
-	 * @return array[] The options for this component.
-	 */
-	public function get_options_for_component( $component ) {
-
-		if ( ! $this->supports_component( $component ) ) {
-			return array();
-		}
-
-		return $this->components[ $component ];
-	}
-
-	/**
-	 * Run the import.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param array                        $args     The settings for the import.
-	 * @param WordPoints_Importer_Feedback $feedback The feedback object.
-	 */
-	public function do_import( array $args, $feedback = null ) {
-
-		if ( ! ( $feedback instanceof WordPoints_Importer_Feedback ) ) {
-			$feedback = new WordPoints_Importer_Feedback();
-		}
-
-		$this->feedback = $feedback;
-
-		// translators: Plugin name.
-		$this->feedback->info( sprintf( __( 'Importing from %s…', 'wordpoints-importer' ), $this->name ) );
-
-		$this->no_interruptions();
-
-		foreach ( $args as $component => $options ) {
-			$this->do_import_for_component( $component, $options );
-		}
-
-		$this->feedback->info( __( 'Import complete.', 'wordpoints-importer' ) );
-	}
-
-	/**
-	 * Prevent any interruptions from occurring during the import.
-	 *
-	 * @since 1.2.1
-	 */
-	protected function no_interruptions() {
-
-		wordpoints_prevent_interruptions();
-	}
-
-	/**
-	 * Validate the import settings for a component.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $component The slug of the component.
-	 * @param array  $settings  The settings supplied for this component.
-	 *
-	 * @return bool Whether the settings are valid.
-	 */
-	protected function validate_import_settings( $component, $settings ) {
-
-		/**
-		 * Filter whether the settings are valid before importing.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param bool  $valid    Whether the settings are valid.
-		 * @param array $settings The settings for this component.
-		 * @param WordPoints_Importer_Feedback $feedback The feedback object.
-		 */
-		return apply_filters( "wordpoints_import_settings_valid-{$component}", true, $settings, $this->feedback );
-	}
-
-	/**
-	 * Run the import for a component.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $component The component to run the import for.
-	 * @param array  $options   The selected options of what to import.
-	 */
-	protected function do_import_for_component( $component, $options ) {
-
-		$component_data = WordPoints_Components::instance()->get_component(
-			$component
-		);
-
-		if ( false === $component_data ) {
-			// translators: Component name.
-			$this->feedback->warning( sprintf( __( 'Skipping %s component—not installed.', 'wordpoints-importer' ), esc_html( $component ) ) );
-			return;
-		}
-
-		if ( true !== $this->supports_component( $component ) ) {
-			// translators: Component name.
-			$this->feedback->warning( sprintf( __( 'Skipping the %s component—not supported.', 'wordpoints-importer' ), $component_data['name'] ) );
-			return;
-		}
-
-		$settings = array();
-
-		if ( isset( $options['_data'] ) ) {
-			$settings = $options['_data'];
-			unset( $options['_data'] );
-		}
-
-		if ( empty( $options ) || ! $this->validate_import_settings( $component, $settings ) ) {
-			return;
-		}
-
-		// translators: Component name.
-		$this->feedback->info( sprintf( __( 'Importing data to the %s component…', 'wordpoints-importer' ), $component_data['name'] ) );
-
-		foreach ( $options as $option => $unused ) {
-			$this->do_import_for_option( $option, $component, $settings );
-		}
-	}
-
-	/**
-	 * Run the import for an option.
-	 *
-	 * The import is split up into different options which the user can select (these
-	 * are displayed to the user as checkboxes in the form). This handles the import
-	 * for each of the individual things the user has selected to import. These are
-	 * all optional, so each is just termed an import "option" here.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $option    An import option that has been selected.
-	 * @param string $component The component this option is for.
-	 * @param array  $settings  Other settings for this component.
-	 */
-	protected function do_import_for_option( $option, $component, $settings ) {
-
-		if ( ! isset( $this->components[ $component ][ $option ] ) ) {
-			// translators: Option name.
-			$this->feedback->warning( sprintf( __( 'Skipping unrecognized import option “%s”…', 'wordpoints-importer' ), $option ) );
-			return;
-		}
-
-		$option_data = $this->components[ $component ][ $option ];
-
-		// Check if we can actually run this option.
-		if ( isset( $option_data['can_import'] ) ) {
-
-			$cant_import = call_user_func( $option_data['can_import'], $settings );
-
-			if ( is_wp_error( $cant_import ) ) {
-				// translators: 1. Option name; 2. Reason the import was skipped.
-				$this->feedback->warning( sprintf( __( 'Skipping importing %1$s. Reason: %2$s', 'wordpoints-importer' ), $option_data['label'], $cant_import->get_error_message() ) );
-				return;
-			}
-		}
-
-		// OK, we can run the import method for this option.
-		call_user_func( $option_data['function'], $settings );
-	}
+    /**
+     * The name of the importer.
+     *
+     * @since 1.0.0
+     *
+     * @type string $name
+     */
+    protected $name;
+
+    /**
+     * The components supported by this importer.
+     *
+     * The keys are the component slugs, the values arrays of options for importing
+     * to that component.
+     *
+     * @since 1.0.0
+     *
+     * @type array[] $components
+     */
+    protected $components = array();
+
+    /**
+     * The feedback provider object.
+     *
+     * This is only set by self::do_import().
+     *
+     * @since 1.0.0
+     *
+     * @type WordPoints_Importer_Feedback $feedback
+     */
+    protected $feedback;
+
+    /**
+     * Check if this importer is available.
+     *
+     * @since 1.0.0
+     *
+     * @return true|WP_Error A WP_Error if the importer is not available.
+     */
+    abstract public function is_available();
+
+    /**
+     * Construct the importer.
+     *
+     * @since 1.0.0
+     *
+     * @param string $name The name of the importer.
+     */
+    public function __construct( $name ) {
+
+        $this->name = $name;
+    }
+
+    /**
+     * Check if this importer supports a specific component.
+     *
+     * @since 1.0.0
+     *
+     * @param string $component The slug of a component.
+     *
+     * @return bool True if the component is supported, otherwise false.
+     */
+    public function supports_component( $component ) {
+
+        return isset( $this->components[ $component ] );
+    }
+
+    /**
+     * Get the import options for a component.
+     *
+     * @since 1.0.0
+     *
+     * @param string $component The slug of a component.
+     *
+     * @return array[] The options for this component.
+     */
+    public function get_options_for_component( $component ) {
+
+        if ( ! $this->supports_component( $component ) ) {
+            return array();
+        }
+
+        return $this->components[ $component ];
+    }
+
+    /**
+     * Run the import.
+     *
+     * @since 1.0.0
+     *
+     * @param array                        $args     The settings for the import.
+     * @param WordPoints_Importer_Feedback $feedback The feedback object.
+     */
+    public function do_import( array $args, $feedback = null ) {
+
+        if ( ! ( $feedback instanceof WordPoints_Importer_Feedback ) ) {
+            $feedback = new WordPoints_Importer_Feedback();
+        }
+
+        $this->feedback = $feedback;
+
+        // translators: Plugin name.
+        $this->feedback->info( sprintf( __( 'Importing from %s…', 'wordpoints-importer' ), $this->name ) );
+
+        $this->no_interruptions();
+
+        foreach ( $args as $component => $options ) {
+            $this->do_import_for_component( $component, $options );
+        }
+
+        $this->feedback->info( __( 'Import complete.', 'wordpoints-importer' ) );
+    }
+
+    /**
+     * Prevent any interruptions from occurring during the import.
+     *
+     * @since 1.2.1
+     */
+    protected function no_interruptions() {
+
+        wordpoints_prevent_interruptions();
+    }
+
+    /**
+     * Validate the import settings for a component.
+     *
+     * @since 1.0.0
+     *
+     * @param string $component The slug of the component.
+     * @param array  $settings  The settings supplied for this component.
+     *
+     * @return bool Whether the settings are valid.
+     */
+    protected function validate_import_settings( $component, $settings ) {
+
+        /**
+         * Filter whether the settings are valid before importing.
+         *
+         * @since 1.0.0
+         *
+         * @param bool  $valid    Whether the settings are valid.
+         * @param array $settings The settings for this component.
+         * @param WordPoints_Importer_Feedback $feedback The feedback object.
+         */
+        return apply_filters( "wordpoints_import_settings_valid-{$component}", true, $settings, $this->feedback );
+    }
+
+    /**
+     * Run the import for a component.
+     *
+     * @since 1.0.0
+     *
+     * @param string $component The component to run the import for.
+     * @param array  $options   The selected options of what to import.
+     */
+    protected function do_import_for_component( $component, $options ) {
+
+        $component_data = WordPoints_Components::instance()->get_component(
+            $component
+        );
+
+        if ( false === $component_data ) {
+            // translators: Component name.
+            $this->feedback->warning( sprintf( __( 'Skipping %s component—not installed.', 'wordpoints-importer' ), esc_html( $component ) ) );
+            return;
+        }
+
+        if ( true !== $this->supports_component( $component ) ) {
+            // translators: Component name.
+            $this->feedback->warning( sprintf( __( 'Skipping the %s component—not supported.', 'wordpoints-importer' ), $component_data['name'] ) );
+            return;
+        }
+
+        $settings = array();
+
+        if ( isset( $options['_data'] ) ) {
+            $settings = $options['_data'];
+            unset( $options['_data'] );
+        }
+
+        if ( empty( $options ) || ! $this->validate_import_settings( $component, $settings ) ) {
+            return;
+        }
+
+        // translators: Component name.
+        $this->feedback->info( sprintf( __( 'Importing data to the %s component…', 'wordpoints-importer' ), $component_data['name'] ) );
+
+        foreach ( $options as $option => $unused ) {
+            $this->do_import_for_option( $option, $component, $settings );
+        }
+    }
+
+    /**
+     * Run the import for an option.
+     *
+     * The import is split up into different options which the user can select (these
+     * are displayed to the user as checkboxes in the form). This handles the import
+     * for each of the individual things the user has selected to import. These are
+     * all optional, so each is just termed an import "option" here.
+     *
+     * @since 1.0.0
+     *
+     * @param string $option    An import option that has been selected.
+     * @param string $component The component this option is for.
+     * @param array  $settings  Other settings for this component.
+     */
+    protected function do_import_for_option( $option, $component, $settings ) {
+
+        if ( ! isset( $this->components[ $component ][ $option ] ) ) {
+            // translators: Option name.
+            $this->feedback->warning( sprintf( __( 'Skipping unrecognized import option “%s”…', 'wordpoints-importer' ), $option ) );
+            return;
+        }
+
+        $option_data = $this->components[ $component ][ $option ];
+
+        // Check if we can actually run this option.
+        if ( isset( $option_data['can_import'] ) ) {
+
+            $cant_import = call_user_func( $option_data['can_import'], $settings );
+
+            if ( is_wp_error( $cant_import ) ) {
+                // translators: 1. Option name; 2. Reason the import was skipped.
+                $this->feedback->warning( sprintf( __( 'Skipping importing %1$s. Reason: %2$s', 'wordpoints-importer' ), $option_data['label'], $cant_import->get_error_message() ) );
+                return;
+            }
+        }
+
+        // OK, we can run the import method for this option.
+        call_user_func( $option_data['function'], $settings );
+    }
 }
 
 // EOF

Spacing +34 added lines, -34 removed lines

@@ -62,7 +62,7 @@ 
 	 *
 	 * @param string $name The name of the importer.
 	 */
-	public function __construct( $name ) {
+	public function __construct($name) {
 
 		$this->name = $name;
 	}
@@ -76,9 +76,9 @@ 
 	 *
 	 * @return bool True if the component is supported, otherwise false.
 	 */
-	public function supports_component( $component ) {
+	public function supports_component($component) {
 
-		return isset( $this->components[ $component ] );
+		return isset($this->components[$component]);
 	}
 
 	/**
@@ -90,13 +90,13 @@ 
 	 *
 	 * @return array[] The options for this component.
 	 */
-	public function get_options_for_component( $component ) {
+	public function get_options_for_component($component) {
 
-		if ( ! $this->supports_component( $component ) ) {
+		if (!$this->supports_component($component)) {
 			return array();
 		}
 
-		return $this->components[ $component ];
+		return $this->components[$component];
 	}
 
 	/**
@@ -107,24 +107,24 @@ 
 	 * @param array                        $args     The settings for the import.
 	 * @param WordPoints_Importer_Feedback $feedback The feedback object.
 	 */
-	public function do_import( array $args, $feedback = null ) {
+	public function do_import(array $args, $feedback = null) {
 
-		if ( ! ( $feedback instanceof WordPoints_Importer_Feedback ) ) {
+		if (!($feedback instanceof WordPoints_Importer_Feedback)) {
 			$feedback = new WordPoints_Importer_Feedback();
 		}
 
 		$this->feedback = $feedback;
 
 		// translators: Plugin name.
-		$this->feedback->info( sprintf( __( 'Importing from %s…', 'wordpoints-importer' ), $this->name ) );
+		$this->feedback->info(sprintf(__('Importing from %s…', 'wordpoints-importer'), $this->name));
 
 		$this->no_interruptions();
 
-		foreach ( $args as $component => $options ) {
-			$this->do_import_for_component( $component, $options );
+		foreach ($args as $component => $options) {
+			$this->do_import_for_component($component, $options);
 		}
 
-		$this->feedback->info( __( 'Import complete.', 'wordpoints-importer' ) );
+		$this->feedback->info(__('Import complete.', 'wordpoints-importer'));
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	 *
 	 * @return bool Whether the settings are valid.
 	 */
-	protected function validate_import_settings( $component, $settings ) {
+	protected function validate_import_settings($component, $settings) {
 
 		/**
 		 * Filter whether the settings are valid before importing.
@@ -158,7 +158,7 @@ 
 		 * @param array $settings The settings for this component.
 		 * @param WordPoints_Importer_Feedback $feedback The feedback object.
 		 */
-		return apply_filters( "wordpoints_import_settings_valid-{$component}", true, $settings, $this->feedback );
+		return apply_filters("wordpoints_import_settings_valid-{$component}", true, $settings, $this->feedback);
 	}
 
 	/**
@@ -169,40 +169,40 @@ 
 	 * @param string $component The component to run the import for.
 	 * @param array  $options   The selected options of what to import.
 	 */
-	protected function do_import_for_component( $component, $options ) {
+	protected function do_import_for_component($component, $options) {
 
 		$component_data = WordPoints_Components::instance()->get_component(
 			$component
 		);
 
-		if ( false === $component_data ) {
+		if (false === $component_data) {
 			// translators: Component name.
-			$this->feedback->warning( sprintf( __( 'Skipping %s component—not installed.', 'wordpoints-importer' ), esc_html( $component ) ) );
+			$this->feedback->warning(sprintf(__('Skipping %s component—not installed.', 'wordpoints-importer'), esc_html($component)));
 			return;
 		}
 
-		if ( true !== $this->supports_component( $component ) ) {
+		if (true !== $this->supports_component($component)) {
 			// translators: Component name.
-			$this->feedback->warning( sprintf( __( 'Skipping the %s component—not supported.', 'wordpoints-importer' ), $component_data['name'] ) );
+			$this->feedback->warning(sprintf(__('Skipping the %s component—not supported.', 'wordpoints-importer'), $component_data['name']));
 			return;
 		}
 
 		$settings = array();
 
-		if ( isset( $options['_data'] ) ) {
+		if (isset($options['_data'])) {
 			$settings = $options['_data'];
-			unset( $options['_data'] );
+			unset($options['_data']);
 		}
 
-		if ( empty( $options ) || ! $this->validate_import_settings( $component, $settings ) ) {
+		if (empty($options) || !$this->validate_import_settings($component, $settings)) {
 			return;
 		}
 
 		// translators: Component name.
-		$this->feedback->info( sprintf( __( 'Importing data to the %s component…', 'wordpoints-importer' ), $component_data['name'] ) );
+		$this->feedback->info(sprintf(__('Importing data to the %s component…', 'wordpoints-importer'), $component_data['name']));
 
-		foreach ( $options as $option => $unused ) {
-			$this->do_import_for_option( $option, $component, $settings );
+		foreach ($options as $option => $unused) {
+			$this->do_import_for_option($option, $component, $settings);
 		}
 	}
 
@@ -220,30 +220,30 @@ 
 	 * @param string $component The component this option is for.
 	 * @param array  $settings  Other settings for this component.
 	 */
-	protected function do_import_for_option( $option, $component, $settings ) {
+	protected function do_import_for_option($option, $component, $settings) {
 
-		if ( ! isset( $this->components[ $component ][ $option ] ) ) {
+		if (!isset($this->components[$component][$option])) {
 			// translators: Option name.
-			$this->feedback->warning( sprintf( __( 'Skipping unrecognized import option “%s”…', 'wordpoints-importer' ), $option ) );
+			$this->feedback->warning(sprintf(__('Skipping unrecognized import option “%s”…', 'wordpoints-importer'), $option));
 			return;
 		}
 
-		$option_data = $this->components[ $component ][ $option ];
+		$option_data = $this->components[$component][$option];
 
 		// Check if we can actually run this option.
-		if ( isset( $option_data['can_import'] ) ) {
+		if (isset($option_data['can_import'])) {
 
-			$cant_import = call_user_func( $option_data['can_import'], $settings );
+			$cant_import = call_user_func($option_data['can_import'], $settings);
 
-			if ( is_wp_error( $cant_import ) ) {
+			if (is_wp_error($cant_import)) {
 				// translators: 1. Option name; 2. Reason the import was skipped.
-				$this->feedback->warning( sprintf( __( 'Skipping importing %1$s. Reason: %2$s', 'wordpoints-importer' ), $option_data['label'], $cant_import->get_error_message() ) );
+				$this->feedback->warning(sprintf(__('Skipping importing %1$s. Reason: %2$s', 'wordpoints-importer'), $option_data['label'], $cant_import->get_error_message()));
 				return;
 			}
 		}
 
 		// OK, we can run the import method for this option.
-		call_user_func( $option_data['function'], $settings );
+		call_user_func($option_data['function'], $settings);
 	}
 }
 

src/includes/class-feedback.php

Indentation +66 added lines, -66 removed lines

@@ -16,84 +16,84 @@
  */
 class WordPoints_Importer_Feedback {
 
-	/**
-	 * Send an info message.
-	 *
-	 * Use this to give the user any info that wouldn't be handles by the other
-	 * methods.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $message The info message.
-	 */
-	public function info( $message ) {
-		$this->_send( $message, 'info' );
-	}
+    /**
+     * Send an info message.
+     *
+     * Use this to give the user any info that wouldn't be handles by the other
+     * methods.
+     *
+     * @since 1.0.0
+     *
+     * @param string $message The info message.
+     */
+    public function info( $message ) {
+        $this->_send( $message, 'info' );
+    }
 
-	/**
-	 * Send a success message.
-	 *
-	 * Use this when you want to let the user know that something was a success.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $message The success message.
-	 */
-	public function success( $message ) {
-		$this->_send( $message, 'success' );
-	}
+    /**
+     * Send a success message.
+     *
+     * Use this when you want to let the user know that something was a success.
+     *
+     * @since 1.0.0
+     *
+     * @param string $message The success message.
+     */
+    public function success( $message ) {
+        $this->_send( $message, 'success' );
+    }
 
-	/**
-	 * Send an error message.
-	 *
-	 * Use this when you want to let the user know that there was an error.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $message The error message.
-	 */
-	public function error( $message ) {
-		$this->_send( $message, 'error' );
-	}
+    /**
+     * Send an error message.
+     *
+     * Use this when you want to let the user know that there was an error.
+     *
+     * @since 1.0.0
+     *
+     * @param string $message The error message.
+     */
+    public function error( $message ) {
+        $this->_send( $message, 'error' );
+    }
 
-	/**
-	 * Send a warning message.
-	 *
-	 * Use this to warn the user about something. A warning doesn't necessarily imply
-	 * an error, but that something unexpected has occured that the user might need
-	 * to know.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $message The warning message.
-	 */
-	public function warning( $message ) {
-		$this->_send( $message, 'warning' );
-	}
+    /**
+     * Send a warning message.
+     *
+     * Use this to warn the user about something. A warning doesn't necessarily imply
+     * an error, but that something unexpected has occured that the user might need
+     * to know.
+     *
+     * @since 1.0.0
+     *
+     * @param string $message The warning message.
+     */
+    public function warning( $message ) {
+        $this->_send( $message, 'warning' );
+    }
 
-	//
-	// Protected Methods.
-	//
+    //
+    // Protected Methods.
+    //
 
-	/**
-	 * Send a message to the user.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $message The feedback message.
-	 * @param string $type    The type of message: 'info' (defuault), 'sucess',
-	 *                        'error', 'warning'.
-	 */
-	protected function _send( $message, $type = 'info' ) { // @codingStandardsIgnoreLine
+    /**
+     * Send a message to the user.
+     *
+     * @since 1.0.0
+     *
+     * @param string $message The feedback message.
+     * @param string $type    The type of message: 'info' (defuault), 'sucess',
+     *                        'error', 'warning'.
+     */
+    protected function _send( $message, $type = 'info' ) { // @codingStandardsIgnoreLine
 
-		?>
+        ?>
 
 		<p class="wordpoints-feedback wordpoints-feedback-<?php echo esc_attr( $type ); ?>">
 			<?php echo wp_kses( $message, 'wordpoints_importer_feedback' ); ?>
 		</p>
 
 		<?php
-	}
+    }
 }
 
 // EOF

Spacing +11 added lines, -11 removed lines

@@ -26,8 +26,8 @@ 
 	 *
 	 * @param string $message The info message.
 	 */
-	public function info( $message ) {
-		$this->_send( $message, 'info' );
+	public function info($message) {
+		$this->_send($message, 'info');
 	}
 
 	/**
@@ -39,8 +39,8 @@ 
 	 *
 	 * @param string $message The success message.
 	 */
-	public function success( $message ) {
-		$this->_send( $message, 'success' );
+	public function success($message) {
+		$this->_send($message, 'success');
 	}
 
 	/**
@@ -52,8 +52,8 @@ 
 	 *
 	 * @param string $message The error message.
 	 */
-	public function error( $message ) {
-		$this->_send( $message, 'error' );
+	public function error($message) {
+		$this->_send($message, 'error');
 	}
 
 	/**
@@ -67,8 +67,8 @@ 
 	 *
 	 * @param string $message The warning message.
 	 */
-	public function warning( $message ) {
-		$this->_send( $message, 'warning' );
+	public function warning($message) {
+		$this->_send($message, 'warning');
 	}
 
 	//
@@ -84,12 +84,12 @@ 
 	 * @param string $type    The type of message: 'info' (defuault), 'sucess',
 	 *                        'error', 'warning'.
 	 */
-	protected function _send( $message, $type = 'info' ) { // @codingStandardsIgnoreLine
+	protected function _send($message, $type = 'info') { // @codingStandardsIgnoreLine
 
 		?>
 
-		<p class="wordpoints-feedback wordpoints-feedback-<?php echo esc_attr( $type ); ?>">
-			<?php echo wp_kses( $message, 'wordpoints_importer_feedback' ); ?>
+		<p class="wordpoints-feedback wordpoints-feedback-<?php echo esc_attr($type); ?>">
+			<?php echo wp_kses($message, 'wordpoints_importer_feedback'); ?>
 		</p>
 
 		<?php

src/includes/functions.php

Indentation +10 added lines, -10 removed lines

@@ -15,12 +15,12 @@ 
  */
 function wordpoints_importer_load_textdomain() {
 
-	_deprecated_function( __FUNCTION__, '1.3.0' );
+    _deprecated_function( __FUNCTION__, '1.3.0' );
 
-	wordpoints_load_module_textdomain(
-		'wordpoints-importer'
-		, wordpoints_module_basename( dirname( dirname( __FILE__ ) ) ) . '/languages'
-	);
+    wordpoints_load_module_textdomain(
+        'wordpoints-importer'
+        , wordpoints_module_basename( dirname( dirname( __FILE__ ) ) ) . '/languages'
+    );
 }
 
 /**
@@ -30,12 +30,12 @@ 
  */
 function wordpoints_importer_register_importers() {
 
-	$args = array(
-		'class' => 'WordPoints_CubePoints_Importer',
-		'name'  => __( 'CubePoints', 'wordpoints-importer' ),
-	);
+    $args = array(
+        'class' => 'WordPoints_CubePoints_Importer',
+        'name'  => __( 'CubePoints', 'wordpoints-importer' ),
+    );
 
-	WordPoints_Importers::register( 'cubepoints', $args );
+    WordPoints_Importers::register( 'cubepoints', $args );
 }
 add_action( 'wordpoints_register_importers', 'wordpoints_importer_register_importers' );
 

Spacing +5 added lines, -5 removed lines

@@ -15,11 +15,11 @@ 
  */
 function wordpoints_importer_load_textdomain() {
 
-	_deprecated_function( __FUNCTION__, '1.3.0' );
+	_deprecated_function(__FUNCTION__, '1.3.0');
 
 	wordpoints_load_module_textdomain(
 		'wordpoints-importer'
-		, wordpoints_module_basename( dirname( dirname( __FILE__ ) ) ) . '/languages'
+		, wordpoints_module_basename(dirname(dirname(__FILE__))).'/languages'
 	);
 }
 
@@ -32,11 +32,11 @@ 
 
 	$args = array(
 		'class' => 'WordPoints_CubePoints_Importer',
-		'name'  => __( 'CubePoints', 'wordpoints-importer' ),
+		'name'  => __('CubePoints', 'wordpoints-importer'),
 	);
 
-	WordPoints_Importers::register( 'cubepoints', $args );
+	WordPoints_Importers::register('cubepoints', $args);
 }
-add_action( 'wordpoints_register_importers', 'wordpoints_importer_register_importers' );
+add_action('wordpoints_register_importers', 'wordpoints_importer_register_importers');
 
 // EOF

src/includes/importers/cubepoints.php

Indentation +673 added lines, -673 removed lines

@@ -14,707 +14,707 @@
  */
 class WordPoints_CubePoints_Importer extends WordPoints_Importer {
 
-	/**
-	 * Reversible log types indexed by the reversing log type.
-	 *
-	 * This information is used to set the `auto_reversed` and `original_log_id`
-	 * points log metadata for the imported logs.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @see WordPoints_CubePoints_Importer::import_points_log()
-	 *
-	 * @var array
-	 */
-	protected $reversible_log_types = array(
-		'comment_remove'      => 'comment',
-		'post_comment_remove' => 'post_comment',
-	);
-
-	/**
-	 * Primary entity slugs for each imported log type.
-	 *
-	 * These are points log meta keys under which to save the entity ID in the
-	 * CubePoints `data` log field.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @see WordPoints_CubePoints_Importer::import_points_log()
-	 *
-	 * @var array
-	 */
-	protected $log_type_entities = array(
-		'comment'             => 'comment',
-		'comment_remove'      => 'comment',
-		'post'                => 'post',
-		'post_comment'        => 'comment',
-		'post_comment_remove' => 'comment',
-		'register'            => 'user',
-	);
-
-	/**
-	 * IDs of reversible logs, indexed by CubePoints log type and object ID.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @see WordPoints_CubePoints_Importer::import_points_log()
-	 *
-	 * @var int[][]
-	 */
-	protected $reversible_log_ids;
-
-	/**
-	 * @since 1.0.0
-	 */
-	public function __construct( $name ) {
-
-		parent::__construct( $name );
-
-		$this->components = array(
-			'points' => array(
-				'excluded_users' => array(
-					'label' => __( 'Excluded users', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_excluded_users' ),
-				),
-				'settings'    => array(
-					'label' => __( 'Points Reactions', 'wordpoints-importer' ),
-					'description' => __( 'If checked, the settings for the number of points to award for posts, comments, etc. are imported.', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_points_settings' ),
-				),
-				'user_points' => array(
-					'label' => __( 'User points', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_user_points' ),
-				),
-				'logs' => array(
-					'label' => __( 'Points logs', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_points_logs' ),
-					'can_import' => array( $this, 'can_import_points_logs' ),
-				),
-			),
-			'ranks' => array(
-				'ranks' => array(
-					'label' => __( 'Rank settings', 'wordpoints-importer' ),
-					'description' => __( 'If checked, the list of ranks is imported, and users will have the correct ranks assigned to them.', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_ranks' ),
-				),
-			),
-		);
-	}
-
-	/**
-	 * @since 1.0.0
-	 */
-	public function is_available() {
-
-		if ( ! $this->is_cubepoints_installed() ) {
-			return new WP_Error(
-				'cubepoints_not_installed'
-				, __( 'CubePoints is not installed', 'wordpoints-importer' )
-			);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if CubePoints is installed.
-	 *
-	 * @since 1.0.0
-	 */
-	public function is_cubepoints_installed() {
-
-		return (bool) get_option( 'cp_db_version' );
-	}
-
-	/**
-	 * Check if CubePoints is active.
-	 *
-	 * @since 1.0.0
-	 */
-	public function is_cubepoints_active() {
-
-		return function_exists( 'cp_ready' );
-	}
-
-	/**
-	 * Import the excluded users.
-	 *
-	 * @since 1.0.0
-	 */
-	protected function import_excluded_users() {
-
-		$this->feedback->info( __( 'Importing excluded users…', 'wordpoints-importer' ) );
-
-		$excluded_users = get_option( 'cp_topfilter' );
-
-		if ( ! is_array( $excluded_users ) ) {
-			$this->feedback->warning( __( 'No excluded users found.', 'wordpoints-importer' ) );
-			return;
-		}
-
-		$user_ids = array();
-
-		foreach ( $excluded_users as $user_login ) {
-
-			$user = get_user_by( 'login', $user_login );
-
-			if ( $user instanceof WP_User ) {
-				$user_ids[] = $user->ID;
-			}
-		}
-
-		$excluded_user_ids = wordpoints_get_maybe_network_array_option(
-			'wordpoints_excluded_users'
-		);
-
-		$excluded_user_ids = array_unique(
-			array_merge( $excluded_user_ids, $user_ids )
-		);
-
-		wordpoints_update_maybe_network_option(
-			'wordpoints_excluded_users'
-			, $excluded_user_ids
-		);
-
-		$this->feedback->success(
-			sprintf(
-				// translators: Number of users.
-				__( 'Imported %s excluded users.', 'wordpoints-importer' )
-				, count( $user_ids )
-			)
-		);
-	}
-
-	/**
-	 * Import the points settings to the points hooks.
-	 *
-	 * @since 1.1.0
-	 *
-	 * @param array $settings The settings for the points component import.
-	 */
-	protected function import_points_settings( $settings ) {
-
-		$this->feedback->info( __( 'Importing points reactions…', 'wordpoints-importer' ) );
-
-		$options = array(
-			'cp_comment_points'     => array(
-				'event' => 'comment_leave\post',
-				'target' => array( 'comment\post', 'author', 'user' ),
-				/* translators: The post type name */
-				'log_text' => __( 'Comment on a %s.', 'wordpoints-importer' ),
-				/* translators: The post type name */
-				'description' => __( 'Commenting on a %s.', 'wordpoints-importer' ),
-				'legacy_log_type' => 'cubepoints-comment',
-				'legacy_meta_key' => 'comment',
-			),
-			'cp_post_points'        => array(
-				'event' => 'post_publish\post',
-				'target' => array( 'post\post', 'author', 'user' ),
-				/* translators: The post type name */
-				'log_text' => __( 'Published a Post.', 'wordpoints-importer' ),
-				/* translators: The post type name */
-				'description' => __( 'Publishing a Post.', 'wordpoints-importer' ),
-				'legacy_log_type' => 'cubepoints-post',
-				'legacy_meta_key' => 'post',
-				// CubePoints doesn't remove points when a post is deleted.
-				'blocker' => array( 'toggle_off' => true ),
-				'points_legacy_repeat_blocker' => array( 'toggle_on' => true ),
-			),
-			'cp_reg_points'         => array(
-				'event' => 'user_register',
-				'log_text' => __( 'Registration.', 'wordpoints-importer' ),
-				'description' => __( 'Registration.', 'wordpoints-importer' ),
-				'legacy_log_type' => 'cubepoints-register',
-			),
-			'cp_post_author_points' => array(
-				'event' => 'comment_leave\post',
-				'target' => array( 'comment\post', 'post\post', 'post\post', 'author', 'user' ),
-				/* translators: The post type name */
-				'log_text' => __( 'Received a comment on a %s.', 'wordpoints-importer' ),
-				/* translators: The post type name */
-				'description' => __( 'Receiving a comment on a %s.', 'wordpoints-importer' ),
-				'legacy_log_type' => 'cubepoints-post_author',
-				'legacy_meta_key' => 'comment',
-			),
-		);
-
-		// Don't import this module setting if the module isn't active.
-		if ( function_exists( 'cp_module_activated' ) && ! cp_module_activated( 'post_author_points' ) ) {
-			unset( $options['cp_post_author_points'] );
-		}
-
-		$imported = 0;
-
-		foreach ( $options as $option => $hook_settings ) {
-
-			$points = get_option( $option );
-
-			if ( wordpoints_posint( $points ) ) {
-
-				$hook_settings['points'] = $points;
-				$hook_settings['points_type'] = $settings['points_type'];
-
-				if (
-					// The CubePoints post points were only awarded for Posts.
-					'post_publish\post' !== $hook_settings['event']
-					&& strpos( $hook_settings['event'], '\post' )
-				) {
-
-					$post_type_slugs = get_post_types( array( 'public' => true ) );
-
-					foreach ( $post_type_slugs as $post_type_slug ) {
-
-						$added = $this->add_points_hook(
-							$this->format_settings_for_post_type(
-								$post_type_slug
-								, $hook_settings
-							)
-						);
-
-						if ( $added ) {
-							$imported++;
-						}
-					}
-
-				} else {
-					if ( $this->add_points_hook( $hook_settings ) ) {
-						$imported++;
-					}
-				}
-			}
-
-		} // End foreach ( $options ).
-
-		if ( $this->import_daily_points_hook( $settings ) ) {
-			$imported++;
-		}
-
-		$this->feedback->success(
-			// translators: Number of reactions.
-			sprintf( __( 'Imported %s points reactions.', 'wordpoints-importer' ), $imported )
-		);
-	}
-
-	/**
-	 * Import the settings for the Daily Points module to a points hook.
-	 *
-	 * @since 1.1.0
-	 *
-	 * @param array $settings The settings for the points component import.
-	 *
-	 * @return bool True if the settings were imported, false otherwise.
-	 */
-	protected function import_daily_points_hook( $settings ) {
-
-		// Don't import this module setting if the module isn't active.
-		if ( function_exists( 'cp_module_activated' ) && ! cp_module_activated( 'dailypoints' ) ) {
-			return false;
-		}
-
-		$points = get_option( 'cp_module_dailypoints_points' );
-		$period = get_option( 'cp_module_dailypoints_time' );
-
-		if ( ! wordpoints_int( $points ) || ! wordpoints_posint( $period ) ) {
-			return false;
-		}
-
-		return $this->add_points_hook(
-			array(
-				'event' => 'user_visit',
-				'target' => array( 'current:user' ),
-				'reactor' => 'points_legacy',
-				'points' => $points,
-				'points_type' => $settings['points_type'],
-				'points_legacy_periods' => array(
-					'fire' => array(
-						array(
-							'length' => $period,
-							'args' => array( array( 'current:user' ) ),
-							'relative' => true,
-						),
-					),
-				),
-				'log_text' => __( 'Visiting the site.', 'wordpoints-importer' ),
-				'description' => __( 'Visiting the site.', 'wordpoints-importer' ),
-				'points_legacy_reversals' => array(),
-				'legacy_log_type' => 'cubepoints-dailypoints',
-			)
-		);
-	}
-
-	/**
-	 * Programmatically create a new instance of a points hook.
-	 *
-	 * @since 1.0.0
-	 * @since 1.2.0 Now just accepts a single argument, $settings.
-	 *
-	 * @param array $settings The settings for this hook.
-	 *
-	 * @return bool True if added successfully, or false on failure.
-	 */
-	private function add_points_hook( $settings = array() ) {
-
-		$reaction_store = wordpoints_hooks()->get_reaction_store( 'points' );
-
-		$settings = array_merge(
-			array(
-				'target' => array( 'user' ),
-				'reactor' => 'points_legacy',
-				'points_legacy_reversals' => array( 'toggle_off' => 'toggle_on' ),
-			)
-			, $settings
-		);
-
-		$reaction = $reaction_store->create_reaction( $settings );
-
-		if ( ! $reaction instanceof WordPoints_Hook_ReactionI ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Format the settings for a reaction for a particular post type.
-	 *
-	 * @since 1.2.0
-	 *
-	 * @param string $post_type The slug of the post type to format the settings for.
-	 * @param array  $settings  The reaction settings.
-	 *
-	 * @return array The settings modified for this particular post type.
-	 */
-	protected function format_settings_for_post_type( $post_type, $settings ) {
-
-		$settings['event'] = str_replace(
-			'\post'
-			, '\\' . $post_type
-			, $settings['event']
-		);
-
-		$settings['target'] = str_replace(
-			'\post'
-			, '\\' . $post_type
-			, $settings['target']
-		);
-
-		$labels = get_post_type_labels( get_post_type_object( $post_type ) );
-
-		$settings['log_text'] = sprintf( $settings['log_text'], $labels->singular_name );
-		$settings['description'] = sprintf( $settings['description'], $labels->singular_name );
-
-		return $settings;
-	}
-
-	/**
-	 * Import the user points.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param array $settings The settings for the points component import.
-	 */
-	protected function import_user_points( $settings ) {
-
-		$this->feedback->info( __( 'Importing users' points…', 'wordpoints-importer' ) );
-
-		// We don't log the import transactions.
-		add_filter( 'wordpoints_points_log', '__return_false' );
-
-		$start = 0;
-		$rows  = $this->get_next_user_points_batch( $start );
-
-		// We do the import in batches.
-		while ( $rows ) {
-
-			foreach ( $rows as $row ) {
-
-				wordpoints_alter_points(
-					$row->user_id
-					, $row->points
-					, $settings['points_type']
-					, 'cubepoints_import' // This is only for the hooks, it isn't being logged.
-				);
-			}
-
-			$start += count( $rows );
-			$rows   = $this->get_next_user_points_batch( $start );
-		}
-
-		remove_filter( 'wordpoints_points_log', '__return_false' );
-
-		// translators: Number of users.
-		$this->feedback->success( sprintf( __( 'Imported points for %s users…', 'wordpoints-importer' ), $start ) );
-	}
-
-	/**
-	 * Get a batch of user points to import.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param int $start The offset number to begin counting at.
-	 *
-	 * @return object[]|false The rows, or false.
-	 */
-	protected function get_next_user_points_batch( $start ) {
-
-		global $wpdb;
-
-		$rows = $wpdb->get_results(
-			$wpdb->prepare(
-				"
+    /**
+     * Reversible log types indexed by the reversing log type.
+     *
+     * This information is used to set the `auto_reversed` and `original_log_id`
+     * points log metadata for the imported logs.
+     *
+     * @since 1.2.0
+     *
+     * @see WordPoints_CubePoints_Importer::import_points_log()
+     *
+     * @var array
+     */
+    protected $reversible_log_types = array(
+        'comment_remove'      => 'comment',
+        'post_comment_remove' => 'post_comment',
+    );
+
+    /**
+     * Primary entity slugs for each imported log type.
+     *
+     * These are points log meta keys under which to save the entity ID in the
+     * CubePoints `data` log field.
+     *
+     * @since 1.2.0
+     *
+     * @see WordPoints_CubePoints_Importer::import_points_log()
+     *
+     * @var array
+     */
+    protected $log_type_entities = array(
+        'comment'             => 'comment',
+        'comment_remove'      => 'comment',
+        'post'                => 'post',
+        'post_comment'        => 'comment',
+        'post_comment_remove' => 'comment',
+        'register'            => 'user',
+    );
+
+    /**
+     * IDs of reversible logs, indexed by CubePoints log type and object ID.
+     *
+     * @since 1.2.0
+     *
+     * @see WordPoints_CubePoints_Importer::import_points_log()
+     *
+     * @var int[][]
+     */
+    protected $reversible_log_ids;
+
+    /**
+     * @since 1.0.0
+     */
+    public function __construct( $name ) {
+
+        parent::__construct( $name );
+
+        $this->components = array(
+            'points' => array(
+                'excluded_users' => array(
+                    'label' => __( 'Excluded users', 'wordpoints-importer' ),
+                    'function' => array( $this, 'import_excluded_users' ),
+                ),
+                'settings'    => array(
+                    'label' => __( 'Points Reactions', 'wordpoints-importer' ),
+                    'description' => __( 'If checked, the settings for the number of points to award for posts, comments, etc. are imported.', 'wordpoints-importer' ),
+                    'function' => array( $this, 'import_points_settings' ),
+                ),
+                'user_points' => array(
+                    'label' => __( 'User points', 'wordpoints-importer' ),
+                    'function' => array( $this, 'import_user_points' ),
+                ),
+                'logs' => array(
+                    'label' => __( 'Points logs', 'wordpoints-importer' ),
+                    'function' => array( $this, 'import_points_logs' ),
+                    'can_import' => array( $this, 'can_import_points_logs' ),
+                ),
+            ),
+            'ranks' => array(
+                'ranks' => array(
+                    'label' => __( 'Rank settings', 'wordpoints-importer' ),
+                    'description' => __( 'If checked, the list of ranks is imported, and users will have the correct ranks assigned to them.', 'wordpoints-importer' ),
+                    'function' => array( $this, 'import_ranks' ),
+                ),
+            ),
+        );
+    }
+
+    /**
+     * @since 1.0.0
+     */
+    public function is_available() {
+
+        if ( ! $this->is_cubepoints_installed() ) {
+            return new WP_Error(
+                'cubepoints_not_installed'
+                , __( 'CubePoints is not installed', 'wordpoints-importer' )
+            );
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if CubePoints is installed.
+     *
+     * @since 1.0.0
+     */
+    public function is_cubepoints_installed() {
+
+        return (bool) get_option( 'cp_db_version' );
+    }
+
+    /**
+     * Check if CubePoints is active.
+     *
+     * @since 1.0.0
+     */
+    public function is_cubepoints_active() {
+
+        return function_exists( 'cp_ready' );
+    }
+
+    /**
+     * Import the excluded users.
+     *
+     * @since 1.0.0
+     */
+    protected function import_excluded_users() {
+
+        $this->feedback->info( __( 'Importing excluded users…', 'wordpoints-importer' ) );
+
+        $excluded_users = get_option( 'cp_topfilter' );
+
+        if ( ! is_array( $excluded_users ) ) {
+            $this->feedback->warning( __( 'No excluded users found.', 'wordpoints-importer' ) );
+            return;
+        }
+
+        $user_ids = array();
+
+        foreach ( $excluded_users as $user_login ) {
+
+            $user = get_user_by( 'login', $user_login );
+
+            if ( $user instanceof WP_User ) {
+                $user_ids[] = $user->ID;
+            }
+        }
+
+        $excluded_user_ids = wordpoints_get_maybe_network_array_option(
+            'wordpoints_excluded_users'
+        );
+
+        $excluded_user_ids = array_unique(
+            array_merge( $excluded_user_ids, $user_ids )
+        );
+
+        wordpoints_update_maybe_network_option(
+            'wordpoints_excluded_users'
+            , $excluded_user_ids
+        );
+
+        $this->feedback->success(
+            sprintf(
+                // translators: Number of users.
+                __( 'Imported %s excluded users.', 'wordpoints-importer' )
+                , count( $user_ids )
+            )
+        );
+    }
+
+    /**
+     * Import the points settings to the points hooks.
+     *
+     * @since 1.1.0
+     *
+     * @param array $settings The settings for the points component import.
+     */
+    protected function import_points_settings( $settings ) {
+
+        $this->feedback->info( __( 'Importing points reactions…', 'wordpoints-importer' ) );
+
+        $options = array(
+            'cp_comment_points'     => array(
+                'event' => 'comment_leave\post',
+                'target' => array( 'comment\post', 'author', 'user' ),
+                /* translators: The post type name */
+                'log_text' => __( 'Comment on a %s.', 'wordpoints-importer' ),
+                /* translators: The post type name */
+                'description' => __( 'Commenting on a %s.', 'wordpoints-importer' ),
+                'legacy_log_type' => 'cubepoints-comment',
+                'legacy_meta_key' => 'comment',
+            ),
+            'cp_post_points'        => array(
+                'event' => 'post_publish\post',
+                'target' => array( 'post\post', 'author', 'user' ),
+                /* translators: The post type name */
+                'log_text' => __( 'Published a Post.', 'wordpoints-importer' ),
+                /* translators: The post type name */
+                'description' => __( 'Publishing a Post.', 'wordpoints-importer' ),
+                'legacy_log_type' => 'cubepoints-post',
+                'legacy_meta_key' => 'post',
+                // CubePoints doesn't remove points when a post is deleted.
+                'blocker' => array( 'toggle_off' => true ),
+                'points_legacy_repeat_blocker' => array( 'toggle_on' => true ),
+            ),
+            'cp_reg_points'         => array(
+                'event' => 'user_register',
+                'log_text' => __( 'Registration.', 'wordpoints-importer' ),
+                'description' => __( 'Registration.', 'wordpoints-importer' ),
+                'legacy_log_type' => 'cubepoints-register',
+            ),
+            'cp_post_author_points' => array(
+                'event' => 'comment_leave\post',
+                'target' => array( 'comment\post', 'post\post', 'post\post', 'author', 'user' ),
+                /* translators: The post type name */
+                'log_text' => __( 'Received a comment on a %s.', 'wordpoints-importer' ),
+                /* translators: The post type name */
+                'description' => __( 'Receiving a comment on a %s.', 'wordpoints-importer' ),
+                'legacy_log_type' => 'cubepoints-post_author',
+                'legacy_meta_key' => 'comment',
+            ),
+        );
+
+        // Don't import this module setting if the module isn't active.
+        if ( function_exists( 'cp_module_activated' ) && ! cp_module_activated( 'post_author_points' ) ) {
+            unset( $options['cp_post_author_points'] );
+        }
+
+        $imported = 0;
+
+        foreach ( $options as $option => $hook_settings ) {
+
+            $points = get_option( $option );
+
+            if ( wordpoints_posint( $points ) ) {
+
+                $hook_settings['points'] = $points;
+                $hook_settings['points_type'] = $settings['points_type'];
+
+                if (
+                    // The CubePoints post points were only awarded for Posts.
+                    'post_publish\post' !== $hook_settings['event']
+                    && strpos( $hook_settings['event'], '\post' )
+                ) {
+
+                    $post_type_slugs = get_post_types( array( 'public' => true ) );
+
+                    foreach ( $post_type_slugs as $post_type_slug ) {
+
+                        $added = $this->add_points_hook(
+                            $this->format_settings_for_post_type(
+                                $post_type_slug
+                                , $hook_settings
+                            )
+                        );
+
+                        if ( $added ) {
+                            $imported++;
+                        }
+                    }
+
+                } else {
+                    if ( $this->add_points_hook( $hook_settings ) ) {
+                        $imported++;
+                    }
+                }
+            }
+
+        } // End foreach ( $options ).
+
+        if ( $this->import_daily_points_hook( $settings ) ) {
+            $imported++;
+        }
+
+        $this->feedback->success(
+            // translators: Number of reactions.
+            sprintf( __( 'Imported %s points reactions.', 'wordpoints-importer' ), $imported )
+        );
+    }
+
+    /**
+     * Import the settings for the Daily Points module to a points hook.
+     *
+     * @since 1.1.0
+     *
+     * @param array $settings The settings for the points component import.
+     *
+     * @return bool True if the settings were imported, false otherwise.
+     */
+    protected function import_daily_points_hook( $settings ) {
+
+        // Don't import this module setting if the module isn't active.
+        if ( function_exists( 'cp_module_activated' ) && ! cp_module_activated( 'dailypoints' ) ) {
+            return false;
+        }
+
+        $points = get_option( 'cp_module_dailypoints_points' );
+        $period = get_option( 'cp_module_dailypoints_time' );
+
+        if ( ! wordpoints_int( $points ) || ! wordpoints_posint( $period ) ) {
+            return false;
+        }
+
+        return $this->add_points_hook(
+            array(
+                'event' => 'user_visit',
+                'target' => array( 'current:user' ),
+                'reactor' => 'points_legacy',
+                'points' => $points,
+                'points_type' => $settings['points_type'],
+                'points_legacy_periods' => array(
+                    'fire' => array(
+                        array(
+                            'length' => $period,
+                            'args' => array( array( 'current:user' ) ),
+                            'relative' => true,
+                        ),
+                    ),
+                ),
+                'log_text' => __( 'Visiting the site.', 'wordpoints-importer' ),
+                'description' => __( 'Visiting the site.', 'wordpoints-importer' ),
+                'points_legacy_reversals' => array(),
+                'legacy_log_type' => 'cubepoints-dailypoints',
+            )
+        );
+    }
+
+    /**
+     * Programmatically create a new instance of a points hook.
+     *
+     * @since 1.0.0
+     * @since 1.2.0 Now just accepts a single argument, $settings.
+     *
+     * @param array $settings The settings for this hook.
+     *
+     * @return bool True if added successfully, or false on failure.
+     */
+    private function add_points_hook( $settings = array() ) {
+
+        $reaction_store = wordpoints_hooks()->get_reaction_store( 'points' );
+
+        $settings = array_merge(
+            array(
+                'target' => array( 'user' ),
+                'reactor' => 'points_legacy',
+                'points_legacy_reversals' => array( 'toggle_off' => 'toggle_on' ),
+            )
+            , $settings
+        );
+
+        $reaction = $reaction_store->create_reaction( $settings );
+
+        if ( ! $reaction instanceof WordPoints_Hook_ReactionI ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Format the settings for a reaction for a particular post type.
+     *
+     * @since 1.2.0
+     *
+     * @param string $post_type The slug of the post type to format the settings for.
+     * @param array  $settings  The reaction settings.
+     *
+     * @return array The settings modified for this particular post type.
+     */
+    protected function format_settings_for_post_type( $post_type, $settings ) {
+
+        $settings['event'] = str_replace(
+            '\post'
+            , '\\' . $post_type
+            , $settings['event']
+        );
+
+        $settings['target'] = str_replace(
+            '\post'
+            , '\\' . $post_type
+            , $settings['target']
+        );
+
+        $labels = get_post_type_labels( get_post_type_object( $post_type ) );
+
+        $settings['log_text'] = sprintf( $settings['log_text'], $labels->singular_name );
+        $settings['description'] = sprintf( $settings['description'], $labels->singular_name );
+
+        return $settings;
+    }
+
+    /**
+     * Import the user points.
+     *
+     * @since 1.0.0
+     *
+     * @param array $settings The settings for the points component import.
+     */
+    protected function import_user_points( $settings ) {
+
+        $this->feedback->info( __( 'Importing users' points…', 'wordpoints-importer' ) );
+
+        // We don't log the import transactions.
+        add_filter( 'wordpoints_points_log', '__return_false' );
+
+        $start = 0;
+        $rows  = $this->get_next_user_points_batch( $start );
+
+        // We do the import in batches.
+        while ( $rows ) {
+
+            foreach ( $rows as $row ) {
+
+                wordpoints_alter_points(
+                    $row->user_id
+                    , $row->points
+                    , $settings['points_type']
+                    , 'cubepoints_import' // This is only for the hooks, it isn't being logged.
+                );
+            }
+
+            $start += count( $rows );
+            $rows   = $this->get_next_user_points_batch( $start );
+        }
+
+        remove_filter( 'wordpoints_points_log', '__return_false' );
+
+        // translators: Number of users.
+        $this->feedback->success( sprintf( __( 'Imported points for %s users…', 'wordpoints-importer' ), $start ) );
+    }
+
+    /**
+     * Get a batch of user points to import.
+     *
+     * @since 1.0.0
+     *
+     * @param int $start The offset number to begin counting at.
+     *
+     * @return object[]|false The rows, or false.
+     */
+    protected function get_next_user_points_batch( $start ) {
+
+        global $wpdb;
+
+        $rows = $wpdb->get_results(
+            $wpdb->prepare(
+                "
 					SELECT `user_id`, `meta_value` as points
 					FROM {$wpdb->usermeta}
 					WHERE `meta_key` = 'cpoints'
 					ORDER BY `umeta_id`
 					LIMIT %d,500
 				"
-				, $start
-			)
-		); // WPCS: cache OK.
-
-		if ( ! is_array( $rows ) ) {
-			return false;
-		}
-
-		return $rows;
-	}
-
-	/**
-	 * Check if the points logs can be imported.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return true|WP_Error True on success or a WP_Error on failure.
-	 */
-	public function can_import_points_logs() {
-
-		if ( ! $this->is_cubepoints_active() ) {
-
-			return new WP_Error(
-				'wordpoints_import_points_logs_cubepoints_inactive'
-				, __( 'CubePoints must be active.', 'wordpoints-importer' )
-			);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Import the points logs.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param array $settings The import settings for the points component.
-	 */
-	protected function import_points_logs( $settings ) {
-
-		$this->feedback->info( __( 'Importing points logs…', 'wordpoints-importer' ) );
-
-		$start = 0;
-		$logs  = $this->get_next_points_logs_batch( $start );
-
-		while ( $logs ) {
-
-			foreach ( $logs as $log ) {
-
-				$this->import_points_log(
-					$log->uid
-					, $log->points
-					, $settings['points_type']
-					, "cubepoints-{$log->type}"
-					, array(
-						'cubepoints_type' => $log->type,
-						'cubepoints_data' => $log->data,
-					)
-					, date( 'Y-m-d H:i:s', $log->timestamp )
-				);
-			}
-
-			$start += count( $logs );
-			$logs   = $this->get_next_points_logs_batch( $start );
-		}
-
-		// translators: Number of points logs.
-		$this->feedback->success( sprintf( __( 'Imported %s points log entries.', 'wordpoints-importer' ), $start ) );
-	}
-
-	/**
-	 * Import a points log.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param int    $user_id     The ID of the user the log is for.
-	 * @param int    $points      The number of points awarded.
-	 * @param string $points_type The points type.
-	 * @param string $log_type    The log type.
-	 * @param array  $meta        The metadata for this log.
-	 * @param int    $date        The date the transaction took place.
-	 */
-	protected function import_points_log( $user_id, $points, $points_type, $log_type, $meta, $date ) {
-
-		global $wpdb;
-
-		$result = $wpdb->insert(
-			$wpdb->wordpoints_points_logs,
-			array(
-				'user_id'     => $user_id,
-				'points'      => $points,
-				'points_type' => $points_type,
-				'log_type'    => $log_type,
-				'text'        => $this->render_points_log_text( '', $user_id, $points, $points_type, $log_type, $meta ),
-				'date'        => $date,
-				'site_id'     => $wpdb->siteid,
-				'blog_id'     => $wpdb->blogid,
-			),
-			array( '%d', '%d', '%s', '%s', '%s', '%s', '%d', '%d' )
-		);
-
-		if ( false !== $result ) {
-
-			$log_id = (int) $wpdb->insert_id;
-
-			// Set auto_reversed and original_log_id metadata for reversed logs.
-			foreach ( $this->reversible_log_types as $reverse_type => $type ) {
-
-				if ( $meta['cubepoints_type'] === $type ) {
-
-					// Save this log ID for later, in case this log was reversed.
-					// cubepoints_data will contain the entity ID.
-					$this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] = $log_id;
-
-				} elseif (
-					$meta['cubepoints_type'] === $reverse_type
-					&& isset( $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] )
-				) {
-
-					// This log was reverses another one. Set the original log ID.
-					$meta['original_log_id'] = $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ];
-
-					// And mark the original as auto_reversed.
-					wordpoints_add_points_log_meta( $meta['original_log_id'], 'auto_reversed', $log_id );
-
-					// No need to keep this info anymore.
-					unset( $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] );
-				}
-			}
-
-			// Set the entity IDs to their own meta keys, for the sake of reversals.
-			if ( isset( $this->log_type_entities[ $meta['cubepoints_type'] ] ) ) {
-				$meta[ $this->log_type_entities[ $meta['cubepoints_type'] ] ] = $meta['cubepoints_data'];
-			}
-
-			foreach ( $meta as $meta_key => $meta_value ) {
-
-				wordpoints_add_points_log_meta( $log_id, $meta_key, $meta_value );
-			}
-
-			do_action( 'wordpoints_points_log', $user_id, $points, $points_type, $log_type, $meta, $log_id );
-
-		} // End if ( inserted successfully ).
-	}
-
-	/**
-	 * Generate the log text when importing a points log.
-	 *
-	 * @since 1.0.0
-	 */
-	public function render_points_log_text( $text, $user_id, $points, $points_type, $log_type, $meta ) {
-
-		ob_start();
-		do_action( 'cp_logs_description', $meta['cubepoints_type'], $user_id, $points, $meta['cubepoints_data'] );
-		return ob_get_clean();
-	}
-
-	/**
-	 * Get the next 500 points logs from CubePoints.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param int $start The offset number to begin counting the 500 at.
-	 *
-	 * @return object[]|false The rows from the database.
-	 */
-	protected function get_next_points_logs_batch( $start ) {
-
-		global $wpdb;
-
-		$logs = $wpdb->get_results( // WPCS: unprepared SQL OK.
-			$wpdb->prepare( // WPCS: unprepared SQL OK.
-				'
+                , $start
+            )
+        ); // WPCS: cache OK.
+
+        if ( ! is_array( $rows ) ) {
+            return false;
+        }
+
+        return $rows;
+    }
+
+    /**
+     * Check if the points logs can be imported.
+     *
+     * @since 1.0.0
+     *
+     * @return true|WP_Error True on success or a WP_Error on failure.
+     */
+    public function can_import_points_logs() {
+
+        if ( ! $this->is_cubepoints_active() ) {
+
+            return new WP_Error(
+                'wordpoints_import_points_logs_cubepoints_inactive'
+                , __( 'CubePoints must be active.', 'wordpoints-importer' )
+            );
+        }
+
+        return true;
+    }
+
+    /**
+     * Import the points logs.
+     *
+     * @since 1.0.0
+     *
+     * @param array $settings The import settings for the points component.
+     */
+    protected function import_points_logs( $settings ) {
+
+        $this->feedback->info( __( 'Importing points logs…', 'wordpoints-importer' ) );
+
+        $start = 0;
+        $logs  = $this->get_next_points_logs_batch( $start );
+
+        while ( $logs ) {
+
+            foreach ( $logs as $log ) {
+
+                $this->import_points_log(
+                    $log->uid
+                    , $log->points
+                    , $settings['points_type']
+                    , "cubepoints-{$log->type}"
+                    , array(
+                        'cubepoints_type' => $log->type,
+                        'cubepoints_data' => $log->data,
+                    )
+                    , date( 'Y-m-d H:i:s', $log->timestamp )
+                );
+            }
+
+            $start += count( $logs );
+            $logs   = $this->get_next_points_logs_batch( $start );
+        }
+
+        // translators: Number of points logs.
+        $this->feedback->success( sprintf( __( 'Imported %s points log entries.', 'wordpoints-importer' ), $start ) );
+    }
+
+    /**
+     * Import a points log.
+     *
+     * @since 1.0.0
+     *
+     * @param int    $user_id     The ID of the user the log is for.
+     * @param int    $points      The number of points awarded.
+     * @param string $points_type The points type.
+     * @param string $log_type    The log type.
+     * @param array  $meta        The metadata for this log.
+     * @param int    $date        The date the transaction took place.
+     */
+    protected function import_points_log( $user_id, $points, $points_type, $log_type, $meta, $date ) {
+
+        global $wpdb;
+
+        $result = $wpdb->insert(
+            $wpdb->wordpoints_points_logs,
+            array(
+                'user_id'     => $user_id,
+                'points'      => $points,
+                'points_type' => $points_type,
+                'log_type'    => $log_type,
+                'text'        => $this->render_points_log_text( '', $user_id, $points, $points_type, $log_type, $meta ),
+                'date'        => $date,
+                'site_id'     => $wpdb->siteid,
+                'blog_id'     => $wpdb->blogid,
+            ),
+            array( '%d', '%d', '%s', '%s', '%s', '%s', '%d', '%d' )
+        );
+
+        if ( false !== $result ) {
+
+            $log_id = (int) $wpdb->insert_id;
+
+            // Set auto_reversed and original_log_id metadata for reversed logs.
+            foreach ( $this->reversible_log_types as $reverse_type => $type ) {
+
+                if ( $meta['cubepoints_type'] === $type ) {
+
+                    // Save this log ID for later, in case this log was reversed.
+                    // cubepoints_data will contain the entity ID.
+                    $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] = $log_id;
+
+                } elseif (
+                    $meta['cubepoints_type'] === $reverse_type
+                    && isset( $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] )
+                ) {
+
+                    // This log was reverses another one. Set the original log ID.
+                    $meta['original_log_id'] = $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ];
+
+                    // And mark the original as auto_reversed.
+                    wordpoints_add_points_log_meta( $meta['original_log_id'], 'auto_reversed', $log_id );
+
+                    // No need to keep this info anymore.
+                    unset( $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] );
+                }
+            }
+
+            // Set the entity IDs to their own meta keys, for the sake of reversals.
+            if ( isset( $this->log_type_entities[ $meta['cubepoints_type'] ] ) ) {
+                $meta[ $this->log_type_entities[ $meta['cubepoints_type'] ] ] = $meta['cubepoints_data'];
+            }
+
+            foreach ( $meta as $meta_key => $meta_value ) {
+
+                wordpoints_add_points_log_meta( $log_id, $meta_key, $meta_value );
+            }
+
+            do_action( 'wordpoints_points_log', $user_id, $points, $points_type, $log_type, $meta, $log_id );
+
+        } // End if ( inserted successfully ).
+    }
+
+    /**
+     * Generate the log text when importing a points log.
+     *
+     * @since 1.0.0
+     */
+    public function render_points_log_text( $text, $user_id, $points, $points_type, $log_type, $meta ) {
+
+        ob_start();
+        do_action( 'cp_logs_description', $meta['cubepoints_type'], $user_id, $points, $meta['cubepoints_data'] );
+        return ob_get_clean();
+    }
+
+    /**
+     * Get the next 500 points logs from CubePoints.
+     *
+     * @since 1.0.0
+     *
+     * @param int $start The offset number to begin counting the 500 at.
+     *
+     * @return object[]|false The rows from the database.
+     */
+    protected function get_next_points_logs_batch( $start ) {
+
+        global $wpdb;
+
+        $logs = $wpdb->get_results( // WPCS: unprepared SQL OK.
+            $wpdb->prepare( // WPCS: unprepared SQL OK.
+                '
 					SELECT *
 					FROM `' . CP_DB . '`
 					ORDER BY `id`
 					LIMIT %d,500
 				'
-				, $start
-			)
-		); // WPCS: cache OK.
+                , $start
+            )
+        ); // WPCS: cache OK.
 
-		if ( ! is_array( $logs ) ) {
-			$this->feedback->error( __( 'Unable to retrieve the logs from CubePoints…', 'wordpoints-importer' ) );
-			return false;
-		}
+        if ( ! is_array( $logs ) ) {
+            $this->feedback->error( __( 'Unable to retrieve the logs from CubePoints…', 'wordpoints-importer' ) );
+            return false;
+        }
 
-		return $logs;
-	}
+        return $logs;
+    }
 
-	/**
-	 * Import ranks.
-	 *
-	 * @since 1.1.0
-	 *
-	 * @param array $settings The import settings for the ranks component.
-	 */
-	public function import_ranks( $settings ) {
+    /**
+     * Import ranks.
+     *
+     * @since 1.1.0
+     *
+     * @param array $settings The import settings for the ranks component.
+     */
+    public function import_ranks( $settings ) {
 
-		$this->feedback->info( __( 'Importing ranks…', 'wordpoints-importer' ) );
+        $this->feedback->info( __( 'Importing ranks…', 'wordpoints-importer' ) );
 
-		$ranks_data = get_option( 'cp_module_ranks_data' );
+        $ranks_data = get_option( 'cp_module_ranks_data' );
 
-		if ( empty( $ranks_data ) || ! is_array( $ranks_data ) ) {
-			$this->feedback->error( __( 'No ranks found.', 'wordpoints-importer' ) );
-			return;
-		}
+        if ( empty( $ranks_data ) || ! is_array( $ranks_data ) ) {
+            $this->feedback->error( __( 'No ranks found.', 'wordpoints-importer' ) );
+            return;
+        }
 
-		$i = 0;
+        $i = 0;
 
-		// The base rank already exists, so we just update it.
-		if ( isset( $ranks_data[0] ) ) {
+        // The base rank already exists, so we just update it.
+        if ( isset( $ranks_data[0] ) ) {
 
-			wordpoints_update_rank(
-				WordPoints_Rank_Groups::get_group( $settings['rank_group'] )->get_rank( 0 )
-				, $ranks_data[0]
-				, 'base'
-				, $settings['rank_group']
-				, 0
-			);
+            wordpoints_update_rank(
+                WordPoints_Rank_Groups::get_group( $settings['rank_group'] )->get_rank( 0 )
+                , $ranks_data[0]
+                , 'base'
+                , $settings['rank_group']
+                , 0
+            );
 
-			$i++;
+            $i++;
 
-			unset( $ranks_data[0] );
-		}
+            unset( $ranks_data[0] );
+        }
 
-		$points_type = substr( $settings['rank_group'], strlen( 'points_type-' ) );
-		$rank_type = 'points-' . $points_type;
+        $points_type = substr( $settings['rank_group'], strlen( 'points_type-' ) );
+        $rank_type = 'points-' . $points_type;
 
-		ksort( $ranks_data );
+        ksort( $ranks_data );
 
-		foreach ( $ranks_data as $points => $rank_name ) {
+        foreach ( $ranks_data as $points => $rank_name ) {
 
-			wordpoints_add_rank(
-				$rank_name
-				, $rank_type
-				, $settings['rank_group']
-				, $i
-				, array( 'points' => $points, 'points_type' => $points_type )
-			);
+            wordpoints_add_rank(
+                $rank_name
+                , $rank_type
+                , $settings['rank_group']
+                , $i
+                , array( 'points' => $points, 'points_type' => $points_type )
+            );
 
-			$i++;
-		}
+            $i++;
+        }
 
-		// translators: Number of ranks.
-		$this->feedback->success( sprintf( __( 'Imported %s ranks.', 'wordpoints-importer' ), $i ) );
-	}
+        // translators: Number of ranks.
+        $this->feedback->success( sprintf( __( 'Imported %s ranks.', 'wordpoints-importer' ), $i ) );
+    }
 }
 
 // EOF

Spacing +136 added lines, -136 removed lines

@@ -66,36 +66,36 @@ 
 	/**
 	 * @since 1.0.0
 	 */
-	public function __construct( $name ) {
+	public function __construct($name) {
 
-		parent::__construct( $name );
+		parent::__construct($name);
 
 		$this->components = array(
 			'points' => array(
 				'excluded_users' => array(
-					'label' => __( 'Excluded users', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_excluded_users' ),
+					'label' => __('Excluded users', 'wordpoints-importer'),
+					'function' => array($this, 'import_excluded_users'),
 				),
 				'settings'    => array(
-					'label' => __( 'Points Reactions', 'wordpoints-importer' ),
-					'description' => __( 'If checked, the settings for the number of points to award for posts, comments, etc. are imported.', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_points_settings' ),
+					'label' => __('Points Reactions', 'wordpoints-importer'),
+					'description' => __('If checked, the settings for the number of points to award for posts, comments, etc. are imported.', 'wordpoints-importer'),
+					'function' => array($this, 'import_points_settings'),
 				),
 				'user_points' => array(
-					'label' => __( 'User points', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_user_points' ),
+					'label' => __('User points', 'wordpoints-importer'),
+					'function' => array($this, 'import_user_points'),
 				),
 				'logs' => array(
-					'label' => __( 'Points logs', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_points_logs' ),
-					'can_import' => array( $this, 'can_import_points_logs' ),
+					'label' => __('Points logs', 'wordpoints-importer'),
+					'function' => array($this, 'import_points_logs'),
+					'can_import' => array($this, 'can_import_points_logs'),
 				),
 			),
 			'ranks' => array(
 				'ranks' => array(
-					'label' => __( 'Rank settings', 'wordpoints-importer' ),
-					'description' => __( 'If checked, the list of ranks is imported, and users will have the correct ranks assigned to them.', 'wordpoints-importer' ),
-					'function' => array( $this, 'import_ranks' ),
+					'label' => __('Rank settings', 'wordpoints-importer'),
+					'description' => __('If checked, the list of ranks is imported, and users will have the correct ranks assigned to them.', 'wordpoints-importer'),
+					'function' => array($this, 'import_ranks'),
 				),
 			),
 		);
@@ -106,10 +106,10 @@ 
 	 */
 	public function is_available() {
 
-		if ( ! $this->is_cubepoints_installed() ) {
+		if (!$this->is_cubepoints_installed()) {
 			return new WP_Error(
 				'cubepoints_not_installed'
-				, __( 'CubePoints is not installed', 'wordpoints-importer' )
+				, __('CubePoints is not installed', 'wordpoints-importer')
 			);
 		}
 
@@ -123,7 +123,7 @@ 
 	 */
 	public function is_cubepoints_installed() {
 
-		return (bool) get_option( 'cp_db_version' );
+		return (bool) get_option('cp_db_version');
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 */
 	public function is_cubepoints_active() {
 
-		return function_exists( 'cp_ready' );
+		return function_exists('cp_ready');
 	}
 
 	/**
@@ -143,22 +143,22 @@ 
 	 */
 	protected function import_excluded_users() {
 
-		$this->feedback->info( __( 'Importing excluded users…', 'wordpoints-importer' ) );
+		$this->feedback->info(__('Importing excluded users…', 'wordpoints-importer'));
 
-		$excluded_users = get_option( 'cp_topfilter' );
+		$excluded_users = get_option('cp_topfilter');
 
-		if ( ! is_array( $excluded_users ) ) {
-			$this->feedback->warning( __( 'No excluded users found.', 'wordpoints-importer' ) );
+		if (!is_array($excluded_users)) {
+			$this->feedback->warning(__('No excluded users found.', 'wordpoints-importer'));
 			return;
 		}
 
 		$user_ids = array();
 
-		foreach ( $excluded_users as $user_login ) {
+		foreach ($excluded_users as $user_login) {
 
-			$user = get_user_by( 'login', $user_login );
+			$user = get_user_by('login', $user_login);
 
-			if ( $user instanceof WP_User ) {
+			if ($user instanceof WP_User) {
 				$user_ids[] = $user->ID;
 			}
 		}
@@ -168,7 +168,7 @@ 
 		);
 
 		$excluded_user_ids = array_unique(
-			array_merge( $excluded_user_ids, $user_ids )
+			array_merge($excluded_user_ids, $user_ids)
 		);
 
 		wordpoints_update_maybe_network_option(
@@ -179,8 +179,8 @@ 
 		$this->feedback->success(
 			sprintf(
 				// translators: Number of users.
-				__( 'Imported %s excluded users.', 'wordpoints-importer' )
-				, count( $user_ids )
+				__('Imported %s excluded users.', 'wordpoints-importer')
+				, count($user_ids)
 			)
 		);
 	}
@@ -192,64 +192,64 @@ 
 	 *
 	 * @param array $settings The settings for the points component import.
 	 */
-	protected function import_points_settings( $settings ) {
+	protected function import_points_settings($settings) {
 
-		$this->feedback->info( __( 'Importing points reactions…', 'wordpoints-importer' ) );
+		$this->feedback->info(__('Importing points reactions…', 'wordpoints-importer'));
 
 		$options = array(
 			'cp_comment_points'     => array(
 				'event' => 'comment_leave\post',
-				'target' => array( 'comment\post', 'author', 'user' ),
+				'target' => array('comment\post', 'author', 'user'),
 				/* translators: The post type name */
-				'log_text' => __( 'Comment on a %s.', 'wordpoints-importer' ),
+				'log_text' => __('Comment on a %s.', 'wordpoints-importer'),
 				/* translators: The post type name */
-				'description' => __( 'Commenting on a %s.', 'wordpoints-importer' ),
+				'description' => __('Commenting on a %s.', 'wordpoints-importer'),
 				'legacy_log_type' => 'cubepoints-comment',
 				'legacy_meta_key' => 'comment',
 			),
 			'cp_post_points'        => array(
 				'event' => 'post_publish\post',
-				'target' => array( 'post\post', 'author', 'user' ),
+				'target' => array('post\post', 'author', 'user'),
 				/* translators: The post type name */
-				'log_text' => __( 'Published a Post.', 'wordpoints-importer' ),
+				'log_text' => __('Published a Post.', 'wordpoints-importer'),
 				/* translators: The post type name */
-				'description' => __( 'Publishing a Post.', 'wordpoints-importer' ),
+				'description' => __('Publishing a Post.', 'wordpoints-importer'),
 				'legacy_log_type' => 'cubepoints-post',
 				'legacy_meta_key' => 'post',
 				// CubePoints doesn't remove points when a post is deleted.
-				'blocker' => array( 'toggle_off' => true ),
-				'points_legacy_repeat_blocker' => array( 'toggle_on' => true ),
+				'blocker' => array('toggle_off' => true),
+				'points_legacy_repeat_blocker' => array('toggle_on' => true),
 			),
 			'cp_reg_points'         => array(
 				'event' => 'user_register',
-				'log_text' => __( 'Registration.', 'wordpoints-importer' ),
-				'description' => __( 'Registration.', 'wordpoints-importer' ),
+				'log_text' => __('Registration.', 'wordpoints-importer'),
+				'description' => __('Registration.', 'wordpoints-importer'),
 				'legacy_log_type' => 'cubepoints-register',
 			),
 			'cp_post_author_points' => array(
 				'event' => 'comment_leave\post',
-				'target' => array( 'comment\post', 'post\post', 'post\post', 'author', 'user' ),
+				'target' => array('comment\post', 'post\post', 'post\post', 'author', 'user'),
 				/* translators: The post type name */
-				'log_text' => __( 'Received a comment on a %s.', 'wordpoints-importer' ),
+				'log_text' => __('Received a comment on a %s.', 'wordpoints-importer'),
 				/* translators: The post type name */
-				'description' => __( 'Receiving a comment on a %s.', 'wordpoints-importer' ),
+				'description' => __('Receiving a comment on a %s.', 'wordpoints-importer'),
 				'legacy_log_type' => 'cubepoints-post_author',
 				'legacy_meta_key' => 'comment',
 			),
 		);
 
 		// Don't import this module setting if the module isn't active.
-		if ( function_exists( 'cp_module_activated' ) && ! cp_module_activated( 'post_author_points' ) ) {
-			unset( $options['cp_post_author_points'] );
+		if (function_exists('cp_module_activated') && !cp_module_activated('post_author_points')) {
+			unset($options['cp_post_author_points']);
 		}
 
 		$imported = 0;
 
-		foreach ( $options as $option => $hook_settings ) {
+		foreach ($options as $option => $hook_settings) {
 
-			$points = get_option( $option );
+			$points = get_option($option);
 
-			if ( wordpoints_posint( $points ) ) {
+			if (wordpoints_posint($points)) {
 
 				$hook_settings['points'] = $points;
 				$hook_settings['points_type'] = $settings['points_type'];
@@ -257,12 +257,12 @@ 
 				if (
 					// The CubePoints post points were only awarded for Posts.
 					'post_publish\post' !== $hook_settings['event']
-					&& strpos( $hook_settings['event'], '\post' )
+					&& strpos($hook_settings['event'], '\post')
 				) {
 
-					$post_type_slugs = get_post_types( array( 'public' => true ) );
+					$post_type_slugs = get_post_types(array('public' => true));
 
-					foreach ( $post_type_slugs as $post_type_slug ) {
+					foreach ($post_type_slugs as $post_type_slug) {
 
 						$added = $this->add_points_hook(
 							$this->format_settings_for_post_type(
@@ -271,13 +271,13 @@ 
 							)
 						);
 
-						if ( $added ) {
+						if ($added) {
 							$imported++;
 						}
 					}
 
 				} else {
-					if ( $this->add_points_hook( $hook_settings ) ) {
+					if ($this->add_points_hook($hook_settings)) {
 						$imported++;
 					}
 				}
@@ -285,13 +285,13 @@ 
 
 		} // End foreach ( $options ).
 
-		if ( $this->import_daily_points_hook( $settings ) ) {
+		if ($this->import_daily_points_hook($settings)) {
 			$imported++;
 		}
 
 		$this->feedback->success(
 			// translators: Number of reactions.
-			sprintf( __( 'Imported %s points reactions.', 'wordpoints-importer' ), $imported )
+			sprintf(__('Imported %s points reactions.', 'wordpoints-importer'), $imported)
 		);
 	}
 
@@ -304,24 +304,24 @@ 
 	 *
 	 * @return bool True if the settings were imported, false otherwise.
 	 */
-	protected function import_daily_points_hook( $settings ) {
+	protected function import_daily_points_hook($settings) {
 
 		// Don't import this module setting if the module isn't active.
-		if ( function_exists( 'cp_module_activated' ) && ! cp_module_activated( 'dailypoints' ) ) {
+		if (function_exists('cp_module_activated') && !cp_module_activated('dailypoints')) {
 			return false;
 		}
 
-		$points = get_option( 'cp_module_dailypoints_points' );
-		$period = get_option( 'cp_module_dailypoints_time' );
+		$points = get_option('cp_module_dailypoints_points');
+		$period = get_option('cp_module_dailypoints_time');
 
-		if ( ! wordpoints_int( $points ) || ! wordpoints_posint( $period ) ) {
+		if (!wordpoints_int($points) || !wordpoints_posint($period)) {
 			return false;
 		}
 
 		return $this->add_points_hook(
 			array(
 				'event' => 'user_visit',
-				'target' => array( 'current:user' ),
+				'target' => array('current:user'),
 				'reactor' => 'points_legacy',
 				'points' => $points,
 				'points_type' => $settings['points_type'],
@@ -329,13 +329,13 @@ 
 					'fire' => array(
 						array(
 							'length' => $period,
-							'args' => array( array( 'current:user' ) ),
+							'args' => array(array('current:user')),
 							'relative' => true,
 						),
 					),
 				),
-				'log_text' => __( 'Visiting the site.', 'wordpoints-importer' ),
-				'description' => __( 'Visiting the site.', 'wordpoints-importer' ),
+				'log_text' => __('Visiting the site.', 'wordpoints-importer'),
+				'description' => __('Visiting the site.', 'wordpoints-importer'),
 				'points_legacy_reversals' => array(),
 				'legacy_log_type' => 'cubepoints-dailypoints',
 			)
@@ -352,22 +352,22 @@ 
 	 *
 	 * @return bool True if added successfully, or false on failure.
 	 */
-	private function add_points_hook( $settings = array() ) {
+	private function add_points_hook($settings = array()) {
 
-		$reaction_store = wordpoints_hooks()->get_reaction_store( 'points' );
+		$reaction_store = wordpoints_hooks()->get_reaction_store('points');
 
 		$settings = array_merge(
 			array(
-				'target' => array( 'user' ),
+				'target' => array('user'),
 				'reactor' => 'points_legacy',
-				'points_legacy_reversals' => array( 'toggle_off' => 'toggle_on' ),
+				'points_legacy_reversals' => array('toggle_off' => 'toggle_on'),
 			)
 			, $settings
 		);
 
-		$reaction = $reaction_store->create_reaction( $settings );
+		$reaction = $reaction_store->create_reaction($settings);
 
-		if ( ! $reaction instanceof WordPoints_Hook_ReactionI ) {
+		if (!$reaction instanceof WordPoints_Hook_ReactionI) {
 			return false;
 		}
 
@@ -384,24 +384,24 @@ 
 	 *
 	 * @return array The settings modified for this particular post type.
 	 */
-	protected function format_settings_for_post_type( $post_type, $settings ) {
+	protected function format_settings_for_post_type($post_type, $settings) {
 
 		$settings['event'] = str_replace(
 			'\post'
-			, '\\' . $post_type
+			, '\\'.$post_type
 			, $settings['event']
 		);
 
 		$settings['target'] = str_replace(
 			'\post'
-			, '\\' . $post_type
+			, '\\'.$post_type
 			, $settings['target']
 		);
 
-		$labels = get_post_type_labels( get_post_type_object( $post_type ) );
+		$labels = get_post_type_labels(get_post_type_object($post_type));
 
-		$settings['log_text'] = sprintf( $settings['log_text'], $labels->singular_name );
-		$settings['description'] = sprintf( $settings['description'], $labels->singular_name );
+		$settings['log_text'] = sprintf($settings['log_text'], $labels->singular_name);
+		$settings['description'] = sprintf($settings['description'], $labels->singular_name);
 
 		return $settings;
 	}
@@ -413,20 +413,20 @@ 
 	 *
 	 * @param array $settings The settings for the points component import.
 	 */
-	protected function import_user_points( $settings ) {
+	protected function import_user_points($settings) {
 
-		$this->feedback->info( __( 'Importing users' points…', 'wordpoints-importer' ) );
+		$this->feedback->info(__('Importing users' points…', 'wordpoints-importer'));
 
 		// We don't log the import transactions.
-		add_filter( 'wordpoints_points_log', '__return_false' );
+		add_filter('wordpoints_points_log', '__return_false');
 
 		$start = 0;
-		$rows  = $this->get_next_user_points_batch( $start );
+		$rows  = $this->get_next_user_points_batch($start);
 
 		// We do the import in batches.
-		while ( $rows ) {
+		while ($rows) {
 
-			foreach ( $rows as $row ) {
+			foreach ($rows as $row) {
 
 				wordpoints_alter_points(
 					$row->user_id
@@ -436,14 +436,14 @@ 
 				);
 			}
 
-			$start += count( $rows );
-			$rows   = $this->get_next_user_points_batch( $start );
+			$start += count($rows);
+			$rows   = $this->get_next_user_points_batch($start);
 		}
 
-		remove_filter( 'wordpoints_points_log', '__return_false' );
+		remove_filter('wordpoints_points_log', '__return_false');
 
 		// translators: Number of users.
-		$this->feedback->success( sprintf( __( 'Imported points for %s users…', 'wordpoints-importer' ), $start ) );
+		$this->feedback->success(sprintf(__('Imported points for %s users…', 'wordpoints-importer'), $start));
 	}
 
 	/**
@@ -455,7 +455,7 @@ 
 	 *
 	 * @return object[]|false The rows, or false.
 	 */
-	protected function get_next_user_points_batch( $start ) {
+	protected function get_next_user_points_batch($start) {
 
 		global $wpdb;
 
@@ -472,7 +472,7 @@ 
 			)
 		); // WPCS: cache OK.
 
-		if ( ! is_array( $rows ) ) {
+		if (!is_array($rows)) {
 			return false;
 		}
 
@@ -488,11 +488,11 @@ 
 	 */
 	public function can_import_points_logs() {
 
-		if ( ! $this->is_cubepoints_active() ) {
+		if (!$this->is_cubepoints_active()) {
 
 			return new WP_Error(
 				'wordpoints_import_points_logs_cubepoints_inactive'
-				, __( 'CubePoints must be active.', 'wordpoints-importer' )
+				, __('CubePoints must be active.', 'wordpoints-importer')
 			);
 		}
 
@@ -506,16 +506,16 @@ 
 	 *
 	 * @param array $settings The import settings for the points component.
 	 */
-	protected function import_points_logs( $settings ) {
+	protected function import_points_logs($settings) {
 
-		$this->feedback->info( __( 'Importing points logs…', 'wordpoints-importer' ) );
+		$this->feedback->info(__('Importing points logs…', 'wordpoints-importer'));
 
 		$start = 0;
-		$logs  = $this->get_next_points_logs_batch( $start );
+		$logs  = $this->get_next_points_logs_batch($start);
 
-		while ( $logs ) {
+		while ($logs) {
 
-			foreach ( $logs as $log ) {
+			foreach ($logs as $log) {
 
 				$this->import_points_log(
 					$log->uid
@@ -526,16 +526,16 @@ 
 						'cubepoints_type' => $log->type,
 						'cubepoints_data' => $log->data,
 					)
-					, date( 'Y-m-d H:i:s', $log->timestamp )
+					, date('Y-m-d H:i:s', $log->timestamp)
 				);
 			}
 
-			$start += count( $logs );
-			$logs   = $this->get_next_points_logs_batch( $start );
+			$start += count($logs);
+			$logs   = $this->get_next_points_logs_batch($start);
 		}
 
 		// translators: Number of points logs.
-		$this->feedback->success( sprintf( __( 'Imported %s points log entries.', 'wordpoints-importer' ), $start ) );
+		$this->feedback->success(sprintf(__('Imported %s points log entries.', 'wordpoints-importer'), $start));
 	}
 
 	/**
@@ -550,7 +550,7 @@ 
 	 * @param array  $meta        The metadata for this log.
 	 * @param int    $date        The date the transaction took place.
 	 */
-	protected function import_points_log( $user_id, $points, $points_type, $log_type, $meta, $date ) {
+	protected function import_points_log($user_id, $points, $points_type, $log_type, $meta, $date) {
 
 		global $wpdb;
 
@@ -561,54 +561,54 @@ 
 				'points'      => $points,
 				'points_type' => $points_type,
 				'log_type'    => $log_type,
-				'text'        => $this->render_points_log_text( '', $user_id, $points, $points_type, $log_type, $meta ),
+				'text'        => $this->render_points_log_text('', $user_id, $points, $points_type, $log_type, $meta),
 				'date'        => $date,
 				'site_id'     => $wpdb->siteid,
 				'blog_id'     => $wpdb->blogid,
 			),
-			array( '%d', '%d', '%s', '%s', '%s', '%s', '%d', '%d' )
+			array('%d', '%d', '%s', '%s', '%s', '%s', '%d', '%d')
 		);
 
-		if ( false !== $result ) {
+		if (false !== $result) {
 
 			$log_id = (int) $wpdb->insert_id;
 
 			// Set auto_reversed and original_log_id metadata for reversed logs.
-			foreach ( $this->reversible_log_types as $reverse_type => $type ) {
+			foreach ($this->reversible_log_types as $reverse_type => $type) {
 
-				if ( $meta['cubepoints_type'] === $type ) {
+				if ($meta['cubepoints_type'] === $type) {
 
 					// Save this log ID for later, in case this log was reversed.
 					// cubepoints_data will contain the entity ID.
-					$this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] = $log_id;
+					$this->reversible_log_ids[$type][$meta['cubepoints_data']] = $log_id;
 
 				} elseif (
 					$meta['cubepoints_type'] === $reverse_type
-					&& isset( $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] )
+					&& isset($this->reversible_log_ids[$type][$meta['cubepoints_data']])
 				) {
 
 					// This log was reverses another one. Set the original log ID.
-					$meta['original_log_id'] = $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ];
+					$meta['original_log_id'] = $this->reversible_log_ids[$type][$meta['cubepoints_data']];
 
 					// And mark the original as auto_reversed.
-					wordpoints_add_points_log_meta( $meta['original_log_id'], 'auto_reversed', $log_id );
+					wordpoints_add_points_log_meta($meta['original_log_id'], 'auto_reversed', $log_id);
 
 					// No need to keep this info anymore.
-					unset( $this->reversible_log_ids[ $type ][ $meta['cubepoints_data'] ] );
+					unset($this->reversible_log_ids[$type][$meta['cubepoints_data']]);
 				}
 			}
 
 			// Set the entity IDs to their own meta keys, for the sake of reversals.
-			if ( isset( $this->log_type_entities[ $meta['cubepoints_type'] ] ) ) {
-				$meta[ $this->log_type_entities[ $meta['cubepoints_type'] ] ] = $meta['cubepoints_data'];
+			if (isset($this->log_type_entities[$meta['cubepoints_type']])) {
+				$meta[$this->log_type_entities[$meta['cubepoints_type']]] = $meta['cubepoints_data'];
 			}
 
-			foreach ( $meta as $meta_key => $meta_value ) {
+			foreach ($meta as $meta_key => $meta_value) {
 
-				wordpoints_add_points_log_meta( $log_id, $meta_key, $meta_value );
+				wordpoints_add_points_log_meta($log_id, $meta_key, $meta_value);
 			}
 
-			do_action( 'wordpoints_points_log', $user_id, $points, $points_type, $log_type, $meta, $log_id );
+			do_action('wordpoints_points_log', $user_id, $points, $points_type, $log_type, $meta, $log_id);
 
 		} // End if ( inserted successfully ).
 	}
@@ -618,10 +618,10 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	public function render_points_log_text( $text, $user_id, $points, $points_type, $log_type, $meta ) {
+	public function render_points_log_text($text, $user_id, $points, $points_type, $log_type, $meta) {
 
 		ob_start();
-		do_action( 'cp_logs_description', $meta['cubepoints_type'], $user_id, $points, $meta['cubepoints_data'] );
+		do_action('cp_logs_description', $meta['cubepoints_type'], $user_id, $points, $meta['cubepoints_data']);
 		return ob_get_clean();
 	}
 
@@ -634,7 +634,7 @@ 
 	 *
 	 * @return object[]|false The rows from the database.
 	 */
-	protected function get_next_points_logs_batch( $start ) {
+	protected function get_next_points_logs_batch($start) {
 
 		global $wpdb;
 
@@ -642,7 +642,7 @@ 
 			$wpdb->prepare( // WPCS: unprepared SQL OK.
 				'
 					SELECT *
-					FROM `' . CP_DB . '`
+					FROM `' . CP_DB.'`
 					ORDER BY `id`
 					LIMIT %d,500
 				'
@@ -650,8 +650,8 @@ 
 			)
 		); // WPCS: cache OK.
 
-		if ( ! is_array( $logs ) ) {
-			$this->feedback->error( __( 'Unable to retrieve the logs from CubePoints…', 'wordpoints-importer' ) );
+		if (!is_array($logs)) {
+			$this->feedback->error(__('Unable to retrieve the logs from CubePoints…', 'wordpoints-importer'));
 			return false;
 		}
 
@@ -665,24 +665,24 @@ 
 	 *
 	 * @param array $settings The import settings for the ranks component.
 	 */
-	public function import_ranks( $settings ) {
+	public function import_ranks($settings) {
 
-		$this->feedback->info( __( 'Importing ranks…', 'wordpoints-importer' ) );
+		$this->feedback->info(__('Importing ranks…', 'wordpoints-importer'));
 
-		$ranks_data = get_option( 'cp_module_ranks_data' );
+		$ranks_data = get_option('cp_module_ranks_data');
 
-		if ( empty( $ranks_data ) || ! is_array( $ranks_data ) ) {
-			$this->feedback->error( __( 'No ranks found.', 'wordpoints-importer' ) );
+		if (empty($ranks_data) || !is_array($ranks_data)) {
+			$this->feedback->error(__('No ranks found.', 'wordpoints-importer'));
 			return;
 		}
 
 		$i = 0;
 
 		// The base rank already exists, so we just update it.
-		if ( isset( $ranks_data[0] ) ) {
+		if (isset($ranks_data[0])) {
 
 			wordpoints_update_rank(
-				WordPoints_Rank_Groups::get_group( $settings['rank_group'] )->get_rank( 0 )
+				WordPoints_Rank_Groups::get_group($settings['rank_group'])->get_rank(0)
 				, $ranks_data[0]
 				, 'base'
 				, $settings['rank_group']
@@ -691,29 +691,29 @@ 
 
 			$i++;
 
-			unset( $ranks_data[0] );
+			unset($ranks_data[0]);
 		}
 
-		$points_type = substr( $settings['rank_group'], strlen( 'points_type-' ) );
-		$rank_type = 'points-' . $points_type;
+		$points_type = substr($settings['rank_group'], strlen('points_type-'));
+		$rank_type = 'points-'.$points_type;
 
-		ksort( $ranks_data );
+		ksort($ranks_data);
 
-		foreach ( $ranks_data as $points => $rank_name ) {
+		foreach ($ranks_data as $points => $rank_name) {
 
 			wordpoints_add_rank(
 				$rank_name
 				, $rank_type
 				, $settings['rank_group']
 				, $i
-				, array( 'points' => $points, 'points_type' => $points_type )
+				, array('points' => $points, 'points_type' => $points_type)
 			);
 
 			$i++;
 		}
 
 		// translators: Number of ranks.
-		$this->feedback->success( sprintf( __( 'Imported %s ranks.', 'wordpoints-importer' ), $i ) );
+		$this->feedback->success(sprintf(__('Imported %s ranks.', 'wordpoints-importer'), $i));
 	}
 }
 

src/includes/index.php

Indentation +4 added lines, -4 removed lines

@@ -8,10 +8,10 @@
  */
 
 return array(
-	'wordpoints_importers' => 'class-importers.php',
-	'wordpoints_importer' => 'class-importer.php',
-	'wordpoints_cubepoints_importer' => 'importers/cubepoints.php',
-	'wordpoints_importer_feedback' => 'class-feedback.php',
+    'wordpoints_importers' => 'class-importers.php',
+    'wordpoints_importer' => 'class-importer.php',
+    'wordpoints_cubepoints_importer' => 'importers/cubepoints.php',
+    'wordpoints_importer_feedback' => 'class-feedback.php',
 );
 
 // EOF

src/includes/class-importers.php

Indentation +132 added lines, -132 removed lines

@@ -14,138 +14,138 @@
  */
 final class WordPoints_Importers {
 
-	//
-	// Private Vars.
-	//
-
-	/**
-	 * The registered importers.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @type array $importers
-	 */
-	private static $importers = array();
-
-	/**
-	 * Whether the class has been initialized yet.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @type bool $initialized
-	 */
-	private static $initialized = false;
-
-	//
-	// Private Functions.
-	//
-
-	/**
-	 * Initialize the class.
-	 *
-	 * @since 1.0.0
-	 */
-	private static function init() {
-
-		// We do this first so we avoid infinite loops if this class is called by a
-		// function hooked to the below action.
-		self::$initialized = true;
-
-		/**
-		 * Register importers.
-		 *
-		 * @since 1.0.0
-		 */
-		do_action( 'wordpoints_register_importers' );
-	}
-
-	//
-	// Public Functions.
-	//
-
-	/**
-	 * Get all of the registered importers.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return array All of the registered importers.
-	 */
-	public static function get() {
-
-		if ( ! self::$initialized ) {
-			self::init();
-		}
-
-		return self::$importers;
-	}
-
-	/**
-	 * Register an importer.
-	 *
-	 * If the importer is already registered, it will be overwritten.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $slug The unique identifier for this importer.
-	 * @param array  $args {
-	 *        Other importer arguments.
-	 *
-	 *        @type string $class The Importer class.
-	 *        @type string $name  The name of this importer.
-	 * }
-	 */
-	public static function register( $slug, array $args ) {
-		self::$importers[ $slug ] = $args;
-	}
-
-	/**
-	 * Deregister an importer.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $slug The slug of the importer to deregister.
-	 */
-	public static function deregister( $slug ) {
-		unset( self::$importers[ $slug ] );
-	}
-
-	/**
-	 * Check if an importer is registered.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $slug The slug of the importer.
-	 *
-	 * @return bool True if the importer is registered, otherwise false.
-	 */
-	public static function is_registered( $slug ) {
-
-		if ( ! self::$initialized ) {
-			self::init();
-		}
-
-		return isset( self::$importers[ $slug ] );
-	}
-
-	/**
-	 * Get an instance of an importer.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $slug The slug of the importer to get an instance of.
-	 *
-	 * @return WordPoints_Importer|false The importer, or false if it isn't registered.
-	 */
-	public static function get_importer( $slug ) {
-
-		if ( ! self::is_registered( $slug ) ) {
-			return false;
-		}
-
-		$importer = self::$importers[ $slug ];
-
-		return new $importer['class']( $importer['name'] );
-	}
+    //
+    // Private Vars.
+    //
+
+    /**
+     * The registered importers.
+     *
+     * @since 1.0.0
+     *
+     * @type array $importers
+     */
+    private static $importers = array();
+
+    /**
+     * Whether the class has been initialized yet.
+     *
+     * @since 1.0.0
+     *
+     * @type bool $initialized
+     */
+    private static $initialized = false;
+
+    //
+    // Private Functions.
+    //
+
+    /**
+     * Initialize the class.
+     *
+     * @since 1.0.0
+     */
+    private static function init() {
+
+        // We do this first so we avoid infinite loops if this class is called by a
+        // function hooked to the below action.
+        self::$initialized = true;
+
+        /**
+         * Register importers.
+         *
+         * @since 1.0.0
+         */
+        do_action( 'wordpoints_register_importers' );
+    }
+
+    //
+    // Public Functions.
+    //
+
+    /**
+     * Get all of the registered importers.
+     *
+     * @since 1.0.0
+     *
+     * @return array All of the registered importers.
+     */
+    public static function get() {
+
+        if ( ! self::$initialized ) {
+            self::init();
+        }
+
+        return self::$importers;
+    }
+
+    /**
+     * Register an importer.
+     *
+     * If the importer is already registered, it will be overwritten.
+     *
+     * @since 1.0.0
+     *
+     * @param string $slug The unique identifier for this importer.
+     * @param array  $args {
+     *        Other importer arguments.
+     *
+     *        @type string $class The Importer class.
+     *        @type string $name  The name of this importer.
+     * }
+     */
+    public static function register( $slug, array $args ) {
+        self::$importers[ $slug ] = $args;
+    }
+
+    /**
+     * Deregister an importer.
+     *
+     * @since 1.0.0
+     *
+     * @param string $slug The slug of the importer to deregister.
+     */
+    public static function deregister( $slug ) {
+        unset( self::$importers[ $slug ] );
+    }
+
+    /**
+     * Check if an importer is registered.
+     *
+     * @since 1.0.0
+     *
+     * @param string $slug The slug of the importer.
+     *
+     * @return bool True if the importer is registered, otherwise false.
+     */
+    public static function is_registered( $slug ) {
+
+        if ( ! self::$initialized ) {
+            self::init();
+        }
+
+        return isset( self::$importers[ $slug ] );
+    }
+
+    /**
+     * Get an instance of an importer.
+     *
+     * @since 1.0.0
+     *
+     * @param string $slug The slug of the importer to get an instance of.
+     *
+     * @return WordPoints_Importer|false The importer, or false if it isn't registered.
+     */
+    public static function get_importer( $slug ) {
+
+        if ( ! self::is_registered( $slug ) ) {
+            return false;
+        }
+
+        $importer = self::$importers[ $slug ];
+
+        return new $importer['class']( $importer['name'] );
+    }
 }
 
 // EOF

Spacing +13 added lines, -13 removed lines

@@ -56,7 +56,7 @@ 
 		 *
 		 * @since 1.0.0
 		 */
-		do_action( 'wordpoints_register_importers' );
+		do_action('wordpoints_register_importers');
 	}
 
 	//
@@ -72,7 +72,7 @@ 
 	 */
 	public static function get() {
 
-		if ( ! self::$initialized ) {
+		if (!self::$initialized) {
 			self::init();
 		}
 
@@ -94,8 +94,8 @@ 
 	 *        @type string $name  The name of this importer.
 	 * }
 	 */
-	public static function register( $slug, array $args ) {
-		self::$importers[ $slug ] = $args;
+	public static function register($slug, array $args) {
+		self::$importers[$slug] = $args;
 	}
 
 	/**
@@ -105,8 +105,8 @@ 
 	 *
 	 * @param string $slug The slug of the importer to deregister.
 	 */
-	public static function deregister( $slug ) {
-		unset( self::$importers[ $slug ] );
+	public static function deregister($slug) {
+		unset(self::$importers[$slug]);
 	}
 
 	/**
@@ -118,13 +118,13 @@ 
 	 *
 	 * @return bool True if the importer is registered, otherwise false.
 	 */
-	public static function is_registered( $slug ) {
+	public static function is_registered($slug) {
 
-		if ( ! self::$initialized ) {
+		if (!self::$initialized) {
 			self::init();
 		}
 
-		return isset( self::$importers[ $slug ] );
+		return isset(self::$importers[$slug]);
 	}
 
 	/**
@@ -136,15 +136,15 @@ 
 	 *
 	 * @return WordPoints_Importer|false The importer, or false if it isn't registered.
 	 */
-	public static function get_importer( $slug ) {
+	public static function get_importer($slug) {
 
-		if ( ! self::is_registered( $slug ) ) {
+		if (!self::is_registered($slug)) {
 			return false;
 		}
 
-		$importer = self::$importers[ $slug ];
+		$importer = self::$importers[$slug];
 
-		return new $importer['class']( $importer['name'] );
+		return new $importer['class']($importer['name']);
 	}
 }