goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Merge pull request #2715 from HB9HIL/email_bugfix

浏览代码 
E-Mail Bugfixes
这个提交包含在：
Peter Goodhall 2023-11-21 21:39:07 +00:00 提交者 GitHub
当前提交 27c8af1f9f
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 22 个文件被更改，包括 330 次插入 和 260 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

114
application/controllers/Options.php
查看文件

@ -268,84 +268,45 @@ class Options extends CI_Controller {
// Update emailProtocol choice within the options system // Update emailProtocol choice within the options system
$emailProtocolupdate = $this->optionslib->update('emailProtocol', $this->input->post('emailProtocol'), 'yes'); $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 // Update smtpEncryption choice within the options system
$smtpEncryptionupdate = $this->optionslib->update('smtpEncryption', $this->input->post('smtpEncryption'), 'yes'); $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 // Update email sender name within the options system
$emailSenderNameupdate = $this->optionslib->update('emailSenderName', $this->input->post('emailSenderName'), 'yes'); $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 // Update email address choice within the options system
$emailAddressupdate = $this->optionslib->update('emailAddress', $this->input->post('emailAddress'), 'yes'); $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 // Update smtpHost choice within the options system
$smtpHostupdate = $this->optionslib->update('smtpHost', $this->input->post('smtpHost'), 'yes'); $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 // Update smtpPort choice within the options system
$smtpPortupdate = $this->optionslib->update('smtpPort', $this->input->post('smtpPort'), 'yes'); $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 // Update smtpUsername choice within the options system
$smtpUsernameupdate = $this->optionslib->update('smtpUsername', $this->input->post('smtpUsername'), 'yes'); $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 // Update smtpPassword choice within the options system
$smtpPasswordupdate = $this->optionslib->update('smtpPassword', $this->input->post('smtpPassword'), 'yes'); $smtpPasswordupdate = $this->optionslib->update('smtpPassword', $this->input->post('smtpPassword'), 'yes');
// If smtpPassword update is complete set a flashsession with a success note // Check if all updates are successful
if($smtpPasswordupdate == TRUE) { $updateSuccessful = $emailProtocolupdate &&
$this->session->set_flashdata('success', $this->lang->line('options_smtp_password_changed_to').$this->input->post('smtpPassword')); $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'));
} }
// Update emailcrlf choice within the options system // Redirect back to /email
$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'); redirect('/options/email');
} }
} }
@ -380,4 +341,47 @@ class Options extends CI_Controller {
redirect('/options/oqrs'); redirect('/options/oqrs');
} }
function sendTestMail() {
$this->load->model('user_model');
$id = $this->session->userdata('user_id');
$email = $this->user_model->get_user_email_by_id($id);
if($email != "") {
$this->load->library('email');
if($this->optionslib->get_option('emailProtocol') == "smtp") {
$config = Array(
'protocol' => $this->optionslib->get_option('emailProtocol'),
'smtp_crypto' => $this->optionslib->get_option('smtpEncryption'),
'smtp_host' => $this->optionslib->get_option('smtpHost'),
'smtp_port' => $this->optionslib->get_option('smtpPort'),
'smtp_user' => $this->optionslib->get_option('smtpUsername'),
'smtp_pass' => $this->optionslib->get_option('smtpPassword'),
);
$this->email->initialize($config);
}
$message = $this->load->view('email/testmail.php', NULL, TRUE);
$this->email->from($this->optionslib->get_option('emailAddress'), $this->optionslib->get_option('emailSenderName'));
$this->email->to($email);
$this->email->subject('Cloudlog Test-Mail');
$this->email->message($message);
if (! $this->email->send()){
$this->session->set_flashdata('testmailFailed', $this->lang->line('options_send_testmail_failed'));
} else {
$this->session->set_flashdata('testmailSuccess', $this->lang->line('options_send_testmail_success'));
}
} else {
$this->session->set_flashdata('testmailFailed', $this->lang->line('options_send_testmail_failed'));
}
redirect('/options/email');
}
} }

3
application/controllers/Oqrs.php
查看文件

