diff --git a/application/controllers/ViewMessage.php b/application/controllers/ViewMessage.php old mode 100644 new mode 100755 index 8b0766ca6..e752cc11f --- a/application/controllers/ViewMessage.php +++ b/application/controllers/ViewMessage.php @@ -14,6 +14,10 @@ if (!defined('BASEPATH')) exit('No direct script access allowed'); +/** + * NOTE: in this controller is not possible to include/call everything + * that automatically call the authentication system, like the most of models or libraries + */ class ViewMessage extends CI_Controller { /** @@ -22,11 +26,11 @@ class ViewMessage extends CI_Controller public function __construct() { parent::__construct(); - + // Loading config file message $this->config->load('message'); - - // Load model MessageToken_model + + // Load model MessageToken_model, not calling the authentication system $this->load->model('system/MessageToken_model', 'MessageTokenModel'); } @@ -37,12 +41,12 @@ class ViewMessage extends CI_Controller public function toHTML($token) { $msg = $this->MessageTokenModel->getMessageByToken($token); - + if ($msg->error) { show_error($msg->retval); } - + if (is_array($msg->retval) && count($msg->retval) > 0) { $setReadMessageStatusByToken = $this->MessageTokenModel->setReadMessageStatusByToken($token); @@ -52,7 +56,12 @@ class ViewMessage extends CI_Controller show_error($msg->$setReadMessageStatusByToken); } + $sender_id = $msg->retval[0]->sender_id; + $sender = $this->MessageTokenModel->getSenderData($sender_id); + $data = array ( + 'sender_id' => $sender_id, + 'sender' => $sender->retval[0], 'message' => $msg->retval[0], 'href' => APP_ROOT . $this->config->item('redirect_view_message_url') . $token ); diff --git a/application/models/system/MessageToken_model.php b/application/models/system/MessageToken_model.php old mode 100644 new mode 100755 index 7b648ae9b..9e5326056 --- a/application/models/system/MessageToken_model.php +++ b/application/models/system/MessageToken_model.php @@ -12,17 +12,17 @@ class MessageToken_model extends CI_Model public function __construct() { parent::__construct(); - + // Loads config file message $this->config->load('message'); - + // Load return message helper $this->load->helper('message'); - + // Loads the database object $this->load->database(); } - + /** * Get a received message identified by token */ @@ -45,7 +45,7 @@ class MessageToken_model extends CI_Model ) s ON (r.message_id = s.message_id AND r.person_id = s.person_id) WHERE r.token = ? LIMIT 1'; - + $result = $this->db->query($sql, array(MSG_STATUS_DELETED, $token)); // If no errors occurred @@ -139,5 +139,34 @@ class MessageToken_model extends CI_Model { return error($this->db->error()); } + + return success($result->result()); + } + + /** + * Get data of the message sender + */ + public function getSenderData($person_id) + { + $sql = 'SELECT p.vorname, + p.nachname, + p.anrede, + p.titelpost, + p.titelpre, + p.vornamen + FROM public.tbl_person p + WHERE p.person_id = ?'; + + $result = $this->db->query($sql, array($person_id)); + + // If no errors occurred + if ($result) + { + return success($result->result()); + } + else + { + return error($this->db->error()); + } } } \ No newline at end of file diff --git a/application/views/system/messageHTML.php b/application/views/system/messageHTML.php old mode 100644 new mode 100755 index bb6858889..d34b3ab94 --- a/application/views/system/messageHTML.php +++ b/application/views/system/messageHTML.php @@ -1,11 +1,23 @@ load->view("templates/header", array("title" => "Message viewer")); ?> - - - +
+

+
+ + + + + + - -
+ From: + - Subject: +   + + vorname.' '.$sender->nachname; ?> +
+ Subject:   @@ -16,7 +28,7 @@
- Message: + Message:   @@ -26,13 +38,13 @@
+ Reply
- + + -load->view("templates/footer"); ?> \ No newline at end of file +load->view("templates/footer"); ?>