WebSVN – Moodle – Diff – /message/externallib.php

             // TODO MDL-31118 performance improvement - edit the function so we can pass an array instead userid
             // Check if the recipient can be messaged by the sender.
             if ($success && !\core_message\api::can_send_message($tousers[$message['touserid']]->id, $USER->id)) {
                 $success = false;
-                $errormessage = get_string('usercantbemessaged', 'message', fullname(\core_user::get_user($message['touserid'])));
+                $errormessage = get_string('usercantbemessaged', 'message');
+            }
             // Now we can send the message (at least try).
             'isdeleted' => new external_value(PARAM_BOOL, 'Is the user deleted?'),
             'canmessageevenifblocked' => new external_value(PARAM_BOOL,
                 'If the user can still message even if they get blocked'),
             'canmessage' => new external_value(PARAM_BOOL, 'If the user can be messaged'),
             'requirescontact' => new external_value(PARAM_BOOL, 'If the user requires to be contacts'),
+            'cancreatecontact' => new external_value(PARAM_BOOL, 'Is the user permitted to add a contact'),
         ];
         $result['contactrequests'] = new external_multiple_structure(
             new external_single_structure(
      *             when private conversations are requested.
      * @return stdClass
      * @throws \moodle_exception if the messaging feature is disabled on the site.
      * @since 3.2
      */
-    public static function get_conversations($userid, $limitfrom = 0, $limitnum = 0, int $type = null, bool $favourites = null,
+    public static function get_conversations($userid, $limitfrom = 0, $limitnum = 0, ?int $type = null, ?bool $favourites = null,
             bool $mergeself = false) {
         global $CFG, $USER;
         // All the standard BL checks.
     /**
      * Returns a notification or message preference structure.
+     *
      * @return external_single_structure the structure
      * @since  Moodle 3.2
-     * @todo Remove loggedin and loggedoff from processors structure on MDL-73284.
      */
     protected static function get_preferences_structure() {
         return new external_single_structure(
             array(
                 'userid' => new external_value(PARAM_INT, 'User id'),
                                                     'name' => new external_value(PARAM_PLUGIN, 'Processor name'),
                                                     'locked' => new external_value(PARAM_BOOL, 'Is locked by admin?'),
                                                     'lockedmessage' => new external_value(PARAM_TEXT,
                                                         'Text to display if locked', VALUE_OPTIONAL),
                                                     'userconfigured' => new external_value(PARAM_INT, 'Is configured?'),
-                                                    'loggedin' => new external_single_structure(
-                                                        array(
-                                                            'name' => new external_value(PARAM_NOTAGS, 'Name'),
-                                                            'displayname' => new external_value(PARAM_TEXT, 'Display name'),
-                                                            'checked' => new external_value(PARAM_BOOL, 'Is checked?'),
-                                                        ),
-                                                        'DEPRECATED ATTRIBUTE -
-                                                        Kept for backward compatibility, use enabled instead.',
-                                                    ),
-                                                    'loggedoff' => new external_single_structure(
-                                                        array(
-                                                            'name' => new external_value(PARAM_NOTAGS, 'Name'),
-                                                            'displayname' => new external_value(PARAM_TEXT, 'Display name'),
-                                                            'checked' => new external_value(PARAM_BOOL, 'Is checked?'),
-                                                        ),
-                                                        'DEPRECATED ATTRIBUTE -
-                                                        Kept for backward compatibility, use enabled instead.',
-                                                    ),
                                                     'enabled' => new external_value(PARAM_BOOL, 'Is enabled?'),
+                                                )
                                             ),
                                             'Processors values for this notification'
                                         ),
         int $referenceuserid,
         array $userids,
         bool $includecontactrequests = false,
         bool $includeprivacyinfo = false
     ) {
-        global $CFG, $USER;
+        global $CFG, $USER, $DB;
         // All the business logic checks that really shouldn't be in here.
         if (empty($CFG->messaging)) {
             throw new moodle_exception('disabled', 'message');
         if (($USER->id != $referenceuserid) && !has_capability('moodle/site:readallmessages', $systemcontext)) {
             throw new moodle_exception('You do not have permission to perform this action.');
+        }
+        // Return early if no userids are provided.
+        if (empty($params['userids'])) {
+            return [];
+        }
+        // Filter the user IDs, removing the IDs of the users that the current user cannot view.
+        require_once($CFG->dirroot . '/user/lib.php');
+        $userfieldsapi = \core_user\fields::for_userpic()->including('username', 'deleted');
+        $userfields = $userfieldsapi->get_sql('', false, '', '', false)->selects;
+        $users = $DB->get_records_list('user', 'id', $userids, '', $userfields, 0, 100);
+        $filteredids = array_filter($params['userids'], function($userid) use ($users, $params) {
+            $targetuser = $users[$userid];
+            // Check if the user has the contact already.
+            $iscontact = \core_message\api::is_contact($params['referenceuserid'], $userid);
+            if ($iscontact) {
+                // User is a contact, so we can return the info for this user.
+                return true;
+            } else {
+                // User is not a contact, so we need to check if the user is allowed to see the profile or not.
+                return user_can_view_profile($targetuser);
+            }
+        });
+        // Return early if no user IDs are left after filtering.
+        if (empty($filteredids)) {
+            return [];
+        }
         return \core_message\helper::get_member_info(
             $params['referenceuserid'],
-            $params['userids'],
+            $filteredids,
             $params['includecontactrequests'],
             $params['includeprivacyinfo']

Proyectos de Subversion Moodle

(root)/message/externallib.php – Rev 1 → 1441