@ -169,12 +169,11 @@ class Oqrs extends CI_Controller {
if($this->optionslib->get_option('emailProtocol') == "smtp") { if($this->optionslib->get_option('emailProtocol') == "smtp") {
$config = Array( $config = Array(
'protocol' => $this->optionslib->get_option('emailProtocol'), 'protocol' => $this->optionslib->get_option('emailProtocol'),
'smtp_crypto' => $this->optionslib->get_option('smtpEncryption'),
'smtp_host' => $this->optionslib->get_option('smtpHost'), 'smtp_host' => $this->optionslib->get_option('smtpHost'),
'smtp_port' => $this->optionslib->get_option('smtpPort'), 'smtp_port' => $this->optionslib->get_option('smtpPort'),
'smtp_user' => $this->optionslib->get_option('smtpUsername'), 'smtp_user' => $this->optionslib->get_option('smtpUsername'),
'smtp_pass' => $this->optionslib->get_option('smtpPassword'), 'smtp_pass' => $this->optionslib->get_option('smtpPassword'),
'crlf' => "\r\n",
'newline' => "\r\n"
); );
$this->email->initialize($config); $this->email->initialize($config);

3
application/controllers/User.php
查看文件

@ -713,12 +713,11 @@ class User extends CI_Controller {
if($this->optionslib->get_option('emailProtocol') == "smtp") { if($this->optionslib->get_option('emailProtocol') == "smtp") {
$config = Array( $config = Array(
'protocol' => $this->optionslib->get_option('emailProtocol'), 'protocol' => $this->optionslib->get_option('emailProtocol'),
'smtp_crypto' => $this->optionslib->get_option('smtpEncryption'),
'smtp_host' => $this->optionslib->get_option('smtpHost'), 'smtp_host' => $this->optionslib->get_option('smtpHost'),
'smtp_port' => $this->optionslib->get_option('smtpPort'), 'smtp_port' => $this->optionslib->get_option('smtpPort'),
'smtp_user' => $this->optionslib->get_option('smtpUsername'), 'smtp_user' => $this->optionslib->get_option('smtpUsername'),
'smtp_pass' => $this->optionslib->get_option('smtpPassword'), 'smtp_pass' => $this->optionslib->get_option('smtpPassword'),
'crlf' => "\r\n",
'newline' => "\r\n"
); );
$this->email->initialize($config); $this->email->initialize($config);

26
application/language/bulgarian/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port'; $lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username'; $lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password'; $lang['options_smtp_password'] = 'SMTP Password';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "The settings were saved successfully.";
$lang['options_newline'] = 'Newline'; $lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to '; $lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to '; $lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
$lang['options_email_address_changed_to'] = 'Email Address changed to '; $lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to '; $lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to '; $lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to '; $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_changed_to'] = 'SMTP Username changed to '; $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_changed_to'] = 'SMTP Password changed to '; $lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to '; $lang['options_send_testmail'] = "Send Test-Mail";
$lang['options_email_newline_changed_to'] = 'Email Newline changed to '; $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_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text'; $lang['options_global_text'] = 'Global text';

26
application/language/chinese_simplified/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP 主机';
$lang['options_smtp_port'] = 'SMTP 端口'; $lang['options_smtp_port'] = 'SMTP 端口';
$lang['options_smtp_username'] = 'SMTP 用户名'; $lang['options_smtp_username'] = 'SMTP 用户名';
$lang['options_smtp_password'] = 'SMTP 密码'; $lang['options_smtp_password'] = 'SMTP 密码';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "The settings were saved successfully.";
$lang['options_newline'] = '新行'; $lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
$lang['options_outgoing_email_protocol_changed_to'] = '传出电子邮件协议更改为 '; $lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
$lang['options_smtp_encryption_changed_to'] = 'SMTP 加密更改为 '; $lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
$lang['options_email_address_changed_to'] = '电子邮件地址更改为 '; $lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
$lang['options_email_sender_name_changed_to'] = '发件人姓名更改为 '; $lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP 主机更改为 '; $lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP 端口更改为 '; $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_changed_to'] = 'SMTP 用户名更改为'; $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_changed_to'] = 'SMTP 密码更改为'; $lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
$lang['options_email_crlf_changed_to'] = '电子邮件 CRLF 更改为'; $lang['options_send_testmail'] = "Send Test-Mail";
$lang['options_email_newline_changed_to'] = '电子邮件新行更改为'; $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_oqrs'] = 'OQRS设置';
$lang['options_global_text'] = '全局文本'; $lang['options_global_text'] = '全局文本';

26
application/language/czech/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP hostitel';
$lang['options_smtp_port'] = 'SMTP port'; $lang['options_smtp_port'] = 'SMTP port';
$lang['options_smtp_username'] = 'SMTP uživatelské jméno'; $lang['options_smtp_username'] = 'SMTP uživatelské jméno';
$lang['options_smtp_password'] = 'SMTP heslo'; $lang['options_smtp_password'] = 'SMTP heslo';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "The settings were saved successfully.";
$lang['options_newline'] = 'Nový řádek'; $lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
$lang['options_outgoing_email_protocol_changed_to'] = 'Protokol odchozího e-mailu změněn na '; $lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
$lang['options_smtp_encryption_changed_to'] = 'SMTP šifrování změněno na '; $lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
$lang['options_email_address_changed_to'] = 'E-mailová adresa změněna na '; $lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
$lang['options_email_sender_name_changed_to'] = 'Jméno odesílatele e-mailu změněno na '; $lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP hostitel změněn na '; $lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP port změněn na '; $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_changed_to'] = 'SMTP uživatelské jméno změněno na '; $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_changed_to'] = 'SMTP heslo změněno na '; $lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
$lang['options_email_crlf_changed_to'] = 'CRLF e-mail změněn na '; $lang['options_send_testmail'] = "Send Test-Mail";
$lang['options_email_newline_changed_to'] = 'Nový řádek e-mailu změněn na '; $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_oqrs'] = 'OQRS možnosti';
$lang['options_global_text'] = 'Globální text'; $lang['options_global_text'] = 'Globální text';

26
application/language/dutch/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port'; $lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username'; $lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password'; $lang['options_smtp_password'] = 'SMTP Password';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "The settings were saved successfully.";
$lang['options_newline'] = 'Newline'; $lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to '; $lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to '; $lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
$lang['options_email_address_changed_to'] = 'Email Address changed to '; $lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to '; $lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to '; $lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to '; $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_changed_to'] = 'SMTP Username changed to '; $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_changed_to'] = 'SMTP Password changed to '; $lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to '; $lang['options_send_testmail'] = "Send Test-Mail";
$lang['options_email_newline_changed_to'] = 'Email Newline changed to '; $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_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text'; $lang['options_global_text'] = 'Global text';

26
application/language/english/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port'; $lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username'; $lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password'; $lang['options_smtp_password'] = 'SMTP Password';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "The settings were saved successfully.";
$lang['options_newline'] = 'Newline'; $lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to '; $lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to '; $lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
$lang['options_email_address_changed_to'] = 'Email Address changed to '; $lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to '; $lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to '; $lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to '; $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_changed_to'] = 'SMTP Username changed to '; $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_changed_to'] = 'SMTP Password changed to '; $lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to '; $lang['options_send_testmail'] = "Send Test-Mail";
$lang['options_email_newline_changed_to'] = 'Email Newline changed to '; $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_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text'; $lang['options_global_text'] = 'Global text';

26
application/language/finnish/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port'; $lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username'; $lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password'; $lang['options_smtp_password'] = 'SMTP Password';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "The settings were saved successfully.";
$lang['options_newline'] = 'Newline'; $lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to '; $lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to '; $lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
$lang['options_email_address_changed_to'] = 'Sähköpostiosoite vaihdettu: '; $lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
$lang['options_email_sender_name_changed_to'] = 'Sähköpostin lähettäjän nimi vaihdettu: '; $lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to '; $lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to '; $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_changed_to'] = 'SMTP Username changed to '; $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_changed_to'] = 'SMTP Password changed to '; $lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to '; $lang['options_send_testmail'] = "Send Test-Mail";
$lang['options_email_newline_changed_to'] = 'Email Newline changed to '; $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_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text'; $lang['options_global_text'] = 'Global text';

