WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-09-19 08:03:29 -04:00
parent 4ec6571a76
commit 86399b3974
3 changed files with 112 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/controllers/Member.php
+22 -6
View File
@@ -1021,14 +1021,14 @@ class Member extends Users_Controller {
ORDER BY mm.id DESC LIMIT 20";
$mysql = "SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,ms.firstname AS senders_name ,mm.senders_id, mm.memo
$mysql = "SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,ms.firstname AS senders_name ,mm.senders_id, mm.memo,mm.reply
FROM members_messages mm
LEFT JOIN members ms ON mm.senders_id = ms.id
WHERE mm.member_id = " . $_SESSION['member_id'] . " AND mm.reply IS NULL
WHERE mm.member_id = " . $_SESSION['member_id'] . "
UNION
SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,'Me' AS senders_name ,mm.senders_id, mm.memo
SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,'Me' AS senders_name ,mm.senders_id, mm.memo, mm.reply
FROM members_messages mm
WHERE mm.senders_id = " . $_SESSION['member_id'] . " AND mm.reply IS NULL
WHERE mm.senders_id = " . $_SESSION['member_id'] . "
ORDER BY msg_date DESC LIMIT 30";
$query = $this->db->query($mysql);
@@ -1052,11 +1052,26 @@ class Member extends Users_Controller {
}
public function setupReply(){
//E&message_id=" + message_id +"&job_id="+job_id
$message_id = trim($this->input->get('message_id'));
$job_id = trim($this->input->get('job_id'));
if ($message_id > 0 && $job_id !=''){
$answer_string = $this->load->view('users/sections/mgs_reply', '', TRUE);
$data['job_id'] = $job_id;
$data['message_id'] = $message_id;
$mysql = "SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,ms.firstname AS senders_name ,mm.senders_id, mm.memo
FROM members_messages mm
LEFT JOIN members ms ON mm.senders_id = ms.id
WHERE mm.member_id = " . $_SESSION['member_id'] . " AND mm.memo='".$job_id."'
UNION
SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,'Me' AS senders_name ,mm.senders_id, mm.memo
FROM members_messages mm
WHERE mm.senders_id = " . $_SESSION['member_id'] . " AND mm.memo='".$job_id."'
ORDER BY msg_date DESC LIMIT 30";
$query = $this->db->query($mysql);
$data['my_message_rows'] = $query->result_array(); // new implementation
$answer_string = $this->load->view('users/sections/mgs_reply', $data, TRUE);
echo $answer_string;
}
}
@@ -1110,6 +1125,7 @@ class Member extends Users_Controller {
$in["message_id"] = $this->input->get('message_id');
$in["memo"] = trim($this->input->get('message_code'));
$in["yourmessage"] = trim($this->input->get('yourmessage'));
$in['member_id'] = $_SESSION['member_id'];
if ($in["message_id"] > 0 && $in["memo"] != '' && $in["yourmessage"] != '') {
$in['action'] = WRENCHBOARD_JOB_REPLY_QUESTION;