Skip to content

Commit

Permalink
After discussion with Penny I think it's best to not include the forum
Browse files Browse the repository at this point in the history
timed posts in 1.6 for now.   It still needs some work and we are
running out of time.
  • Loading branch information
moodler committed Apr 14, 2006
1 parent 05803bf commit 3d28412
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions mod/forum/lib.php
Expand Up @@ -77,6 +77,10 @@
$CFG->forum_trackreadposts = false; // This feature never works when a user isn't logged in
}

if (!isset($CFG->forum_enabletimedposts)) { // Newish feature that is not quite ready for production in 1.6
$CFG->forum_enabletimedposts = false;
}


/// STANDARD FUNCTIONS ///////////////////////////////////////////////////////////

Expand Down Expand Up @@ -1379,15 +1383,17 @@ function forum_get_discussions($forum="0", $forumsort="d.timemodified DESC",
/// Get all discussions in a forum
global $CFG, $USER;

if ((isadmin() and !empty($CFG->admineditalways)) || isteacher(get_field('forum', 'course', 'id', $forum))) {
$timelimit = '';
} else {
$now = time();
$timelimit = " AND ((d.timestart = 0 OR d.timestart <= '$now') AND (d.timeend = 0 OR d.timeend > '$now')";
if (!empty($USER->id)) {
$timelimit .= " OR d.userid = '$USER->id'";
$timelimit = '';

if (!empty($CFG->forum_enabletimedposts)) {
if (!((isadmin() and !empty($CFG->admineditalways)) || isteacher(get_field('forum', 'course', 'id', $forum)))) {
$now = time();
$timelimit = " AND ((d.timestart = 0 OR d.timestart <= '$now') AND (d.timeend = 0 OR d.timeend > '$now')";
if (!empty($USER->id)) {
$timelimit .= " OR d.userid = '$USER->id'";
}
$timelimit .= ')';
}
$timelimit .= ')';
}

if ($user) {
Expand Down

0 comments on commit 3d28412

Please sign in to comment.