blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 08:34:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Messages

Browse Source
This commit is contained in:
Paminger
2016-06-22 08:11:04 +02:00
parent 6e62fbdcd4
commit 70e83b6e18
12 changed files with 116 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/system/Message_model.php
+8 -6
View File
@@ -39,7 +39,7 @@ status, statusinfo, s.insertamum AS statusamum
FROM public.tbl_msg_message m
JOIN public.tbl_person USING (person_id)
JOIN public.tbl_benutzer USING (person_id)
LEFT JOIN
LEFT OUTER JOIN
(
SELECT message_id, person_id, status, statusinfo, tbl_msg_status.insertamum
FROM public.tbl_msg_status
@@ -55,7 +55,7 @@ LEFT JOIN
USING (message_id, person_id)
WHERE uid = ?';
if (! $all)
$sql .= ' AND status<2';
$sql .= ' AND (status<3 OR status IS NULL)';
$result = $this->db->query($sql, array($uid));
if (is_object($result))
return $this->_success($result->result());
@@ -67,14 +67,16 @@ public function getMessagesByPerson($person_id, $all)
{
// Check wrights
if (! $this->fhc_db_acl->isBerechtigt('basis/message', 's'))
return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> system/message', FHC_MODEL_ERROR);
return $this->_error(lang('fhc_'.FHC_NORIGHT).' -> basis/message', FHC_MODEL_ERROR);
// prepare parameters
$person_id = (int)$person_id;
// get Data
$sql = 'SELECT person_id, message_id, subject, priority, relationmessage_id, oe_kurzbz, m.insertamum, anrede, titelpost, titelpre, nachname, vorname, vornamen,
status, statusinfo, s.insertamum AS statusamum
FROM public.tbl_msg_message m
JOIN public.tbl_person USING (person_id)
LEFT JOIN
LEFT OUTER JOIN
(
SELECT message_id, person_id, status, statusinfo, tbl_msg_status.insertamum
FROM public.tbl_msg_status
@@ -90,9 +92,9 @@ LEFT JOIN
USING (message_id, person_id)
WHERE person_id = ?';
if (! $all)
$sql .= ' AND status<2';
$sql .= ' AND (status<3 OR status IS NULL)';
$result = $this->db->query($sql, array($person_id));
var_dump($result);
//var_dump($result);
if (is_object($result))
return $this->_success($result->result());
else