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

- Added method sendMessageVorlage to MessageLib

Browse Source 
- Fixed method loadVorlagetext in VorlageLib
- Changed query in method getMessagesByPerson of Message_model
This commit is contained in:
paolo
2016-06-23 15:42:43 +02:00
parent 38c98531ed
commit 3fdf54c1d1
3 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/MessageLib.php
+13 -14
View File
@@ -236,27 +236,21 @@ class MessageLib
*/
function sendMessageVorlage($sender_id, $receiver_id, $vorlage_kurzbz, $oe_kurzbz, $data, $orgform_kurzbz = null)
{
var_dump($data);
exit;
if (!is_numeric($sender_id) || !is_numeric($receiver_id))
return $this->_invalid_id(MSG_ERR_INVALID_MSG_ID);
$result = $this->ci->vorlagelib->getVorlage($vorlage_kurzbz);
$result = $this->ci->vorlagelib->loadVorlagetext($vorlage_kurzbz, $oe_kurzbz, $orgform_kurzbz);
if (is_object($result) && $result->error == EXIT_SUCCESS)
{
if (is_array($result->retval) && count($result->retval) > 0)
{
$parsedText = $this->ci->vorlagelib->parseVorlagetext($result->retval[0]->text, $data);
error_log($parsedText);
$this->ci->db->trans_start(false);
//save Message
$msgData = array(
'person_id' => $sender_id,
//'subject' => $subject,
'subject' => $result->retval[0]->subject,
'body' => $parsedText,
'priority' => PRIORITY_NORMAL,
//'relationmessage_id' => $relationmessage_id,
@@ -272,22 +266,27 @@ class MessageLib
'message_id' => $msg_id
);
$result = $this->ci->RecipientModel->insert($recipientData);
/*if (is_object($result) && $result->error == EXIT_SUCCESS)
if (is_object($result) && $result->error == EXIT_SUCCESS)
{
}*/
$statusData = array(
'message_id' => $msg_id,
'person_id' => $receiver_id,
'status' => MSG_STATUS_UNREAD
);
$result = $this->ci->MsgStatusModel->insert($statusData);
}
}
$this->ci->db->trans_complete();
if ($this->ci->db->trans_status() === FALSE)
if ($this->ci->db->trans_status() === FALSE || (is_object($result) && $result->error != EXIT_SUCCESS))
{
$this->db->trans_rollback();
$this->ci->db->trans_rollback();
return $this->_error($result->msg, EXIT_ERROR);
}
else
{
$this->db->trans_commit();
$this->ci->db->trans_commit();
return $this->_success($msg_id);
}
}
application/libraries/VorlageLib.php
+5 -1
View File
@@ -102,7 +102,11 @@ class VorlageLib
if (empty($vorlage_kurzbz))
return $this->_error($this->ci->lang->line('fhc_'.FHC_INVALIDID, false));
$vorlage = $this->ci->VorlageStudiengangModel->getVorlageStudiengang($vorlage_kurzbz, $oe_kurzbz, $orgform_kurzbz);
$vorlage = $this->ci->VorlageStudiengangModel->loadWhere(array(
'vorlage_kurzbz' => $vorlage_kurzbz,
'oe_kurzbz' => $oe_kurzbz,
'orgform_kurzbz' => $orgform_kurzbz)
);
return $vorlage;
}
application/models/system/Message_model.php
+17 -4
View File
@@ -82,7 +82,7 @@ public function getMessagesByPerson($person_id, $all)
// prepare parameters
$person_id = (int)$person_id;
// get Data
$sql = 'SELECT person_id,
/*$sql = 'SELECT person_id,
message_id,
subject,
body,
@@ -109,10 +109,23 @@ public function getMessagesByPerson($person_id, $all)
) status USING (message_id, person_id)
WHERE tbl_msg_status.insertamum=status.insertamum
) s USING (message_id, person_id)
WHERE person_id = ?';
WHERE person_id = ?';*/
if (! $all)
$sql .= ' AND (status < 3 OR status IS NULL)';
$sql = 'SELECT r.message_id,
m.subject,
m.body,
m.insertamum,
m.oe_kurzbz,
s.status,
s.statusinfo,
s.updateamum
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 public.tbl_msg_status s USING (message_id)
WHERE r.person_id = ?';
/*if (! $all)
$sql .= ' AND (status < 3 OR status IS NULL)';*/
$result = $this->db->query($sql, array($person_id));
//var_dump($result);
if (is_object($result))