Skip to content

Commit

Permalink
Cleanups in view.php. Also moved logging of a forum view so that the …
Browse files Browse the repository at this point in the history 
…event is not logged if the user does not have permission to view discussions in a forum (user never sees the discussions, so not counted as a view).

Tidy up of error display in discuss.php for when a user does not have permission to view the discussion.
  • Loading branch information
vyshane committed Sep 21, 2006
1 parent c095178 commit 49a0ba9
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 54 deletions.
19 changes: 12 additions & 7 deletions mod/forum/discuss.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@
$modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
$canviewdiscussion = has_capability('mod/forum:viewdiscussion', $modcontext);


if ($forum->type == "news") {
if (!($canviewdiscussion || $USER->id == $discussion->userid
|| (($discussion->timestart == 0 || $discussion->timestart <= time())
if (!($USER->id == $discussion->userid || (($discussion->timestart == 0
|| $discussion->timestart <= time())
&& ($discussion->timeend == 0 || $discussion->timeend > time())))) {
error('Discussion ID was incorrect or no longer exists', "$CFG->wwwroot/mod/forum/view.php?f=$forum->id");
}
Expand Down Expand Up @@ -236,10 +235,16 @@
notify(get_string("discussionmoved", "forum", format_string($forum->name,true)));
}

/// Print the actual discussion
$canrate = has_capability('mod/forum:rate', $modcontext);
forum_print_discussion($course, $forum, $discussion, $post, $displaymode, $canreply, $canrate);

/// Print the actual discussion
if (!$canviewdiscussion) {
notice(get_string('noviewdiscussionspermission', 'forum'));
} else {
$canrate = has_capability('mod/forum:rate', $modcontext);
forum_print_discussion($course, $forum, $discussion, $post, $displaymode, $canreply, $canrate);
}

print_footer($course);


?>
?>
98 changes: 51 additions & 47 deletions mod/forum/view.php
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
<?php // $Id$

require_once("../../config.php");
require_once("lib.php");
require_once('../../config.php');
require_once('lib.php');
require_once("$CFG->libdir/rsslib.php");

$id = optional_param('id', 0, PARAM_INT); // Course Module ID
$f = optional_param('f', 0, PARAM_INT); // Forum ID
$mode = optional_param('mode', 0, PARAM_INT); // Display mode (for single forum)
$showall = optional_param('showall', '', PARAM_INT); // show all discussions on one page
$changegroup = optional_param('group', -1, PARAM_INT); // choose the current group
$page = optional_param('page', 0, PARAM_INT); // which page to show
$search = optional_param('search', ''); // search string

$id = optional_param('id', 0, PARAM_INT); // Course Module ID
$f = optional_param('f', 0, PARAM_INT); // Forum ID
$mode = optional_param('mode', 0, PARAM_INT); // Display mode (for single forum)
$showall = optional_param('showall', '', PARAM_INT); // show all discussions on one page
$changegroup = optional_param('group', -1, PARAM_INT); // choose the current group
$page = optional_param('page', 0, PARAM_INT); // which page to show
$search = optional_param('search', ''); // search string



if ($id) {

if (! $cm = get_coursemodule_from_id('forum', $id)) {
error("Course Module ID was incorrect");
}
Expand All @@ -22,13 +26,12 @@
if (! $forum = get_record("forum", "id", $cm->instance)) {
error("Forum ID was incorrect");
}

$strforums = get_string("modulenameplural", "forum");
$strforum = get_string("modulename", "forum");

$buttontext = update_module_button($cm->id, $course->id, $strforum);

} else if ($f) {

if (! $forum = get_record("forum", "id", $f)) {
error("Forum ID was incorrect or no longer exists");
}
Expand All @@ -49,64 +52,66 @@
}

} else {
error("Must specify a course module or a forum ID");
error('Must specify a course module or a forum ID');
}

if (!$buttontext) {
$buttontext = forum_search_form($course, $search);
}


require_course_login($course, true, $cm);



/// Print header.
$navigation = "<a href=\"index.php?id=$course->id\">$strforums</a> ->";
print_header_simple(format_string($forum->name), "",
"$navigation ".format_string($forum->name), "", "", true, $buttontext, navmenu($course, $cm));



/// Check whether the user should be able to view this forum.
$context = get_context_instance(CONTEXT_MODULE, $cm->id);

if (!has_capability('mod/forum:viewforum', $context)) {
error('You do not have the permission to view this forum');
}

if ($cm->id) {
add_to_log($course->id, "forum", "view forum", "view.php?id=$cm->id", "$forum->id", $cm->id);
} else {
add_to_log($course->id, "forum", "view forum", "view.php?f=$forum->id", "$forum->id");
}

print_header_simple(format_string($forum->name), "",
"$navigation ".format_string($forum->name), "", "", true, $buttontext, navmenu($course, $cm));

if (empty($cm->visible) and !has_capability('moodle/course:viewhiddenactivities', $context)) {
notice(get_string("activityiscurrentlyhidden"));
}


$groupmode = groupmode($course, $cm);

if (!has_capability('mod/forum:viewforum', $context)) {
notice(get_string('noviewdiscussionspermission', 'forum'));
}

$groupmode = groupmode($course, $cm);
$currentgroup = get_and_set_current_group($course, $groupmode, $changegroup);

if ($groupmode and ($currentgroup === false) and
!has_capability('moodle/site:accessallgroups', $context)) {

print_heading(get_string("notingroup", "forum"));
print_footer($course);
exit;
notice(get_string('notingroup', 'forum'));
}


/// Print settings and things in a table across the top

/// Okay, we can show the discussions. Log the forum view.
if ($cm->id) {
add_to_log($course->id, "forum", "view forum", "view.php?id=$cm->id", "$forum->id", $cm->id);
} else {
add_to_log($course->id, "forum", "view forum", "view.php?f=$forum->id", "$forum->id");
}



/// Print settings and things in a table across the top
echo '<table width="100%" border="0" cellpadding="3" cellspacing="0"><tr valign="top">';

///2 ways to do this, 1. we can changed the setup_and_print_groups functions
///in moodlelib, taking in 1 more parameter, and tell the function when to
///allow student menus, 2, we can just use this code to explicitly print this
///menu for students in forums.
/// 2 ways to do this, 1. we can changed the setup_and_print_groups functions
/// in moodlelib, taking in 1 more parameter, and tell the function when to
/// allow student menus, 2, we can just use this code to explicitly print this
/// menu for students in forums.

//now we need a menu for separategroups as well!
if ($groupmode == VISIBLEGROUPS or ($groupmode and
has_capability('moodle/site:accessallgroups', $context))) {
/// Now we need a menu for separategroups as well!
if ($groupmode == VISIBLEGROUPS || ($groupmode
&& has_capability('moodle/site:accessallgroups', $context))) {

//the following query really needs to change
if ($groups = get_records_menu("groups", "courseid", $course->id, "name ASC", "id,name")) {
Expand All @@ -116,23 +121,22 @@
}
}

//only print menus the student is in any course
/// Only print menus the student is in any course
else if ($groupmode == SEPARATEGROUPS){
$validgroups = array();
//get all the groups this guy is in in this course
// Get all the groups this guy is in in this course

if ($p = user_group($course->id,$USER->id)){
//extract the name and id for the group
/// Extract the name and id for the group
foreach ($p as $index => $object){
$validgroups[$object->id] = $object->name;
}
//print_r($validgroups);
echo '<td>';
//print them in the menu
/// Print them in the menu
print_group_menu($validgroups, $groupmode, $currentgroup, "view.php?id=$cm->id",0);
echo '</td>';
}
}
}

if (!empty($USER->id)) {
echo '<td align="right" class="subscription">';
Expand Down Expand Up @@ -196,7 +200,7 @@
echo '</td>';
}

//If rss are activated at site and forum level and this forum has rss defined, show link
/// If rss are activated at site and forum level and this forum has rss defined, show link
if (isset($CFG->enablerssfeeds) && isset($CFG->forum_enablerssfeeds) &&
$CFG->enablerssfeeds && $CFG->forum_enablerssfeeds && $forum->rsstype and $forum->rssarticles) {
echo '</tr><tr><td align="right">';
Expand Down

0 comments on commit 49a0ba9

Please sign in to comment.