Index: moodle/lang/en_utf8/forum.php
===================================================================
RCS file: /Users/John/Documents/JWC/Moodle 1.9.4 CVS/moodle 1.9.4/moodle/lang/en_utf8/forum.php,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 forum.php
--- moodle/lang/en_utf8/forum.php 31 Jan 2009 08:06:42 -0000 1.1.1.1
+++ moodle/lang/en_utf8/forum.php 21 Feb 2009 00:55:19 -0000
@@ -1,5 +1,6 @@
-
If you wish to DELETE all such subscriptions, click Yes
You will then need to save the forum settings again.
Otherwise click No';
$string['forum'] = 'Forum';
$string['forum:addnews'] = 'Add news';
$string['forumauthorhidden'] = 'Author (hidden)';
@@ -174,7 +187,7 @@
$string['noviewdiscussionspermission'] = 'You do not have the permission to view discussions in this forum';
$string['nowallsubscribed'] = 'All forums in $a are subscribed.';
$string['nowallunsubscribed'] = 'All forums in $a are not subscribed.';
-$string['nownotsubscribed'] = '$a->name will NOT receive copies of \'$a->forum\' by email.';
+$string['nownotsubscribed'] = '$a->name will NOT receive email copies of all posts to \'$a->forum\'';
$string['nownottracking'] = '$a->name is no longer tracking \'$a->forum\'.';
$string['nowsubscribed'] = '$a->name will receive copies of \'$a->forum\' by email.';
$string['nowtracking'] = '$a->name is now tracking \'$a->forum\'.';
@@ -219,6 +232,8 @@
$string['ratingpublic'] = '$a can see everyone\'s ratings';
$string['ratingpublicnot'] = '$a can only see their own ratings';
$string['ratings'] = 'Ratings';
+$string['ratingsnudge'] = 'Remind user to rate posts';
+$string['ratingsreminder'] = 'Reminder:
We notice that you began this discussion thread, and other users have contributed to it, however, you have not rated any of these postings as yet. You may wish to rate postings now or return later to do so, if you prefer.
You can use the navigation \'breadcrumb\' trail, or the back button, to leave this discussion.';
$string['ratingssaved'] = 'Ratings saved';
$string['ratingsuse'] = 'Use ratings';
$string['ratingtime'] = 'Restrict ratings to posts with dates in this range:';
@@ -254,18 +269,33 @@
$string['seeallposts'] = 'See all posts made by this user';
$string['sendinratings'] = 'Send in my latest ratings';
$string['shortpost'] = 'Short post';
-$string['showsubscribers'] = 'Show/edit current subscribers';
+$string['showsubscribers'] = 'Show/edit current forum subscribers';
$string['singleforum'] = 'A single simple discussion';
$string['startedby'] = 'Started by';
$string['subject'] = 'Subject';
$string['subscribe'] = 'Subscribe to this forum';
$string['subscribeall'] = 'Subscribe everyone to this forum';
$string['subscribed'] = 'Subscribed';
+$string['subscribedfirst'] = 'Subscribed threads are shown first';
+$string['subscribedfirstclick'] = 'CLICK to show subscribed threads first';
+$string['subscribedfirstgo'] = 'Show subscribed threads first';
+$string['subscribedmixed'] = 'Threads are shown in date order';
+$string['subscribedmixedclick'] = 'CLICK to show threads in date order';
+$string['subscribedmixedgo'] = 'Show threads in date order';
+$string['subscribedq'] = 'Subscribed?';
+$string['subscribedthread'] = 'You are subscribed to this discussion thread';
+$string['subscribedthreadno'] = 'You are NOT subscribed to this discussion thread';
+$string['subscribedthreadq'] = 'Thread subscribed?';
$string['subscribenone'] = 'Unsubscribe everyone from this forum';
$string['subscribers'] = 'Subscribers';
$string['subscribersto'] = 'Subscribers to \'$a\'';
$string['subscribestart'] = 'Send me email copies of posts to this forum';
+$string['subscribestartthread'] = 'Send me email copies of posts to this discussion';
+$string['subscribestartthreadclick'] = 'CLICK to ALLOW emails from this discussion';
$string['subscribestop'] = 'I don\'t want email copies of posts to this forum';
+$string['subscribestopthread'] = 'I don\'t want email copies of posts to this discussion';
+$string['subscribestopthreadclick'] = 'CLICK to DISALLOW emails from this discussion';
+$string['subscribethisthread'] = 'Subscribe to this discussion thread';
$string['subscription'] = 'Subscription';
$string['subscriptions'] = 'Subscriptions';
$string['thisforumisthrottled'] = 'This forum has a limit to the number of forum postings you can make in a given time period - this is currently set at $a->blockafter posting(s) in $a->blockperiod';
@@ -288,7 +318,10 @@
$string['unsubscribeallempty'] = 'Sorry, you are not subscribed to any forums. If you do not want to receive any emails from this server please go to your profile and disable email address there.';
$string['unsubscribed'] = 'Unsubscribed';
$string['unsubscribeshort'] = 'Unsubscribe';
+$string['unsubscribethisthread'] = 'Unsubscribe from this discussion thread';
$string['usermarksread'] = 'Manual message read marking';
+$string['userunsubscribewarning'] = 'You are currently subscribed to one or more discussion threads in this forum!
If you wish to DELETE all such subscriptions so as to replace these with a subscription to the entire forum, click Yes.
Otherwise click No.';
+$string['warnofthreadsubs'] = 'WARNING: $a thread subscription(s) already exist in this forum!
The number of such subscriptions appear in parenthesis after the user\'s name.
Subscribing a user to the forum WILL REMOVE any thread subscriptions they had!';
$string['warnafter'] = 'Post threshold for warning';
$string['yesforever'] = 'Yes, forever';
$string['yesinitially'] = 'Yes, initially';
Index: moodle/lang/en_utf8/help/forum/subscription.html
===================================================================
RCS file: /Users/John/Documents/JWC/Moodle 1.9.4 CVS/moodle 1.9.4/moodle/lang/en_utf8/help/forum/subscription.html,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 subscription.html
--- moodle/lang/en_utf8/help/forum/subscription.html 6 Jan 2007 11:00:58 -0000 1.1.1.1
+++ moodle/lang/en_utf8/help/forum/subscription.html 13 Feb 2009 19:08:37 -0000
@@ -16,3 +16,7 @@
towards the beginning of the course (before everyone has
worked out that they can subscribe to these emails themselves).
Further choices may be offered by the teacher allowing +subscription by discussion thread. When subscribed to a thread +the user gets email copies of posts in that thread only. +In very large forums this may be more appropriate.
\ No newline at end of file Index: moodle/lang/en_utf8/help/forum/subscription2.html =================================================================== RCS file: /Users/John/Documents/JWC/Moodle 1.9.4 CVS/moodle 1.9.4/moodle/lang/en_utf8/help/forum/subscription2.html,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 subscription2.html --- moodle/lang/en_utf8/help/forum/subscription2.html 6 Jan 2007 11:00:58 -0000 1.1.1.1 +++ moodle/lang/en_utf8/help/forum/subscription2.html 13 Feb 2009 19:08:46 -0000 @@ -31,5 +31,4 @@ existing users, it will only affect future course users. Similarly changing later to "Yes, initially" will not subscribe existing course users but only those enrolling later. - - + \ No newline at end of file Index: moodle/mod/forum/discuss.php =================================================================== RCS file: /Users/John/Documents/JWC/Moodle 1.9.4 CVS/moodle 1.9.4/moodle/mod/forum/discuss.php,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 discuss.php --- moodle/mod/forum/discuss.php 29 Jan 2009 08:07:20 -0000 1.1.1.1 +++ moodle/mod/forum/discuss.php 19 Feb 2009 16:59:03 -0000 @@ -1,4 +1,4 @@ -id, 'id', $discussion->id); set_field('forum_read', 'forumid', $forumto->id, 'discussionid', $discussion->id); + $modcontextto = get_context_instance(CONTEXT_MODULE, $cmto->id); + forum_discussion_copy_subscribers($discussion->id, $forum->id, $discussion->id, $forumto->id, $modcontextto); add_to_log($course->id, 'forum', 'move discussion', "discuss.php?d=$discussion->id", $discussion->id, $cmto->id); require_once($CFG->libdir.'/rsslib.php'); @@ -165,8 +168,15 @@ /// Print the controls across the top - echo '';
-
+ echo '
'; + $posthtml .= ' ';
+ // Added for thread-based subscriptions : if subscribed to thread create unsubscribe from thread link instead of forum unsubscribe
+ if (forum_is_subscribed_to_thread($userto->id, $forum->id)) {
+ $posthtml .= ''
+ .get_string('unsubscribethisthread', 'forum').' ';
+ } else {
+ $posthtml .= ''.get_string('unsubscribe', 'forum').' ';
+ }
+ $posthtml .= ''.get_string('unsubscribeall', 'forum').' ';
}
$posthtml .= ' |