'.format_string($post->subject,true).' '.get_string("bynameondate", "forum", $by).'
';
} else {
@@ -811,6 +819,8 @@
function forum_make_mail_text($course, $forum, $discussion, $post, $userfrom, $userto, $bare = false) {
global $CFG, $USER;
+ $post->anonymous = $forum->anonymous == 1 ? true : ($forum->anonymous == 2 ? $post->anonymous : false);
+
if (!isset($userto->viewfullnames[$forum->id])) {
if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) {
error('Course Module ID was incorrect');
@@ -829,7 +839,7 @@
}
$by = New stdClass;
- $by->name = fullname($userfrom, $viewfullnames);
+ $by->name = $post->anonymous ? $CFG->forum_anonymousname : fullname($userfrom, $viewfullnames);
$by->date = userdate($post->modified, "", $userto->timezone);
$strbynameondate = get_string('bynameondate', 'forum', $by);
@@ -1204,10 +1214,11 @@
foreach ($printposts as $post) {
$subjectclass = empty($post->parent) ? ' bold' : '';
+ $fullname = $post->anonymous ? $CFG->forum_anonymousname : fullname($post, $viewfullnames);
echo ''.
'
';
echo ''.userdate($post->modified, $strftimerecent).'
'.
- ''.fullname($post, $viewfullnames).'
'.
+ ''.$fullname.'
'.
'';
if (empty($post->parent)) {
@@ -1983,6 +1994,7 @@
JOIN {$CFG->prefix}user u ON u.id = p.userid
WHERE f.id = $forumid
AND p.userid = $userid
+ AND p.anonymous = 0
$timedsql
ORDER BY p.modified ASC");
}
@@ -2011,6 +2023,7 @@
JOIN {$CFG->prefix}forum_posts p ON p.discussion = d.id
WHERE f.id = $forumid
AND p.userid = $userid
+ AND p.anonymous = 0
$timedsql");
}
@@ -2039,6 +2052,7 @@
JOIN {$CFG->prefix}user u ON u.id = p.userid
WHERE f.id = $forumid
AND p.userid = $userid
+ AND p.anonymous = 0
$timedsql");
}
@@ -2643,6 +2657,8 @@
global $CFG;
+ $post->anonymous = $forum->anonymous == 1 ? true : ($forum->anonymous == 2 ? $post->anonymous : false);
+
if (!isset($userto->viewfullnames[$forum->id])) {
if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) {
error('Course Module ID was incorrect');
@@ -2657,11 +2673,12 @@
$options = new object();
$options->para = true;
$formattedtext = format_text(trusttext_strip($post->message), $post->format, $options, $course->id);
+ $anonpicture = ' . '/pix/anonymous.png' . ')
';
$output = '';
$output .= '';
echo "
';
$output = '| '; - $output .= print_user_picture($userfrom, $course->id, $userfrom->picture, false, true); + $output .= $post->anonymous ? $anonpicture : print_user_picture($userfrom, $course->id, $userfrom->picture, false, true); $output .= ' | '; if ($post->parent) { @@ -2673,7 +2690,7 @@ $fullname = fullname($userfrom, $viewfullnames); $by = new object(); - $by->name = ''.$fullname.''; + $by->name = $post->anonymous ? $CFG->forum_anonymousname : ''.$fullname.''; $by->date = userdate($post->modified, '', $userto->timezone); $output .= ''; @@ -2768,8 +2785,9 @@ static $strpruneheading, $displaymode; static $strmarkread, $strmarkunread; - $post->course = $course->id; - $post->forum = $forum->id; + $post->course = $course->id; + $post->forum = $forum->id; + $post->anonymous = $forum->anonymous == 1 ? true : ($forum->anonymous == 2 ? $post->anonymous : false); // caching if (!isset($cm->cache)) { @@ -2861,9 +2879,10 @@ $postuser->lastname = $post->lastname; $postuser->imagealt = $post->imagealt; $postuser->picture = $post->picture; + $anonpicture = '|
| '; - print_user_picture($postuser, $course->id); + $post->anonymous ? print($anonpicture) : print_user_picture($postuser, $course->id); echo ' | '; if ($post->parent) { @@ -2881,8 +2900,14 @@ echo ''; - print_user_picture($postuser, $forum->course); + $post->anonymous ? print($anonpicture) : print_user_picture($postuser, $forum->course); echo " | \n"; // User name $fullname = fullname($post, has_capability('moodle/site:viewfullnames', $modcontext)); echo ''; - echo ''.$fullname.''; + + if ($post->anonymous) { + echo $CFG->forum_anonymousname; + } else { + echo ''.$fullname.''; + } + echo " | \n"; // Group picture @@ -3215,8 +3257,13 @@ $usermodified->id = $post->usermodified; $usermodified->firstname = $post->umfirstname; $usermodified->lastname = $post->umlastname; - echo ''. - fullname($usermodified).'
| ";
- print_user_picture($activity->user, $courseid);
+ if($activity->user->anonymous) {
+ echo '';
+ } else {
+ print_user_picture($activity->user, $courseid);
+ }
echo " | ";
echo ' ';
@@ -5357,7 +5418,7 @@
echo ' ';
echo '';
- $fullname = fullname($activity->user, $viewfullnames);
+ $fullname = $activity->user->anonymous ? $CFG->forum_anonymousname : fullname($activity->user, $viewfullnames);
echo "wwwroot/user/view.php?id={$activity->user->id}&course=$courseid\">"
."{$fullname} - ".userdate($activity->timestamp);
echo ' ';
Index: mod/forum/post_form.php
===================================================================
--- mod/forum/post_form.php (.../vendor/moodle/1.9weekly) (revision 139)
+++ mod/forum/post_form.php (.../branches/1.9.5-LAE1.0/AnonymousForums) (revision 139)
@@ -66,6 +66,10 @@
$mform->addElement('checkbox', 'mailnow', get_string('mailnow', 'forum'));
}
+ if ($forum->anonymous == 2) {
+ $mform->addElement('checkbox', 'anonymous', get_string('anonymouspost', 'forum'));
+ }
+
if (!empty($CFG->forum_enabletimedposts) && !$post->parent && has_capability('mod/forum:viewhiddentimedposts', $coursecontext)) { // hack alert
$mform->addElement('header', '', get_string('displayperiod', 'forum'));
Index: mod/forum/user.php
===================================================================
--- mod/forum/user.php (.../vendor/moodle/1.9weekly) (revision 139)
+++ mod/forum/user.php (.../branches/1.9.5-LAE1.0/AnonymousForums) (revision 139)
@@ -69,12 +69,12 @@
switch ($mode) {
case 'posts' :
$searchterms = array('userid:'.$user->id);
- $extrasql = '';
+ $extrasql = 'AND anonymous = 0';
break;
default:
$searchterms = array('userid:'.$user->id);
- $extrasql = 'AND p.parent = 0';
+ $extrasql = 'AND p.parent = 0 AND anonymous = 0';
break;
}
@@ -93,12 +93,9 @@
}
// Get the posts.
- if ($posts = forum_search_posts($searchterms, $searchcourse, $page*$perpage, $perpage,
- $totalcount, $extrasql)) {
+ if ($posts = forum_search_posts($searchterms, $searchcourse, $page*$perpage, $perpage, $totalcount, $extrasql)) {
+ print_paging_bar($totalcount, $page, $perpage, "user.php?id=$user->id&course=$course->id&mode=$mode&perpage=$perpage&");
- print_paging_bar($totalcount, $page, $perpage,
- "user.php?id=$user->id&course=$course->id&mode=$mode&perpage=$perpage&");
-
$discussions = array();
$forums = array();
$cms = array();
Index: mod/forum/post.php
===================================================================
--- mod/forum/post.php (.../vendor/moodle/1.9weekly) (revision 139)
+++ mod/forum/post.php (.../branches/1.9.5-LAE1.0/AnonymousForums) (revision 139)
@@ -5,6 +5,7 @@
require_once('../../config.php');
require_once('lib.php');
+
$reply = optional_param('reply', 0, PARAM_INT);
$forum = optional_param('forum', 0, PARAM_INT);
$edit = optional_param('edit', 0, PARAM_INT);
@@ -13,8 +14,8 @@
$name = optional_param('name', '', PARAM_CLEAN);
$confirm = optional_param('confirm', 0, PARAM_INT);
$groupid = optional_param('groupid', null, PARAM_INT);
+ $isanon = optional_param('anonymous', 0, PARAM_INT) ? true : false;
-
//these page_params will be passed as hidden variables later in the form.
$page_params = array('reply'=>$reply, 'forum'=>$forum, 'edit'=>$edit);
@@ -111,6 +112,7 @@
$post->subject = '';
$post->userid = $USER->id;
$post->message = '';
+ $post->anonymous = $isanon;
if (isset($groupid)) {
$post->groupid = $groupid;
@@ -179,6 +181,7 @@
$post->subject = $parent->subject;
$post->userid = $USER->id;
$post->message = '';
+ $post->anonymous = $isanon;
$post->groupid = ($discussion->groupid == -1) ? 0 : $discussion->groupid;
@@ -391,6 +394,7 @@
$newpost->id = $post->id;
$newpost->parent = 0;
$newpost->subject = $name;
+ $newpost->anonymous = $isanon;
if (!update_record("forum_posts", $newpost)) {
error('Could not update the original post');
@@ -581,6 +585,7 @@
$discussion = $fromform;
$discussion->name = $fromform->subject;
$discussion->intro = $fromform->message;
+ $discussion->anonymous = $isanon;
$newstopic = false;
if ($forum->type == 'news' && !$fromform->parent) {
@@ -757,6 +762,7 @@
'userid'=>$post->userid,
'parent'=>$post->parent,
'discussion'=>$post->discussion,
+ 'anonymous'=>$post->anonymous,
'course'=>$course->id)+
$page_params+
Index: lang/en_utf8/forum.php
===================================================================
--- lang/en_utf8/forum.php (.../vendor/moodle/1.9weekly) (revision 139)
+++ lang/en_utf8/forum.php (.../branches/1.9.5-LAE1.0/AnonymousForums) (revision 139)
@@ -15,6 +15,7 @@
$string['aggregatetype'] = 'Aggregate type';
$string['ajaxrating'] = 'Enable AJAX rating';
$string['allforums'] = 'All forums';
+$string['allowanonymous'] = 'Anonymize posts?';
$string['allowchoice'] = 'Allow everyone to choose';
$string['allowdiscussions'] = 'Can a $a post to this forum?';
$string['allowratings'] = 'Allow posts to be rated?';
@@ -22,6 +23,11 @@
$string['allowsdiscussions'] = 'This forum allows each person to start one discussion topic.';
$string['allsubscribe'] = 'Subscribe to all forums';
$string['allunsubscribe'] = 'Unsubscribe from all forums';
+$string['anonno'] = 'No, never';
+$string['anonoptional'] = 'Optional (let the user decide)';
+$string['anonyes'] = 'Yes, all posts';
+$string['anonymouspost'] = 'Post anonymously';
+$string['configanonymousname'] = 'Anonymous user name';
$string['anyfile'] = 'Any file';
$string['attachment'] = 'Attachment';
$string['blockafter'] = 'Post threshold for blocking';
|