WebSVN – Moodle – Diff – /admin/tool/mfa/factor/sms/classes/factor.php

 namespace factor_sms;
 use moodle_url;
 use stdClass;
+use tool_mfa\local\factor\object_factor_base;
-use tool_mfa\local\factor\object_factor_base;
+use tool_mfa\local\secret_manager;
 /**
  * SMS Factor implementation.
         $editphonenumber = \html_writer::link(
             new \moodle_url('/admin/tool/mfa/factor/sms/editphonenumber.php', ['sesskey' => sesskey()]),
             get_string('editphonenumber', 'factor_sms'),
             ['class' => 'btn btn-secondary', 'type' => 'button']);
-        $mform->addElement('html', \html_writer::tag('div', $editphonenumber, ['class' => 'float-sm-left col-md-4']));
+        $mform->addElement('html', \html_writer::tag('div', $editphonenumber, ['class' => 'float-sm-start col-md-4']));
         // Disable the form check prompt.
         global $SESSION;
         if (!empty($SESSION->tool_mfa_sms_number)) {
             unset($SESSION->tool_mfa_sms_number);
+        }
         // Clean temp secrets code.
-        $secretmanager = new \tool_mfa\local\secret_manager('sms');
+        $secretmanager = new secret_manager('sms');
         $secretmanager->cleanup_temp_secrets();
+    }
     /**
      * Returns the information about factor availability.
+     *
      * @return bool
      */
     public function is_enabled(): bool {
-        if (empty(get_config('factor_sms', 'gateway'))) {
-            return false;
-        }
-        $class = '\factor_sms\local\smsgateway\\' . get_config('factor_sms', 'gateway');
-        if (!call_user_func($class . '::is_gateway_enabled')) {
-            return false;
-        }
         return parent::is_enabled();
+    }
     /**
      * Decides if the setup buttons should be shown on the preferences page.
+     *
      * @return bool
      */
     public function show_setup_buttons(): bool {
+        if (get_config('factor_sms', 'smsgateway') > 0) {
-        return true;
+            return true;
+        }
+        return false;
+    }
     /**
      * Returns true if factor class has factor records that might be revoked.
             'url' => $url->get_host(),
             'code' => $secret,
         ];
         $message = get_string('smsstring', 'factor_sms', $content);
-        $class = '\factor_sms\local\smsgateway\\' . get_config('factor_sms', 'gateway');
+        $manager = \core\di::get(\core_sms\manager::class);
-        $gateway = new $class();
+        $manager->send(
+            recipientnumber: $phonenumber,
+            content: $message,
+            component: 'factor_sms',
+            messagetype: 'mfa',
+            recipientuserid: null,
+            issensitive: true,
+            async: false,
+            gatewayid: get_config('factor_sms', 'smsgateway'),
-        $gateway->send_sms_message($message, $phonenumber);
+        );
+    }
     /**
      * Verifies entered code against stored DB record.
+     *
      * @param string $enteredcode
      * @return bool
      */
     private function check_verification_code(string $enteredcode): bool {
-        return ($this->secretmanager->validate_secret($enteredcode) === \tool_mfa\local\secret_manager::VALID) ? true : false;
+        return $this->secretmanager->validate_secret($enteredcode) === secret_manager::VALID;
+    }
         $phonenumber = $this->get_phonenumber();
-        if (empty($phonenumber)) {
-            return get_string('errorsmssent', 'factor_sms');
-        } else {
+        if (empty($phonenumber)) {
+            return get_string('errorsmssent', 'factor_sms');
+        }
             return get_string('logindesc', 'factor_' . $this->name, $phonenumber);
         return get_string('logindesc', 'factor_' . $this->name, $phonenumber);

Proyectos de Subversion Moodle

(root)/admin/tool/mfa/factor/sms/classes/factor.php – Rev 1 → 1441