Set $reset_by_sms even if password reset is disabled

... to avoid an "undefined variable" warning
7 years ago · 24ad5cc3d8
parent 7c38bdd871
commit 24ad5cc3d8
2 changed files with 6 additions and 10 deletions
--- a/model/AdminHandler.php
+++ b/model/AdminHandler.php
@ -36,11 +36,9 @@ class AdminHandler extends PFAHandler {

        $passwordReset = Config::read('forgotten_admin_password_reset');

-        if ($passwordReset) {
-            $reset_by_sms = 0;
-            if (Config::read('sms_send_function')) {
-                $reset_by_sms = 1;
-            }
+        $reset_by_sms = 0;
+        if ($passwordReset && Config::read('sms_send_function')) {
+            $reset_by_sms = 1;
        }

        $this->struct=array(
--- a/model/MailboxHandler.php
+++ b/model/MailboxHandler.php
@ -13,11 +13,9 @@ class MailboxHandler extends PFAHandler {
    # init $this->struct, $this->db_table and $this->id_field
    protected function initStruct() {
        $passwordReset = Config::read('forgotten_user_password_reset');
-        if ($passwordReset) {
-            $reset_by_sms = 0;
-            if (Config::read('sms_send_function')) {
-                $reset_by_sms = 1;
-            }
+        $reset_by_sms = 0;
+        if ($passwordReset && Config::read('sms_send_function')) {
+            $reset_by_sms = 1;
        }

        $this->struct=array(