diff --git a/application/controllers/Options.php b/application/controllers/Options.php
index f22eee3e..1cf4562c 100644
--- a/application/controllers/Options.php
+++ b/application/controllers/Options.php
@@ -267,85 +267,46 @@ class Options extends CI_Controller {
// Update emailProtocol choice within the options system
$emailProtocolupdate = $this->optionslib->update('emailProtocol', $this->input->post('emailProtocol'), 'yes');
-
- // If emailProtocolupdate update is complete set a flashsession with a success note
- if($emailProtocolupdate == TRUE) {
- $this->session->set_flashdata('success', $this->lang->line('options_outgoing_email_protocol_changed_to').$this->input->post('emailProtocol'));
- }
// Update smtpEncryption choice within the options system
$smtpEncryptionupdate = $this->optionslib->update('smtpEncryption', $this->input->post('smtpEncryption'), 'yes');
-
- // If smtpEncryption update is complete set a flashsession with a success note
- if($smtpEncryptionupdate == TRUE) {
- $this->session->set_flashdata('success', $this->lang->line('options_smtp_encryption_changed_to').$this->input->post('smtpEncryption'));
- }
// Update email sender name within the options system
$emailSenderNameupdate = $this->optionslib->update('emailSenderName', $this->input->post('emailSenderName'), 'yes');
- // If email address update is complete set a flashsession with a success note
- if($emailSenderNameupdate == TRUE) {
- $this->session->set_flashdata('success', $this->lang->line('options_email_sender_name_changed_to').$this->input->post('emailSenderName'));
- }
-
// Update email address choice within the options system
$emailAddressupdate = $this->optionslib->update('emailAddress', $this->input->post('emailAddress'), 'yes');
- // If email address update is complete set a flashsession with a success note
- if($emailAddressupdate == TRUE) {
- $this->session->set_flashdata('success', $this->lang->line('options_email_address_changed_to').$this->input->post('emailAddress'));
- }
-
// Update smtpHost choice within the options system
$smtpHostupdate = $this->optionslib->update('smtpHost', $this->input->post('smtpHost'), 'yes');
-
- // If smtpHost update is complete set a flashsession with a success note
- if($smtpHostupdate == TRUE) {
- $this->session->set_flashdata('success', $this->lang->line('options_smtp_host_changed_to').$this->input->post('smtpHost'));
- }
// Update smtpPort choice within the options system
$smtpPortupdate = $this->optionslib->update('smtpPort', $this->input->post('smtpPort'), 'yes');
- // If smtpPort update is complete set a flashsession with a success note
- if($smtpPortupdate == TRUE) {
- $this->session->set_flashdata('success', $this->lang->line('options_smtp_port_changed_to').$this->input->post('smtpPort'));
- }
-
// Update smtpUsername choice within the options system
$smtpUsernameupdate = $this->optionslib->update('smtpUsername', $this->input->post('smtpUsername'), 'yes');
-
- // If smtpUsername update is complete set a flashsession with a success note
- if($smtpUsernameupdate == TRUE) {
- $this->session->set_flashdata('success', $this->lang->line('options_smtp_username_changed_to').$this->input->post('smtpUsername'));
- }
// Update smtpPassword choice within the options system
$smtpPasswordupdate = $this->optionslib->update('smtpPassword', $this->input->post('smtpPassword'), 'yes');
- // If smtpPassword update is complete set a flashsession with a success note
- if($smtpPasswordupdate == TRUE) {
- $this->session->set_flashdata('success', $this->lang->line('options_smtp_password_changed_to').$this->input->post('smtpPassword'));
- }
+ // Check if all updates are successful
+ $updateSuccessful = $emailProtocolupdate &&
+ $smtpEncryptionupdate &&
+ $emailSenderNameupdate &&
+ $emailAddressupdate &&
+ $smtpHostupdate &&
+ $smtpPortupdate &&
+ $smtpUsernameupdate &&
+ $smtpPasswordupdate;
- // Update emailcrlf choice within the options system
- $emailcrlfupdate = $this->optionslib->update('emailcrlf', $this->input->post('emailcrlf'), 'yes');
-
- // If emailcrlf update is complete set a flashsession with a success note
- if($emailcrlfupdate == TRUE) {
- $this->session->set_flashdata('success', $this->lang->line('options_email_crlf_changed_to').$this->input->post('emailcrlf'));
- }
-
- // Update emailnewline choice within the options system
- $emailnewlineupdate = $this->optionslib->update('emailnewline', $this->input->post('emailnewline'), 'yes');
-
- // If emailnewline update is complete set a flashsession with a success note
- if($emailnewlineupdate == TRUE) {
- $this->session->set_flashdata('success', $this->lang->line('options_email_newline_changed_to').$this->input->post('emailnewline'));
+ // Set flash session based on update success
+ if ($updateSuccessful) {
+ $this->session->set_flashdata('success', $this->lang->line('options_mail_settings_saved'));
+ } else {
+ $this->session->set_flashdata('saveFailed', $this->lang->line('options_mail_settings_failed'));
}
- // Redirect back to /appearance
+ // Redirect back to /email
redirect('/options/email');
}
}
@@ -380,4 +341,47 @@ class Options extends CI_Controller {
redirect('/options/oqrs');
}
+ function sendTestMail() {
+ $this->load->model('user_model');
+
+ $id = $this->session->userdata('user_id');
+
+ $email = $this->user_model->get_user_email_by_id($id);
+
+ if($email != "") {
+
+ $this->load->library('email');
+
+ if($this->optionslib->get_option('emailProtocol') == "smtp") {
+ $config = Array(
+ 'protocol' => $this->optionslib->get_option('emailProtocol'),
+ 'smtp_crypto' => $this->optionslib->get_option('smtpEncryption'),
+ 'smtp_host' => $this->optionslib->get_option('smtpHost'),
+ 'smtp_port' => $this->optionslib->get_option('smtpPort'),
+ 'smtp_user' => $this->optionslib->get_option('smtpUsername'),
+ 'smtp_pass' => $this->optionslib->get_option('smtpPassword'),
+ );
+
+ $this->email->initialize($config);
+ }
+
+ $message = $this->load->view('email/testmail.php', NULL, TRUE);
+
+ $this->email->from($this->optionslib->get_option('emailAddress'), $this->optionslib->get_option('emailSenderName'));
+ $this->email->to($email);
+ $this->email->subject('Cloudlog Test-Mail');
+ $this->email->message($message);
+
+ if (! $this->email->send()){
+ $this->session->set_flashdata('testmailFailed', $this->lang->line('options_send_testmail_failed'));
+ } else {
+ $this->session->set_flashdata('testmailSuccess', $this->lang->line('options_send_testmail_success'));
+ }
+ } else {
+ $this->session->set_flashdata('testmailFailed', $this->lang->line('options_send_testmail_failed'));
+ }
+
+ redirect('/options/email');
+ }
+
}
diff --git a/application/controllers/Oqrs.php b/application/controllers/Oqrs.php
index bc7ce099..ae46d42d 100644
--- a/application/controllers/Oqrs.php
+++ b/application/controllers/Oqrs.php
@@ -40,7 +40,7 @@ class Oqrs extends CI_Controller {
public function get_qsos() {
$this->load->model('bands');
$data['bands'] = $this->bands->get_worked_bands_oqrs($this->security->xss_clean($this->input->post('station_id')));
-
+
$this->load->model('oqrs_model');
$result = $this->oqrs_model->get_qsos($this->input->post('station_id'), $this->input->post('callsign'), $data['bands']);
$data['callsign'] = $this->security->xss_clean($this->input->post('callsign'));
@@ -60,7 +60,7 @@ class Oqrs extends CI_Controller {
public function not_in_log() {
$data['page_title'] = "Log Search & OQRS";
-
+
$this->load->model('bands');
// $data['bands'] = $this->bands->get_worked_bands_oqrs($this->security->xss_clean($this->input->post('station_id')));
@@ -68,10 +68,13 @@ class Oqrs extends CI_Controller {
}
public function save_not_in_log() {
+ $station_ids = array();
+
$postdata = $this->input->post();
$this->load->model('oqrs_model');
$this->oqrs_model->save_not_in_log($postdata);
- $this->alert_oqrs_request($postdata);
+ array_push($station_ids, xss_clean($this->input->post('station_id')));
+ $this->alert_oqrs_request($postdata, $station_ids);
}
/*
@@ -152,47 +155,46 @@ class Oqrs extends CI_Controller {
public function alert_oqrs_request($postdata, $station_ids) {
foreach ($station_ids as $id) {
$this->load->model('user_model');
-
+
$email = $this->user_model->get_email_address($id);
-
+
$this->load->model('oqrs_model');
-
+
$sendEmail = $this->oqrs_model->getOqrsEmailSetting($id);
-
+
if($email != "" && $sendEmail == "1") {
-
+
$this->load->library('email');
-
+
if($this->optionslib->get_option('emailProtocol') == "smtp") {
$config = Array(
'protocol' => $this->optionslib->get_option('emailProtocol'),
+ 'smtp_crypto' => $this->optionslib->get_option('smtpEncryption'),
'smtp_host' => $this->optionslib->get_option('smtpHost'),
'smtp_port' => $this->optionslib->get_option('smtpPort'),
'smtp_user' => $this->optionslib->get_option('smtpUsername'),
'smtp_pass' => $this->optionslib->get_option('smtpPassword'),
- 'crlf' => "\r\n",
- 'newline' => "\r\n"
);
-
+
$this->email->initialize($config);
}
-
+
$data['callsign'] = $this->security->xss_clean($postdata['callsign']);
$data['usermessage'] = $this->security->xss_clean($postdata['message']);
-
+
$message = $this->load->view('email/oqrs_request', $data, TRUE);
-
+
$this->email->from($this->optionslib->get_option('emailAddress'), $this->optionslib->get_option('emailSenderName'));
$this->email->to($email);
$this->email->reply_to($this->security->xss_clean($postdata['email']), strtoupper($data['callsign']));
-
+
$this->email->subject('Cloudlog OQRS from ' . strtoupper($data['callsign']));
$this->email->message($message);
-
+
if (! $this->email->send()) {
- $this->session->set_flashdata('warning', 'Email settings are incorrect.');
+ log_message('error', 'OQRS Alert! Email settings are incorrect.');
} else {
- $this->session->set_flashdata('notice', 'Password Reset Processed.');
+ log_message('info', 'An OQRS request is made.');
}
}
}
diff --git a/application/controllers/User.php b/application/controllers/User.php
index 79b740d9..877d05f2 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -713,12 +713,11 @@ class User extends CI_Controller {
if($this->optionslib->get_option('emailProtocol') == "smtp") {
$config = Array(
'protocol' => $this->optionslib->get_option('emailProtocol'),
+ 'smtp_crypto' => $this->optionslib->get_option('smtpEncryption'),
'smtp_host' => $this->optionslib->get_option('smtpHost'),
'smtp_port' => $this->optionslib->get_option('smtpPort'),
'smtp_user' => $this->optionslib->get_option('smtpUsername'),
'smtp_pass' => $this->optionslib->get_option('smtpPassword'),
- 'crlf' => "\r\n",
- 'newline' => "\r\n"
);
$this->email->initialize($config);
diff --git a/application/language/bulgarian/options_lang.php b/application/language/bulgarian/options_lang.php
index f6d172b1..19703452 100644
--- a/application/language/bulgarian/options_lang.php
+++ b/application/language/bulgarian/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = 'Newline';
-$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to ';
-$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to ';
-$lang['options_email_address_changed_to'] = 'Email Address changed to ';
-$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to ';
-$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to ';
-$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to ';
-$lang['options_smtp_username_changed_to'] = 'SMTP Username changed to ';
-$lang['options_smtp_password_changed_to'] = 'SMTP Password changed to ';
-$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to ';
-$lang['options_email_newline_changed_to'] = 'Email Newline changed to ';
+$lang['options_mail_settings_saved'] = "The settings were saved successfully.";
+$lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
+$lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
+$lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
+$lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'";
+$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used.";
+$lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
+$lang['options_send_testmail'] = "Send Test-Mail";
+$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings.";
+$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong.";
+$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct.";
$lang['options_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text';
diff --git a/application/language/chinese_simplified/options_lang.php b/application/language/chinese_simplified/options_lang.php
index 9b17e609..35480b6c 100644
--- a/application/language/chinese_simplified/options_lang.php
+++ b/application/language/chinese_simplified/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP 主机';
$lang['options_smtp_port'] = 'SMTP 端口';
$lang['options_smtp_username'] = 'SMTP 用户名';
$lang['options_smtp_password'] = 'SMTP 密码';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = '新行';
-$lang['options_outgoing_email_protocol_changed_to'] = '传出电子邮件协议更改为 ';
-$lang['options_smtp_encryption_changed_to'] = 'SMTP 加密更改为 ';
-$lang['options_email_address_changed_to'] = '电子邮件地址更改为 ';
-$lang['options_email_sender_name_changed_to'] = '发件人姓名更改为 ';
-$lang['options_smtp_host_changed_to'] = 'SMTP 主机更改为 ';
-$lang['options_smtp_port_changed_to'] = 'SMTP 端口更改为 ';
-$lang['options_smtp_username_changed_to'] = 'SMTP 用户名更改为';
-$lang['options_smtp_password_changed_to'] = 'SMTP 密码更改为';
-$lang['options_email_crlf_changed_to'] = '电子邮件 CRLF 更改为';
-$lang['options_email_newline_changed_to'] = '电子邮件新行更改为';
+$lang['options_mail_settings_saved'] = "The settings were saved successfully.";
+$lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
+$lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
+$lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
+$lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'";
+$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used.";
+$lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
+$lang['options_send_testmail'] = "Send Test-Mail";
+$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings.";
+$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong.";
+$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct.";
$lang['options_oqrs'] = 'OQRS设置';
$lang['options_global_text'] = '全局文本';
diff --git a/application/language/czech/options_lang.php b/application/language/czech/options_lang.php
index 23821e29..ce333cf3 100644
--- a/application/language/czech/options_lang.php
+++ b/application/language/czech/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP hostitel';
$lang['options_smtp_port'] = 'SMTP port';
$lang['options_smtp_username'] = 'SMTP uživatelské jméno';
$lang['options_smtp_password'] = 'SMTP heslo';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = 'Nový řádek';
-$lang['options_outgoing_email_protocol_changed_to'] = 'Protokol odchozího e-mailu změněn na ';
-$lang['options_smtp_encryption_changed_to'] = 'SMTP šifrování změněno na ';
-$lang['options_email_address_changed_to'] = 'E-mailová adresa změněna na ';
-$lang['options_email_sender_name_changed_to'] = 'Jméno odesílatele e-mailu změněno na ';
-$lang['options_smtp_host_changed_to'] = 'SMTP hostitel změněn na ';
-$lang['options_smtp_port_changed_to'] = 'SMTP port změněn na ';
-$lang['options_smtp_username_changed_to'] = 'SMTP uživatelské jméno změněno na ';
-$lang['options_smtp_password_changed_to'] = 'SMTP heslo změněno na ';
-$lang['options_email_crlf_changed_to'] = 'CRLF e-mail změněn na ';
-$lang['options_email_newline_changed_to'] = 'Nový řádek e-mailu změněn na ';
+$lang['options_mail_settings_saved'] = "The settings were saved successfully.";
+$lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
+$lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
+$lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
+$lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'";
+$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used.";
+$lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
+$lang['options_send_testmail'] = "Send Test-Mail";
+$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings.";
+$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong.";
+$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct.";
$lang['options_oqrs'] = 'OQRS možnosti';
$lang['options_global_text'] = 'Globální text';
diff --git a/application/language/dutch/options_lang.php b/application/language/dutch/options_lang.php
index 431bfc55..a6c760b8 100644
--- a/application/language/dutch/options_lang.php
+++ b/application/language/dutch/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = 'Newline';
-$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to ';
-$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to ';
-$lang['options_email_address_changed_to'] = 'Email Address changed to ';
-$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to ';
-$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to ';
-$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to ';
-$lang['options_smtp_username_changed_to'] = 'SMTP Username changed to ';
-$lang['options_smtp_password_changed_to'] = 'SMTP Password changed to ';
-$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to ';
-$lang['options_email_newline_changed_to'] = 'Email Newline changed to ';
+$lang['options_mail_settings_saved'] = "The settings were saved successfully.";
+$lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
+$lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
+$lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
+$lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'";
+$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used.";
+$lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
+$lang['options_send_testmail'] = "Send Test-Mail";
+$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings.";
+$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong.";
+$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct.";
$lang['options_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text';
diff --git a/application/language/english/options_lang.php b/application/language/english/options_lang.php
index 34f1f2ce..b3422a5d 100644
--- a/application/language/english/options_lang.php
+++ b/application/language/english/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = 'Newline';
-$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to ';
-$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to ';
-$lang['options_email_address_changed_to'] = 'Email Address changed to ';
-$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to ';
-$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to ';
-$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to ';
-$lang['options_smtp_username_changed_to'] = 'SMTP Username changed to ';
-$lang['options_smtp_password_changed_to'] = 'SMTP Password changed to ';
-$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to ';
-$lang['options_email_newline_changed_to'] = 'Email Newline changed to ';
+$lang['options_mail_settings_saved'] = "The settings were saved successfully.";
+$lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
+$lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
+$lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
+$lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'";
+$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used.";
+$lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
+$lang['options_send_testmail'] = "Send Test-Mail";
+$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings.";
+$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong.";
+$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct.";
$lang['options_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text';
diff --git a/application/language/finnish/options_lang.php b/application/language/finnish/options_lang.php
index c69085f8..2dbfd530 100644
--- a/application/language/finnish/options_lang.php
+++ b/application/language/finnish/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = 'Newline';
-$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to ';
-$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to ';
-$lang['options_email_address_changed_to'] = 'Sähköpostiosoite vaihdettu: ';
-$lang['options_email_sender_name_changed_to'] = 'Sähköpostin lähettäjän nimi vaihdettu: ';
-$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to ';
-$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to ';
-$lang['options_smtp_username_changed_to'] = 'SMTP Username changed to ';
-$lang['options_smtp_password_changed_to'] = 'SMTP Password changed to ';
-$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to ';
-$lang['options_email_newline_changed_to'] = 'Email Newline changed to ';
+$lang['options_mail_settings_saved'] = "The settings were saved successfully.";
+$lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
+$lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
+$lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
+$lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'";
+$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used.";
+$lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
+$lang['options_send_testmail'] = "Send Test-Mail";
+$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings.";
+$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong.";
+$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct.";
$lang['options_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text';
diff --git a/application/language/french/options_lang.php b/application/language/french/options_lang.php
index 34f1f2ce..b3422a5d 100644
--- a/application/language/french/options_lang.php
+++ b/application/language/french/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = 'Newline';
-$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to ';
-$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to ';
-$lang['options_email_address_changed_to'] = 'Email Address changed to ';
-$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to ';
-$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to ';
-$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to ';
-$lang['options_smtp_username_changed_to'] = 'SMTP Username changed to ';
-$lang['options_smtp_password_changed_to'] = 'SMTP Password changed to ';
-$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to ';
-$lang['options_email_newline_changed_to'] = 'Email Newline changed to ';
+$lang['options_mail_settings_saved'] = "The settings were saved successfully.";
+$lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
+$lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
+$lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
+$lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'";
+$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used.";
+$lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
+$lang['options_send_testmail'] = "Send Test-Mail";
+$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings.";
+$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong.";
+$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct.";
$lang['options_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text';
diff --git a/application/language/german/options_lang.php b/application/language/german/options_lang.php
index 91e21b4a..fcc241cd 100644
--- a/application/language/german/options_lang.php
+++ b/application/language/german/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Benutzername';
$lang['options_smtp_password'] = 'SMTP Passwort';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = 'Zeilenvorschub (Newline)';
-$lang['options_outgoing_email_protocol_changed_to'] = 'Protokoll für ausgehende E-Mails geändert zu ';
-$lang['options_smtp_encryption_changed_to'] = 'SMTP Verschlüsselung geändert zu ';
-$lang['options_email_address_changed_to'] = 'E-Mailadresse geändert zu ';
-$lang['options_email_sender_name_changed_to'] = 'E-Mail Absendername geändert zu ';
-$lang['options_smtp_host_changed_to'] = 'SMTP Host geändert zu ';
-$lang['options_smtp_port_changed_to'] = 'SMTP Port geändert zu ';
-$lang['options_smtp_username_changed_to'] = 'SMTP Benutzername geändert zu ';
-$lang['options_smtp_password_changed_to'] = 'SMTP Passwort geändert zu ';
-$lang['options_email_crlf_changed_to'] = 'E-Mail CRLF geändert zu ';
-$lang['options_email_newline_changed_to'] = 'E-Mail Zeilenvorschub geändert zu ';
+$lang['options_mail_settings_saved'] = "Die Einstellungen wurden erfolgreich gespeichert.";
+$lang['options_mail_settings_failed'] = "Beim Speichern ist was schief gelaufen. Probiere es erneut.";
+$lang['options_outgoing_protocol_hint'] = "Das Protokoll, mit dem E-Mails versendet werden.";
+$lang['options_smtp_encryption_hint'] = "Wähle ob E-Mails mit TLS oder SSL versendet werden sollen.";
+$lang['options_email_address_hint'] = "Die E-Mail Adresse von der die Mails versendet werden, z.B. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "Der Name des Absenders, z.B. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "Der Hostname des Mailservers, z.B. 'mail.example.com' (ohne 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "Der SMTP Port des Mailservers, z.B. für TLS -> '587', für SSL -> '465'";
+$lang['options_smtp_username_hint'] = "Der Benutzername um sich am Mailserver anzumelden. Normalerweise ist dies die E-Mail Adresse.";
+$lang['options_smtp_password_hint'] = "Das Passwort um sich am Mailserver anzumelden.";
+$lang['options_send_testmail'] = "Sende eine Test-Mail";
+$lang['options_send_testmail_hint'] = "Die E-Mail wird an die Adresse versandt, welche in den Account-Einstellungen hinterlegt ist.";
+$lang['options_send_testmail_failed'] = "Die Testmail wurde nicht versandt. Da ist was schief gelaufen.";
+$lang['options_send_testmail_success'] = "Testmail gesendet. E-Mail Einstellungen scheinen korrekt zu sein.";
$lang['options_oqrs'] = 'OQRS Optionen';
$lang['options_global_text'] = 'Globaler Text';
diff --git a/application/language/greek/options_lang.php b/application/language/greek/options_lang.php
index 34f1f2ce..b3422a5d 100644
--- a/application/language/greek/options_lang.php
+++ b/application/language/greek/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = 'Newline';
-$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to ';
-$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to ';
-$lang['options_email_address_changed_to'] = 'Email Address changed to ';
-$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to ';
-$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to ';
-$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to ';
-$lang['options_smtp_username_changed_to'] = 'SMTP Username changed to ';
-$lang['options_smtp_password_changed_to'] = 'SMTP Password changed to ';
-$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to ';
-$lang['options_email_newline_changed_to'] = 'Email Newline changed to ';
+$lang['options_mail_settings_saved'] = "The settings were saved successfully.";
+$lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
+$lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
+$lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
+$lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'";
+$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used.";
+$lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
+$lang['options_send_testmail'] = "Send Test-Mail";
+$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings.";
+$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong.";
+$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct.";
$lang['options_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text';
diff --git a/application/language/italian/options_lang.php b/application/language/italian/options_lang.php
index 34f1f2ce..b3422a5d 100644
--- a/application/language/italian/options_lang.php
+++ b/application/language/italian/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = 'Newline';
-$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to ';
-$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to ';
-$lang['options_email_address_changed_to'] = 'Email Address changed to ';
-$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to ';
-$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to ';
-$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to ';
-$lang['options_smtp_username_changed_to'] = 'SMTP Username changed to ';
-$lang['options_smtp_password_changed_to'] = 'SMTP Password changed to ';
-$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to ';
-$lang['options_email_newline_changed_to'] = 'Email Newline changed to ';
+$lang['options_mail_settings_saved'] = "The settings were saved successfully.";
+$lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
+$lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
+$lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
+$lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'";
+$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used.";
+$lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
+$lang['options_send_testmail'] = "Send Test-Mail";
+$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings.";
+$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong.";
+$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct.";
$lang['options_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text';
diff --git a/application/language/polish/options_lang.php b/application/language/polish/options_lang.php
index 34f1f2ce..b3422a5d 100644
--- a/application/language/polish/options_lang.php
+++ b/application/language/polish/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = 'Newline';
-$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to ';
-$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to ';
-$lang['options_email_address_changed_to'] = 'Email Address changed to ';
-$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to ';
-$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to ';
-$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to ';
-$lang['options_smtp_username_changed_to'] = 'SMTP Username changed to ';
-$lang['options_smtp_password_changed_to'] = 'SMTP Password changed to ';
-$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to ';
-$lang['options_email_newline_changed_to'] = 'Email Newline changed to ';
+$lang['options_mail_settings_saved'] = "The settings were saved successfully.";
+$lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
+$lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
+$lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
+$lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'";
+$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used.";
+$lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
+$lang['options_send_testmail'] = "Send Test-Mail";
+$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings.";
+$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong.";
+$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct.";
$lang['options_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text';
diff --git a/application/language/russian/options_lang.php b/application/language/russian/options_lang.php
index 1da9dcf8..db4f12f1 100644
--- a/application/language/russian/options_lang.php
+++ b/application/language/russian/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP хост';
$lang['options_smtp_port'] = 'SMTP порт';
$lang['options_smtp_username'] = 'SMTP логин';
$lang['options_smtp_password'] = 'SMTP пароль';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = 'Newline';
-$lang['options_outgoing_email_protocol_changed_to'] = 'Протокол отправки емэйл изменён на ';
-$lang['options_smtp_encryption_changed_to'] = 'Шифрование SMTP изменено на ';
-$lang['options_email_address_changed_to'] = 'Адрес электронной почты изменён на ';
-$lang['options_email_sender_name_changed_to'] = 'Имя отправителя изменено на ';
-$lang['options_smtp_host_changed_to'] = 'SMTP хост изменён на ';
-$lang['options_smtp_port_changed_to'] = 'SMTP порт изменён на ';
-$lang['options_smtp_username_changed_to'] = 'SMTP логин изменён на ';
-$lang['options_smtp_password_changed_to'] = 'SMTP пароль изменён на ';
-$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to ';
-$lang['options_email_newline_changed_to'] = 'Email Newline changed to ';
+$lang['options_mail_settings_saved'] = "The settings were saved successfully.";
+$lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
+$lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
+$lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
+$lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'";
+$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used.";
+$lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
+$lang['options_send_testmail'] = "Send Test-Mail";
+$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings.";
+$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong.";
+$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct.";
$lang['options_oqrs'] = 'OQRS';
$lang['options_global_text'] = 'Сообщение на странице OQRS';
diff --git a/application/language/spanish/options_lang.php b/application/language/spanish/options_lang.php
index 34f1f2ce..b3422a5d 100644
--- a/application/language/spanish/options_lang.php
+++ b/application/language/spanish/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = 'Newline';
-$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to ';
-$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to ';
-$lang['options_email_address_changed_to'] = 'Email Address changed to ';
-$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to ';
-$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to ';
-$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to ';
-$lang['options_smtp_username_changed_to'] = 'SMTP Username changed to ';
-$lang['options_smtp_password_changed_to'] = 'SMTP Password changed to ';
-$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to ';
-$lang['options_email_newline_changed_to'] = 'Email Newline changed to ';
+$lang['options_mail_settings_saved'] = "The settings were saved successfully.";
+$lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
+$lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
+$lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
+$lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'";
+$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used.";
+$lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
+$lang['options_send_testmail'] = "Send Test-Mail";
+$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings.";
+$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong.";
+$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct.";
$lang['options_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text';
diff --git a/application/language/swedish/options_lang.php b/application/language/swedish/options_lang.php
index 7058d532..e5e267c7 100644
--- a/application/language/swedish/options_lang.php
+++ b/application/language/swedish/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Användarnamn';
$lang['options_smtp_password'] = 'SMTP Lösenord';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = 'Nyrad';
-$lang['options_outgoing_email_protocol_changed_to'] = 'Protokoll för utgående e-post har ändrats till ';
-$lang['options_smtp_encryption_changed_to'] = 'SMTP-kryptering ändras till ';
-$lang['options_email_address_changed_to'] = 'E-postadress ändrad till ';
-$lang['options_email_sender_name_changed_to'] = 'E-postavsändarens namn har ändrats till ';
-$lang['options_smtp_host_changed_to'] = 'SMTP Host har ändrats till ';
-$lang['options_smtp_port_changed_to'] = 'SMTP Post har ändrats till ';
-$lang['options_smtp_username_changed_to'] = 'SMTP Användarnamn ändrat till ';
-$lang['options_smtp_password_changed_to'] = 'SMTP Lösenordet ändrat till ';
-$lang['options_email_crlf_changed_to'] = 'Email CRLF ändrad till ';
-$lang['options_email_newline_changed_to'] = 'E-post nyrad Newline ändrad till ';
+$lang['options_mail_settings_saved'] = "The settings were saved successfully.";
+$lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
+$lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
+$lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
+$lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'";
+$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used.";
+$lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
+$lang['options_send_testmail'] = "Send Test-Mail";
+$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings.";
+$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong.";
+$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct.";
$lang['options_oqrs'] = 'OQRS Alternativ';
$lang['options_global_text'] = 'Global text';
diff --git a/application/language/turkish/options_lang.php b/application/language/turkish/options_lang.php
index 34f1f2ce..b3422a5d 100644
--- a/application/language/turkish/options_lang.php
+++ b/application/language/turkish/options_lang.php
@@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password';
-$lang['options_crlf'] = 'CRLF';
-$lang['options_newline'] = 'Newline';
-$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to ';
-$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to ';
-$lang['options_email_address_changed_to'] = 'Email Address changed to ';
-$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to ';
-$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to ';
-$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to ';
-$lang['options_smtp_username_changed_to'] = 'SMTP Username changed to ';
-$lang['options_smtp_password_changed_to'] = 'SMTP Password changed to ';
-$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to ';
-$lang['options_email_newline_changed_to'] = 'Email Newline changed to ';
+$lang['options_mail_settings_saved'] = "The settings were saved successfully.";
+$lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
+$lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
+$lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
+$lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
+$lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
+$lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
+$lang['options_smtp_port_hint'] = "The SMTP port of the mail server, e.g. if TLS is used -> '587', if SSL is used -> '465'";
+$lang['options_smtp_username_hint'] = "The username to log in to the mail server, usually this is the email address that is used.";
+$lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
+$lang['options_send_testmail'] = "Send Test-Mail";
+$lang['options_send_testmail_hint'] = "The email will be sent to the address defined in your account settings.";
+$lang['options_send_testmail_failed'] = "Testmail failed. Something went wrong.";
+$lang['options_send_testmail_success'] = "Testmail sent. Email settings seem to be correct.";
$lang['options_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text';
diff --git a/application/models/User_model.php b/application/models/User_model.php
index 1757fe34..0bb24d90 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -76,6 +76,17 @@ class User_Model extends CI_Model {
}
}
+ function get_user_email_by_id($id) {
+
+ $clean_id = $this->security->xss_clean($id);
+
+ $this->db->where('user_id', $clean_id);
+ $query = $this->db->get($this->config->item('auth_table'));
+
+ $r = $query->row();
+ return $r->user_email;
+ }
+
function get_email_address($station_id) {
$this->db->where('station_id', $station_id);
$this->db->join('station_profile', 'station_profile.user_id = '.$this->config->item('auth_table').'.user_id');
diff --git a/application/views/email/testmail.php b/application/views/email/testmail.php
new file mode 100644
index 00000000..116023d5
--- /dev/null
+++ b/application/views/email/testmail.php
@@ -0,0 +1,9 @@
+Hi,
+
+This is a test email from your Cloudlog instance.
+
+If you received this email, your mail settings are correct.
+
+Regards,
+
+Cloudlog.
\ No newline at end of file
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 15a2ce1d..7c00b086 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -70,6 +70,18 @@ function load_was_map() {
+uri->segment(1) == "options") { ?>
+
+
+
uri->segment(1) == "awards" && ($this->uri->segment(2) == "cq") ) { ?>
diff --git a/application/views/options/email.php b/application/views/options/email.php
index 9cc83e4e..edd46529 100644
--- a/application/views/options/email.php
+++ b/application/views/options/email.php
@@ -20,18 +20,25 @@
session->flashdata('message')) { ?>
-