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

Messages Inbox Outbox

Browse Source
This commit is contained in:
Paminger
2016-06-23 10:28:26 +02:00
parent ab4c8ac373
commit 4f14e7fa92
17 changed files with 196 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Messages.php
+35 -5
View File
@@ -8,8 +8,7 @@ class Messages extends VileSci_Controller
{
parent::__construct();
$this->load->library('MessageLib');
//$this->load->model('person/Person_model');
//$this->load->model('system/Message_model');
$this->load->model('person/Person_model', 'PersonModel');
}
public function index($person_id = null)
@@ -18,7 +17,7 @@ class Messages extends VileSci_Controller
$this->load->view('system/messages.php', $data);
}
public function table($person_id = null)
public function inbox($person_id = null)
{
if (empty($person_id))
$person_id = $this->input->post('person_id', TRUE);
@@ -31,12 +30,43 @@ class Messages extends VileSci_Controller
$data = array
(
'uid' => $this->getUID(),
'messages' => $msg->retval
);
//var_dump ($data);
$this->load->view('system/messagesList.php', $data);
if (!empty($person_id))
{
$person = $this->PersonModel->load($person_id);
$data['person'] = $person->retval[0];
}
// var_dump ($data);
$this->load->view('system/messagesInbox.php', $data);
}
public function outbox($person_id = null)
{
if (empty($person_id))
$person_id = $this->input->post('person_id', TRUE);
if (empty($person_id))
$msg = $this->messagelib->getMessagesByUID($this->getUID());
else
$msg = $this->messagelib->getMessagesByPerson($person_id);
if ($msg->error)
show_error($msg->retval);
$data = array
(
'uid' => $this->getUID(),
'messages' => $msg->retval
);
if (!empty($person_id))
{
$person = $this->PersonModel->load($person_id);
$data['person'] = $person->retval[0];
}
//var_dump ($data);
$this->load->view('system/messagesOutbox.php', $data);
}
public function view($msg_id)
{
$msg = $this->messagelib->getMessage($msg_id);
application/controllers/system/Templates.php
+4
View File
@@ -134,6 +134,10 @@ class Templates extends FHC_Controller
$data['studiengang_kz'] = $this->input->post('studiengang_kz', TRUE);
$data['version'] = $this->input->post('version', TRUE);
$data['oe_kurzbz'] = $this->input->post('oe_kurzbz', TRUE);
if ($this->input->post('orgform_kurzbz') == '')
$data['orgform_kurzbz'] = null;
else
$data['orgform_kurzbz'] = $this->input->post('orgform_kurzbz', TRUE);
$data['text'] = $this->input->post('text', TRUE);
$data['aktiv'] = $this->input->post('aktiv', TRUE);
$vorlagetext = $this->vorlagelib->updateVorlagetext($vorlagestudiengang_id, $data);