mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 20:50:21 +01:00
Code Issues Projects Releases Wiki Activity

Fixes to finding list of subscribers to a forum for site-level forums

Browse Source 
which affected both the displayed list and the mailouts.
This commit is contained in:
martin 2002-08-15 04:16:39 +00:00
parent 2fe33daded
commit 8697022530
3 changed files with 61 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/setup.php
View File

@ -18,7 +18,7 @@
// Default editing time for posts and the like (in seconds) // Default editing time for posts and the like (in seconds)
$CFG->maxeditingtime = 1800; $CFG->maxeditingtime = 10;
// Location of standard files // Location of standard files

88
mod/forum/lib.php
View File

@ -106,7 +106,7 @@ function forum_make_mail_post(&$post, $user, $touser, $course,
$output .= "</FONT></P></TD></TR>"; $output .= "</FONT></P></TD></TR>";
$output .= "<TR><TD BGCOLOR=\"$THEME->body\" WIDTH=10>"; $output .= "<TR><TD BGCOLOR=\"$THEME->body\" WIDTH=10>";
$output .= "&nbsp;"; $output .= "&nbsp;";
$output .= "</TD><TD BGCOLOR=\"#FFFFFF\">\n"; $output .= "</TD><TD BGCOLOR=\"$THEME->cellcontent\">\n";
$output .= text_to_html($post->message); $output .= text_to_html($post->message);
@ -175,7 +175,7 @@ function forum_print_post(&$post, $courseid, $ownpost=false, $reply=false, $link
echo "</FONT></P></TD></TR>"; echo "</FONT></P></TD></TR>";
echo "<TR><TD BGCOLOR=\"$THEME->body\" WIDTH=10>"; echo "<TR><TD BGCOLOR=\"$THEME->body\" WIDTH=10>";
echo "&nbsp;"; echo "&nbsp;";
echo "</TD><TD BGCOLOR=\"#FFFFFF\">\n"; echo "</TD><TD BGCOLOR=\"$THEME->cellcontent\">\n";
if ($link && (strlen($post->message) > $FORUM_LONG_POST)) { if ($link && (strlen($post->message) > $FORUM_LONG_POST)) {
// Print shortened version // Print shortened version
@ -691,7 +691,7 @@ function forum_cron () {
continue; continue;
} }
if ($users = get_course_users($course->id)) { if ($users = forum_subscribed_users($course, $forum)) {
$strforums = get_string("forums", "forum"); $strforums = get_string("forums", "forum");
$mailcount=0; $mailcount=0;
@ -700,44 +700,43 @@ function forum_cron () {
$by->date = userdate($post->created, "", $userto->timezone); $by->date = userdate($post->created, "", $userto->timezone);
$strbynameondate = get_string("bynameondate", "forum", $by); $strbynameondate = get_string("bynameondate", "forum", $by);
if (forum_is_subscribed($userto->id, $forum->id)) { $postsubject = "$course->shortname: $post->subject";
$postsubject = "$course->shortname: $post->subject"; $posttext = "$course->shortname -> $strforums -> $forum->name";
$posttext = "$course->shortname -> $strforums -> $forum->name";
if ($discussion->name == $forum->name) {
$posttext .= "\n";
} else {
$posttext .= " -> $discussion->name\n";
}
$posttext .= "---------------------------------------------------------------------\n";
$posttext .= "$post->subject\n";
$posttext .= $strbynameondate."\n";
$posttext .= "---------------------------------------------------------------------\n";
$posttext .= strip_tags($post->message);
$posttext .= "\n\n";
$posttext .= "---------------------------------------------------------------------\n";
$posttext .= get_string("postmailinfo", "forum", $course->shortname)."\n";
$posttext .= "$CFG->wwwroot/mod/forum/post.php?reply=$post->id";
if ($userto->mailformat == 1) { // HTML
$posthtml = "<P><FONT FACE=sans-serif>".
"<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> -> ".
"<A HREF=\"$CFG->wwwroot/mod/forum/index.php?id=$course->id\">$strforums</A> -> ".
"<A HREF=\"$CFG->wwwroot/mod/forum/view.php?f=$forum->id\">$forum->name</A>";
if ($discussion->name == $forum->name) { if ($discussion->name == $forum->name) {
$posttext .= "\n"; $posthtml .= "</FONT></P>";
} else { } else {
$posttext .= " -> $discussion->name\n"; $posthtml .= " -> <A HREF=\"$CFG->wwwroot/mod/forum/discuss.php?d=$discussion->id\">$discussion->name</A></FONT></P>";
}
$posttext .= "---------------------------------------------------------------------\n";
$posttext .= "$post->subject\n";
$posttext .= $strbynameondate."\n";
$posttext .= "---------------------------------------------------------------------\n";
$posttext .= strip_tags($post->message);
$posttext .= "\n\n";
$posttext .= "---------------------------------------------------------------------\n";
$posttext .= get_string("postmailinfo", "forum", $course->shortname)."\n";
$posttext .= "$CFG->wwwroot/mod/forum/post.php?reply=$post->id";
if ($userto->mailformat == 1) { // HTML
$posthtml = "<P><FONT FACE=sans-serif>".
"<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> -> ".
"<A HREF=\"$CFG->wwwroot/mod/forum/index.php?id=$course->id\">$strforums</A> -> ".
"<A HREF=\"$CFG->wwwroot/mod/forum/view.php?f=$forum->id\">$forum->name</A>";
if ($discussion->name == $forum->name) {
$posthtml .= "</FONT></P>";
} else {
$posthtml .= " -> <A HREF=\"$CFG->wwwroot/mod/forum/discuss.php?d=$discussion->id\">$discussion->name</A></FONT></P>";
}
$posthtml .= forum_make_mail_post($post, $userfrom, $userto, $course, false, true, false, false);
} else {
$posthtml = "";
}
if (! email_to_user($userto, $userfrom, $postsubject, $posttext, $posthtml)) {
echo "Error: mod/forum/cron.php: Could not send out mail for id $post->id to user $userto->id ($userto->email)\n";
} else {
$mailcount++;
} }
$posthtml .= forum_make_mail_post($post, $userfrom, $userto, $course, false, true, false, false);
} else {
$posthtml = "";
}
if (! email_to_user($userto, $userfrom, $postsubject, $posttext, $posthtml)) {
echo "Error: mod/forum/cron.php: Could not send out mail for id $post->id to user $userto->id ($userto->email)\n";
} else {
$mailcount++;
} }
} }
echo "mailed to $mailcount users ..."; echo "mailed to $mailcount users ...";
@ -769,6 +768,19 @@ function forum_is_subscribed($userid, $forumid) {
return record_exists_sql("SELECT * FROM forum_subscriptions WHERE user='$userid' AND forum='$forumid'"); return record_exists_sql("SELECT * FROM forum_subscriptions WHERE user='$userid' AND forum='$forumid'");
} }
function forum_subscribed_users($course, $forum) {
// Returns list of user objects that are subscribed to this forum
if ($course->category) { // normal course
if ($forum->forcesubscribe) {
return get_course_users($course->id);
}
}
return get_records_sql("SELECT u.* FROM user u, forum_subscriptions s
WHERE s.forum = '$forum->id'
AND s.user = u.id");
}
function forum_subscribe($userid, $forumid) { function forum_subscribe($userid, $forumid) {
global $db; global $db;

31
mod/forum/subscribers.php
View File

@ -38,31 +38,20 @@
print_header("$course->shortname: $strsubscribers", "$course->fullname", "$navigation"); print_header("$course->shortname: $strsubscribers", "$course->fullname", "$navigation");
if ($course->category) { if (! $users = forum_subscribed_users($course, $forum) ) {
$users = get_course_users($course->id); print_heading(get_string("nosubscribers", "forum"));
} else {
$users = get_records_sql("SELECT * from user");
}
if (! $users) {
print_heading(get_string("nousersyet"));
} else { } else {
print_heading(get_string("subscribersto","forum", "'$forum->name'")); print_heading(get_string("subscribersto","forum", "'$forum->name'"));
echo "<TABLE ALIGN=CENTER>"; echo "<TABLE ALIGN=CENTER cellpadding=5 cellspacing=5>";
$count = 0;
foreach ($users as $user) { foreach ($users as $user) {
if (forum_is_subscribed($user->id, $forum->id)) { echo "<TR><TD>";
echo "<TR><TD>"; print_user_picture($user->id, $course->id, $user->picture);
print_user_picture($user->id, $course->id, $user->picture); echo "</TD><TD BGCOLOR=\"$THEME->cellcontent\">";
echo "</TD><TD>"; echo "$user->firstname $user->lastname";
echo "$user->firstname $user->lastname"; echo "</TD><TD BGCOLOR=\"$THEME->cellcontent\">";
echo "</TD></TR>"; echo "$user->email";
$count++; echo "</TD></TR>";
}
}
if (!$count) {
echo "<TR><TD>".get_string("nosubscribers", "forum")."</TD></TR>";
} }
echo "</TABLE>"; echo "</TABLE>";
} }