26
application/language/french/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port'; $lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username'; $lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password'; $lang['options_smtp_password'] = 'SMTP Password';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "The settings were saved successfully.";
$lang['options_newline'] = 'Newline'; $lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to '; $lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to '; $lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
$lang['options_email_address_changed_to'] = 'Email Address changed to '; $lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to '; $lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to '; $lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to '; $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_changed_to'] = 'SMTP Username changed to '; $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_changed_to'] = 'SMTP Password changed to '; $lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to '; $lang['options_send_testmail'] = "Send Test-Mail";
$lang['options_email_newline_changed_to'] = 'Email Newline changed to '; $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_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text'; $lang['options_global_text'] = 'Global text';

26
application/language/german/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port'; $lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Benutzername'; $lang['options_smtp_username'] = 'SMTP Benutzername';
$lang['options_smtp_password'] = 'SMTP Passwort'; $lang['options_smtp_password'] = 'SMTP Passwort';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "Die Einstellungen wurden erfolgreich gespeichert.";
$lang['options_newline'] = 'Zeilenvorschub (Newline)'; $lang['options_mail_settings_failed'] = "Beim Speichern ist was schief gelaufen. Probiere es erneut.";
$lang['options_outgoing_email_protocol_changed_to'] = 'Protokoll für ausgehende E-Mails geändert zu '; $lang['options_outgoing_protocol_hint'] = "Das Protokoll, mit dem E-Mails versendet werden.";
$lang['options_smtp_encryption_changed_to'] = 'SMTP Verschlüsselung geändert zu '; $lang['options_smtp_encryption_hint'] = "Wähle ob E-Mails mit TLS oder SSL versendet werden sollen.";
$lang['options_email_address_changed_to'] = 'E-Mailadresse geändert zu '; $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_changed_to'] = 'E-Mail Absendername geändert zu '; $lang['options_email_sender_name_hint'] = "Der Name des Absenders, z.B. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP Host geändert zu '; $lang['options_smtp_host_hint'] = "Der Hostname des Mailservers, z.B. 'mail.example.com' (ohne 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP Port geändert zu '; $lang['options_smtp_port_hint'] = "Der SMTP Port des Mailservers, z.B. für TLS -> '587', für SSL -> '465'";
$lang['options_smtp_username_changed_to'] = 'SMTP Benutzername geändert zu '; $lang['options_smtp_username_hint'] = "Der Benutzername um sich am Mailserver anzumelden. Normalerweise ist dies die E-Mail Adresse.";
$lang['options_smtp_password_changed_to'] = 'SMTP Passwort geändert zu '; $lang['options_smtp_password_hint'] = "Das Passwort um sich am Mailserver anzumelden.";
$lang['options_email_crlf_changed_to'] = 'E-Mail CRLF geändert zu '; $lang['options_send_testmail'] = "Sende eine Test-Mail";
$lang['options_email_newline_changed_to'] = 'E-Mail Zeilenvorschub geändert zu '; $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_oqrs'] = 'OQRS Optionen';
$lang['options_global_text'] = 'Globaler Text'; $lang['options_global_text'] = 'Globaler Text';

