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

Task #404: GUI zum Schreiben von Nachrichten im FAS: 3rd part

Browse Source
This commit is contained in:
bison-paolo
2016-09-26 13:08:03 +02:00
parent 3009a03eac
commit a90adbda72
5 changed files with 74 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Messages.php
+41 -3
View File
@@ -71,7 +71,7 @@ class Messages extends VileSci_Controller
$v = $this->load->view("system/messageView", array("message" => $msg->retval[0]));
}
public function write($msg_id, $person_id)
public function reply($msg_id, $person_id)
{
$msg = $this->messagelib->getMessage($msg_id, $person_id);
if ($msg->error)
@@ -79,10 +79,10 @@ class Messages extends VileSci_Controller
show_error($msg->retval);
}
$v = $this->load->view("system/messageWrite", array("message" => $msg->retval[0]));
$v = $this->load->view("system/messageReply", array("message" => $msg->retval[0]));
}
public function send($msg_id, $person_id)
public function sendReply($msg_id, $person_id)
{
$subject = $this->input->post("subject");
$body = $this->input->post("body");
@@ -103,6 +103,44 @@ class Messages extends VileSci_Controller
redirect("/system/Messages/view/" . $msg->retval . "/" . $originMsg->retval[0]->person_id);
}
public function write($sender_id, $receiver_id)
{
$person = $this->PersonModel->load($receiver_id);
if ($person->error)
{
show_error($person->retval);
}
$data = array (
"sender_id" => $sender_id,
"receiver_id" => $receiver_id,
"receiver" => $person->retval[0]
);
$v = $this->load->view("system/messageWrite", $data);
}
public function send($sender_id, $receiver_id)
{
$subject = $this->input->post("subject");
$body = $this->input->post("body");
$this->load->model("system/Message_model", "MessageModel");
$originMsg = $this->MessageModel->load($msg_id);
if ($originMsg->error)
{
show_error($originMsg->retval);
}
$msg = $this->messagelib->sendMessage($sender_id, $receiver_id, $subject, $body, PRIORITY_NORMAL);
if ($msg->error)
{
show_error($msg->retval);
}
redirect("/system/Messages/view/" . $msg->retval . "/" . $receiver_id);
}
private function getPersonId()
{
$person_id = null;
application/models/system/Recipient_model.php
+1 -1
View File
@@ -37,7 +37,7 @@ class Recipient_model extends DB_Model
p.vorname,
b.uid
FROM public.tbl_msg_recipient mr INNER JOIN public.tbl_msg_message mm USING (message_id)
INNER JOIN public.tbl_person p ON (mr.person_id = p.person_id)
INNER JOIN public.tbl_person p ON (mm.person_id = p.person_id)
LEFT JOIN public.tbl_benutzer b ON (mr.person_id = b.person_id)
LEFT JOIN (
SELECT person_id, kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email'
application/views/system/messageReply.php
+28
View File
@@ -0,0 +1,28 @@
<?php $this->load->view('templates/header'); ?>
<script type="text/javascript" src="<?php echo base_url('vendor/tinymce/tinymce/tinymce.min.js');?>"></script>
<body>
<div class="row">
<div class="span4">
<?php
$href = str_replace("/system/Messages/reply", "/system/Messages/sendReply", $_SERVER["REQUEST_URI"]);
?>
<form id="sendForm" method="post" action="<?php echo $href; ?>">
<div class="span4">
To: <?php echo $message->uid . " " . $message->vorname . " " . $message->nachname . " " . $message->kontakt; ?><br/>
Subject: <input type="text" value="Re: <?php echo $message->subject; ?>" name="subject"><br/>
<textarea id="bodyTextArea" name="body"><?php echo $message->body; ?></textarea>
</div>
<button type="submit">Send</button>
</form>
</div>
</div>
<script>
tinymce.init({
selector: '#bodyTextArea'
});
</script>
</body>
</html>
application/views/system/messageView.php
+1 -1
View File
@@ -15,7 +15,7 @@
<div class="row">
<div class="span4">
<button type="submit" onClick="parent.document.getElementById('MessagesBottom').src = 'Messages/write/<?php echo $message->message_id; ?>/<?php echo $message->person_id; ?>'">
<button type="submit" onClick="parent.document.getElementById('MessagesBottom').src = 'Messages/reply/<?php echo $message->message_id; ?>/<?php echo $message->person_id; ?>'">
Reply
</button>
</div>
application/views/system/messageWrite.php
+3 -6
View File
@@ -7,15 +7,12 @@
<div class="span4">
<?php
$href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER["REQUEST_URI"]);
/*$href = substr($href, 0, strrpos($href, "/") - strlen($href));
$href = substr($href, 0, strrpos($href, "/") - strlen($href));*/
/*$href .= "/" . $m->message_id . "/" . $person->person_id;*/
?>
<form id="sendForm" method="post" action="<?php echo $href; ?>">
<div class="span4">
To: <?php echo $message->uid . " " . $message->vorname . " " . $message->nachname . " " . $message->kontakt; ?><br/>
Subject: <input type="text" value="Re: <?php echo $message->subject; ?>" name="subject"><br/>
<textarea id="bodyTextArea" name="body"><?php echo $message->body; ?></textarea>
To: <?php echo $receiver->vorname . " " . $receiver->nachname; ?><br/>
Subject: <input type="text" value="" name="subject"><br/>
<textarea id="bodyTextArea" name="body"></textarea>
</div>
<button type="submit">Send</button>
</form>