diff --git a/application/controllers/ViewMessage.php b/application/controllers/ViewMessage.php old mode 100644 new mode 100755 index ec8b73898..7e6eeab4c --- a/application/controllers/ViewMessage.php +++ b/application/controllers/ViewMessage.php @@ -22,31 +22,36 @@ class ViewMessage extends CI_Controller public function __construct() { parent::__construct(); - + // Loading config file message $this->config->load('message'); - + // Load model MessageToken_model $this->load->model('system/MessageToken_model', 'MessageTokenModel'); + $this->load->model('person/Person_model', 'PersonModel'); } - + 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) { + $sender_id = $msg->retval[0]->sender_id; + $sender = $this->PersonModel->load($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 ); - + $this->load->view('system/messageHTML.php', $data); } } -} \ No newline at end of file +} diff --git a/application/models/system/MessageToken_model.php b/application/models/system/MessageToken_model.php old mode 100644 new mode 100755 index c724478bf..506273d07 --- a/application/models/system/MessageToken_model.php +++ b/application/models/system/MessageToken_model.php @@ -8,17 +8,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 */ @@ -41,9 +41,9 @@ 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)); - + return success($result->result()); } -} \ 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"); ?>