From a2c7227ab8996d33ef3a475fe7f7b8e2895d7b8b Mon Sep 17 00:00:00 2001 From: Simey Lameze Date: Thu, 27 Oct 2016 11:02:45 +0800 Subject: [PATCH] MDL-56514 core_message: add missing is messaging enabled checks --- message/externallib.php | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/message/externallib.php b/message/externallib.php index 994ab4a952b..8a19d2efb0a 100644 --- a/message/externallib.php +++ b/message/externallib.php @@ -1642,7 +1642,12 @@ class core_message_external extends external_api { * @return external_description */ public static function get_unread_conversations_count($useridto) { - global $USER; + global $USER, $CFG; + + // Check if messaging is enabled. + if (empty($CFG->messaging)) { + throw new moodle_exception('disabled', 'message'); + } $params = self::validate_parameters( self::get_unread_conversations_count_parameters(), @@ -1708,6 +1713,11 @@ class core_message_external extends external_api { public static function get_blocked_users($userid) { global $CFG, $USER, $PAGE; + // Check if messaging is enabled. + if (empty($CFG->messaging)) { + throw new moodle_exception('disabled', 'message'); + } + // Warnings array, it can be empty at the end but is mandatory. $warnings = array(); @@ -1896,7 +1906,12 @@ class core_message_external extends external_api { * @return external_description */ public static function mark_all_messages_as_read($useridto, $useridfrom) { - global $USER; + global $USER, $CFG; + + // Check if messaging is enabled. + if (empty($CFG->messaging)) { + throw new moodle_exception('disabled', 'message'); + } $params = self::validate_parameters( self::mark_all_messages_as_read_parameters(), @@ -2145,7 +2160,12 @@ class core_message_external extends external_api { * @since 3.2 */ public static function message_processor_config_form($userid, $name, $formvalues) { - global $USER; + global $USER, $CFG; + + // Check if messaging is enabled. + if (empty($CFG->messaging)) { + throw new moodle_exception('disabled', 'message'); + } $params = self::validate_parameters( self::message_processor_config_form_parameters(), @@ -2215,7 +2235,12 @@ class core_message_external extends external_api { * @since 3.2 */ public static function get_message_processor($userid = 0, $name) { - global $USER, $PAGE; + global $USER, $PAGE, $CFG; + + // Check if messaging is enabled. + if (empty($CFG->messaging)) { + throw new moodle_exception('disabled', 'message'); + } $params = self::validate_parameters( self::get_message_processor_parameters(), @@ -2279,7 +2304,12 @@ class core_message_external extends external_api { * @since 3.2 */ public static function get_user_notification_preferences($userid = 0) { - global $USER, $PAGE; + global $USER, $PAGE, $CFG; + + // Check if messaging is enabled. + if (empty($CFG->messaging)) { + throw new moodle_exception('disabled', 'message'); + } $params = self::validate_parameters( self::get_user_notification_preferences_parameters(), -- 2.43.0