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

- Added new template for plain text email

Browse Source 
- Renamed template for html email mail.php -> mailHTML.php
- Changed method getMessageByToken of Recipient_model for getting only the last message by token
- Changed method getMessages of Recipient_model for getting event the token
- Changed method send of library MailLib to add the possibility to send an alternative plain text
body for a html mail
- Changed library MessageLib to add the possibility to send emails in html/text format to inform
the users about new messages
- Added method toHTML to controller Messages
- Added new configuration entries in message.php
- Added new view messageHTML.php
This commit is contained in:
bison-paolo
2016-10-06 16:27:04 +02:00
parent 5ab5b291b3
commit bfaf901550
8 changed files with 142 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Messages.php
+50 -32
View File
@@ -1,19 +1,19 @@
<?php
if (! defined("BASEPATH")) exit("No direct script access allowed");
if (! defined('BASEPATH')) exit('No direct script access allowed');
class Messages extends VileSci_Controller
{
public function __construct()
{
parent::__construct();
$this->load->library("MessageLib");
$this->load->model("person/Person_model", "PersonModel");
$this->load->library('MessageLib');
$this->load->model('person/Person_model', 'PersonModel');
}
public function index()
{
$this->load->view("system/messages.php", array("person_id" => $this->getPersonId()));
$this->load->view('system/messages.php', array('person_id' => $this->getPersonId()));
}
public function inbox($person_id)
@@ -31,11 +31,11 @@ class Messages extends VileSci_Controller
}
$data = array (
"messages" => $msg->retval,
"person" => $person->retval[0]
'messages' => $msg->retval,
'person' => $person->retval[0]
);
$this->load->view("system/messagesInbox.php", $data);
$this->load->view('system/messagesInbox.php', $data);
}
public function outbox($person_id)
@@ -53,11 +53,11 @@ class Messages extends VileSci_Controller
}
$data = array (
"messages" => $msg->retval,
"person" => $person->retval[0]
'messages' => $msg->retval,
'person' => $person->retval[0]
);
$this->load->view("system/messagesOutbox.php", $data);
$this->load->view('system/messagesOutbox.php', $data);
}
public function view($msg_id, $person_id)
@@ -68,7 +68,7 @@ class Messages extends VileSci_Controller
show_error($msg->retval);
}
$v = $this->load->view("system/messageView", array("message" => $msg->retval[0]));
$v = $this->load->view('system/messageView', array('message' => $msg->retval[0]));
}
public function reply($msg_id, $person_id)
@@ -79,15 +79,15 @@ class Messages extends VileSci_Controller
show_error($msg->retval);
}
$v = $this->load->view("system/messageReply", array("message" => $msg->retval[0]));
$v = $this->load->view('system/messageReply', array('message' => $msg->retval[0]));
}
public function sendReply($msg_id, $person_id)
{
$subject = $this->input->post("subject");
$body = $this->input->post("body");
$subject = $this->input->post('subject');
$body = $this->input->post('body');
$this->load->model("system/Message_model", "MessageModel");
$this->load->model('system/Message_model', 'MessageModel');
$originMsg = $this->MessageModel->load($msg_id);
if ($originMsg->error)
{
@@ -100,7 +100,7 @@ class Messages extends VileSci_Controller
show_error($msg->retval);
}
redirect("/system/Messages/view/" . $msg->retval . "/" . $originMsg->retval[0]->person_id);
redirect('/system/Messages/view/' . $msg->retval . '/' . $originMsg->retval[0]->person_id);
}
public function write($sender_id, $receiver_id)
@@ -112,20 +112,20 @@ class Messages extends VileSci_Controller
}
$data = array (
"sender_id" => $sender_id,
"receiver_id" => $receiver_id,
"receiver" => $person->retval[0]
'sender_id' => $sender_id,
'receiver_id' => $receiver_id,
'receiver' => $person->retval[0]
);
$v = $this->load->view("system/messageWrite", $data);
$v = $this->load->view('system/messageWrite', $data);
}
public function send($sender_id, $receiver_id)
{
$subject = $this->input->post("subject");
$body = $this->input->post("body");
$subject = $this->input->post('subject');
$body = $this->input->post('body');
$this->load->model("system/Message_model", "MessageModel");
$this->load->model('system/Message_model', 'MessageModel');
$originMsg = $this->MessageModel->load($msg_id);
if ($originMsg->error)
{
@@ -138,25 +138,43 @@ class Messages extends VileSci_Controller
show_error($msg->retval);
}
redirect("/system/Messages/view/" . $msg->retval . "/" . $receiver_id);
redirect('/system/Messages/view/' . $msg->retval . '/' . $receiver_id);
}
public function toHTML($token)
{
$msg = $this->messagelib->getMessageByToken($token);
if ($msg->error)
{
show_error($msg->retval);
}
if (is_array($msg->retval) && count($msg->retval) > 0)
{
$data = array (
'message' => $msg->retval[0]
);
$this->load->view('system/messageHTML.php', $data);
}
}
private function getPersonId()
{
$person_id = null;
if ($this->input->get("person_id") !== null)
if ($this->input->get('person_id') !== null)
{
$person_id = $this->input->get("person_id");
$person_id = $this->input->get('person_id');
}
else if ($this->input->post("person_id") !== null)
else if ($this->input->post('person_id') !== null)
{
$person_id = $this->input->get("person_id");
$person_id = $this->input->get('person_id');
}
if (!is_numeric($person_id))
{
show_error("Person_id is not numeric");
show_error('Person_id is not numeric');
}
return $person_id;
@@ -164,12 +182,12 @@ class Messages extends VileSci_Controller
public function getVorlage()
{
$vorlage_kurzbz = $this->input->get("vorlage_kurzbz");
$vorlage_kurzbz = $this->input->get('vorlage_kurzbz');
if (isset($vorlage_kurzbz))
{
$this->load->model("system/Vorlagestudiengang_model", "VorlagestudiengangModel");
$result = $this->VorlagestudiengangModel->loadWhere(array("vorlage_kurzbz" => $vorlage_kurzbz));
$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
$result = $this->VorlagestudiengangModel->loadWhere(array('vorlage_kurzbz' => $vorlage_kurzbz));
$this->output
->set_content_type('application/json')