Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 02:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

using json to load the mail allows to place everything message related in the view (e.g. the subject)

Browse Source
This commit is contained in:
HB9HIL
2024-10-28 12:37:31 +01:00
parent d22b3fda13
commit bbb1b8c976
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/Options.php
View File

@@ -374,8 +374,8 @@ class Options extends CI_Controller {
$this->email->from($this->optionslib->get_option('emailAddress'), $this->optionslib->get_option('emailSenderName'));
$this->email->to($email);
$this->email->subject('Wavelog Test-Mail');
$this->email->message($message);
$this->email->subject($message['subject']);
$this->email->message($message['body']);
if (! $this->email->send()){
$this->session->set_flashdata('testmailFailed', __("Testmail failed. Something went wrong."));

8
application/views/email/testmail.php
View File

@@ -1,6 +1,8 @@
<?=
<?php
__("Hi,
$message['subject'] = __("Wavelog Test-Mail");
$message['body'] = __("Hi,
This is a test email from your Wavelog instance.
@@ -9,3 +11,5 @@ If you received this email, your mail settings are correct.
Regards,
Wavelog");
echo json_encode($message);

4
system/libraries/Email.php
View File

@@ -469,7 +469,7 @@ class CI_Email {
* @param array $data = array()
* @param string language
*
* @return string message
* @return string message in json format
*/
public function load($view, $data = array(), $language = NULL) {
@@ -492,7 +492,7 @@ class CI_Email {
_setlocale(LC_ALL, $origin_lang);
}
return html_entity_decode($message);
return json_decode(html_entity_decode($message), true);
}
// --------------------------------------------------------------------