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

json for the other mails

Browse Source
This commit is contained in:
HB9HIL
2024-10-28 13:01:59 +01:00
parent bbb1b8c976
commit 89ce91aa00
5 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/Oqrs.php
View File

@@ -232,8 +232,8 @@ class Oqrs extends CI_Controller {
$this->email->to($email);
$this->email->reply_to($this->security->xss_clean($postdata['email']), strtoupper($data['callsign']));
$this->email->subject('Wavelog OQRS from ' . strtoupper($data['callsign']));
$this->email->message($message);
$this->email->subject($message['subject']);
$this->email->message($message['body']);
if (! $this->email->send()) {
log_message('error', 'OQRS Alert! Email settings are incorrect.');

8
application/controllers/User.php
View File

@@ -1011,8 +1011,8 @@ class User extends CI_Controller {
$this->email->from($this->optionslib->get_option('emailAddress'), $this->optionslib->get_option('emailSenderName'));
$this->email->to($email);
$this->email->subject('Wavelog Account Password Reset');
$this->email->message($message);
$this->email->subject($message['subject']);
$this->email->message($message['body']);
if (! $this->email->send())
{
@@ -1098,8 +1098,8 @@ class User extends CI_Controller {
$this->email->from($this->optionslib->get_option('emailAddress'), $this->optionslib->get_option('emailSenderName'));
$this->email->to($data->user_email);
$this->email->subject('Wavelog Account Password Reset');
$this->email->message($message);
$this->email->subject($message['subject']);
$this->email->message($message['body']);
if (! $this->email->send())
{

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

@@ -1,6 +1,8 @@
<?=
<?php
sprintf(__("Hello %s"), $user_firstname . ", " . $user_callsign) . "\n\n" .
$message['subject'] = __("Wavelog Account Password Reset");
$message['body'] = sprintf(__("Hello %s"), $user_firstname . ", " . $user_callsign) . "\n\n" .
__("An admin initiated a password reset for your Wavelog account.") . "\n\n" .
@@ -13,3 +15,5 @@ __("If you didn't request any password reset, just ignore this email and talk to
Regards,
Wavelog");
echo json_encode($message);

12
application/views/email/forgot_password.php
View File

@@ -1,8 +1,10 @@
<?=
<?php
__("Hi,
$message['subject'] = __("Wavelog Account Password Reset");
You or someone else has requested a password reset on your Wavelog account.") . "\n\n" . __("Log View") . "\n\n" .
$message['body'] = __("Hi,
You or someone else has requested a password reset on your Wavelog account.") . "\n\n" .
sprintf(__("Your password reset code is: %s"), $reset_code) . "\n\n" .
@@ -12,4 +14,6 @@ __("If you didn't request this just ignore.
Regards,
Wavelog");
Wavelog");
echo json_encode($message);

17
application/views/email/oqrs_request.php
View File

@@ -1,21 +1,26 @@
<?php
$message['subject'] = sprintf(__("Wavelog OQRS from %s"), strtoupper($callsign));
if ($usermessage != '') {
$usermessage = __("The user entered the following message:
%s", $usermessage);
$um_formatted = __("The user entered the following message: ") . "\n\n";
$um_formatted .= "------------" . "\n";
$um_formatted .= $usermessage . "\n";
$um_formatted .= "------------" . "\n\n";
} else {
$usermessage = __("The user did not enter any additional message.");
$um_formatted = __("The user did not enter any additional message.") . "\n\n";
}
echo sprintf( __("Hi,
$message['body'] = sprintf( __("Hi,
You got an OQRS request from %s."), strtoupper($callsign)) . "\n\n" .
$usermessage . "\n\n" .
$um_formatted .
__("Please log into your Wavelog and process it.
Regards,
Wavelog");
echo json_encode($message);