26
application/language/greek/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port'; $lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username'; $lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password'; $lang['options_smtp_password'] = 'SMTP Password';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "The settings were saved successfully.";
$lang['options_newline'] = 'Newline'; $lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to '; $lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to '; $lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
$lang['options_email_address_changed_to'] = 'Email Address changed to '; $lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to '; $lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to '; $lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to '; $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_changed_to'] = 'SMTP Username changed to '; $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_changed_to'] = 'SMTP Password changed to '; $lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to '; $lang['options_send_testmail'] = "Send Test-Mail";
$lang['options_email_newline_changed_to'] = 'Email Newline changed to '; $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_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text'; $lang['options_global_text'] = 'Global text';

26
application/language/italian/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port'; $lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username'; $lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password'; $lang['options_smtp_password'] = 'SMTP Password';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "The settings were saved successfully.";
$lang['options_newline'] = 'Newline'; $lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to '; $lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to '; $lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
$lang['options_email_address_changed_to'] = 'Email Address changed to '; $lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to '; $lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to '; $lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to '; $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_changed_to'] = 'SMTP Username changed to '; $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_changed_to'] = 'SMTP Password changed to '; $lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to '; $lang['options_send_testmail'] = "Send Test-Mail";
$lang['options_email_newline_changed_to'] = 'Email Newline changed to '; $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_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text'; $lang['options_global_text'] = 'Global text';

