L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-63864_master' of git://github.com/markn86/moodle

Browse Source
This commit is contained in:
Damyon Wiese
2018-11-12 10:02:25 +08:00
parent fa54c160f9 b3ce575e63
commit 080cc5b671
4 changed files with 107 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/classes/api.php
+12 -10
View File
@@ -2046,24 +2046,26 @@ class api {
* It will not include blocked users.
*
* @param int $userid
* @param int $limitfrom
* @param int $limitnum
* @return array The list of contact requests
*/
public static function get_contact_requests(int $userid) : array {
public static function get_contact_requests(int $userid, int $limitfrom = 0, int $limitnum = 0) : array {
global $DB;
$ufields = \user_picture::fields('u');
$sql = "SELECT $ufields, mcr.id as contactrequestid
FROM {user} u
JOIN {message_contact_requests} mcr
ON u.id = mcr.userid
$sql = "SELECT mcr.userid
FROM {message_contact_requests} mcr
LEFT JOIN {message_users_blocked} mub
ON (mub.userid = ? AND mub.blockeduserid = u.id)
ON (mub.userid = ? AND mub.blockeduserid = mcr.userid)
WHERE mcr.requesteduserid = ?
AND u.deleted = 0
AND mub.id is NULL
ORDER BY mcr.timecreated DESC";
ORDER BY mcr.timecreated ASC";
if ($contactrequests = $DB->get_records_sql($sql, [$userid, $userid], $limitfrom, $limitnum)) {
$userids = array_keys($contactrequests);
return helper::get_member_info($userid, $userids);
}
return $DB->get_records_sql($sql, [$userid, $userid]);
return [];
}
/**