blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 01:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed logic in method postDms of controller Dms, now is it possibile to

Browse Source 
insert a new version for a dms
- Fix method getMessagesByPerson of model Message_model, now is not showing messages with status 3
This commit is contained in:
bison
2016-08-25 13:18:11 +02:00
parent 2c86315f42
commit 59b5d76e44
2 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/system/Message_model.php
+14 -4
View File
@@ -93,16 +93,26 @@ class Message_model extends DB_Model
FROM public.tbl_msg_recipient r JOIN public.tbl_msg_message m USING (message_id)
JOIN public.tbl_person p ON (p.person_id = m.person_id)
JOIN (
SELECT * FROM public.tbl_msg_status ORDER BY insertamum DESC
SELECT message_id, person_id, status, statusinfo, insertamum
FROM public.tbl_msg_status
%s
ORDER BY insertamum DESC
) s ON (m.message_id = s.message_id AND r.person_id = s.person_id)
WHERE r.person_id = ?";
if ($all != "true")
$parametersArray = array($person_id);
if ($all == "true")
{
$sql .= " AND (s.status < 3 OR s.status IS NULL)";
$sql = sprintf($sql, "");
}
else
{
array_push($parametersArray, $person_id, $person_id);
$sql = sprintf($sql, "WHERE person_id = ? AND message_id NOT IN (SELECT message_id FROM public.tbl_msg_status WHERE status >= 3 AND person_id = ?)");
}
$result = $this->db->query($sql, array($person_id));
$result = $this->db->query($sql, $parametersArray);
if (is_object($result))
return $this->_success($result->result());
else