26
application/language/polish/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port'; $lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username'; $lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password'; $lang['options_smtp_password'] = 'SMTP Password';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "The settings were saved successfully.";
$lang['options_newline'] = 'Newline'; $lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to '; $lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to '; $lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
$lang['options_email_address_changed_to'] = 'Email Address changed to '; $lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to '; $lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to '; $lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to '; $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_changed_to'] = 'SMTP Username changed to '; $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_changed_to'] = 'SMTP Password changed to '; $lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to '; $lang['options_send_testmail'] = "Send Test-Mail";
$lang['options_email_newline_changed_to'] = 'Email Newline changed to '; $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_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text'; $lang['options_global_text'] = 'Global text';

26
application/language/russian/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP хост';
$lang['options_smtp_port'] = 'SMTP порт'; $lang['options_smtp_port'] = 'SMTP порт';
$lang['options_smtp_username'] = 'SMTP логин'; $lang['options_smtp_username'] = 'SMTP логин';
$lang['options_smtp_password'] = 'SMTP пароль'; $lang['options_smtp_password'] = 'SMTP пароль';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "The settings were saved successfully.";
$lang['options_newline'] = 'Newline'; $lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
$lang['options_outgoing_email_protocol_changed_to'] = 'Протокол отправки емэйл изменён на '; $lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
$lang['options_smtp_encryption_changed_to'] = 'Шифрование SMTP изменено на '; $lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
$lang['options_email_address_changed_to'] = 'Адрес электронной почты изменён на '; $lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
$lang['options_email_sender_name_changed_to'] = 'Имя отправителя изменено на '; $lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP хост изменён на '; $lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP порт изменён на '; $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_changed_to'] = 'SMTP логин изменён на '; $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_changed_to'] = 'SMTP пароль изменён на '; $lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to '; $lang['options_send_testmail'] = "Send Test-Mail";
$lang['options_email_newline_changed_to'] = 'Email Newline changed to '; $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_oqrs'] = 'OQRS';
$lang['options_global_text'] = 'Сообщение на странице OQRS'; $lang['options_global_text'] = 'Сообщение на странице OQRS';

26
application/language/spanish/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port'; $lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username'; $lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password'; $lang['options_smtp_password'] = 'SMTP Password';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "The settings were saved successfully.";
$lang['options_newline'] = 'Newline'; $lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to '; $lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to '; $lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
$lang['options_email_address_changed_to'] = 'Email Address changed to '; $lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to '; $lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to '; $lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to '; $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_changed_to'] = 'SMTP Username changed to '; $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_changed_to'] = 'SMTP Password changed to '; $lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to '; $lang['options_send_testmail'] = "Send Test-Mail";
$lang['options_email_newline_changed_to'] = 'Email Newline changed to '; $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_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text'; $lang['options_global_text'] = 'Global text';

26
application/language/swedish/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port'; $lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Användarnamn'; $lang['options_smtp_username'] = 'SMTP Användarnamn';
$lang['options_smtp_password'] = 'SMTP Lösenord'; $lang['options_smtp_password'] = 'SMTP Lösenord';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "The settings were saved successfully.";
$lang['options_newline'] = 'Nyrad'; $lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
$lang['options_outgoing_email_protocol_changed_to'] = 'Protokoll för utgående e-post har ändrats till '; $lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
$lang['options_smtp_encryption_changed_to'] = 'SMTP-kryptering ändras till '; $lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
$lang['options_email_address_changed_to'] = 'E-postadress ändrad till '; $lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
$lang['options_email_sender_name_changed_to'] = 'E-postavsändarens namn har ändrats till '; $lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP Host har ändrats till '; $lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP Post har ändrats till '; $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_changed_to'] = 'SMTP Användarnamn ändrat till '; $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_changed_to'] = 'SMTP Lösenordet ändrat till '; $lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
$lang['options_email_crlf_changed_to'] = 'Email CRLF ändrad till '; $lang['options_send_testmail'] = "Send Test-Mail";
$lang['options_email_newline_changed_to'] = 'E-post nyrad Newline ändrad till '; $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_oqrs'] = 'OQRS Alternativ';
$lang['options_global_text'] = 'Global text'; $lang['options_global_text'] = 'Global text';

