fixup! MDL-81732 core_sms: Add SMS gateway management UI

mickhawkins · Aug 26, 2024 · b48368a · b48368a
1 parent 696c798
commit b48368a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/lang/en/sms.php b/lang/en/sms.php
@@ -52,6 +52,6 @@
 $string['status:unknown'] = 'Unable to determine the status of the message';
 $string['sms_gateways'] = 'SMS gateways';
 $string['sms_gateway_deleted'] = '{$a->gateway} SMS gateway has been deleted';
-$string['sms_gateway_delete_failed'] = 'Cannot delete {$a->gateway} SMS gateway. The gateway is either in use or there\'s a database issue. Please contact your database administrator for help.';
-$string['sms_gateway_disable_failed'] = 'Cannot disable the SMS gateway. The gateway is either in use or there\'s a database issue. Please contact your database administrator for help.';
+$string['sms_gateway_delete_failed'] = 'Cannot delete the {$a->gateway} SMS gateway. The gateway is either in use or there\'s a database issue. Check if the gateway is active or contact your database administrator for help.';
+$string['sms_gateway_disable_failed'] = 'Cannot disable the SMS gateway. The gateway is either in use or there\'s a database issue. Check if the gateway is active or contact your database administrator for help.';
 $string['select_sms_gateways'] = 'SMS gateway provider';
diff --git a/sms/classes/external/sms_gateway_status.php b/sms/classes/external/sms_gateway_status.php
@@ -44,6 +44,10 @@ public static function execute(int $gatewayid, bool $enabled): array {
             'enabled' => $enabled,
         ]);
 
+        $context = context_system::instance();
+        self::validate_context($context);
+        require_capability('moodle/site:config', $context);
+
         $result = [
             'result' => true,
             'message' => '',

diff --git a/sms/classes/gateway.php b/sms/classes/gateway.php
@@ -29,7 +29,7 @@
  * @property-read int $id The id of the gateway in the database
  * @property-read bool $enabled Whether the gateway is enabled
  * @property-read stdClass $config The configuration for this instance
- * @property-write string $name The name of the gateway config
+ * @property string $name The name of the gateway config
  */
 abstract class gateway {
     use Cloneable;
@@ -48,6 +48,7 @@ abstract class gateway {
     public function __construct(
         /** @var bool Whether the gateway is enabled */
         public readonly bool $enabled,
+        /** @var string The name of the gateway config */
         public string $name,
         string $config,
         /** @var null|int The ID of the gateway in the database, or null if it has not been persisted yet */

diff --git a/sms/configure.php b/sms/configure.php
@@ -25,8 +25,9 @@
 require_once('../config.php');
 
 require_login();
-
 $context = context_system::instance();
+require_capability('moodle/site:config', $context);
+
 $id = optional_param('id', null, PARAM_INT);
 $gateway = optional_param('smsgateway', null, PARAM_PLUGIN);
 $returnurl = optional_param('returnurl', null, PARAM_LOCALURL);

diff --git a/sms/sms_gateways.php b/sms/sms_gateways.php
@@ -28,8 +28,9 @@
 require_once($CFG->dirroot . '/lib/adminlib.php');
 
 require_login();
-
 $context = context_system::instance();
+require_capability('moodle/site:config', $context);
+
 $id = optional_param('id', null, PARAM_INT);
 $action = optional_param('action', '', PARAM_TEXT);
 $confirm = optional_param('confirm', 0, PARAM_BOOL);