diff --git a/interface/lib/classes/ispcmail.inc.php b/interface/lib/classes/ispcmail.inc.php index 522fd1a71b6f0e6bf4beebbff0c9e2ba4a06aac7..fbf5f84dcae2f0d8104f1cb540c66d5a69dadf49 100644 --- a/interface/lib/classes/ispcmail.inc.php +++ b/interface/lib/classes/ispcmail.inc.php @@ -169,7 +169,7 @@ class ispcmail { $this->smtp_host = $value; break; case 'smtp_port': - $this->smtp_port = $value; + if(intval($value) > 0) $this->smtp_port = $value; break; case 'smtp_user': $this->smtp_user = $value; @@ -586,8 +586,8 @@ class ispcmail { */ private function _smtp_login() { $this->_smtp_conn = fsockopen(($this->smtp_crypt == 'ssl' ? 'tls://' : '') . $this->smtp_host, $this->smtp_port, $errno, $errstr, 30); - $response = fgets($this->_smtp_conn, 515); if(empty($this->_smtp_conn)) return false; + $response = fgets($this->_smtp_conn, 515); //Say Hello to SMTP if($this->smtp_helo == '') $this->detectHelo(); @@ -607,8 +607,11 @@ class ispcmail { } stream_context_set_option($this->_smtp_conn, 'ssl', 'verify_host', false); stream_context_set_option($this->_smtp_conn, 'ssl', 'verify_peer', false); + stream_context_set_option($this->_smtp_conn, 'ssl', 'verify_peer_name', false); stream_context_set_option($this->_smtp_conn, 'ssl', 'allow_self_signed', true); - stream_socket_enable_crypto($this->_smtp_conn, true, $crypto_method); + if (stream_socket_enable_crypto($this->_smtp_conn, true, $crypto_method) != true) { + return false; + } } //AUTH LOGIN diff --git a/interface/web/login/lib/lang/ar.lng b/interface/web/login/lib/lang/ar.lng index 6d2e8b3b31956819bdd3d85b3498b9eafeb5daac..a50df19db41051fb421ffe9dc5673ba273bda9c9 100644 --- a/interface/web/login/lib/lang/ar.lng +++ b/interface/web/login/lib/lang/ar.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'A new password will be generated and send to your email $wb['pw_reset'] = 'The password has been reset and send to your email address.'; $wb['pw_error'] = 'Username or email address does not match.'; $wb['pw_error_noinput'] = 'Please enter email address and username.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'The password to your ISPConfig 3 control panel account has been reset. The new password is: '; $wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel password has been reset.'; $wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.'; diff --git a/interface/web/login/lib/lang/bg.lng b/interface/web/login/lib/lang/bg.lng index 3d1aaae5e8343bcb3e4d9fd41953af30898d6ef2..8081ec8097f2efe56bed1d001c7365be9b46e29a 100644 --- a/interface/web/login/lib/lang/bg.lng +++ b/interface/web/login/lib/lang/bg.lng @@ -3,6 +3,7 @@ $wb['pass_reset_txt'] = 'Нова парола ще бъде генериран $wb['pw_reset'] = 'Новата ви парола беше изпратена на електронната ви поща.'; $wb['pw_error'] = 'Греяно потребителското име или електронна поща.'; $wb['pw_error_noinput'] = 'Моля въведете потребителско име и електронна поща.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Новата парола за вашия ISPConfig 3 контролен панел е:'; $wb['pw_reset_mail_title'] = 'Нова парола за вашия ISPConfig 3 контролен панел'; $wb['user_regex_error'] = 'Потребителско име contains unallowed characters or is longer then 64 characters.'; diff --git a/interface/web/login/lib/lang/br.lng b/interface/web/login/lib/lang/br.lng index 9baaf55212a4c2bc9bc25666b66ed8dfb40a1ca9..33cddc8fb3c7c0d4a7b6f54e3c51f13cf3929a90 100644 --- a/interface/web/login/lib/lang/br.lng +++ b/interface/web/login/lib/lang/br.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'Uma nova senha foi gerada e será enviada para você no $wb['pw_reset'] = 'Senha redefinida! Ela será enviada para você no e-mail cadastrado no sistema.'; $wb['pw_error'] = 'Nome do usuário ou e-mail não coincidem.'; $wb['pw_error_noinput'] = 'Favor informar nome do usuário e e-mail válidos.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'A senha para esta conta no ISPConfig foi redefinida. A nova senha é: '; $wb['pw_reset_mail_title'] = 'A senha para esta conta no ISPConfig foi redefinida.'; $wb['user_regex_error'] = 'O nome do usuário contém menos de 1 ou mais de 64 caracteres ou contém caracteres inválidos.'; diff --git a/interface/web/login/lib/lang/ca.lng b/interface/web/login/lib/lang/ca.lng index 17c427714b6ee480e971c460318345bb1a3ef0b7..8c672b59c5caac8bbef310f796b5e283799f5f40 100644 --- a/interface/web/login/lib/lang/ca.lng +++ b/interface/web/login/lib/lang/ca.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'Un nouveau mot de passe vous sera envoyé à votre adre $wb['pw_reset'] = 'Le mot de passe a été réinitialisé, et vous a été envoyé à votre adresse e-mail.'; $wb['pw_error'] = 'Le nom d\'utilisateur et/ou L\'adresse e-mail ne correspondent pas.'; $wb['pw_error_noinput'] = 'Entrez votre nom d\'utilisateur et votre adresse e-mail.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Le mot de passe d\'accès à votre panel a été réinitialisé. Le nouveau mot de passe est : '; $wb['pw_reset_mail_title'] = 'Le mot de passe d\'accès à votre panel a été réinitialisé.'; $wb['user_regex_error'] = 'Le nom d\'utilisateur contient des caractères incorrects ou contient plus de 64 caractères.'; diff --git a/interface/web/login/lib/lang/cz.lng b/interface/web/login/lib/lang/cz.lng index 065f6fc865cdd9694f3d9e8834d8003b3b41bd4a..9b22d7d3c776076375eef06dcfc64f313d871c32 100644 --- a/interface/web/login/lib/lang/cz.lng +++ b/interface/web/login/lib/lang/cz.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'Bude Vám vygenerováno a zasláno nové heslo na e-mai $wb['pw_reset'] = 'Heslo bylo resetováno a zasláno na Váš e-mail.'; $wb['pw_error'] = 'Uživatelské jméno nebo e-mail nesouhlasí.'; $wb['pw_error_noinput'] = 'Prosím zadejte uživatelské jméno a e-mail.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Vaše heslo do ISPConfigu bylo resetováno. Nové heslo je: '; $wb['pw_reset_mail_title'] = 'Heslo do ISPConfigu bylo resetováno.'; $wb['user_regex_error'] = 'Uživatelské jméno obsahuje nepovolené znaky nebo je delší než 64 znaků.'; diff --git a/interface/web/login/lib/lang/de.lng b/interface/web/login/lib/lang/de.lng index 217e5c51b05c608c008c59d3efb46b9e5fa17e7c..446f04edc87eb44b17263d5b4754f1966679f848 100644 --- a/interface/web/login/lib/lang/de.lng +++ b/interface/web/login/lib/lang/de.lng @@ -8,6 +8,7 @@ $wb['pw_reset'] = 'Das Passwort wurde zurückgesetzt und wird per E-Mail an Sie $wb['pw_reset_act'] = 'Ein Aktivierungslink wurde per E-Mail an Sie geschickt. Bitte bestätigen Sie die Anforderung eines neuen Passwortes.'; $wb['pw_error'] = 'Benutzername oder E-Mail Adresse stimmen nicht überein.'; $wb['pw_error_noinput'] = 'Bitte geben Sie Ihre E-Mail Adresse und Ihren Benutzernamen ein.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Das Passwort wurde zurückgesetzt. Das neue Passwort lautet: '; $wb['pw_reset_mail_title'] = 'Ihr Passwort wurde zurückgesetzt'; $wb['pw_reset_act_mail_msg'] = 'Bitte bestätigen Sie die Anforderung eines neuen Passworts, indem Sie folgenden Link besuchen: '; diff --git a/interface/web/login/lib/lang/dk.lng b/interface/web/login/lib/lang/dk.lng index 48e7885ec5dad4e3b9c34928786330e9ab227bb0..8a104c45be9fdd0a364f519870d20134cd926b2e 100644 --- a/interface/web/login/lib/lang/dk.lng +++ b/interface/web/login/lib/lang/dk.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'En ny adgangskode vil blive genereret og sendt til din $wb['pw_reset'] = 'Adgangskoden er blevet nulstillet og sendt til din e-mail adresse.'; $wb['pw_error'] = 'Brugernavn eller e-mail adresse matcher ikke.'; $wb['pw_error_noinput'] = 'Indtast e-mail adresse og brugernavn.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Adgangskoden til din ISPConfig 3 kontrol panel konto er blevet nulstillet. Den nye adgangskode er: '; $wb['pw_reset_mail_title'] = 'ISPConfig 3 Kontrol panel adgangskode er blevet nulstillet.'; $wb['user_regex_error'] = 'Brugernavn indeholder Ikke-tilladte karakterer eller er længer end 64 karaktere.'; diff --git a/interface/web/login/lib/lang/el.lng b/interface/web/login/lib/lang/el.lng index c4e7518904afe9287d344616d7fb182c9710d27e..8a6ed3387f8bb72829facb4051345e2197db9aa2 100644 --- a/interface/web/login/lib/lang/el.lng +++ b/interface/web/login/lib/lang/el.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'Ένα νέο συνθηματικό θα δημιου $wb['pw_reset'] = 'Το νέο συνθηματικό δημιουργηθήκε και στάλθηκε στο e-mail που δηλώσατε'; $wb['pw_error'] = 'Το όνομα χρήστη ή το email δεν ταιριάζουν'; $wb['pw_error_noinput'] = 'Παρακαλούμε εισάγετε διεύθυνση email και όνομα χρήστη'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Ο κωδικός σας για το εργαλείο διαχείρισης ISPConfig 3 έχει αρχικοποιηθεί. Το νέο συνθηματικό είναι: '; $wb['pw_reset_mail_title'] = 'το συνθηματικό σας για το εργαλείο διαχείρισης ISPConfig 3 έχει αρχικοποιηθεί.'; $wb['user_regex_error'] = 'Το όνομα χρήστη περιέχει μη επιτρεπόμενους χαρακτήρες ή το μέγεθος του ξεπερνά του 64 χαρακτήρες.'; diff --git a/interface/web/login/lib/lang/en.lng b/interface/web/login/lib/lang/en.lng index 2db2d49f94566b51b3aa99e953c3bf368bd8f7c7..44844f089baf09041e18c562ac495377b30dd7b5 100644 --- a/interface/web/login/lib/lang/en.lng +++ b/interface/web/login/lib/lang/en.lng @@ -2,19 +2,20 @@ $wb['error_user_password_empty'] = "Username or Password empty."; $wb['error_user_password_incorrect'] = "Username or Password wrong."; $wb['error_user_blocked'] = "User is blocked."; -$wb['error_user_too_many_logins'] = "To many wrong login's, Please retry it after 15 minutes"; -$wb['pass_reset_txt'] = 'A new password will be generated and send to your email address if the email address entered below matches the email address in your client settings.'; -$wb['pw_reset'] = 'The password has been reset and send to your email address.'; -$wb['pw_reset_act'] = 'You have been sent an activation link. Please visit the link to confirm your password request.'; +$wb['error_user_too_many_logins'] = "Too many failed login attempts. Please retry after 15 minutes"; +$wb['pass_reset_txt'] = 'A new password will be generated and sent to your email address if the email address entered below matches the email address in your client settings.'; +$wb['pw_reset'] = 'The password has been reset and sent to your email address.'; +$wb['pw_reset_act'] = 'You have been sent a password reset link. Please visit the link to confirm your password reset request.'; $wb['pw_error'] = 'Username or email address does not match.'; $wb['pw_error_noinput'] = 'Please enter email address and username.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'The password to your ISPConfig 3 control panel account has been reset. The new password is: '; $wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel password has been reset'; $wb['pw_reset_act_mail_title'] = 'Confirm ISPConfig 3 Control panel password reset'; $wb['pw_reset_act_mail_msg'] = 'Please confirm that your want to reset your ISPConfig 3 control panel account password by visiting the following activation link: '; $wb['user_regex_error'] = 'Username contains unallowed characters or is longer than 64 characters.'; $wb['pw_error_length'] = 'The password length is < 1 or > 256 characters.'; -$wb['email_error'] = 'Email contains unallowed characters or has a invalid format.'; +$wb['email_error'] = 'Email contains unallowed characters or has an invalid format.'; $wb['login_txt'] = "Login"; $wb['username_txt'] = "Username"; $wb['password_txt'] = "Password"; @@ -28,7 +29,7 @@ $wb['error_maintenance_mode'] = 'This ISPConfig installation is currently under $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.
The default theme as been activated automatically.'; $wb['stay_logged_in_txt'] = 'Keep me logged in'; $wb['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.'; -$wb['lost_password_function_wait_txt'] = 'You cannot request a new password, yet. Please wait a few minutes.'; +$wb['lost_password_function_wait_txt'] = 'You cannot request a new password yet. Please wait a few minutes.'; $wb['lost_password_function_expired_txt'] = 'This activation link has expired. Please request a new one.'; $wb['lost_password_function_denied_txt'] = 'This activation link is not valid.'; ?> diff --git a/interface/web/login/lib/lang/es.lng b/interface/web/login/lib/lang/es.lng index c7576d509d8aec45c7799df0958125e4d349e10c..98c94443c54ddc2a0770cdfb29907a2a352e956d 100755 --- a/interface/web/login/lib/lang/es.lng +++ b/interface/web/login/lib/lang/es.lng @@ -16,6 +16,7 @@ $wb['pw_button_txt'] = 'Reenviar contraseña'; $wb['pw_error'] = 'El usuario o la cuenta de correo no coinciden.'; $wb['pw_error_length'] = 'La longitud de la contraseña es superior a 64 caracteres.'; $wb['pw_error_noinput'] = 'Por favor, introduzca la dirección de correo y el nombre de usuario.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_lost_txt'] = 'Olvidé la contraseña'; $wb['pw_reset'] = 'La nueva contraseña ha sido generada y enviada a su cuenta de correo.'; $wb['pw_reset_mail_msg'] = 'La contraseña de su cuenta de panel de control ISPConfig 3 ha sido regenerada. La nueva contraseña es: '; diff --git a/interface/web/login/lib/lang/fi.lng b/interface/web/login/lib/lang/fi.lng index e2cc04da8a0651c871ab70fdc36fbb5bd69e4810..8198dd4822ae84dd7a2202b9e0b9ec726316148f 100755 --- a/interface/web/login/lib/lang/fi.lng +++ b/interface/web/login/lib/lang/fi.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'Uusi salasana luodaan ja lähetetään asiakastiedoissa $wb['pw_reset'] = 'Salasana on vaihdettu ja lähetetty sähköpostiisi.'; $wb['pw_error'] = 'Käyttäjätunnusta tai sähköpostiosoitetta ei löydy.'; $wb['pw_error_noinput'] = 'Anna sähköpostiosoite ja käyttäjätunnus.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Käyttäjätunnuksesi salasana ISPConfi3 Hallintapaneeliin on vaihdettu. Uusi salasanasi: '; $wb['pw_reset_mail_title'] = 'ISPConfi3 Hallintapaneelin salasana on vaihdettu.'; $wb['user_regex_error'] = 'Käyttäjänimi sisältää kiellettyjä merkkejä tai on yli 64 merkkiä pitkä.'; diff --git a/interface/web/login/lib/lang/fr.lng b/interface/web/login/lib/lang/fr.lng index ac4f3c2d78f4e7d0485137f225fdf5851a44e54f..f067751aa9bc1499665c7126c494f4e78c51f48e 100644 --- a/interface/web/login/lib/lang/fr.lng +++ b/interface/web/login/lib/lang/fr.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'Un nouveau mot de passe vous sera envoyé à votre adre $wb['pw_reset'] = 'Le mot de passe a été réinitialisé, et vous a été envoyé à votre adresse e-mail.'; $wb['pw_error'] = 'Le nom d’utilisateur ou l’adresse e-mail ne correspondent pas.'; $wb['pw_error_noinput'] = 'Saisissez votre nom d’utilisateur et votre adresse e-mail.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Le mot de passe d’accès à votre Panel a été réinitialisé. Le nouveau mot de passe est : '; $wb['pw_reset_mail_title'] = 'Le mot de passe d’accès à votre Panel a été réinitialisé.'; $wb['user_regex_error'] = 'Le nom d’utilisateur contient des caractères incorrects ou contient plus de 64 caractères.'; diff --git a/interface/web/login/lib/lang/hr.lng b/interface/web/login/lib/lang/hr.lng index a2920e617849e2fdd28ed9583186000567e35a6c..193123557a4b6931d20ef32de6c01ee782f3596b 100644 --- a/interface/web/login/lib/lang/hr.lng +++ b/interface/web/login/lib/lang/hr.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'Nova šifra će biti generirana i poslana na email ako $wb['pw_reset'] = 'Šifra je resetirana i poslana na vašu email adresu.'; $wb['pw_error'] = 'Korisničko ime ili šifra nisu ispravni.'; $wb['pw_error_noinput'] = 'Unesite email adresu i korisničko ime.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Šifra za ISPConfig 3 control panel račun je resetirana. Vaša nova šifra je: '; $wb['pw_reset_mail_title'] = 'Resetirana ISPConfig 3 control panel šifra.'; $wb['user_regex_error'] = 'Korisničko ime sadrži nedozvoljene znakove ili je dulje od 64 znaka.'; diff --git a/interface/web/login/lib/lang/hu.lng b/interface/web/login/lib/lang/hu.lng index 7548c01de39cc4c29b79ff2ed7eb506a5c75e2b8..b6adb6b19d2dd3fb3ba25d24508061c972954ca1 100644 --- a/interface/web/login/lib/lang/hu.lng +++ b/interface/web/login/lib/lang/hu.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'Új jelszót generáltunk és email címére elküldjü $wb['pw_reset'] = 'Jelszavát reseteltük és elküldtük email címére.'; $wb['pw_error'] = 'Felhasználónév vagy email cím nem egyezik.'; $wb['pw_error_noinput'] = 'Kérem üsse be email címét és felahsználónevét.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'The password to your ISPConfig 3 control panel hozzáfárás módosítva. Az új jelszó: '; $wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel jelszó módosítva.'; $wb['user_regex_error'] = 'Felhasználónév érvénytelen karaktereket tartalmaz, vagy több mint 64 karakter'; diff --git a/interface/web/login/lib/lang/id.lng b/interface/web/login/lib/lang/id.lng index accdcbc3c4f0058b82fd26764c9fd22031fa6745..35e3675a9d9f630a024d13ca03b6e097b70b9331 100644 --- a/interface/web/login/lib/lang/id.lng +++ b/interface/web/login/lib/lang/id.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'Kata sandi baru telah dibuat dan dikirim ke alamat emai $wb['pw_reset'] = 'Kata sandi telah direset dan telah dikirim ke alamat email Anda.'; $wb['pw_error'] = 'Nama pengguna atau alamat email tidak cocok.'; $wb['pw_error_noinput'] = 'Masukkan alamat email dan nama pengguna.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Kata sandi untuk control panel ISPConfig 3 Anda telah direset. Kata sandi yang baru adalah: '; $wb['pw_reset_mail_title'] = 'Kata sandi Control Panel ISPConfig 3 telah direset.'; $wb['user_regex_error'] = 'Nama Pengguna mengandung karakter yang tidak diperbolehkan atau lebih dari 64 karakter.'; diff --git a/interface/web/login/lib/lang/it.lng b/interface/web/login/lib/lang/it.lng index 6d23aa0ccb86d29572ac822080597687e36cda91..0d3ec93c9b493e2c5d7ac5212d0c172652414033 100644 --- a/interface/web/login/lib/lang/it.lng +++ b/interface/web/login/lib/lang/it.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'Una nuova password sarà generata e spedita alla tua e $wb['pw_reset'] = 'La password è stata reimpostata e spedita al tuo indirizzo mail.'; $wb['pw_error'] = 'Nome utente o e-mail non corrispondenti.'; $wb['pw_error_noinput'] = 'Inserisci nome utente e indirizzo e-mail.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'La password nel tuo pannello di controllo è stata reimpostata. La nuova password è: '; $wb['pw_reset_mail_title'] = 'Password del pannello di controllo reimpostata.'; $wb['user_regex_error'] = 'Nome utente contenente caratteri non permessi oppure più lungo di 64 caratteri.'; diff --git a/interface/web/login/lib/lang/ja.lng b/interface/web/login/lib/lang/ja.lng index 8318ef92633027354a0367be4c377640833321bc..4b9e2c62363720530033eee88a65e4639edd08be 100644 --- a/interface/web/login/lib/lang/ja.lng +++ b/interface/web/login/lib/lang/ja.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = '新しいパスワードをメールで送りました $wb['pw_reset'] = 'パスワードをリセットしました。新しいパスワードをメールで送信したのでメールボックスを確認してください。'; $wb['pw_error'] = 'ユーザー名またはメールアドレスが一致しません。'; $wb['pw_error_noinput'] = 'メールアドレスとユーザー名を入力してください。'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'ISPConfig 3 のコントロールパネルのパスワードをリセットしました。新しいパスワードは次の通りです：'; $wb['pw_reset_mail_title'] = 'ISPConfig3 のコントロールパネルのパスワードをリセットしました。'; $wb['user_regex_error'] = 'ユーザー名に不正な文字が含まれているか、または64文字を超えています。'; diff --git a/interface/web/login/lib/lang/nl.lng b/interface/web/login/lib/lang/nl.lng index ca641e3b026b2bb06f6fe697ff72aa58f1450d24..2c98275fd4fef242932c23287428c894f42ab2a0 100644 --- a/interface/web/login/lib/lang/nl.lng +++ b/interface/web/login/lib/lang/nl.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'Een nieuw wachtwoord zal worden gegenereerd en per e-ma $wb['pw_reset'] = 'Het wachtwoord is gereset en is verzonden naar uw e-mailadres.'; $wb['pw_error'] = 'Gebruikersnaam of e-mailadres komt niet overeen.'; $wb['pw_error_noinput'] = 'Voer a.u.b. een e-mailadres en gebruikersnaam in.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Het wachtwoord dat toegang biedt tot uw ISPConfig 3 control panel account is gereset. Het nieuwe wachtwoord is: '; $wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel wachtwoord is gereset.'; $wb['user_regex_error'] = 'Gebruikersnaam bevat karakters die niet zijn toegestaan of is langer dan 64 karakters.'; diff --git a/interface/web/login/lib/lang/pl.lng b/interface/web/login/lib/lang/pl.lng index 702b50117f7000a48e7a1a9c08e9f7d5b7b4332d..2367ede54d5b222eb2724e109d4984852b9b3c1e 100644 --- a/interface/web/login/lib/lang/pl.lng +++ b/interface/web/login/lib/lang/pl.lng @@ -3,6 +3,7 @@ $wb['pass_reset_txt'] = 'Nowe hasło zostanie wygenerowane i wysłane na Twój a $wb['pw_reset'] = 'Nowe hasło zostało wygenerowane i wysłane na Twój adres e-mail.'; $wb['pw_error'] = 'Nazwa użytkownika lub e-mail nie pasują do siebie.'; $wb['pw_error_noinput'] = 'Podaj nazwę użytkownika i adres e-mail.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Hasło do Twojego panelu w ISPConfig 3 zostało zresetowane. Twoje nowe hasło to: '; $wb['pw_reset_mail_title'] = 'Hasło do panelu w ISPConfig 3 zostało zresetowane.'; $wb['user_regex_error'] = 'Nazwa użytkownika zawiera niedozwolone znaki lub jest dłuższa niż 64 znaki.'; diff --git a/interface/web/login/lib/lang/pt.lng b/interface/web/login/lib/lang/pt.lng index 576d7ca44cdf6a5ac12fe053c804f57b64f51620..4be018a50c72b54a1f4007b73e1a60b80b1a054a 100644 --- a/interface/web/login/lib/lang/pt.lng +++ b/interface/web/login/lib/lang/pt.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'Uma nova senha foi gerada e ser-lhe-á enviada para o c $wb['pw_reset'] = 'Senha restabelecida! Ser-lhe-á enviada para o correio eletrônico registado no sistema.'; $wb['pw_error'] = 'Nome de utilizador ou correio eletrônico não coincidem.'; $wb['pw_error_noinput'] = 'Favor informar nome de utilizador e endereço de correio válidos.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'A senha do painel de controle foi restabelecida. A nova senha é: '; $wb['pw_reset_mail_title'] = 'A senha do painel de controle foi restabelecida.'; $wb['user_regex_error'] = 'O nome de utilizador contém mais de 64 caracteres ou contém caracteres inválidos.'; diff --git a/interface/web/login/lib/lang/ro.lng b/interface/web/login/lib/lang/ro.lng index 3eb550194a80848a396e42af098e7841c1a1a360..7676d928d57fbe6a18e2eb7182d9a80e7f6c714d 100644 --- a/interface/web/login/lib/lang/ro.lng +++ b/interface/web/login/lib/lang/ro.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'O noua parola va fi generata si trimisa catre mail-ul t $wb['pw_reset'] = 'Parola a fost schimbata si trimisa la mail-ul tau.'; $wb['pw_error'] = 'Username sau email nu s epotrivesc'; $wb['pw_error_noinput'] = 'introduceti email address si username.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Parola la panoul de control a fost resetata . Noua parola este : '; $wb['pw_reset_mail_title'] = 'parola panoului de control a fost schimbata'; $wb['user_regex_error'] = 'Username contine caractere nepermise sau are mai mult de 64 caractere'; diff --git a/interface/web/login/lib/lang/ru.lng b/interface/web/login/lib/lang/ru.lng index ab19c92b13983dbc8ad7e5e4446fe1724cc1dd4e..4f1b4e86fc8d4cd099161dd6d8f5fc5d7d31ad47 100644 --- a/interface/web/login/lib/lang/ru.lng +++ b/interface/web/login/lib/lang/ru.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'Новый пароль будет сгенериров $wb['pw_reset'] = 'Пароль был сброшен и и отправлен вам на почту.'; $wb['pw_error'] = 'Логин или E-mail адрес не совпадают.'; $wb['pw_error_noinput'] = 'Введите E-mail адрес и логин.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Пароль в панель управления ISPConfig 3Был сброшен. Новый пароль: '; $wb['pw_reset_mail_title'] = 'Пароль для контрольной панели ISPConfig 3 был сброшен.'; $wb['user_regex_error'] = 'Логин содержит неправильные символы, или длиннее 64 символов.'; diff --git a/interface/web/login/lib/lang/se.lng b/interface/web/login/lib/lang/se.lng index 280332789b223a5a46355e08075281f85a260bdb..4f8a8a44431c6787484fd280173fdd4b6e2c3b7b 100644 --- a/interface/web/login/lib/lang/se.lng +++ b/interface/web/login/lib/lang/se.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'A new password will be generated and send to your email $wb['pw_reset'] = 'Lösenordet har återställts och skickats till din epostadress.'; $wb['pw_error'] = 'Användarenmn eller lösenord matchar inte.'; $wb['pw_error_noinput'] = 'Vänligen fyll i epostadress och användarnamn.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'The password to your ISPConfig 3 control panel account has been reset. The new password is: '; $wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel password has been reset.'; $wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.'; diff --git a/interface/web/login/lib/lang/sk.lng b/interface/web/login/lib/lang/sk.lng index b03a6455646071a15f28412bfd351450539d0fd8..8c211b19beab44a010faa95f82f731c0988b04ef 100644 --- a/interface/web/login/lib/lang/sk.lng +++ b/interface/web/login/lib/lang/sk.lng @@ -7,6 +7,7 @@ $wb['pass_reset_txt'] = 'Nové heslo bude vytvorené a poslané na e-mailovú ad $wb['pw_reset'] = 'Heslo bolo resetnuté a posielané na e-mailovú adresu.'; $wb['pw_error'] = 'Užívateľské meno alebo e-mailová adresa nezodpovedá.'; $wb['pw_error_noinput'] = 'Prosím, zadajte e-mailovú adresu a Užívateľské meno.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'Heslo k svojmu účtu na ovládacom paneli bol resetnuté. Nové heslo je:'; $wb['pw_reset_mail_title'] = 'Heslo ovládacieho panelu bolo resetnuté.'; $wb['user_regex_error'] = 'Užívateľské meno obsahuje neplatné znaky, alebo je dlhšia ako 64 znakov.'; diff --git a/interface/web/login/lib/lang/tr.lng b/interface/web/login/lib/lang/tr.lng index 863a6310d57e5d692bbf7fd8003c3c2f9633163b..7bcc75f6942b52238d1c80546c0397d3c29d908d 100644 --- a/interface/web/login/lib/lang/tr.lng +++ b/interface/web/login/lib/lang/tr.lng @@ -8,6 +8,7 @@ $wb['pw_reset'] = 'Parolanız sıfırlandı ve e-posta adresinize gönderildi.'; $wb['pw_reset_act'] = 'Size bir etkinleştirme bağlantısı gönderildi. Parola isteğinizi onaylamak için bağlantıya tıklayın.'; $wb['pw_error'] = 'Kullanıcı adı ya da e-posta adresiniz doğru değil.'; $wb['pw_error_noinput'] = 'Lütfen e-posta adresinizi ya da kullanıcı adınızı yazın.'; +$wb['pw_reset_error_smtp_connection'] = 'There was a connection problem when trying to send an email pertaining to your password reset request.'; $wb['pw_reset_mail_msg'] = 'ISPConfig 3 Kontrol Paneli parolanız sıfırlandı. Yeni parolanız: '; $wb['pw_reset_mail_title'] = 'ISPConfig 3 Kontrol Paneli parolanız sıfırlandı'; $wb['pw_reset_act_mail_title'] = 'ISPConfig 3 Control Panel parola sıfırlama isteğini onaylayın'; diff --git a/interface/web/login/password_reset.php b/interface/web/login/password_reset.php index 1550ae8af261f6e895d660b0780502f7f0d45fdf..0a15b0c52b0a3da2ea55ee78f80cf7ba18f03955 100644 --- a/interface/web/login/password_reset.php +++ b/interface/web/login/password_reset.php @@ -71,8 +71,7 @@ if(isset($_POST['username']) && $_POST['username'] != '' && $_POST['email'] != ' $username = $client['username']; $password_hash = sha1(uniqid('ispc_pw')); $app->db->query("UPDATE sys_user SET lost_password_reqtime = NOW(), lost_password_hash = ? WHERE username = ?", $password_hash, $username); - $app->tpl->setVar("message", $wb['pw_reset_act']); - + $server_domain = (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']); if($server_domain == '_') { $tmp = explode(':',$_SERVER["HTTP_HOST"]); @@ -81,9 +80,9 @@ if(isset($_POST['username']) && $_POST['username'] != '' && $_POST['email'] != ' } if(!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on') $server_domain = 'http://' . $server_domain; else $server_domain = 'https://' . $server_domain; - + if(isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != '443') $server_domain .= ':' . $_SERVER['SERVER_PORT']; - + $app->uses('getconf,ispcmail'); $server_config_array = $app->getconf->get_global_config(); $mail_config = $server_config_array['mail']; @@ -94,10 +93,14 @@ if(isset($_POST['username']) && $_POST['username'] != '' && $_POST['email'] != ' $app->ispcmail->setSender($mail_config['admin_mail'], $mail_config['admin_name']); $app->ispcmail->setSubject($wb['pw_reset_act_mail_title']); $app->ispcmail->setMailText($wb['pw_reset_act_mail_msg'].$server_domain . '/login/password_reset.php?username=' . urlencode($username) . '&hash=' . urlencode($password_hash)); - $app->ispcmail->send(array($client['contact_name'] => $client['email'])); + $send_result = $app->ispcmail->send(array($client['contact_name'] => $client['email'])); $app->ispcmail->finish(); - $app->tpl->setVar("msg", $wb['pw_reset_act']); + if($send_result !== false) { + $app->tpl->setVar("msg", $wb['pw_reset_act']); + } else { + $app->tpl->setVar("error", $wb['pw_reset_error_smtp_connection']); + } } else { $app->tpl->setVar("error", $wb['pw_error']); } @@ -132,7 +135,6 @@ if(isset($_POST['username']) && $_POST['username'] != '' && $_POST['email'] != ' $username = $client['username']; $app->db->query("UPDATE sys_user SET passwort = ?, lost_password_hash = '', lost_password_reqtime = NULL WHERE username = ?", $new_password_encrypted, $username); $app->db->query("UPDATE client SET password = ? WHERE username = ?", $new_password_encrypted, $username); - $app->tpl->setVar("message", $wb['pw_reset']); $app->uses('getconf,ispcmail'); $mail_config = $server_config_array['mail']; @@ -143,11 +145,17 @@ if(isset($_POST['username']) && $_POST['username'] != '' && $_POST['email'] != ' $app->ispcmail->setSender($mail_config['admin_mail'], $mail_config['admin_name']); $app->ispcmail->setSubject($wb['pw_reset_mail_title']); $app->ispcmail->setMailText($wb['pw_reset_mail_msg'].$new_password); - $app->ispcmail->send(array($client['contact_name'] => $client['email'])); + $send_result = $app->ispcmail->send(array($client['contact_name'] => $client['email'])); $app->ispcmail->finish(); $app->plugin->raiseEvent('password_reset', true); - $app->tpl->setVar("msg", $wb['pw_reset']); + + if($send_result !== false) { + $app->tpl->setVar("msg", $wb['pw_reset']); + } else { + $app->tpl->setVar("error", $wb['pw_reset_error_smtp_connection']); + } + } else { $app->tpl->setVar("error", $wb['pw_error']); }