 . '/pix/anonymous.png' . ')
';
echo '';
echo ''; + if(!$post->anonymous) { + echo ''. + fullname($usermodified).'
'; + } echo ''. userdate($usedate, $datestring).''; echo "\n"; @@ -3375,6 +3410,7 @@ $post->attachment = ""; $post->forum = $forum->id; // speedup $post->course = $forum->course; // speedup + $post->anonymous = $forum->anonymous == 1 ? 1 : ($forum->anonymous == 2 ? (int)$post->anonymous : 0); if (! $post->id = insert_record("forum_posts", $post)) { return false; @@ -3461,6 +3497,7 @@ $post->course = $forum->course; // speedup $post->format = $discussion->format; $post->mailnow = $discussion->mailnow; + $post->anonymous = $forum->anonymous == 1 ? 1 : ($forum->anonymous == 2 ? $discussion->anonymous : 0); if (! $post->id = insert_record("forum_posts", $post) ) { return 0; @@ -4494,7 +4531,13 @@ continue; } $by = new object(); - $by->name = fullname($post, $canviewfullnames); + + if($post->anonymous) { + $by->name = $CFG->anonymous_name; + } else { + $by->name = fullname($post, $canviewfullnames); + } + $by->date = userdate($post->modified); if ($istracking) { @@ -4595,7 +4638,7 @@ JOIN {$CFG->prefix}forum f ON f.id = d.forum JOIN {$CFG->prefix}user u ON u.id = p.userid $groupjoin - WHERE p.created > $timestart AND f.id = $cm->instance + WHERE p.created > $timestart AND p.anonymous = 0 AND f.id = $cm->instance $userselect $groupselect ORDER BY p.id ASC")) { // order by initial posting date return; Index: mod/forum/post_form.php =================================================================== --- mod/forum/post_form.php (revision 25) +++ mod/forum/post_form.php (revision 29) @@ -64,6 +64,11 @@ $mform->addElement('checkbox', 'mailnow', get_string('mailnow', 'forum')); } + // MDL-1071 + 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)) { $mform->addElement('header', '', get_string('displayperiod', 'forum')); Index: mod/forum/user.php =================================================================== --- mod/forum/user.php (revision 25) +++ mod/forum/user.php (revision 29) @@ -60,12 +60,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; } @@ -84,11 +84,8 @@ } // Get the posts. - 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&"); + 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&"); $discussions = array(); $forums = array(); Index: mod/forum/post.php =================================================================== --- mod/forum/post.php (revision 25) +++ mod/forum/post.php (revision 29) @@ -13,8 +13,8 @@ $prune = optional_param('prune', 0, PARAM_INT); $name = optional_param('name', '', PARAM_CLEAN); $confirm = optional_param('confirm', 0, 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 +111,7 @@ $post->subject = ''; $post->userid = $USER->id; $post->message = ''; + $post->anonymous = $isanon; if ($groupmode = groups_get_activity_groupmode($cm)) { $post->groupid = groups_get_activity_group($cm); @@ -175,6 +176,7 @@ $post->subject = $parent->subject; $post->userid = $USER->id; $post->message = ''; + $post->anonymous = $isanon; $strre = get_string('re', 'forum'); if (!(substr($post->subject, 0, strlen($strre)) == $strre)) { @@ -387,6 +389,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'); @@ -723,12 +726,12 @@ $subscribe=(isset($post->forum)&&forum_is_subscribed($USER->id, $post->forum)) || (!empty($USER->autosubscribe)); - $mform_post->set_data(array( 'general'=>$heading, 'subject'=>$post->subject, 'message'=>$post->message, 'subscribe'=>$subscribe?1:0, 'mailnow'=>!empty($post->mailnow), + 'anonymous'=>($post->anonymous)?1:0, 'userid'=>$post->userid, 'parent'=>$post->parent, 'discussion'=>$post->discussion, Index: lang/en_utf8/forum.php =================================================================== --- lang/en_utf8/forum.php (revision 25) +++ lang/en_utf8/forum.php (revision 29) @@ -13,6 +13,7 @@ $string['aggregatesum'] = 'Sum of ratings'; $string['aggregatetype'] = 'Aggregate type'; $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?'; @@ -20,6 +21,10 @@ $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['anyfile'] = 'Any file'; $string['attachment'] = 'Attachment'; $string['blockafter'] = 'Post threshold for blocking';