From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 1 Mar 2019 15:59:14 +0000 (-0500)
Subject: adding image upload ability from the member info record flyout
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fd6018a66460289f08a1e6732c0808de4932dcac;p=WP-Plugins%2Fglm-member-db.git

adding image upload ability from the member info record flyout
---

diff --git a/classes/data/dataFiles.php b/classes/data/dataFiles.php
index 5d8b9f3d..73cc8354 100644
--- a/classes/data/dataFiles.php
+++ b/classes/data/dataFiles.php
@@ -330,9 +330,7 @@ class GlmDataFiles extends GlmDataAbstract
             reset($_REQUEST['file_caption']);
             
             foreach ( $_REQUEST['file_caption'] as $k => $v ) {
-                $support->write_log($k);
                 $id = ($k -0);
-                $support->write_log($_REQUEST['file_caption']);
                 
                 // Sanitize input
                 $caption = sanitize_text_field( $_REQUEST['file_caption'][$k] );
diff --git a/js/memberManagement.js b/js/memberManagement.js
index a866905b..e02f6dd3 100644
--- a/js/memberManagement.js
+++ b/js/memberManagement.js
@@ -1,6 +1,6 @@
 window.Glma = (function() {  
-    var xhr = function(data, complete, success, error, type){
-        jQuery.ajax({
+    var xhr = function(data, complete, success, error, type, content){
+        var config = {
             dataType: "json",
             type : type,
             url: wp.ajax.settings.url,
@@ -8,8 +8,14 @@ window.Glma = (function() {
             complete: complete,
             success: success,
             error: error
-        });
+        }
+        if(content){
+            config['contentType'] = false;
+            config['processData'] = false;
+        }
+        jQuery.ajax(config);
     }
+
     var memberRecordHandler = function(data, callback){
         return function(e){
             jQuery(".edit-screen").html('');
@@ -49,7 +55,6 @@ window.Glma = (function() {
         }
     }
     var deleteProps = function(obj){
-        console.log(obj)
         var searchFields = $(".glm-admin-search-field");
         for(var i = 0; i < searchFields.length; i++){
             var field = $(searchFields[i]).attr("data-search") ;
@@ -90,16 +95,16 @@ window.Glma = (function() {
             glm_action      : 'memberManagement',
         },
 
-        manageMember: function(data, complete, success, error, type){
+        manageMember: function(data, complete, success, error, type, content){
             xhr(
                 data,
                 complete, 
                 success,
                 error,
                 type,
+                content
             );
         },
-
         updateSearchFilterValues: updateSearchFilterValues,
         getSearchFieldValues: getSearchFieldValues,
         getSearchFieldValues: getSearchFieldValues,
@@ -180,7 +185,6 @@ window.Glma = (function() {
     
                 onSelect: function(e, term, item){
                     let search = jQuery(item).text();
-                    console.log("select")
                     
                     if(search){
                         var entityData = {
diff --git a/lib/GlmDataAbstract/DataAbstract.php b/lib/GlmDataAbstract/DataAbstract.php
index 7611e510..d9c7792d 100755
--- a/lib/GlmDataAbstract/DataAbstract.php
+++ b/lib/GlmDataAbstract/DataAbstract.php
@@ -25,7 +25,7 @@
  * @release   Release: (0.1)
  * @link      <>
  */
-
+require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/glmPluginSupport.php';
 abstract class GlmDataAbstract
 {
 
@@ -2380,7 +2380,6 @@ $forEdit = true;
     {
 
         $new = false;
-
         // Check if we have a new image being submitted
         if (isset($_FILES[$as.'_new']) && is_array($_FILES[$as.'_new']) && $_FILES[$as.'_new']['tmp_name'] != '') {
             $new = true;
@@ -3100,7 +3099,6 @@ $forEdit = true;
      */
     private function processInputData($op = 'u', $id = false, $idField = false)
     {
-
         // Status is good unless otherwise determined
         $status = true;
 
diff --git a/models/admin/ajax/imageUpload.php b/models/admin/ajax/imageUpload.php
index 7e365346..3fd19df6 100644
--- a/models/admin/ajax/imageUpload.php
+++ b/models/admin/ajax/imageUpload.php
@@ -15,7 +15,7 @@
 
 // Load Members data abstract
 require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php';
-
+require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/glmPluginSupport.php';
 /*
  * This class performs the work of handling images passed to it via
  * an AJAX call that goes through the WorPress AJAX Handler.
@@ -76,7 +76,8 @@ class GlmMembersAdmin_ajax_imageUpload extends GlmDataImages
      */
     public function modelAction ($actionData = false)
     {
-
+        $support->write_log("upload");
+        $support = new glmPluginSupport();
         $return = array(
             'status' => false,       // Assume we didn't get files or nothing works
             'files' => false,       // Provide submitted data along with stored image data
@@ -93,6 +94,7 @@ class GlmMembersAdmin_ajax_imageUpload extends GlmDataImages
         $refTable = $this->config['ref_type_table'][$_REQUEST['glm_refType']];
 
         // Check for uploaded files
+        $support->write_log($_FILES);
         if (!isset($_FILES) || count($_FILES) == 0) {
             $return['message'] = 'No image file provided!';
             echo json_encode($return);
diff --git a/models/admin/ajax/memberManagement.php b/models/admin/ajax/memberManagement.php
index 1e394cda..849d15fb 100644
--- a/models/admin/ajax/memberManagement.php
+++ b/models/admin/ajax/memberManagement.php
@@ -108,10 +108,11 @@ class GlmMembersAdmin_ajax_memberManagement extends glmMembersAdmin
         }
 
         if($_REQUEST['option'] == 'submit'){
-            
+            //$support->write_log($_REQUEST);
             foreach($_REQUEST['form'] as $form=>$field){
                 preg_match_all("/\\[(.*?)\\]/", $field['name'], $match); 
-                $id = $match[1][0];
+                if(isset($match[1][0])) $id = $match[1][0];
+                
                 if( strpos($field['name'], "category[") !== false){
                     $_REQUEST['category'][$field['name']] = $field['value'];
                 }elseif( strpos($field['name'], "amenity[") !== false){
diff --git a/models/admin/manageDashboard/members.php b/models/admin/manageDashboard/members.php
index a37484a0..73172b19 100644
--- a/models/admin/manageDashboard/members.php
+++ b/models/admin/manageDashboard/members.php
@@ -348,7 +348,7 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
             // If request is for Next
             if ($_REQUEST['pageSelect'][0] == 'N') {
                 $newStart = $_REQUEST['nextStart'] - 0;
-                $this->write_log("\nNEW START:". $newStart);
+                // $this->write_log("\nNEW START:". $newStart);
             // Otherwise it must be Previous
             } else {
                 $newStart = $_REQUEST['prevStart'] - 0;
@@ -380,11 +380,11 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
         }
         if ($listResult['returned'] == $limit) {
             $nextStart = $start + $limit;
-            $this->write_log("\nYOP");    
+            // $this->write_log("\nYOP");    
         }
-        $this->write_log("\nstart: " . $start);
-        $this->write_log("\nlimit: " . $limit);
-        $this->write_log("\nNext start: " . $nextStart);
+        // $this->write_log("\nstart: " . $start);
+        // $this->write_log("\nlimit: " . $limit);
+        // $this->write_log("\nNext start: " . $nextStart);
 
         // since we're doing paging, we have to break out just the member data
         $list = $listResult['list'];
@@ -422,7 +422,7 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
         $textSearch = str_replace('\\', '', $textSearch );
 
         
-        $this->write_log("\nstart : $nextStart");
+        // $this->write_log("\nstart : $nextStart");
         // Compile template data
         $templateData = array(
             'testData'          => "TEST123",
diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html
index 4b223623..18f36982 100644
--- a/views/admin/manageDashboard/index.html
+++ b/views/admin/manageDashboard/index.html
@@ -294,18 +294,19 @@
                 function(error) {
                     console.log(error);
                 },
-                "POST"
+                "POST",
             );
         });
         // When submit button is clicked, disable the beforeunload message
         $(document).on('click', '.updateMemberProfile',function(e) {
                 e.preventDefault();
                 var form = $("#member-info-form");
-                editData.option = "submit";
-                editData.form = form.serializeArray();
-                console.log(editData.form);
+                var fileForm = new FormData(form[0]);
+                fileForm.set("action",'glm_members_admin_ajax');
+                fileForm.set("glm_action" , 'memberManagement');
+                fileForm.set("option" ,"submit");
                 window.Glma.manageMember(
-                    editData,
+                    fileForm,
                     function(complete) {},
                     function(success) {
                         console.log(success);
@@ -313,7 +314,9 @@
                     function(error) {
                         console.log(error);
                     },
-                    "POST"
+                    "POST",
+                    true
+                    
                 );
                 // glmSubmitRequired = false;
                 // return true;
diff --git a/views/admin/member/memberInfo/editMediaImages.html b/views/admin/member/memberInfo/editMediaImages.html
index 923bb663..2c386adf 100644
--- a/views/admin/member/memberInfo/editMediaImages.html
+++ b/views/admin/member/memberInfo/editMediaImages.html
@@ -31,7 +31,7 @@
                             </div>
                         </div>
                     {/if}
-                    <div class="glm-center"><b>New image:</b> <input type="file" name="logo_new"></div>
+                    <div class="glm-center"><b>New image:</b> <input id="glm-admin-member-profile-image" type="file" name="logo_new"></div>
                 </div>
                 <div id="glm-galleryImageLarger_logo" class="glm-imageDialog"><img src="{$glmPluginMediaUrl}/images/large/{$memberInfo.fieldData.logo}"></div>
                 {if $memberInfo.fieldFail.logo}<p>{$memberInfo.fieldFail.logo}</p>{/if}