diff --git a/cronjobs b/cronjobs
index 936b667bc..500cc7b6f 100644
--- a/cronjobs
+++ b/cronjobs
@@ -2,5 +2,5 @@
0 1 * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/updatenextpayment.php >> /var/log/cron/updatenextpayment.log 2>&1
0 2 * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/updateexchange.php >> /var/log/cron/updateexchange.log 2>&1
0 9 * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/sendnotifications.php >> /var/log/cron/sendnotifications.log 2>&1
-*/2 * * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/sendverificationemails.php > /var/log/cron/sendverificationemails.log 2>&1
-*/2 * * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/sendresetpasswordemails.php > /var/log/cron/sendresetpasswordemails.log 2>&1
+*/2 * * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/sendverificationemails.php >> /var/log/cron/sendverificationemails.log 2>&1
+*/2 * * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/sendresetpasswordemails.php >> /var/log/cron/sendresetpasswordemails.log 2>&1
diff --git a/endpoints/cronjobs/sendresetpasswordemails.php b/endpoints/cronjobs/sendresetpasswordemails.php
index 6a87aae01..50cebbff2 100644
--- a/endpoints/cronjobs/sendresetpasswordemails.php
+++ b/endpoints/cronjobs/sendresetpasswordemails.php
@@ -72,11 +72,11 @@
}
} else {
// There are no SMTP settings
- die("There are password reset emails to be sent but no SMTP settings found.
");
+ exit();
}
} else {
// There are no password reset emails to be sent
- die("No password reset emails to be sent.
");
+ exit();
}
?>
\ No newline at end of file
diff --git a/endpoints/cronjobs/sendverificationemails.php b/endpoints/cronjobs/sendverificationemails.php
index d5954f22f..6f05ac156 100644
--- a/endpoints/cronjobs/sendverificationemails.php
+++ b/endpoints/cronjobs/sendverificationemails.php
@@ -75,11 +75,11 @@
}
} else {
// There are no SMTP settings
- die("There are verification emails to be sent but no SMTP settings found.");
+ exit();
}
} else {
// There are no verification emails to be sent
- die("No verification emails to be sent.");
+ exit();
}
?>
\ No newline at end of file
diff --git a/includes/i18n/de.php b/includes/i18n/de.php
index 42d78ab56..6909fa998 100644
--- a/includes/i18n/de.php
+++ b/includes/i18n/de.php
@@ -26,6 +26,7 @@
'forgot_password' => "Passwort vergessen?",
'reset_password' => "Passwort zurücksetzen",
'reset_sent_check_email' => "Passwort zurücksetzen E-Mail wurde gesendet. Bitte überprüfen Sie Ihr Postfach.",
+ 'password_reset_successful' => "Passwort erfolgreich zurückgesetzt",
// Header
'subscriptions' => "Abonnements",
'stats' => "Statistiken",
diff --git a/includes/i18n/el.php b/includes/i18n/el.php
index 8ad4bdfc5..4893487ce 100644
--- a/includes/i18n/el.php
+++ b/includes/i18n/el.php
@@ -26,6 +26,7 @@
'forgot_password' => "Ξέχασες τον κωδικό σου; Κάνε κλικ",
'reset_password' => "Επαναφορά κωδικού πρόσβασης",
'reset_sent_check_email' => "Ένα email με οδηγίες για την επαναφορά του κωδικού πρόσβασης σας έχει σταλεί. Παρακαλώ ελέγξτε το email σας.",
+ 'password_reset_successful' => "Επιτυχής επαναφορά κωδικού πρόσβασης",
// Header
'subscriptions' => "Συνδρομές",
'stats' => "Στατιστικές",
diff --git a/includes/i18n/en.php b/includes/i18n/en.php
index 9c6e25e71..74982d965 100644
--- a/includes/i18n/en.php
+++ b/includes/i18n/en.php
@@ -26,6 +26,7 @@
'forgot_password' => "Forgot Password",
'reset_password' => "Reset Password",
'reset_sent_check_email' => "Reset email sent. Please check your email.",
+ 'password_reset_successful' => "Password reset successful",
// Header
'subscriptions' => "Subscriptions",
'stats' => "Statistics",
diff --git a/includes/i18n/es.php b/includes/i18n/es.php
index a7b9586a3..42ad2b613 100644
--- a/includes/i18n/es.php
+++ b/includes/i18n/es.php
@@ -26,6 +26,7 @@
'forgot_password' => "¿Olvidaste tu contraseña?",
'reset_password' => "Restablecer Contraseña",
'reset_sent_check_email' => "Se ha enviado un correo electrónico con instrucciones para restablecer la contraseña. Por favor, compruebe su correo electrónico.",
+ 'password_reset_successful' => "Contraseña restablecida con éxito",
// Header
'subscriptions' => "Suscripciones",
'stats' => "Estadísticas",
diff --git a/includes/i18n/fr.php b/includes/i18n/fr.php
index 33da15e5a..ab9e08792 100644
--- a/includes/i18n/fr.php
+++ b/includes/i18n/fr.php
@@ -26,6 +26,7 @@
'forgot_password' => "Mot de passe oublié",
'reset_password' => "Réinitialiser le mot de passe",
'reset_sent_check_email' => "Un courriel a été envoyé à l'adresse fournie. Vérifiez votre boîte de réception.",
+ 'password_reset_successful' => "Réinitialisation du mot de passe réussie",
// En-tête
'subscriptions' => "Abonnements",
'stats' => "Statistiques",
diff --git a/includes/i18n/it.php b/includes/i18n/it.php
index 40995037b..b1ce8bb2a 100644
--- a/includes/i18n/it.php
+++ b/includes/i18n/it.php
@@ -28,6 +28,7 @@
'forgot_password' => "Hai dimenticato la password?",
'reset_password' => "Reimposta password",
'reset_sent_check_email' => "Un'email è stata inviata. Controlla la tua casella di posta",
+ 'password_reset_successful' => "La password è stata reimpostata con successo",
// Header
'subscriptions' => 'Abbonamenti',
diff --git a/includes/i18n/jp.php b/includes/i18n/jp.php
index 8bae89552..2e3b8a1dc 100644
--- a/includes/i18n/jp.php
+++ b/includes/i18n/jp.php
@@ -26,6 +26,7 @@
'forgot_password' => "パスワードを忘れた場合",
'reset_password' => "パスワードをリセット",
'reset_sent_check_email' => "パスワードリセットリンクが送信されました。メールを確認してください。",
+ 'password_reset_successful' => "パスワードリセットに成功",
// Header
'subscriptions' => "定期購入",
'stats' => "統計",
diff --git a/includes/i18n/ko.php b/includes/i18n/ko.php
index 263342fe1..e7817de0b 100644
--- a/includes/i18n/ko.php
+++ b/includes/i18n/ko.php
@@ -26,6 +26,7 @@
'forgot_password' => "비밀번호를 잊으셨나요?",
'reset_password' => "비밀번호 재설정",
'reset_sent_check_email' => "비밀번호 재설정 이메일이 전송되었습니다. 이메일을 확인해 주세요.",
+ 'password_reset_successful' => "비밀번호 재설정 성공",
// Header
'subscriptions' => "구독",
'stats' => "통계",
diff --git a/includes/i18n/pl.php b/includes/i18n/pl.php
index efc06f56e..b4140efb5 100644
--- a/includes/i18n/pl.php
+++ b/includes/i18n/pl.php
@@ -26,6 +26,7 @@
'forgot_password' => "Zapomniałeś hasła? Kliknij tutaj",
'reset_password' => "Zresetuj hasło",
'reset_sent_check_email' => "Link do zresetowania hasła został wysłany na Twój adres e-mail",
+ 'password_reset_successful' => "Hasło zostało zresetowane pomyślnie",
// Header
'subscriptions' => "Subskrypcje",
'stats' => "Statystyki",
diff --git a/includes/i18n/pt.php b/includes/i18n/pt.php
index 7cd739548..fde510eb0 100644
--- a/includes/i18n/pt.php
+++ b/includes/i18n/pt.php
@@ -26,6 +26,7 @@
'forgot_password' => "Esqueceu-se da password?",
'reset_password' => "Repor Password",
'reset_sent_check_email' => "Pedido de reposição de password enviado. Verifique o seu email.",
+ 'password_reset_successful' => "Password reposta com sucesso",
// Header
'subscriptions' => "Subscrições",
'stats' => "Estatísticas",
diff --git a/includes/i18n/pt_br.php b/includes/i18n/pt_br.php
index 6624ad521..416258f41 100644
--- a/includes/i18n/pt_br.php
+++ b/includes/i18n/pt_br.php
@@ -26,6 +26,7 @@
'forgot_password' => "Esqueceu a senha?",
'reset_password' => "Redefinir senha",
'reset_sent_check_email' => "Redefinição de senha enviada. Por favor, verifique seu email",
+ 'password_reset_successful' => "Senha redefinida com sucesso",
// Header
'subscriptions' => "Assinaturas",
'stats' => "Estatísticas",
diff --git a/includes/i18n/ru.php b/includes/i18n/ru.php
index c4029ec8f..5731a7bdb 100644
--- a/includes/i18n/ru.php
+++ b/includes/i18n/ru.php
@@ -26,6 +26,7 @@
'forgot_password' => "Забыли пароль?",
'reset_password' => "Сбросить пароль",
'reset_sent_check_email' => "Ссылка для сброса пароля отправлена на вашу электронную почту",
+ 'password_reset_successful' => "Пароль успешно сброшен",
// Header
'subscriptions' => "Подписки",
'stats' => "Статистика",
diff --git a/includes/i18n/sr.php b/includes/i18n/sr.php
index acab0e3f3..900ae4e57 100644
--- a/includes/i18n/sr.php
+++ b/includes/i18n/sr.php
@@ -26,6 +26,7 @@
'forgot_password' => "Заборављена лозинка",
'reset_password' => "Ресетуј лозинку",
'reset_sent_check_email' => "Ресетовање лозинке је послато на вашу е-пошту",
+ 'password_reset_successful' => "Ресетовање лозинке је успешно",
// Header
'subscriptions' => "Претплате",
'stats' => "Статистике",
diff --git a/includes/i18n/sr_lat.php b/includes/i18n/sr_lat.php
index a96bf5713..44cf784f8 100644
--- a/includes/i18n/sr_lat.php
+++ b/includes/i18n/sr_lat.php
@@ -26,6 +26,7 @@
'forgot_password' => "Zaboravili ste lozinku?",
'reset_password' => "Resetuj lozinku",
'reset_sent_check_email' => "Poslali smo vam e-poštu sa uputstvima za resetovanje lozinke",
+ 'password_reset_successful' => "Lozinka uspešno resetovana",
// Header
'subscriptions' => "Pretplate",
'stats' => "Statistike",
diff --git a/includes/i18n/tr.php b/includes/i18n/tr.php
index bb240e387..7bf0a3667 100644
--- a/includes/i18n/tr.php
+++ b/includes/i18n/tr.php
@@ -26,6 +26,7 @@
'forgot_password' => "Şifremi Unuttum",
'reset_password' => "Şifreyi Sıfırla",
'reset_sent_check_email' => "Şifre sıfırlama bağlantısı e-posta adresinize gönderildi. Lütfen e-postanızı kontrol edin.",
+ 'password_reset_successful' => "Şifre sıfırlama başarılı",
// Header
'subscriptions' => "Abonelikler",
'stats' => "İstatistikler",
diff --git a/includes/i18n/zh_cn.php b/includes/i18n/zh_cn.php
index 499729260..306a82eda 100644
--- a/includes/i18n/zh_cn.php
+++ b/includes/i18n/zh_cn.php
@@ -23,10 +23,12 @@
'login_failed' => "登录信息错误",
'registration_successful' => "注册成功",
'user_email_waiting_verification' => "您的电子邮件需要验证。请检查您的电子邮件",
+
// Password Reset Page
'forgot_password' => "忘记密码",
'reset_password' => "重置密码",
'reset_sent_check_email' => "重置密码链接已发送到您的电子邮箱",
+ 'password_reset_successful' => "密码重置成功",
// 页眉
'subscriptions' => "订阅",
diff --git a/includes/i18n/zh_tw.php b/includes/i18n/zh_tw.php
index a1b7ff9e2..439cfd2dc 100644
--- a/includes/i18n/zh_tw.php
+++ b/includes/i18n/zh_tw.php
@@ -26,6 +26,7 @@
'forgot_password' => "忘記密碼",
'reset_password' => "重設密碼",
'reset_sent_check_email' => "重設密碼的電子郵件已發送,請檢查您的電子郵件",
+ 'password_reset_successful' => "密碼重設成功",
// 頁首
'subscriptions' => "訂閱",
'stats' => "統計",
diff --git a/passwordreset.php b/passwordreset.php
index 7fd3a4959..b5a453eb1 100644
--- a/passwordreset.php
+++ b/passwordreset.php
@@ -198,6 +198,13 @@
+