fix creativecommons#317 - check name who ask for clarification, added to user meta for fast access

Author: hugosolar

plugins/cc-global-network/admin/assets/js/script.js

@@ -203,15 +203,14 @@ jQuery(document).ready(function ($) {
                 success: function (data) {
                     this_button.text("Yes, I'm sure");
                     $('#alert-messages').html('');
-                    if (data == 'ok') {
-                        tb_remove();
+                    if (data.trim() == 'ok') {
                         $('#alert-messages').append('<div class="updated notice is-dismissible"><p>The request was sended to the user</p></div>').find('.notice').delay(3200).fadeOut(300);
                         $('#search-all-members').trigger('click');
                     }
-                    if (data == 'error') {
+                    if (data.trim() == 'error') {
                         $('#alert-messages').append('<div class="error notice is-dismissible"><p>There was an error sending your request</p></div>').find('.notice').delay(3200).fadeOut(300);
-                        tb_remove();
                     }
+                    tb_remove();
                 }
             });
         });

plugins/cc-global-network/admin/user-application-page.php

@@ -553,20 +553,20 @@ function ccgn_application_users_page_render_details ( $applicant_id, $state ) {
                 $log_user = ccgn_ask_clarification_log_get_id($applicant_id);
                 foreach ($log_user as $entry) {
                     $asked_meta = get_user_meta($entry['voucher_id'], 'ccgn_need_to_clarify_vouch_reason_applicant_status', true);
-                    
                     if (($asked_meta['status'] == 1) && ($entry['voucher_id'] == $voucher['id'])) {
                         $user_is_asked_for_clarification = 1;
                         $asked_class = 'asked-box';
-                        $who_asked = $entry['ask_user_name'];
+                        $who_asked = (!empty($asked_info['ask_user'])) ? get_user_by('ID',$asked_info['ask_user'])->display_name : $entry['ask_user_name'];
                     } else if (($asked_meta['status'] == 0) && ($entry['voucher_id'] == $voucher['id'])) {
                         $user_is_asked_for_clarification = 2;
                         $asked_class = 'asked-box-answered';
-                        $who_asked = $entry['ask_user_name'];
+                        $who_asked = (!empty($asked_info['ask_user'])) ? get_user_by('ID',$asked_info['ask_user'])->display_name : $entry['ask_user_name'];
                     }
                 }
 
             } else {
-                $who_asked = get_user_by('ID', $asked_info['user_id'])->display_name;
+                $log_user = ccgn_ask_clarification_log_get_id($asked_info['applicant_id']);
+                $who_asked = (!empty($asked_info['ask_user'])) ? get_user_by('ID',$asked_info['ask_user'])->display_name : $log_user[count($log_user)-1]['ask_user_name'];
                 $user_is_asked_for_clarification = $asked_info['status'];
             }
             echo '<div class="ccgn-box applicant '.$asked_class.'">';
@@ -774,14 +774,15 @@ function ccgn_ajax_ask_voucher()
 {
     $user_id = $_POST['user_id'];
     $applicant_id = $_POST['applicant_id'];
+    $current_user_ask = get_current_user_id();
     if (check_ajax_referer('ask_voucher', 'sec') && (!empty($user_id))) {
         ccgn_ask_email_vouching_request($applicant_id,$user_id);
         //set user state to clarification of the reason to vouch applicant
-        $update_ask_status = array('status' => 1, 'applicant_id' => $applicant_id, 'user_id' => $user_id);
+        $update_ask_status = array('status' => 1, 'applicant_id' => $applicant_id, 'user_id' => $user_id, 'ask_user' => $current_user_ask, 'time' => time());
         update_user_meta($user_id, 'ccgn_need_to_clarify_vouch_reason_applicant_status', $update_ask_status );
         update_user_meta($user_id,'ccgn_need_to_clarify_vouch_reason',1);
         ccgn_ask_clarification_log_append($applicant_id,$user_id);
-        echo 'ok';        
+        echo 'ok';
     }
     exit(0);
 }