mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-24 09:30:17 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-74586-401-sqlrss' of https://github.com/mudrd8mz/moodle into MOODLE_401_STABLE

Browse Source
This commit is contained in:
Jun Pataleta 2023-03-02 08:58:22 +08:00
commit ba428c3255
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/rsslib.php
View File

@ -413,10 +413,15 @@ function rss_geterrorxmlfile($errortype = 'rsserror') {
function rss_get_userid_from_token($token) {
global $DB;
$sql = 'SELECT u.id FROM {user} u
JOIN {user_private_key} k ON u.id = k.userid
WHERE u.deleted = 0 AND u.confirmed = 1
AND u.suspended = 0 AND k.value = ?';
$sql = "SELECT u.id
FROM {user} u
JOIN {user_private_key} k ON u.id = k.userid
WHERE u.deleted = 0
AND u.confirmed = 1
AND u.suspended = 0
AND k.script = 'rss'
AND k.value = ?";
return $DB->get_field_sql($sql, array($token), IGNORE_MISSING);
}

17
lib/tests/rsslib_test.php
View File

@ -20,7 +20,7 @@ defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->libdir.'/simplepie/moodle_simplepie.php');
require_once($CFG->libdir . '/rsslib.php');
/**
* These tests rely on the rsstest.xml file on download.moodle.org,
@ -140,4 +140,19 @@ EOD;
$this->assertSame('Moodle News', $feed->get_title());
$this->assertSame('http://moodle.org/mod/forum/view.php?f=1', $feed->get_link());
}
/**
* Test that we can get the right user ID based on the provided private key (token).
*
* @covers ::rss_get_userid_from_token
*/
public function test_rss_get_userid_from_token() {
global $USER;
$this->resetAfterTest();
$this->setGuestUser();
$key = rss_get_token($USER->id);
$this->assertSame(rss_get_userid_from_token($key), $USER->id);
}
}