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

Some fixes relating to the unsubscribe link in emails for some types of forums

Browse Source
This commit is contained in:
moodler
2007-08-06 13:08:05 +00:00
parent 4fb68891b0
commit caa413ece1
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/lib.php
+11 -7
View File
@@ -603,7 +603,7 @@ function forum_cron() {
course_setup($course);
$strforums = get_string('forums', 'forum');
$canunsubscribe = ! forum_is_forcesubscribed($forum->id);
$canunsubscribe = ! forum_is_forcesubscribed($forum);
$canreply = forum_user_can_post($forum, $userto);
@@ -762,7 +762,7 @@ function forum_make_mail_text($course, $forum, $discussion, $post, $userfrom, $u
$strforums = get_string('forums', 'forum');
$canunsubscribe = ! forum_is_forcesubscribed($forum->id);
$canunsubscribe = ! forum_is_forcesubscribed($forum);
$canreply = forum_user_can_post($forum, $userto);
$posttext = '';
@@ -823,7 +823,7 @@ function forum_make_mail_html($course, $forum, $discussion, $post, $userfrom, $u
$strforums = get_string('forums', 'forum');
$canreply = forum_user_can_post($forum, $userto);
$canunsubscribe = ! $forum->forcesubscribe;
$canunsubscribe = ! forum_is_forcesubscribed($forum);
$posthtml = '<head>';
foreach ($CFG->stylesheets as $stylesheet) {
@@ -845,7 +845,7 @@ function forum_make_mail_html($course, $forum, $discussion, $post, $userfrom, $u
$posthtml .= forum_make_mail_post($post, $userfrom, $userto, $course, false, $canreply, true, false);
if ($canunsubscribe) {
$posthtml .= '<br /><div class="unsubscribelink"><a href="'.$CFG->wwwroot.'/mod/forum/subscribe.php?id='.$forum->id.'">'.
$posthtml .= '<hr /><div align="center" class="unsubscribelink"><a href="'.$CFG->wwwroot.'/mod/forum/subscribe.php?id='.$forum->id.'">'.
get_string('unsubscribe', 'forum').'</a></div>';
}
@@ -1860,7 +1860,7 @@ function forum_subscribed_users($course, $forum, $groupid=0, $cache=false) {
$groupselect = '';
}
if (forum_is_forcesubscribed($forum->id)) {
if (forum_is_forcesubscribed($forum)) {
$results = get_course_users($course->id); // Otherwise get everyone in the course
} else {
$results = get_records_sql("SELECT u.id, u.username, u.firstname, u.lastname, u.maildisplay, u.mailformat, u.maildigest, u.emailstop,
@@ -3101,8 +3101,12 @@ function forum_forcesubscribe($forumid, $value=1) {
/**
* TODO document
*/
function forum_is_forcesubscribed($forumid) {
return (get_field("forum", "forcesubscribe", "id", $forumid) == 1);
function forum_is_forcesubscribed($forum) {
if (isset($forum->forcesubscribe)) { // then we use that
return ($forum->forcesubscribe == FORUM_FORCESUBSCRIBE);
} else { // Check the database
return (get_field('forum', 'forcesubscribe', 'id', $forum) == FORUM_FORCESUBSCRIBE);
}
}
/**