Enhance setup wizard script loading and improve CSV parsing for people groups

Author: corsacca

dt-core/admin/menu/menu-setup-wizard.php

@@ -37,9 +37,13 @@ public function __construct() {
             remove_action( 'network_admin_notices', 'update_nag', 3 );
             remove_action( 'network_admin_notices', 'maintenance_nag', 3 );
         });
-        add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_scripts' ] );
         add_filter( 'script_loader_tag', [ $this, 'filter_script_loader_tag' ], 10, 2 );
         add_filter( 'dt_setup_wizard_items', [ $this, 'dt_setup_wizard_items' ], 10, 1 );
+
+        //only enqueue scripts if the setup wizard is being viewed
+        if ( isset( $_GET['page'] ) && $_GET['page'] === 'dt_setup_wizard' ) {
+            add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_scripts' ] );
+        }
     }
 
     public function enqueue_scripts(){

dt-people-groups/people-groups.php

@@ -25,7 +25,7 @@ public static function get_jp_source() {
         $jp_csv = [];
         $handle = fopen( __DIR__ . '/csv/jp.csv', 'r' );
         if ( $handle !== false ) {
-            while ( ( $data = fgetcsv( $handle, 0, ',' ) ) !== false ) {
+            while ( ( $data = fgetcsv( $handle, 0, ',', '"', '\\' ) ) !== false ) {
                 $jp_csv[] = $data;
             }
             fclose( $handle );
@@ -41,7 +41,7 @@ public static function get_imb_source() {
         $imb_csv = [];
         $handle = fopen( __DIR__ . '/csv/imb.csv', 'r' );
         if ( $handle !== false ) {
-            while ( ( $data = fgetcsv( $handle, 0, ',' ) ) !== false ) {
+            while ( ( $data = fgetcsv( $handle, 0, ',', '"', '\\' ) ) !== false ) {
                 $imb_csv[] = $data;
             }
             fclose( $handle );