mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 20:42:22 +02:00
Code Issues Projects Releases Wiki Activity

MDL-54973 message: Taking care of support and noreply users on search

Browse Source
This commit is contained in:
David Monllao 2016-08-17 12:41:48 +08:00
parent b4bb1e65dc
commit df762928f6
3 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
message/classes/search/base_message.php
View File

@ -43,17 +43,6 @@ abstract class base_message extends \core_search\base {
*/
protected static $levels = [CONTEXT_USER];
/**
* Returns recordset containing message records.
*
* @param int $modifiedfrom timestamp
* @return \moodle_recordset
*/
public function get_recordset_by_timestamp($modifiedfrom = 0) {
global $DB;
return $DB->get_recordset_select('message_read', 'timecreated >= ?', array($modifiedfrom), 'timecreated ASC');
}
/**
* Returns the document associated with this message record.
*
@ -135,4 +124,4 @@ abstract class base_message extends \core_search\base {
return $users;
}
}
}

22
message/classes/search/message_received.php
View File

@ -35,6 +35,22 @@ defined('MOODLE_INTERNAL') || die();
*/
class message_received extends base_message {
/**
* Returns recordset containing message records.
*
* @param int $modifiedfrom timestamp
* @return \moodle_recordset
*/
public function get_recordset_by_timestamp($modifiedfrom = 0) {
global $DB;
// We don't want to index messages received from noreply and support users.
$params = array('modifiedfrom' => $modifiedfrom, 'noreplyuser' => \core_user::NOREPLY_USER,
'supportuser' => \core_user::SUPPORT_USER);
return $DB->get_recordset_select('message_read', 'timecreated >= :modifiedfrom AND
useridto != :noreplyuser AND useridto != :supportuser', $params, 'timecreated ASC');
}
/**
* Returns the document associated with this message record.
*
@ -64,8 +80,8 @@ class message_received extends base_message {
return \core_search\manager::ACCESS_DELETED;
}
$userfrom = $DB->get_record('user', array('id' => $message->useridfrom));
$userto = $DB->get_record('user', array('id' => $message->useridto));
$userfrom = \core_user::get_user($message->useridfrom, 'id, deleted');
$userto = \core_user::get_user($message->useridto, 'id, deleted');
if (!$userfrom || !$userto || $userfrom->deleted || $userto->deleted) {
return \core_search\manager::ACCESS_DELETED;
@ -82,4 +98,4 @@ class message_received extends base_message {
return \core_search\manager::ACCESS_GRANTED;
}
}
}

22
message/classes/search/message_sent.php
View File

@ -34,6 +34,22 @@ defined('MOODLE_INTERNAL') || die();
*/
class message_sent extends base_message {
/**
* Returns recordset containing message records.
*
* @param int $modifiedfrom timestamp
* @return \moodle_recordset
*/
public function get_recordset_by_timestamp($modifiedfrom = 0) {
global $DB;
// We don't want to index messages sent by noreply and support users.
$params = array('modifiedfrom' => $modifiedfrom, 'noreplyuser' => \core_user::NOREPLY_USER,
'supportuser' => \core_user::SUPPORT_USER);
return $DB->get_recordset_select('message_read', 'timecreated >= :modifiedfrom AND
useridfrom != :noreplyuser AND useridfrom != :supportuser', $params, 'timecreated ASC');
}
/**
* Returns the document associated with this message record.
*
@ -63,8 +79,8 @@ class message_sent extends base_message {
return \core_search\manager::ACCESS_DELETED;
}
$userfrom = $DB->get_record('user', array('id' => $message->useridfrom));
$userto = $DB->get_record('user', array('id' => $message->useridto));
$userfrom = \core_user::get_user($message->useridfrom, 'id, deleted');
$userto = \core_user::get_user($message->useridto, 'id, deleted');
if (!$userfrom || !$userto || $userfrom->deleted || $userto->deleted) {
return \core_search\manager::ACCESS_DELETED;
@ -81,4 +97,4 @@ class message_sent extends base_message {
return \core_search\manager::ACCESS_GRANTED;
}
}
}