Fix the member import script to remove newlines.

Newlines were effecting the imported member records.
With them they would get extra break tags in the output.
Giving them too much spacing between their paragraphs of description.

diff --git a/models/admin/management/import/members.php b/models/admin/management/import/members.php
index 4359b2e..f573ec2 100644 (file)
--- a/models/admin/management/import/members.php
+++ b/models/admin/management/import/members.php
@@ -580,13 +580,13 @@ if (!$failure) {
     while (list ($key, $val) = each ($city) ) {
 
         $res = $this->wpdb->insert(
-                GLM_MEMBERS_PLUGIN_DB_PREFIX.'cities',
-                array(
-                        'name' => $val['city_name'],
-                ),
-                array(
-                        '%s',
-                )
+            GLM_MEMBERS_PLUGIN_DB_PREFIX.'cities',
+            array(
+                'name' => $val['city_name'],
+            ),
+            array(
+                '%s',
+            )
         );
         $city[$key]['new_id'] = $this->wpdb->insert_id;
 
@@ -598,14 +598,14 @@ if (!$failure) {
         $res = $this->wpdb->insert(
                 GLM_MEMBERS_PLUGIN_DB_PREFIX.'regions',
                 array(
-                        'name' => $val['region_name'],
-                        'descr' => '',
-                        'short_descr' => ''
+                    'name' => $val['region_name'],
+                    'descr' => '',
+                    'short_descr' => ''
                 ),
                 array(
-                        '%s',
-                        '%s',
-                        '%s'
+                    '%s',
+                    '%s',
+                    '%s'
                 )
         );
         $region[$key]['new_id'] = $this->wpdb->insert_id;
@@ -646,16 +646,16 @@ if (!$failure) {
         $res = $this->wpdb->insert(
                 GLM_MEMBERS_PLUGIN_DB_PREFIX.'categories',
                 array(
-                        'name' => $val['name'],
-                        'descr' => '',
-                        'short_descr' => '',
-                        'parent' => 0
+                    'name' => $val['name'],
+                    'descr' => '',
+                    'short_descr' => '',
+                    'parent' => 0
                 ),
                 array(
-                        '%s',
-                        '%s',
-                        '%s',
-                        '%d'
+                    '%s',
+                    '%s',
+                    '%s',
+                    '%d'
                 )
         );
         $newID = $this->wpdb->insert_id;
@@ -732,12 +732,12 @@ if (!$failure) {
      */
 
     // Import Members
-    $numbMembersActive = 0;
-    $numbMembersInactive = 0;
-    $namesInserted = array();
-    $membImportIssues = '';
-    $haveMembImportIssues = false;
-    $dupeNames = 0;
+    $numbMembersActive       = 0;
+    $numbMembersInactive     = 0;
+    $namesInserted           = array();
+    $membImportIssues        = '';
+    $haveMembImportIssues    = false;
+    $dupeNames               = 0;
     while (list ($key, $val) = each ($member) ) {
 
         // Determine if member is active and set access accordingly
@@ -772,20 +772,20 @@ if (!$failure) {
         $res = $this->wpdb->insert(
                 GLM_MEMBERS_PLUGIN_DB_PREFIX.'members',
                 array(
-                        'access' => $access,
-                        'member_type' => $defaultMemberType,
-                        'created' => date('Y-m-d'),
-                        'name' => $membName,
-                        'member_slug' => sanitize_title($val['member_name']),
-                        'old_member_id' => $val['member_id']
+                    'access'        => $access,
+                    'member_type'   => $defaultMemberType,
+                    'created'       => date('Y-m-d'),
+                    'name'          => $membName,
+                    'member_slug'   => sanitize_title($val['member_name']),
+                    'old_member_id' => $val['member_id']
                 ),
                 array(
-                        '%d',
-                        '%d',
-                        '%s',
-                        '%s',
-                        '%s',
-                        '%d'
+                    '%d',
+                    '%d',
+                    '%s',
+                    '%s',
+                    '%s',
+                    '%d'
                 )
         );
         $membID = $this->wpdb->insert_id;
@@ -815,56 +815,56 @@ if (!$failure) {
         $res = $this->wpdb->insert(
                 GLM_MEMBERS_PLUGIN_DB_PREFIX.'member_info',
                 array(
-                        'member' => $membID,
-                        'member_name' => $val['member_name'],
-                        'status' => $this->config['status_numb']['Active'],
-                        'reference_name' => 'Imported Member Information',
-                        'descr' => $val['description'],
-                        'short_descr' => $short_descr,
-                        'addr1' => $val['street'],
-                        'addr2' => '',
-                        'city' => $city[$val['city_id']]['new_id'],
-                        'state' => $state[$val['state_id']]['state_abb'],
-                        'country' => 'US',
-                        'zip' => $val['zip'],
-                        'lat' => $val['lat'],
-                        'lon' => $val['lon'],
-                        'region' => (isset($region[$val['region']]) ? $region[$val['region']]['new_id'] : 0),
-                        'phone' => $val['phone'],
-                        'toll_free' => $val['toll_free'],
-                        'url' => $val['url'],
-                        'email' => $val['process_email'],
-                        'logo' => '',
-                        'cc_type' => $ccBits,
-                        'notes' => '',
-                        'create_time' => $val['create_date'],
-                        'modify_time' => $val['last_update']
+                    'member'         => $membID,
+                    'member_name'    => $val['member_name'],
+                    'status'         => $this->config['status_numb']['Active'],
+                    'reference_name' => 'Imported Member Information',
+                    'descr'          => preg_replace('%[\n\r]%', '', $val['description']),
+                    'short_descr'    => $short_descr,
+                    'addr1'          => $val['street'],
+                    'addr2'          => '',
+                    'city'           => $city[$val['city_id']]['new_id'],
+                    'state'          => $state[$val['state_id']]['state_abb'],
+                    'country'        => 'US',
+                    'zip'            => $val['zip'],
+                    'lat'            => $val['lat'],
+                    'lon'            => $val['lon'],
+                    'region'         => (isset($region[$val['region']]) ? $region[$val['region']]['new_id'] : 0),
+                    'phone'          => $val['phone'],
+                    'toll_free'      => $val['toll_free'],
+                    'url'            => $val['url'],
+                    'email'          => $val['process_email'],
+                    'logo'           => '',
+                    'cc_type'        => $ccBits,
+                    'notes'          => '',
+                    'create_time'    => $val['create_date'],
+                    'modify_time'    => $val['last_update']
                 ),
                 array(
-                        '%d',
-                        '%s',
-                        '%d',
-                        '%s',
-                        '%s',
-                        '%s',
-                        '%s',
-                        '%s',
-                        '%d',
-                        '%s',
-                        '%s',
-                        '%s',
-                        '%f',
-                        '%f',
-                        '%d',
-                        '%s',
-                        '%s',
-                        '%s',
-                        '%s',
-                        '%s',
-                        '%d',
-                        '%s',
-                        '%s',
-                        '%s'
+                    '%d',
+                    '%s',
+                    '%d',
+                    '%s',
+                    '%s',
+                    '%s',
+                    '%s',
+                    '%s',
+                    '%d',
+                    '%s',
+                    '%s',
+                    '%s',
+                    '%f',
+                    '%f',
+                    '%d',
+                    '%s',
+                    '%s',
+                    '%s',
+                    '%s',
+                    '%s',
+                    '%d',
+                    '%s',
+                    '%s',
+                    '%s'
                 )
         );
         $infoID = $this->wpdb->insert_id;
@@ -875,15 +875,15 @@ if (!$failure) {
             foreach ($membCat[$val['member_id']] as $c) {
 
                 $res = $this->wpdb->insert(
-                        GLM_MEMBERS_PLUGIN_DB_PREFIX.'category_member_info',
-                        array(
-                                'category' => $catTrans[$c['category_id']]['new'],
-                                'member_info' => $infoID
-                        ),
-                        array(
-                                '%d',
-                                '%d'
-                        )
+                    GLM_MEMBERS_PLUGIN_DB_PREFIX.'category_member_info',
+                    array(
+                        'category' => $catTrans[$c['category_id']]['new'],
+                        'member_info' => $infoID
+                    ),
+                    array(
+                        '%d',
+                        '%d'
+                    )
                 );
 
             }
@@ -894,17 +894,17 @@ if (!$failure) {
             foreach ($membAmen[$val['member_id']] as $a) {
 
                 $res = $this->wpdb->insert(
-                        GLM_MEMBERS_PLUGIN_DB_PREFIX.'amenity_ref',
-                        array(
-                                'amenity' => $amenity[$a['amenity_id']]['new_id'],
-                                'ref_type' => $this->config['ref_type_numb']['MemberInfo'],
-                                'ref_dest' => $infoID
-                        ),
-                        array(
-                                '%d',
-                                '%d',
-                                '%d'
-                        )
+                    GLM_MEMBERS_PLUGIN_DB_PREFIX.'amenity_ref',
+                    array(
+                        'amenity' => $amenity[$a['amenity_id']]['new_id'],
+                        'ref_type' => $this->config['ref_type_numb']['MemberInfo'],
+                        'ref_dest' => $infoID
+                    ),
+                    array(
+                        '%d',
+                        '%d',
+                        '%d'
+                    )
                 );
 
             }
@@ -939,38 +939,38 @@ if (!$failure) {
     update_option( 'glm-member-db-import-imageurl', $dbImageURL);
     update_option( 'glm-member-db-import-image', $image );
 
-    $templateData['numbCities'] = count($city);
-    $templateData['numbStates'] = count($state);
-    $templateData['numbRegions'] = count($region);
-    $templateData['numbMembers'] = count($member);
-    $templateData['numbMembersActive'] = $numbMembersActive;
-    $templateData['numbMembersInactive'] = $numbMembersInactive;
+    $templateData['numbCities']           = count($city);
+    $templateData['numbStates']           = count($state);
+    $templateData['numbRegions']          = count($region);
+    $templateData['numbMembers']          = count($member);
+    $templateData['numbMembersActive']    = $numbMembersActive;
+    $templateData['numbMembersInactive']  = $numbMembersInactive;
     $templateData['haveMembImportIssues'] = $haveMembImportIssues;
-    $templateData['membImportIssues'] = $membImportIssues;
-    $templateData['numbCategories'] = count($catTrans);
-    $templateData['haveCatImportIssues'] = $haveCatImportIssues;
-    $templateData['catImportIssues'] = $catImportIssues;
-    $templateData['numbCategoryMembers'] = count($membCat);
-    $templateData['numbAmenities'] = count($amenity);
-    $templateData['numbAmenityMembers'] = $numbAmenityMembers;
-    $templateData['numbImagesFound'] = $numbImagesFound;
-    $templateData['numbCcards'] = count($ccard);
-    $templateData['numbCcardMembers'] = $numbCcardMembers;
+    $templateData['membImportIssues']     = $membImportIssues;
+    $templateData['numbCategories']       = count($catTrans);
+    $templateData['haveCatImportIssues']  = $haveCatImportIssues;
+    $templateData['catImportIssues']      = $catImportIssues;
+    $templateData['numbCategoryMembers']  = count($membCat);
+    $templateData['numbAmenities']        = count($amenity);
+    $templateData['numbAmenityMembers']   = $numbAmenityMembers;
+    $templateData['numbImagesFound']      = $numbImagesFound;
+    $templateData['numbCcards']           = count($ccard);
+    $templateData['numbCcardMembers']     = $numbCcardMembers;
 
     // For testing only
-    $templateData['member'] = $member;
+    $templateData['member']            = $member;
     $templateData['defaultMemberType'] = $defaultMemberType;
-    $templateData['amenity'] = $amenity;
-    $templateData['membAmen'] = $membAmen;
-    $templateData['category'] = $category;
-    $templateData['membCat'] = $membCat;
-    $templateData['catTrans'] = $catTrans;
-    $templateData['city'] = $city;
-    $templateData['state'] = $state;
-    $templateData['region'] = $region;
-    $templateData['ccard'] = $ccard;
-    $templateData['membCcard'] = $membCcard;
-    $templateData['image'] = $image;
+    $templateData['amenity']           = $amenity;
+    $templateData['membAmen']          = $membAmen;
+    $templateData['category']          = $category;
+    $templateData['membCat']           = $membCat;
+    $templateData['catTrans']          = $catTrans;
+    $templateData['city']              = $city;
+    $templateData['state']             = $state;
+    $templateData['region']            = $region;
+    $templateData['ccard']             = $ccard;
+    $templateData['membCcard']         = $membCcard;
+    $templateData['image']             = $image;
 }