Merge branch 'MDL-40787-m' of git://github.com/andrewnicols/moodle

This commit is contained in:
Sam Hemelryk
2013-07-23 11:07:53 +12:00
-64
View File
@@ -7696,70 +7696,6 @@ function forum_get_extra_capabilities() {
return array('moodle/site:accessallgroups', 'moodle/site:viewfullnames', 'moodle/site:trustcontent', 'moodle/rating:view', 'moodle/rating:viewany', 'moodle/rating:viewall', 'moodle/rating:rate');
}
/**
* This function is used to extend the global navigation by add forum nodes if there
* is relevant content.
*
* @param navigation_node $navref
* @param stdClass $course
* @param stdClass $module
* @param stdClass $cm
*/
/*************************************************
function forum_extend_navigation($navref, $course, $module, $cm) {
global $CFG, $OUTPUT, $USER;
$limit = 5;
$discussions = forum_get_discussions($cm,"d.timemodified DESC", false, -1, $limit);
$discussioncount = forum_get_discussions_count($cm);
if (!is_array($discussions) || count($discussions)==0) {
return;
}
$discussionnode = $navref->add(get_string('discussions', 'forum').' ('.$discussioncount.')');
$discussionnode->mainnavonly = true;
$discussionnode->display = false; // Do not display on navigation (only on navbar)
foreach ($discussions as $discussion) {
$icon = new pix_icon('i/feedback', '');
$url = new moodle_url('/mod/forum/discuss.php', array('d'=>$discussion->discussion));
$discussionnode->add($discussion->subject, $url, navigation_node::TYPE_SETTING, null, null, $icon);
}
if ($discussioncount > count($discussions)) {
if (!empty($navref->action)) {
$url = $navref->action;
} else {
$url = new moodle_url('/mod/forum/view.php', array('id'=>$cm->id));
}
$discussionnode->add(get_string('viewalldiscussions', 'forum'), $url, navigation_node::TYPE_SETTING, null, null, $icon);
}
$index = 0;
$recentposts = array();
$lastlogin = time() - COURSE_MAX_RECENT_PERIOD;
if (!isguestuser() and !empty($USER->lastcourseaccess[$course->id])) {
if ($USER->lastcourseaccess[$course->id] > $lastlogin) {
$lastlogin = $USER->lastcourseaccess[$course->id];
}
}
forum_get_recent_mod_activity($recentposts, $index, $lastlogin, $course->id, $cm->id);
if (is_array($recentposts) && count($recentposts)>0) {
$recentnode = $navref->add(get_string('recentactivity').' ('.count($recentposts).')');
$recentnode->mainnavonly = true;
$recentnode->display = false;
foreach ($recentposts as $post) {
$icon = new pix_icon('i/feedback', '');
$url = new moodle_url('/mod/forum/discuss.php', array('d'=>$post->content->discussion));
$title = $post->content->subject."\n".userdate($post->timestamp, get_string('strftimerecent', 'langconfig'))."\n".$post->user->firstname.' '.$post->user->lastname;
$recentnode->add($title, $url, navigation_node::TYPE_SETTING, null, null, $icon);
}
}
}
*************************/
/**
* Adds module specific settings to the settings block
*