moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 00:16:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-01-10 11:13:13 +01:00
commit 72a504dc2a
1 changed files with 18 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

50
mod/forum/rsslib.php
View file

@ -67,14 +67,15 @@ function forum_rss_get_feed($context, $args) {
if (file_exists($cachedfilepath)) { if (file_exists($cachedfilepath)) {
$cachedfilelastmodified = filemtime($cachedfilepath); $cachedfilelastmodified = filemtime($cachedfilepath);
} }
//if the cache is more than 60 seconds old and there's new stuff // Used to determine if we need to generate a new RSS feed.
$dontrecheckcutoff = time()-60; $dontrecheckcutoff = time()-60;
if ($dontrecheckcutoff > $cachedfilelastmodified && forum_rss_newstuff($forum, $cm, $cachedfilelastmodified)) { // If it hasn't been generated we will need to create it, otherwise only update
//need to regenerate the cached version // if there is new stuff to show and it is older than the cut off date set above.
if (($cachedfilelastmodified == 0) || (($dontrecheckcutoff > $cachedfilelastmodified) &&
forum_rss_newstuff($forum, $cm, $cachedfilelastmodified))) {
// Need to regenerate the cached version.
$result = forum_rss_feed_contents($forum, $sql, $params, $modcontext); $result = forum_rss_feed_contents($forum, $sql, $params, $modcontext);
if (!empty($result)) { $status = rss_save_file('mod_forum', $filename, $result);
$status = rss_save_file('mod_forum',$filename,$result);
}
} }
//return the path to the cached version //return the path to the cached version
@ -106,11 +107,8 @@ function forum_rss_newstuff($forum, $cm, $time) {
global $DB; global $DB;
list($sql, $params) = forum_rss_get_sql($forum, $cm, $time); list($sql, $params) = forum_rss_get_sql($forum, $cm, $time);
if ($DB->count_records_sql($sql, $params) > 0) {
return true;
}
return false; return $DB->record_exists_sql($sql, $params);
} }
/** /**
@ -365,29 +363,17 @@ function forum_rss_feed_contents($forum, $sql, $params, $context) {
} }
$recs->close(); $recs->close();
// Create the RSS header.
$header = rss_standard_header(strip_tags(format_string($forum->name,true)),
$CFG->wwwroot."/mod/forum/view.php?f=".$forum->id,
format_string($forum->intro,true)); // TODO: fix format
// Now all the RSS items, if there are any.
$articles = '';
if (!empty($items)) { if (!empty($items)) {
//First the RSS header $articles = rss_add_items($items);
$header = rss_standard_header(strip_tags(format_string($forum->name,true)),
$CFG->wwwroot."/mod/forum/view.php?f=".$forum->id,
format_string($forum->intro,true)); // TODO: fix format
//Now all the rss items
if (!empty($header)) {
$articles = rss_add_items($items);
}
//Now the RSS footer
if (!empty($header) && !empty($articles)) {
$footer = rss_standard_footer();
}
//Now, if everything is ok, concatenate it
if (!empty($header) && !empty($articles) && !empty($footer)) {
$status = $header.$articles.$footer;
} else {
$status = false;
}
} else {
$status = false;
} }
// Create the RSS footer.
$footer = rss_standard_footer();
return $status; return $header . $articles . $footer;
} }