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

Merge branch 'MDL-54973_master-fix' of git://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2016-08-17 12:57:41 +08:00
parent b4bb1e65dc df762928f6
commit 72d088f229
3 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/classes/search/base_message.php
+1 -12
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;
}
}
}
message/classes/search/message_received.php
+19 -3
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;
}
}
}
message/classes/search/message_sent.php
+19 -3
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;
}
}
}