From 694f9fbd80cb7ce28286efbc0d280e6f238f5c0a Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:07:59 +0100 Subject: [PATCH 01/19] [OQRS] Fixed error 500 with OQRS notification email --- application/controllers/Oqrs.php | 37 +++++++++++++++++--------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/application/controllers/Oqrs.php b/application/controllers/Oqrs.php index bc7ce099..429a85ac 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,17 +155,17 @@ 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'), @@ -173,26 +176,26 @@ class Oqrs extends CI_Controller { '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.'); } } } From 9d020aca843206512affbdb726cb8841b1824dc6 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 10:22:14 +0100 Subject: [PATCH 02/19] email fix --- application/controllers/Oqrs.php | 1 + application/controllers/User.php | 1 + 2 files changed, 2 insertions(+) diff --git a/application/controllers/Oqrs.php b/application/controllers/Oqrs.php index 429a85ac..d559cb07 100644 --- a/application/controllers/Oqrs.php +++ b/application/controllers/Oqrs.php @@ -169,6 +169,7 @@ class Oqrs 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'), diff --git a/application/controllers/User.php b/application/controllers/User.php index 79b740d9..06f9a533 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -713,6 +713,7 @@ 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'), From a8247065f54ccf6587d35ccdb0c74fd616ceb736 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 12:01:11 +0100 Subject: [PATCH 03/19] testmail language --- application/language/bulgarian/options_lang.php | 1 + application/language/chinese_simplified/options_lang.php | 1 + application/language/czech/options_lang.php | 1 + application/language/dutch/options_lang.php | 1 + application/language/english/options_lang.php | 1 + application/language/finnish/options_lang.php | 1 + application/language/french/options_lang.php | 1 + application/language/german/options_lang.php | 1 + application/language/greek/options_lang.php | 1 + application/language/italian/options_lang.php | 1 + application/language/polish/options_lang.php | 1 + application/language/russian/options_lang.php | 1 + application/language/spanish/options_lang.php | 1 + application/language/swedish/options_lang.php | 1 + application/language/turkish/options_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/options_lang.php b/application/language/bulgarian/options_lang.php index f6d172b1..f29fe636 100644 --- a/application/language/bulgarian/options_lang.php +++ b/application/language/bulgarian/options_lang.php @@ -50,6 +50,7 @@ $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_send_testmail'] = "Send a Test-Mail"; $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..70f7d318 100644 --- a/application/language/chinese_simplified/options_lang.php +++ b/application/language/chinese_simplified/options_lang.php @@ -50,6 +50,7 @@ $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_send_testmail'] = "Send a Test-Mail"; $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..dc6838c0 100644 --- a/application/language/czech/options_lang.php +++ b/application/language/czech/options_lang.php @@ -50,6 +50,7 @@ $lang['options_smtp_username_changed_to'] = 'SMTP uživatelské jméno změněno $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_send_testmail'] = "Send a Test-Mail"; $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..2f01e1be 100644 --- a/application/language/dutch/options_lang.php +++ b/application/language/dutch/options_lang.php @@ -50,6 +50,7 @@ $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_send_testmail'] = "Send a Test-Mail"; $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..7d9af21a 100644 --- a/application/language/english/options_lang.php +++ b/application/language/english/options_lang.php @@ -50,6 +50,7 @@ $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_send_testmail'] = "Send a Test-Mail"; $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..baa4b579 100644 --- a/application/language/finnish/options_lang.php +++ b/application/language/finnish/options_lang.php @@ -50,6 +50,7 @@ $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_send_testmail'] = "Send a Test-Mail"; $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..7d9af21a 100644 --- a/application/language/french/options_lang.php +++ b/application/language/french/options_lang.php @@ -50,6 +50,7 @@ $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_send_testmail'] = "Send a Test-Mail"; $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..25082f96 100644 --- a/application/language/german/options_lang.php +++ b/application/language/german/options_lang.php @@ -50,6 +50,7 @@ $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_send_testmail'] = "Sende eine Test-Mail"; $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..7d9af21a 100644 --- a/application/language/greek/options_lang.php +++ b/application/language/greek/options_lang.php @@ -50,6 +50,7 @@ $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_send_testmail'] = "Send a Test-Mail"; $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..7d9af21a 100644 --- a/application/language/italian/options_lang.php +++ b/application/language/italian/options_lang.php @@ -50,6 +50,7 @@ $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_send_testmail'] = "Send a Test-Mail"; $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..7d9af21a 100644 --- a/application/language/polish/options_lang.php +++ b/application/language/polish/options_lang.php @@ -50,6 +50,7 @@ $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_send_testmail'] = "Send a Test-Mail"; $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..de7453d4 100644 --- a/application/language/russian/options_lang.php +++ b/application/language/russian/options_lang.php @@ -50,6 +50,7 @@ $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_send_testmail'] = "Send a Test-Mail"; $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..7d9af21a 100644 --- a/application/language/spanish/options_lang.php +++ b/application/language/spanish/options_lang.php @@ -50,6 +50,7 @@ $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_send_testmail'] = "Send a Test-Mail"; $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..cc865076 100644 --- a/application/language/swedish/options_lang.php +++ b/application/language/swedish/options_lang.php @@ -50,6 +50,7 @@ $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_send_testmail'] = "Send a Test-Mail"; $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..7d9af21a 100644 --- a/application/language/turkish/options_lang.php +++ b/application/language/turkish/options_lang.php @@ -50,6 +50,7 @@ $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_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS Options'; $lang['options_global_text'] = 'Global text'; From e417c222dd8b2de7bdbbad4dda04bfd0a2046503 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 12:12:21 +0100 Subject: [PATCH 04/19] new function get_user_email_by_id --- application/models/User_model.php | 11 +++++++++++ 1 file changed, 11 insertions(+) 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'); From 0f7f1176bdad9766d6fdb6aecdaff9b3e021c8eb Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 12:12:34 +0100 Subject: [PATCH 05/19] Testmail Template --- application/views/email/testmail.php | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 application/views/email/testmail.php 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 From 3ef158b6381d41463a61ee0b222861f4bd64ec90 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 12:12:53 +0100 Subject: [PATCH 06/19] function sendTestmail --- application/controllers/Options.php | 43 +++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/application/controllers/Options.php b/application/controllers/Options.php index f22eee3e..778756de 100644 --- a/application/controllers/Options.php +++ b/application/controllers/Options.php @@ -380,4 +380,47 @@ class Options extends CI_Controller { redirect('/options/oqrs'); } + public 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'), + 'crlf' => "\r\n", + 'newline' => "\r\n" + ); + + $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('success', 'Email settings are incorrect.'); + } else { + $this->session->set_flashdata('message', 'Email settings seem to be correct'); + } + } else { + $this->session->set_flashdata('error', 'You have no email address in your account settings!'); + } + } + } From 2baf8a3a23e9a329f539a0af35835b9025a1a84d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 12:13:09 +0100 Subject: [PATCH 07/19] sendTestMail button --- application/views/interface_assets/footer.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 40597e06..c74dc525 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") ) { ?> From ea9f3000bf00fb4d54d44102f42c3391020b548b Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 12:14:14 +0100 Subject: [PATCH 08/19] flashdata --- application/views/options/email.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/application/views/options/email.php b/application/views/options/email.php index 9a11bd6a..48ae318c 100644 --- a/application/views/options/email.php +++ b/application/views/options/email.php @@ -20,18 +20,25 @@ session->flashdata('message')) { ?> -
+
session->flashdata('message'); ?>
+ session->flashdata('error')) { ?> + +
+ session->flashdata('error'); ?> +
+ +
x
- +
@@ -109,6 +116,7 @@ +
From 1d701a0c8bb3b71538ed0b215ceb0a1a2d0e9ab1 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 12:22:14 +0100 Subject: [PATCH 09/19] removed crlf and newline option --- application/controllers/Options.php | 16 ---------------- application/views/options/email.php | 14 -------------- 2 files changed, 30 deletions(-) diff --git a/application/controllers/Options.php b/application/controllers/Options.php index 778756de..c5e3a55b 100644 --- a/application/controllers/Options.php +++ b/application/controllers/Options.php @@ -328,22 +328,6 @@ class Options extends CI_Controller { if($smtpPasswordupdate == TRUE) { $this->session->set_flashdata('success', $this->lang->line('options_smtp_password_changed_to').$this->input->post('smtpPassword')); } - - // 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')); - } // Redirect back to /appearance redirect('/options/email'); diff --git a/application/views/options/email.php b/application/views/options/email.php index 48ae318c..b02d8487 100644 --- a/application/views/options/email.php +++ b/application/views/options/email.php @@ -100,20 +100,6 @@ -
- -
- optionslib->get_option('emailcrlf'); } ?>"> -
-
- -
- -
- optionslib->get_option('emailnewline'); } ?>"> -
-
- From 14ed03fa02b7d011380c07c12339471cf18ce5f1 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 12:33:06 +0100 Subject: [PATCH 10/19] removed crlf and newline (not needed) --- application/controllers/Options.php | 2 -- application/controllers/Oqrs.php | 2 -- 2 files changed, 4 deletions(-) diff --git a/application/controllers/Options.php b/application/controllers/Options.php index c5e3a55b..6f39359c 100644 --- a/application/controllers/Options.php +++ b/application/controllers/Options.php @@ -383,8 +383,6 @@ class Options extends CI_Controller { '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/controllers/Oqrs.php b/application/controllers/Oqrs.php index d559cb07..ae46d42d 100644 --- a/application/controllers/Oqrs.php +++ b/application/controllers/Oqrs.php @@ -174,8 +174,6 @@ class Oqrs extends CI_Controller { '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); From fc1baa63710268eee9d9692482316a7c108e125c Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 12:39:52 +0100 Subject: [PATCH 11/19] SMTP password should not be shown after save --- application/controllers/Options.php | 2 +- application/language/bulgarian/options_lang.php | 4 +--- application/language/chinese_simplified/options_lang.php | 4 +--- application/language/czech/options_lang.php | 4 +--- application/language/dutch/options_lang.php | 4 +--- application/language/english/options_lang.php | 4 +--- application/language/finnish/options_lang.php | 4 +--- application/language/french/options_lang.php | 4 +--- application/language/german/options_lang.php | 4 +--- application/language/greek/options_lang.php | 4 +--- application/language/italian/options_lang.php | 4 +--- application/language/polish/options_lang.php | 4 +--- application/language/russian/options_lang.php | 4 +--- application/language/spanish/options_lang.php | 4 +--- application/language/swedish/options_lang.php | 4 +--- application/language/turkish/options_lang.php | 4 +--- 16 files changed, 16 insertions(+), 46 deletions(-) diff --git a/application/controllers/Options.php b/application/controllers/Options.php index 6f39359c..2b6146c9 100644 --- a/application/controllers/Options.php +++ b/application/controllers/Options.php @@ -326,7 +326,7 @@ class Options extends CI_Controller { // 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')); + $this->session->set_flashdata('success', $this->lang->line('options_smtp_password_changed')); } // Redirect back to /appearance diff --git a/application/language/bulgarian/options_lang.php b/application/language/bulgarian/options_lang.php index f29fe636..4bc4fc1f 100644 --- a/application/language/bulgarian/options_lang.php +++ b/application/language/bulgarian/options_lang.php @@ -47,9 +47,7 @@ $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_smtp_password_changed'] = 'SMTP Password changed'; $lang['options_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS Options'; diff --git a/application/language/chinese_simplified/options_lang.php b/application/language/chinese_simplified/options_lang.php index 70f7d318..d9fee0dd 100644 --- a/application/language/chinese_simplified/options_lang.php +++ b/application/language/chinese_simplified/options_lang.php @@ -47,9 +47,7 @@ $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_smtp_password_changed'] = 'SMTP Password changed'; $lang['options_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS设置'; diff --git a/application/language/czech/options_lang.php b/application/language/czech/options_lang.php index dc6838c0..fe20fd6d 100644 --- a/application/language/czech/options_lang.php +++ b/application/language/czech/options_lang.php @@ -47,9 +47,7 @@ $lang['options_email_sender_name_changed_to'] = 'Jméno odesílatele e-mailu zm $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_smtp_password_changed'] = 'SMTP Password changed'; $lang['options_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS možnosti'; diff --git a/application/language/dutch/options_lang.php b/application/language/dutch/options_lang.php index 2f01e1be..7f73731e 100644 --- a/application/language/dutch/options_lang.php +++ b/application/language/dutch/options_lang.php @@ -47,9 +47,7 @@ $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_smtp_password_changed'] = 'SMTP Password changed'; $lang['options_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS Options'; diff --git a/application/language/english/options_lang.php b/application/language/english/options_lang.php index 7d9af21a..acb877e0 100644 --- a/application/language/english/options_lang.php +++ b/application/language/english/options_lang.php @@ -47,9 +47,7 @@ $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_smtp_password_changed'] = 'SMTP Password changed'; $lang['options_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS Options'; diff --git a/application/language/finnish/options_lang.php b/application/language/finnish/options_lang.php index baa4b579..ac026887 100644 --- a/application/language/finnish/options_lang.php +++ b/application/language/finnish/options_lang.php @@ -47,9 +47,7 @@ $lang['options_email_sender_name_changed_to'] = 'Sähköpostin lähettäjän nim $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_smtp_password_changed'] = 'SMTP Password changed'; $lang['options_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS Options'; diff --git a/application/language/french/options_lang.php b/application/language/french/options_lang.php index 7d9af21a..acb877e0 100644 --- a/application/language/french/options_lang.php +++ b/application/language/french/options_lang.php @@ -47,9 +47,7 @@ $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_smtp_password_changed'] = 'SMTP Password changed'; $lang['options_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS Options'; diff --git a/application/language/german/options_lang.php b/application/language/german/options_lang.php index 25082f96..342453ae 100644 --- a/application/language/german/options_lang.php +++ b/application/language/german/options_lang.php @@ -47,9 +47,7 @@ $lang['options_email_sender_name_changed_to'] = 'E-Mail Absendername geändert z $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_smtp_password_changed'] = 'SMTP Passwort geändert'; $lang['options_send_testmail'] = "Sende eine Test-Mail"; $lang['options_oqrs'] = 'OQRS Optionen'; diff --git a/application/language/greek/options_lang.php b/application/language/greek/options_lang.php index 7d9af21a..acb877e0 100644 --- a/application/language/greek/options_lang.php +++ b/application/language/greek/options_lang.php @@ -47,9 +47,7 @@ $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_smtp_password_changed'] = 'SMTP Password changed'; $lang['options_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS Options'; diff --git a/application/language/italian/options_lang.php b/application/language/italian/options_lang.php index 7d9af21a..acb877e0 100644 --- a/application/language/italian/options_lang.php +++ b/application/language/italian/options_lang.php @@ -47,9 +47,7 @@ $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_smtp_password_changed'] = 'SMTP Password changed'; $lang['options_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS Options'; diff --git a/application/language/polish/options_lang.php b/application/language/polish/options_lang.php index 7d9af21a..acb877e0 100644 --- a/application/language/polish/options_lang.php +++ b/application/language/polish/options_lang.php @@ -47,9 +47,7 @@ $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_smtp_password_changed'] = 'SMTP Password changed'; $lang['options_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS Options'; diff --git a/application/language/russian/options_lang.php b/application/language/russian/options_lang.php index de7453d4..4e588f83 100644 --- a/application/language/russian/options_lang.php +++ b/application/language/russian/options_lang.php @@ -47,9 +47,7 @@ $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_smtp_password_changed'] = 'SMTP Password changed'; $lang['options_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS'; diff --git a/application/language/spanish/options_lang.php b/application/language/spanish/options_lang.php index 7d9af21a..acb877e0 100644 --- a/application/language/spanish/options_lang.php +++ b/application/language/spanish/options_lang.php @@ -47,9 +47,7 @@ $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_smtp_password_changed'] = 'SMTP Password changed'; $lang['options_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS Options'; diff --git a/application/language/swedish/options_lang.php b/application/language/swedish/options_lang.php index cc865076..b5979e57 100644 --- a/application/language/swedish/options_lang.php +++ b/application/language/swedish/options_lang.php @@ -47,9 +47,7 @@ $lang['options_email_sender_name_changed_to'] = 'E-postavsändarens namn har än $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_smtp_password_changed'] = 'SMTP Lösenordet ändrat'; $lang['options_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS Alternativ'; diff --git a/application/language/turkish/options_lang.php b/application/language/turkish/options_lang.php index 7d9af21a..acb877e0 100644 --- a/application/language/turkish/options_lang.php +++ b/application/language/turkish/options_lang.php @@ -47,9 +47,7 @@ $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_smtp_password_changed'] = 'SMTP Password changed'; $lang['options_send_testmail'] = "Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS Options'; From 3aca60717ba69ab698f5517520c74ca34845d4c9 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 12:56:01 +0100 Subject: [PATCH 12/19] flash data --- application/controllers/Options.php | 6 +++--- application/language/bulgarian/options_lang.php | 2 +- application/language/chinese_simplified/options_lang.php | 2 +- application/language/czech/options_lang.php | 2 +- application/language/dutch/options_lang.php | 2 +- application/language/english/options_lang.php | 2 +- application/language/finnish/options_lang.php | 2 +- application/language/french/options_lang.php | 2 +- application/language/greek/options_lang.php | 2 +- application/language/italian/options_lang.php | 2 +- application/language/polish/options_lang.php | 2 +- application/language/russian/options_lang.php | 2 +- application/language/spanish/options_lang.php | 2 +- application/language/swedish/options_lang.php | 2 +- application/language/turkish/options_lang.php | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/application/controllers/Options.php b/application/controllers/Options.php index 2b6146c9..b71e6fa0 100644 --- a/application/controllers/Options.php +++ b/application/controllers/Options.php @@ -396,12 +396,12 @@ class Options extends CI_Controller { $this->email->message($message); if (! $this->email->send()){ - $this->session->set_flashdata('success', 'Email settings are incorrect.'); + return FALSE; + $this->session->set_flashdata('success', 'Something went wrong.'); } else { + return TRUE; $this->session->set_flashdata('message', 'Email settings seem to be correct'); } - } else { - $this->session->set_flashdata('error', 'You have no email address in your account settings!'); } } diff --git a/application/language/bulgarian/options_lang.php b/application/language/bulgarian/options_lang.php index 4bc4fc1f..f2f3225c 100644 --- a/application/language/bulgarian/options_lang.php +++ b/application/language/bulgarian/options_lang.php @@ -48,7 +48,7 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Send a Test-Mail"; +$lang['options_send_testmail'] = "Save and Send a Test-Mail"; $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 d9fee0dd..9c96940a 100644 --- a/application/language/chinese_simplified/options_lang.php +++ b/application/language/chinese_simplified/options_lang.php @@ -48,7 +48,7 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Send a Test-Mail"; +$lang['options_send_testmail'] = "Save and Send a Test-Mail"; $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 fe20fd6d..0efe53a1 100644 --- a/application/language/czech/options_lang.php +++ b/application/language/czech/options_lang.php @@ -48,7 +48,7 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Send a Test-Mail"; +$lang['options_send_testmail'] = "Save and Send a Test-Mail"; $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 7f73731e..11d574e2 100644 --- a/application/language/dutch/options_lang.php +++ b/application/language/dutch/options_lang.php @@ -48,7 +48,7 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Send a Test-Mail"; +$lang['options_send_testmail'] = "Save and Send a Test-Mail"; $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 acb877e0..e1285312 100644 --- a/application/language/english/options_lang.php +++ b/application/language/english/options_lang.php @@ -48,7 +48,7 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Send a Test-Mail"; +$lang['options_send_testmail'] = "Save and Send a Test-Mail"; $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 ac026887..67c57573 100644 --- a/application/language/finnish/options_lang.php +++ b/application/language/finnish/options_lang.php @@ -48,7 +48,7 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Send a Test-Mail"; +$lang['options_send_testmail'] = "Save and Send a Test-Mail"; $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 acb877e0..e1285312 100644 --- a/application/language/french/options_lang.php +++ b/application/language/french/options_lang.php @@ -48,7 +48,7 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Send a Test-Mail"; +$lang['options_send_testmail'] = "Save and Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS Options'; $lang['options_global_text'] = 'Global text'; diff --git a/application/language/greek/options_lang.php b/application/language/greek/options_lang.php index acb877e0..e1285312 100644 --- a/application/language/greek/options_lang.php +++ b/application/language/greek/options_lang.php @@ -48,7 +48,7 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Send a Test-Mail"; +$lang['options_send_testmail'] = "Save and Send a Test-Mail"; $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 acb877e0..e1285312 100644 --- a/application/language/italian/options_lang.php +++ b/application/language/italian/options_lang.php @@ -48,7 +48,7 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Send a Test-Mail"; +$lang['options_send_testmail'] = "Save and Send a Test-Mail"; $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 acb877e0..e1285312 100644 --- a/application/language/polish/options_lang.php +++ b/application/language/polish/options_lang.php @@ -48,7 +48,7 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Send a Test-Mail"; +$lang['options_send_testmail'] = "Save and Send a Test-Mail"; $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 4e588f83..ce86b4de 100644 --- a/application/language/russian/options_lang.php +++ b/application/language/russian/options_lang.php @@ -48,7 +48,7 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Send a Test-Mail"; +$lang['options_send_testmail'] = "Save and Send a Test-Mail"; $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 acb877e0..e1285312 100644 --- a/application/language/spanish/options_lang.php +++ b/application/language/spanish/options_lang.php @@ -48,7 +48,7 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Send a Test-Mail"; +$lang['options_send_testmail'] = "Save and Send a Test-Mail"; $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 b5979e57..9ff6c687 100644 --- a/application/language/swedish/options_lang.php +++ b/application/language/swedish/options_lang.php @@ -48,7 +48,7 @@ $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'] = 'SMTP Lösenordet ändrat'; -$lang['options_send_testmail'] = "Send a Test-Mail"; +$lang['options_send_testmail'] = "Save and Send a Test-Mail"; $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 acb877e0..e1285312 100644 --- a/application/language/turkish/options_lang.php +++ b/application/language/turkish/options_lang.php @@ -48,7 +48,7 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Send a Test-Mail"; +$lang['options_send_testmail'] = "Save and Send a Test-Mail"; $lang['options_oqrs'] = 'OQRS Options'; $lang['options_global_text'] = 'Global text'; From c4d15eaba48ee737eab693502332542a1133604f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 21:03:23 +0100 Subject: [PATCH 13/19] Mail Language --- application/language/bulgarian/options_lang.php | 7 +++++-- application/language/chinese_simplified/options_lang.php | 7 +++++-- application/language/czech/options_lang.php | 7 +++++-- application/language/dutch/options_lang.php | 7 +++++-- application/language/english/options_lang.php | 7 +++++-- application/language/finnish/options_lang.php | 7 +++++-- application/language/french/options_lang.php | 7 +++++-- application/language/german/options_lang.php | 5 ++++- application/language/greek/options_lang.php | 7 +++++-- application/language/italian/options_lang.php | 7 +++++-- application/language/polish/options_lang.php | 7 +++++-- application/language/russian/options_lang.php | 7 +++++-- application/language/spanish/options_lang.php | 7 +++++-- application/language/swedish/options_lang.php | 7 +++++-- application/language/turkish/options_lang.php | 7 +++++-- 15 files changed, 74 insertions(+), 29 deletions(-) diff --git a/application/language/bulgarian/options_lang.php b/application/language/bulgarian/options_lang.php index f2f3225c..7801b1d5 100644 --- a/application/language/bulgarian/options_lang.php +++ b/application/language/bulgarian/options_lang.php @@ -47,8 +47,11 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Save and Send a Test-Mail"; +$lang['options_smtp_password_saved'] = 'SMTP Password saved'; +$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 9c96940a..fb95c0b6 100644 --- a/application/language/chinese_simplified/options_lang.php +++ b/application/language/chinese_simplified/options_lang.php @@ -47,8 +47,11 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Save and Send a Test-Mail"; +$lang['options_smtp_password_saved'] = 'SMTP Password saved'; +$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 0efe53a1..95b32f85 100644 --- a/application/language/czech/options_lang.php +++ b/application/language/czech/options_lang.php @@ -47,8 +47,11 @@ $lang['options_email_sender_name_changed_to'] = 'Jméno odesílatele e-mailu zm $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Save and Send a Test-Mail"; +$lang['options_smtp_password_saved'] = 'SMTP Password saved'; +$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 11d574e2..8a6d000d 100644 --- a/application/language/dutch/options_lang.php +++ b/application/language/dutch/options_lang.php @@ -47,8 +47,11 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Save and Send a Test-Mail"; +$lang['options_smtp_password_saved'] = 'SMTP Password saved'; +$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 e1285312..1d5f0845 100644 --- a/application/language/english/options_lang.php +++ b/application/language/english/options_lang.php @@ -47,8 +47,11 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Save and Send a Test-Mail"; +$lang['options_smtp_password_saved'] = 'SMTP Password saved'; +$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 67c57573..ae493b55 100644 --- a/application/language/finnish/options_lang.php +++ b/application/language/finnish/options_lang.php @@ -47,8 +47,11 @@ $lang['options_email_sender_name_changed_to'] = 'Sähköpostin lähettäjän nim $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Save and Send a Test-Mail"; +$lang['options_smtp_password_saved'] = 'SMTP Password saved'; +$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 e1285312..1d5f0845 100644 --- a/application/language/french/options_lang.php +++ b/application/language/french/options_lang.php @@ -47,8 +47,11 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Save and Send a Test-Mail"; +$lang['options_smtp_password_saved'] = 'SMTP Password saved'; +$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 342453ae..861460a4 100644 --- a/application/language/german/options_lang.php +++ b/application/language/german/options_lang.php @@ -47,8 +47,11 @@ $lang['options_email_sender_name_changed_to'] = 'E-Mail Absendername geändert z $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'] = 'SMTP Passwort geändert'; +$lang['options_smtp_password_saved'] = 'SMTP Passwort gespeichert'; $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 e1285312..1d5f0845 100644 --- a/application/language/greek/options_lang.php +++ b/application/language/greek/options_lang.php @@ -47,8 +47,11 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Save and Send a Test-Mail"; +$lang['options_smtp_password_saved'] = 'SMTP Password saved'; +$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 e1285312..1d5f0845 100644 --- a/application/language/italian/options_lang.php +++ b/application/language/italian/options_lang.php @@ -47,8 +47,11 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Save and Send a Test-Mail"; +$lang['options_smtp_password_saved'] = 'SMTP Password saved'; +$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 e1285312..1d5f0845 100644 --- a/application/language/polish/options_lang.php +++ b/application/language/polish/options_lang.php @@ -47,8 +47,11 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Save and Send a Test-Mail"; +$lang['options_smtp_password_saved'] = 'SMTP Password saved'; +$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 ce86b4de..d2650ec1 100644 --- a/application/language/russian/options_lang.php +++ b/application/language/russian/options_lang.php @@ -47,8 +47,11 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Save and Send a Test-Mail"; +$lang['options_smtp_password_saved'] = 'SMTP Password saved'; +$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 e1285312..1d5f0845 100644 --- a/application/language/spanish/options_lang.php +++ b/application/language/spanish/options_lang.php @@ -47,8 +47,11 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Save and Send a Test-Mail"; +$lang['options_smtp_password_saved'] = 'SMTP Password saved'; +$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 9ff6c687..731e58c0 100644 --- a/application/language/swedish/options_lang.php +++ b/application/language/swedish/options_lang.php @@ -47,8 +47,11 @@ $lang['options_email_sender_name_changed_to'] = 'E-postavsändarens namn har än $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'] = 'SMTP Lösenordet ändrat'; -$lang['options_send_testmail'] = "Save and Send a Test-Mail"; +$lang['options_smtp_password_saved'] = 'SMTP Password saved'; +$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 e1285312..1d5f0845 100644 --- a/application/language/turkish/options_lang.php +++ b/application/language/turkish/options_lang.php @@ -47,8 +47,11 @@ $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'] = 'SMTP Password changed'; -$lang['options_send_testmail'] = "Save and Send a Test-Mail"; +$lang['options_smtp_password_saved'] = 'SMTP Password saved'; +$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'; From b586d5889c59614439143179ec0a667a5143c556 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 21:03:40 +0100 Subject: [PATCH 14/19] testmail set up --- application/views/options/email.php | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/application/views/options/email.php b/application/views/options/email.php index b02d8487..07cb5e02 100644 --- a/application/views/options/email.php +++ b/application/views/options/email.php @@ -25,18 +25,18 @@ - session->flashdata('error')) { ?> - + session->flashdata('testmailFailed')) { ?> +
- session->flashdata('error'); ?> + session->flashdata('testmailFailed'); ?>
- -
- x - -
+ session->flashdata('testmailSuccess')) { ?> + +
+ session->flashdata('testmailSuccess'); ?> +
@@ -102,7 +102,11 @@ - + +
+ + + From 9af8f09be849beedd17ff87f5c94b271d2c691b3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 21:03:48 +0100 Subject: [PATCH 15/19] Language --- application/controllers/Options.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/application/controllers/Options.php b/application/controllers/Options.php index b71e6fa0..6f851bd9 100644 --- a/application/controllers/Options.php +++ b/application/controllers/Options.php @@ -326,10 +326,10 @@ class Options extends CI_Controller { // 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')); + $this->session->set_flashdata('success', $this->lang->line('options_smtp_password_saved')); } - // Redirect back to /appearance + // Redirect back to /email redirect('/options/email'); } } @@ -364,7 +364,7 @@ class Options extends CI_Controller { redirect('/options/oqrs'); } - public function sendTestMail() { + function sendTestMail() { $this->load->model('user_model'); $id = $this->session->userdata('user_id'); @@ -396,13 +396,15 @@ class Options extends CI_Controller { $this->email->message($message); if (! $this->email->send()){ - return FALSE; - $this->session->set_flashdata('success', 'Something went wrong.'); + $this->session->set_flashdata('testmailFailed', $this->lang->line('options_send_testmail_failed')); } else { - return TRUE; - $this->session->set_flashdata('message', 'Email settings seem to be correct'); + $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'); } } From 5854f28c824473d1a1fb48bd7c6a48163e3289f2 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 21:49:32 +0100 Subject: [PATCH 16/19] form hints --- application/views/options/email.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/application/views/options/email.php b/application/views/options/email.php index 07cb5e02..3ae70a55 100644 --- a/application/views/options/email.php +++ b/application/views/options/email.php @@ -47,6 +47,7 @@ +
@@ -56,19 +57,22 @@ +
- +
optionslib->get_option('emailSenderName'));?>"> +
- +
optionslib->get_option('emailAddress'); } ?>"> +
@@ -76,6 +80,7 @@
optionslib->get_option('smtpHost'); } ?>"> +
@@ -83,6 +88,7 @@
optionslib->get_option('smtpPort'); } ?>"> +
@@ -90,6 +96,7 @@
optionslib->get_option('smtpUsername'); } ?>"> +
@@ -97,6 +104,7 @@
optionslib->get_option('smtpPassword'); } ?>"> +
@@ -106,7 +114,7 @@
- + From f49ad97c9eb3b6cd898d8d75002c428f5cd3d117 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 21:49:40 +0100 Subject: [PATCH 17/19] mail language --- .../language/bulgarian/options_lang.php | 20 +++++++++---------- .../chinese_simplified/options_lang.php | 20 +++++++++---------- application/language/czech/options_lang.php | 20 +++++++++---------- application/language/dutch/options_lang.php | 20 +++++++++---------- application/language/english/options_lang.php | 20 +++++++++---------- application/language/finnish/options_lang.php | 20 +++++++++---------- application/language/french/options_lang.php | 20 +++++++++---------- application/language/german/options_lang.php | 20 +++++++++---------- application/language/greek/options_lang.php | 20 +++++++++---------- application/language/italian/options_lang.php | 20 +++++++++---------- application/language/polish/options_lang.php | 20 +++++++++---------- application/language/russian/options_lang.php | 20 +++++++++---------- application/language/spanish/options_lang.php | 20 +++++++++---------- application/language/swedish/options_lang.php | 20 +++++++++---------- application/language/turkish/options_lang.php | 20 +++++++++---------- 15 files changed, 150 insertions(+), 150 deletions(-) diff --git a/application/language/bulgarian/options_lang.php b/application/language/bulgarian/options_lang.php index 7801b1d5..19703452 100644 --- a/application/language/bulgarian/options_lang.php +++ b/application/language/bulgarian/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Password saved'; +$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."; diff --git a/application/language/chinese_simplified/options_lang.php b/application/language/chinese_simplified/options_lang.php index fb95c0b6..35480b6c 100644 --- a/application/language/chinese_simplified/options_lang.php +++ b/application/language/chinese_simplified/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Password saved'; +$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."; diff --git a/application/language/czech/options_lang.php b/application/language/czech/options_lang.php index 95b32f85..ce333cf3 100644 --- a/application/language/czech/options_lang.php +++ b/application/language/czech/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Password saved'; +$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."; diff --git a/application/language/dutch/options_lang.php b/application/language/dutch/options_lang.php index 8a6d000d..a6c760b8 100644 --- a/application/language/dutch/options_lang.php +++ b/application/language/dutch/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Password saved'; +$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."; diff --git a/application/language/english/options_lang.php b/application/language/english/options_lang.php index 1d5f0845..b3422a5d 100644 --- a/application/language/english/options_lang.php +++ b/application/language/english/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Password saved'; +$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."; diff --git a/application/language/finnish/options_lang.php b/application/language/finnish/options_lang.php index ae493b55..2dbfd530 100644 --- a/application/language/finnish/options_lang.php +++ b/application/language/finnish/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Password saved'; +$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."; diff --git a/application/language/french/options_lang.php b/application/language/french/options_lang.php index 1d5f0845..b3422a5d 100644 --- a/application/language/french/options_lang.php +++ b/application/language/french/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Password saved'; +$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."; diff --git a/application/language/german/options_lang.php b/application/language/german/options_lang.php index 861460a4..fcc241cd 100644 --- a/application/language/german/options_lang.php +++ b/application/language/german/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Passwort gespeichert'; +$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."; diff --git a/application/language/greek/options_lang.php b/application/language/greek/options_lang.php index 1d5f0845..b3422a5d 100644 --- a/application/language/greek/options_lang.php +++ b/application/language/greek/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Password saved'; +$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."; diff --git a/application/language/italian/options_lang.php b/application/language/italian/options_lang.php index 1d5f0845..b3422a5d 100644 --- a/application/language/italian/options_lang.php +++ b/application/language/italian/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Password saved'; +$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."; diff --git a/application/language/polish/options_lang.php b/application/language/polish/options_lang.php index 1d5f0845..b3422a5d 100644 --- a/application/language/polish/options_lang.php +++ b/application/language/polish/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Password saved'; +$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."; diff --git a/application/language/russian/options_lang.php b/application/language/russian/options_lang.php index d2650ec1..db4f12f1 100644 --- a/application/language/russian/options_lang.php +++ b/application/language/russian/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Password saved'; +$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."; diff --git a/application/language/spanish/options_lang.php b/application/language/spanish/options_lang.php index 1d5f0845..b3422a5d 100644 --- a/application/language/spanish/options_lang.php +++ b/application/language/spanish/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Password saved'; +$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."; diff --git a/application/language/swedish/options_lang.php b/application/language/swedish/options_lang.php index 731e58c0..e5e267c7 100644 --- a/application/language/swedish/options_lang.php +++ b/application/language/swedish/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Password saved'; +$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."; diff --git a/application/language/turkish/options_lang.php b/application/language/turkish/options_lang.php index 1d5f0845..b3422a5d 100644 --- a/application/language/turkish/options_lang.php +++ b/application/language/turkish/options_lang.php @@ -38,16 +38,16 @@ $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_saved'] = 'SMTP Password saved'; +$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."; From e881887cde34565efedc440e75b1a45cf6443dd2 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 21:49:54 +0100 Subject: [PATCH 18/19] simple confirmation --- application/controllers/Options.php | 53 ++++++++--------------------- 1 file changed, 15 insertions(+), 38 deletions(-) diff --git a/application/controllers/Options.php b/application/controllers/Options.php index 6f851bd9..1cf4562c 100644 --- a/application/controllers/Options.php +++ b/application/controllers/Options.php @@ -267,66 +267,43 @@ 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_saved')); + // Check if all updates are successful + $updateSuccessful = $emailProtocolupdate && + $smtpEncryptionupdate && + $emailSenderNameupdate && + $emailAddressupdate && + $smtpHostupdate && + $smtpPortupdate && + $smtpUsernameupdate && + $smtpPasswordupdate; + + // 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 /email From 8b52d06df29ff20513707e9d6cd2bee81c85780a Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 22:15:05 +0100 Subject: [PATCH 19/19] removed crlf and newline (not needed) --- application/controllers/User.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/application/controllers/User.php b/application/controllers/User.php index 06f9a533..877d05f2 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -718,8 +718,6 @@ class User extends CI_Controller { '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);