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

Merge branch 'wip-MDL-32199-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2012-05-28 15:19:03 +08:00
parent c4f5ec20db ef518ff137
commit b269d8f988
1 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/rsslib.php
+43 -12
View File
@@ -33,7 +33,7 @@
* @return string the full path to the cached RSS feed directory. Null if there is a problem.
*/
function forum_rss_get_feed($context, $args) {
global $CFG, $DB;
global $CFG, $DB, $USER;
$status = true;
@@ -60,8 +60,15 @@ function forum_rss_get_feed($context, $args) {
//the sql that will retreive the data for the feed and be hashed to get the cache filename
$sql = forum_rss_get_sql($forum, $cm);
//hash the sql to get the cache file name
$filename = rss_get_file_name($forum, $sql);
// Hash the sql to get the cache file name.
// If the forum is Q and A then we need to cache the files per user. This can
// have a large impact on performance, so we want to only do it on this type of forum.
if ($forum->type == 'qanda') {
$filename = rss_get_file_name($forum, $sql . $USER->id);
} else {
$filename = rss_get_file_name($forum, $sql);
}
$cachedfilepath = rss_get_file_full_name('mod_forum', $filename);
//Is the cache out of date?
@@ -262,7 +269,7 @@ function forum_rss_get_group_sql($cm, $groupmode, $currentgroup, $modcontext=nul
* @return bool|string false if the contents is empty, otherwise the contents of the feed is returned
*/
function forum_rss_feed_contents($forum, $sql, $context) {
global $CFG, $DB;
global $CFG, $DB, $USER;
$status = true;
@@ -276,18 +283,43 @@ function forum_rss_feed_contents($forum, $sql, $context) {
$isdiscussion = false;
}
if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $forum->course)) {
print_error('invalidcoursemodule');
}
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
$formatoptions = new stdClass();
$items = array();
foreach ($recs as $rec) {
$item = new stdClass();
$user = new stdClass();
if ($isdiscussion && !empty($rec->discussionname)) {
$item->title = format_string($rec->discussionname);
} else if (!empty($rec->postsubject)) {
$item->title = format_string($rec->postsubject);
if ($isdiscussion && !forum_user_can_see_discussion($forum, $rec->discussionid, $context)) {
// This is a discussion which the user has no permission to view
$item->title = get_string('forumsubjecthidden', 'forum');
$message = get_string('forumbodyhidden', 'forum');
$item->author = get_string('forumauthorhidden', 'forum');
} else if (!$isdiscussion && !forum_user_can_see_post($forum, $rec->discussionid, $rec->postid, $USER, $cm)) {
// This is a post which the user has no permission to view
$item->title = get_string('forumsubjecthidden', 'forum');
$message = get_string('forumbodyhidden', 'forum');
$item->author = get_string('forumauthorhidden', 'forum');
} else {
//we should have an item title by now but if we dont somehow then substitute something somewhat meaningful
$item->title = format_string($forum->name.' '.userdate($rec->postcreated,get_string('strftimedatetimeshort', 'langconfig')));
// The user must have permission to view
if ($isdiscussion && !empty($rec->discussionname)) {
$item->title = format_string($rec->discussionname);
} else if (!empty($rec->postsubject)) {
$item->title = format_string($rec->postsubject);
} else {
//we should have an item title by now but if we dont somehow then substitute something somewhat meaningful
$item->title = format_string($forum->name.' '.userdate($rec->postcreated,get_string('strftimedatetimeshort', 'langconfig')));
}
$user->firstname = $rec->userfirstname;
$user->lastname = $rec->userlastname;
$item->author = fullname($user);
$message = file_rewrite_pluginfile_urls($rec->postmessage, 'pluginfile.php', $context->id,
'mod_forum', 'post', $rec->postid);
$formatoptions->trusted = $rec->posttrust;
}
$user->firstname = $rec->userfirstname;
$user->lastname = $rec->userlastname;
@@ -300,8 +332,6 @@ function forum_rss_feed_contents($forum, $sql, $context) {
}
$formatoptions->trusted = $rec->posttrust;
$message = file_rewrite_pluginfile_urls($rec->postmessage, 'pluginfile.php', $context->id,
'mod_forum', 'post', $rec->postid);
$item->description = format_text($message, $rec->postformat, $formatoptions, $forum->course);
//TODO: implement post attachment handling
@@ -313,6 +343,7 @@ function forum_rss_feed_contents($forum, $sql, $context) {
$item->attachments = array();
}
}*/
$item->pubdate = $rec->postcreated;
$items[] = $item;
}