26
application/language/turkish/options_lang.php
查看文件

@ -38,18 +38,20 @@ $lang['options_smtp_host'] = 'SMTP Host';
$lang['options_smtp_port'] = 'SMTP Port'; $lang['options_smtp_port'] = 'SMTP Port';
$lang['options_smtp_username'] = 'SMTP Username'; $lang['options_smtp_username'] = 'SMTP Username';
$lang['options_smtp_password'] = 'SMTP Password'; $lang['options_smtp_password'] = 'SMTP Password';
$lang['options_crlf'] = 'CRLF'; $lang['options_mail_settings_saved'] = "The settings were saved successfully.";
$lang['options_newline'] = 'Newline'; $lang['options_mail_settings_failed'] = "Something went wrong with saving the settings. Try again.";
$lang['options_outgoing_email_protocol_changed_to'] = 'Outgoing Email Protocol changed to '; $lang['options_outgoing_protocol_hint'] = "The protocol that will be used to send out emails.";
$lang['options_smtp_encryption_changed_to'] = 'SMTP Encryption changed to '; $lang['options_smtp_encryption_hint'] = "Choose whether emails should be sent with TLS or SSL.";
$lang['options_email_address_changed_to'] = 'Email Address changed to '; $lang['options_email_address_hint'] = "The email address from which the emails are sent, e.g. 'cloudlog@example.com'";
$lang['options_email_sender_name_changed_to'] = 'Email Sender Name changed to '; $lang['options_email_sender_name_hint'] = "The email sender name, e.g. 'Cloudlog'";
$lang['options_smtp_host_changed_to'] = 'SMTP Host changed to '; $lang['options_smtp_host_hint'] = "The hostname of the mail server, e.g. 'mail.example.com' (without 'ssl://' or 'tls://')";
$lang['options_smtp_port_changed_to'] = 'SMTP Post changed to '; $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_changed_to'] = 'SMTP Username changed to '; $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_changed_to'] = 'SMTP Password changed to '; $lang['options_smtp_password_hint'] = "The password to log in to the mail server.";
$lang['options_email_crlf_changed_to'] = 'Email CRLF changed to '; $lang['options_send_testmail'] = "Send Test-Mail";
$lang['options_email_newline_changed_to'] = 'Email Newline changed to '; $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_oqrs'] = 'OQRS Options';
$lang['options_global_text'] = 'Global text'; $lang['options_global_text'] = 'Global text';

