From d85b287ec8b0e646debbb9adae30b33b229387d6 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Fri, 25 Sep 2015 11:31:17 -0400
Subject: [PATCH] Fixed problem with imported images going to wrong member info
 record.

---
 glm-member-db.php                  |  4 ++--
 models/admin/ajax/imageUpload.php  |  4 ++--
 models/admin/management/import.php | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/glm-member-db.php b/glm-member-db.php
index 11c6ac91..e835ad20 100644
--- a/glm-member-db.php
+++ b/glm-member-db.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Members Database
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media Members Database.
- * Version: 1.0.10
+ * Version: 1.0.11
  * Author: Chuck Scott
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -19,7 +19,7 @@
  * @package glmMembersDatabase
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 1.0.10
+ * @version 1.0.11
  */
 
 /*
diff --git a/models/admin/ajax/imageUpload.php b/models/admin/ajax/imageUpload.php
index 0c3566a7..64399c1b 100644
--- a/models/admin/ajax/imageUpload.php
+++ b/models/admin/ajax/imageUpload.php
@@ -169,7 +169,7 @@ class GlmMembersAdmin_ajax_imageUpload extends GlmDataImages
      * @return array
      *
      */
-    public function storeImage ($file, $refType = false, $refTable = false, $refDest = false)
+    public function storeImage ($file, $refType = false, $refTable = false, $refDest = false, $caption = '')
     {
 
         // If $file is just a URL to an image, the simulate the file array from a form submission
@@ -252,7 +252,7 @@ class GlmMembersAdmin_ajax_imageUpload extends GlmDataImages
                                     '".$file['name']."',
                                     '".$file['newFileName']."',
                                     '',
-                                    '',
+                                    '".addslashes($caption)."',
                                     ".$this->config['status_numb']['Inactive'].",
                                         99,
                                         $refType,
diff --git a/models/admin/management/import.php b/models/admin/management/import.php
index b098ac50..71d26095 100644
--- a/models/admin/management/import.php
+++ b/models/admin/management/import.php
@@ -870,7 +870,7 @@ class GlmMembersAdmin_management_import
                                         'member' => $membID,
                                         'member_name' => $val['member_name'],
                                         'status' => $this->config['status_numb']['Active'],
-                                        'reference_name' => 'Imported Membmer Information',
+                                        'reference_name' => 'Imported Member Information',
                                         'descr' => $val['description'],
                                         'short_descr' => $short_descr,
                                         'addr1' => $val['street'],
@@ -919,8 +919,8 @@ class GlmMembersAdmin_management_import
                                         '%s'
                                 )
                         );
-                        $mID = $this->wpdb->insert_id;
-                        $member[$key]['new_id'] = $mID;
+                        $infoID = $this->wpdb->insert_id;
+                        $member[$key]['new_info_id'] = $infoID;
 
                         // Add Member Categories
                         if (isset($membCat[$val['member_id']])) {
@@ -930,7 +930,7 @@ class GlmMembersAdmin_management_import
                                         GLM_MEMBERS_PLUGIN_DB_PREFIX.'category_member_info',
                                         array(
                                                 'category' => $catTrans[$c['category_id']]['new'],
-                                                'member_info' => $mID
+                                                'member_info' => $infoID
                                         ),
                                         array(
                                                 '%d',
@@ -950,7 +950,7 @@ class GlmMembersAdmin_management_import
                                         array(
                                                 'amenity' => $amenity[$a['amenity_id']]['new_id'],
                                                 'ref_type' => $this->config['ref_type_numb']['MemberInfo'],
-                                                'ref_dest' => $mID
+                                                'ref_dest' => $infoID
                                         ),
                                         array(
                                                 '%d',
@@ -976,7 +976,7 @@ class GlmMembersAdmin_management_import
 
                         // Update image list with new member IDs
                         if (isset($image[$val['member_id']])) {
-                            $image[$val['member_id']]['new_memberinfo_id'] = $membID;
+                            $image[$val['member_id']]['new_memberinfo_id'] = $infoID;
                         }
 
                     }
@@ -1081,7 +1081,7 @@ class GlmMembersAdmin_management_import
                         if ($m['images']) {
                             foreach ($m['images'] as $i) {
                                 $imageURL = $imageBaseURL.$i['image'];
-                                $res = $ImageUpload->storeImage ($imageURL, $refType, $refTable, $m['new_memberinfo_id']);
+                                $res = $ImageUpload->storeImage ($imageURL, $refType, $refTable, $m['new_memberinfo_id'], $i['caption']);
                             }
                         }
 
-- 
2.17.1