From 3aca60717ba69ab698f5517520c74ca34845d4c9 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 21 Nov 2023 12:56:01 +0100 Subject: [PATCH] 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';