11
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) { function get_email_address($station_id) {
$this->db->where('station_id', $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'); $this->db->join('station_profile', 'station_profile.user_id = '.$this->config->item('auth_table').'.user_id');

9
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.

12
application/views/interface_assets/footer.php
查看文件

@ -70,6 +70,18 @@ function load_was_map() {
<script src="<?php echo base_url() ;?>assets/js/sections/oqrs.js"></script> <script src="<?php echo base_url() ;?>assets/js/sections/oqrs.js"></script>
<?php } ?> <?php } ?>
<?php if ($this->uri->segment(1) == "options") { ?>
<script>
$('#sendTestMailButton').click(function() {
$.ajax({
url: base_url + 'index.php/options/sendTestMail',
type: 'POST',
});
});
</script>
<?php } ?>
<?php if ($this->uri->segment(1) == "awards" && ($this->uri->segment(2) == "cq") ) { ?> <?php if ($this->uri->segment(1) == "awards" && ($this->uri->segment(2) == "cq") ) { ?>
<script src="<?php echo base_url(); ?>assets/js/Polyline.encoded.js"></script> <script src="<?php echo base_url(); ?>assets/js/Polyline.encoded.js"></script>
<script id="cqmapjs" type="text/javascript" src="<?php echo base_url(); ?>assets/js/sections/cqmap.js" tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"></script> <script id="cqmapjs" type="text/javascript" src="<?php echo base_url(); ?>assets/js/sections/cqmap.js" tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"></script>

42
application/views/options/email.php
查看文件

@ -20,15 +20,22 @@
<?php if($this->session->flashdata('message')) { ?> <?php if($this->session->flashdata('message')) { ?>
<!-- Display Message --> <!-- Display Message -->
<div class="alert-message error"> <div class="alert alert-info">
<?php echo $this->session->flashdata('message'); ?> <?php echo $this->session->flashdata('message'); ?>
</div> </div>
<?php } ?> <?php } ?>
<?php if(validation_errors()) { ?> <?php if($this->session->flashdata('testmailFailed')) { ?>
<!-- Display testmailFailed Message -->
<div class="alert alert-danger"> <div class="alert alert-danger">
<a class="close" data-dismiss="alert">x</a> <?php echo $this->session->flashdata('testmailFailed'); ?>
<?php echo validation_errors(); ?> </div>
<?php } ?>
<?php if($this->session->flashdata('testmailSuccess')) { ?>
<!-- Display testmailSuccess Message -->
<div class="alert alert-success">
<?php echo $this->session->flashdata('testmailSuccess'); ?>
</div> </div>
<?php } ?> <?php } ?>
@ -40,6 +47,7 @@
<option value="sendmail" <?php if($this->optionslib->get_option('emailProtocol')== "sendmail") { echo "selected=\"selected\""; } ?>>Sendmail</option> <option value="sendmail" <?php if($this->optionslib->get_option('emailProtocol')== "sendmail") { echo "selected=\"selected\""; } ?>>Sendmail</option>
<option value="smtp" <?php if($this->optionslib->get_option('emailProtocol')== "smtp") { echo "selected=\"selected\""; } ?>>SMTP</option> <option value="smtp" <?php if($this->optionslib->get_option('emailProtocol')== "smtp") { echo "selected=\"selected\""; } ?>>SMTP</option>
</select> </select>
<small class="form-text text-muted"><?php echo lang('options_outgoing_protocol_hint'); ?></small>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -49,12 +57,14 @@
<option value="tls" <?php if($this->optionslib->get_option('smtpEncryption') == "tls") { echo "selected=\"selected\""; } ?>>TLS</option> <option value="tls" <?php if($this->optionslib->get_option('smtpEncryption') == "tls") { echo "selected=\"selected\""; } ?>>TLS</option>
<option value="ssl" <?php if($this->optionslib->get_option('smtpEncryption') == "ssl") { echo "selected=\"selected\""; } ?>>SSL</option> <option value="ssl" <?php if($this->optionslib->get_option('smtpEncryption') == "ssl") { echo "selected=\"selected\""; } ?>>SSL</option>
</select> </select>
<small class="form-text text-muted"><?php echo lang('options_smtp_encryption_hint'); ?></small>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label for="emailSenderName" class="col-sm-2 col-form-label"><?php echo lang('options_email_sender_name'); ?></label> <label for="emailSenderName" class="col-sm-2 col-form-label"><?php echo lang('options_email_sender_name'); ?></label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text" name="emailSenderName" class="form-control" id="emailSenderName" value="<?php echo ($this->optionslib->get_option('emailSenderName') == "" ? 'Cloudlog' : $this->optionslib->get_option('emailSenderName'));?>"> <input type="text" name="emailSenderName" class="form-control" id="emailSenderName" value="<?php echo ($this->optionslib->get_option('emailSenderName') == "" ? 'Cloudlog' : $this->optionslib->get_option('emailSenderName'));?>">
<small class="form-text text-muted"><?php echo lang('options_email_sender_name_hint'); ?></small>
</div> </div>
</div> </div>
@ -62,6 +72,7 @@
<label for="emailAddress" class="col-sm-2 col-form-label"><?php echo lang('options_email_address'); ?></label> <label for="emailAddress" class="col-sm-2 col-form-label"><?php echo lang('options_email_address'); ?></label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text" name="emailAddress" class="form-control" id="emailAddress" value="<?php if($this->optionslib->get_option('emailAddress') != "") { echo $this->optionslib->get_option('emailAddress'); } ?>"> <input type="text" name="emailAddress" class="form-control" id="emailAddress" value="<?php if($this->optionslib->get_option('emailAddress') != "") { echo $this->optionslib->get_option('emailAddress'); } ?>">
<small class="form-text text-muted"><?php echo lang('options_email_address_hint'); ?></small>
</div> </div>
</div> </div>
@ -69,6 +80,7 @@
<label for="smtpHost" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_host'); ?></label> <label for="smtpHost" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_host'); ?></label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text" name="smtpHost" class="form-control" id="smtpHost" value="<?php if($this->optionslib->get_option('smtpHost') != "") { echo $this->optionslib->get_option('smtpHost'); } ?>"> <input type="text" name="smtpHost" class="form-control" id="smtpHost" value="<?php if($this->optionslib->get_option('smtpHost') != "") { echo $this->optionslib->get_option('smtpHost'); } ?>">
<small class="form-text text-muted"><?php echo lang('options_smtp_host_hint'); ?></small>
</div> </div>
</div> </div>
@ -76,6 +88,7 @@
<label for="smtpPort" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_port'); ?></label> <label for="smtpPort" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_port'); ?></label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="number" name="smtpPort" class="form-control" id="smtpPort" value="<?php if($this->optionslib->get_option('smtpPort') != "") { echo $this->optionslib->get_option('smtpPort'); } ?>"> <input type="number" name="smtpPort" class="form-control" id="smtpPort" value="<?php if($this->optionslib->get_option('smtpPort') != "") { echo $this->optionslib->get_option('smtpPort'); } ?>">
<small class="form-text text-muted"><?php echo lang('options_smtp_port_hint'); ?></small>
</div> </div>
</div> </div>
@ -83,6 +96,7 @@
<label for="smtpUsername" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_username'); ?></label> <label for="smtpUsername" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_username'); ?></label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text" name="smtpUsername" class="form-control" id="smtpUsername" value="<?php if($this->optionslib->get_option('smtpUsername') != "") { echo $this->optionslib->get_option('smtpUsername'); } ?>"> <input type="text" name="smtpUsername" class="form-control" id="smtpUsername" value="<?php if($this->optionslib->get_option('smtpUsername') != "") { echo $this->optionslib->get_option('smtpUsername'); } ?>">
<small class="form-text text-muted"><?php echo lang('options_smtp_username_hint'); ?></small>
</div> </div>
</div> </div>
@ -90,26 +104,18 @@
<label for="smtpPassword" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_password'); ?></label> <label for="smtpPassword" class="col-sm-2 col-form-label"><?php echo lang('options_smtp_password'); ?></label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="password" name="smtpPassword" class="form-control" id="smtpPassword" value="<?php if($this->optionslib->get_option('smtpPassword') != "") { echo $this->optionslib->get_option('smtpPassword'); } ?>"> <input type="password" name="smtpPassword" class="form-control" id="smtpPassword" value="<?php if($this->optionslib->get_option('smtpPassword') != "") { echo $this->optionslib->get_option('smtpPassword'); } ?>">
</div> <small class="form-text text-muted"><?php echo lang('options_smtp_password_hint'); ?></small>
</div>
<div class="form-group row">
<label for="emailcrlf" class="col-sm-2 col-form-label"><?php echo lang('options_crlf'); ?></label>
<div class="col-sm-10">
<input type="text" name="emailcrlf" class="form-control" id="emailcrlf" value="<?php if($this->optionslib->get_option('emailcrlf') != "") { echo $this->optionslib->get_option('emailcrlf'); } ?>">
</div>
</div>
<div class="form-group row">
<label for="emailnewline" class="col-sm-2 col-form-label"><?php echo lang('options_newline'); ?></label>
<div class="col-sm-10">
<input type="text" name="emailnewline" class="form-control" id="emailnewline" value="<?php if($this->optionslib->get_option('emailnewline') != "") { echo $this->optionslib->get_option('emailnewline'); } ?>">
</div> </div>
</div> </div>
<!-- Save the Form --> <!-- Save the Form -->
<input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" /> <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
</form> </form>
<br>
<?php echo form_open('options/sendTestMail'); ?>
<input class="btn btn-primary" type="submit" value="<?php echo lang('options_send_testmail'); ?>" />
<small class="form-text text-muted"><?php echo lang('options_send_testmail_hint'); ?></small>
</form>
</div> </div>
</div> </div>
</div> </div>