Code cleanup; Make NOT_ANONYMOUS default; Fix externallib anonymous check; Remove reputation display completely when anonymous

Author: justusdieckmann

externallib.php

@@ -121,18 +121,19 @@ public static function record_vote($discussionid, $postid, $ratingid, $sesskey)
             print_error('ratingfailed', 'moodleoverflow');
         }
 
-        $postownerid = moodleoverflow_get_post_full($params['postid'])->userid;
+        $post = moodleoverflow_get_post_full($params['postid']);
+        $postownerid = $post->userid;
         $rating      = \mod_moodleoverflow\ratings::moodleoverflow_get_ratings_by_discussion($discussion->id,
             $params['postid']);
         $ownerrating = \mod_moodleoverflow\ratings::moodleoverflow_get_reputation($moodleoverflow->id, $postownerid);
         $raterrating = \mod_moodleoverflow\ratings::moodleoverflow_get_reputation($moodleoverflow->id, $USER->id);
 
-        $canseeowner = $moodleoverflow->anonymous && $USER->id != $postownerid;
+        $cannotseeowner = \mod_moodleoverflow\anonymous::is_post_anonymous($post, $moodleoverflow, $USER->id) && $USER->id != $postownerid;
 
         $params['postrating']      = $rating->upvotes - $rating->downvotes;
-        $params['ownerreputation'] = $canseeowner ? null : $ownerrating;
+        $params['ownerreputation'] = $cannotseeowner ? null : $ownerrating;
         $params['raterreputation'] = $raterrating;
-        $params['ownerid']         = $canseeowner ? null : $postownerid;
+        $params['ownerid']         = $cannotseeowner ? null : $postownerid;
 
         $transaction->allow_commit();
 

locallib.php

@@ -1289,23 +1289,17 @@ function moodleoverflow_print_post($post, $discussion, $moodleoverflow, $cm, $co
     }
 
     // The rating of the user.
-    if (anonymous::is_post_anonymous($post, $moodleoverflow, $post->userid) && $post->userid !== $USER->id) {
-        $postuserrating = '--';
+    if (anonymous::is_post_anonymous($post, $moodleoverflow, $post->userid)) {
+        $postuserrating = null;
     } else {
         $postuserrating = \mod_moodleoverflow\ratings::moodleoverflow_get_reputation($moodleoverflow->id, $postinguser->id);
     }
 
     // The name of the user and the date modified.
-    $by = new stdClass();
-    $by->date = userdate($post->modified);
-    $by->name = $postinguser->profilelink ?
-            html_writer::link($postinguser->profilelink, $postinguser->fullname)
-            : $postinguser->fullname;
-    $by->rating = "<img class='icon iconsmall' src='" .
-        $OUTPUT->image_url('star', 'moodleoverflow') . "'><span>" . $postuserrating . '</span>';
-    $mustachedata->bytext = get_string('bynameondate', 'moodleoverflow', $by);
-    $mustachedata->bydate = $by->date;
-    $mustachedata->byname = $by->name;
+    $mustachedata->bydate = userdate($post->modified);
+    $mustachedata->byname = $postinguser->profilelink ?
+        html_writer::link($postinguser->profilelink, $postinguser->fullname)
+        : $postinguser->fullname;
     $mustachedata->byrating = $postuserrating;
 
     // Set options for the post.

mod_form.php

@@ -84,6 +84,7 @@ public function definition() {
 
         $mform->addElement('select', 'anonymous', get_string('anonymous', 'moodleoverflow'), $possiblesettings);
         $mform->addHelpButton('anonymous', 'anonymous', 'moodleoverflow');
+        $mform->setDefault('anonymous', anonymous::NOT_ANONYMOUS);
 
         // Attachments.
         $mform->addElement('header', 'attachmentshdr', get_string('attachments', 'moodleoverflow'));

templates/answer.mustache

@@ -74,7 +74,7 @@
                                             {{{ picture }}}
                                         </div>
                                         <div class="user-details">
-                                            {{{ byname }}} ({{#pix}}star, moodleoverflow, {{#str}}reputation, moodleoverflow{{/str}}{{/pix}}<span>{{ byrating }}</span>)
+                                            {{{ byname }}} {{#byrating}}({{#pix}}star, moodleoverflow, {{#str}}reputation, moodleoverflow{{/str}}{{/pix}}<span>{{ byrating }}</span>){{/byrating}}
                                             <div class="-flair">
                                                 <div class="user-action-time">
                                                     {{ bydate }}

templates/question.mustache

@@ -59,7 +59,11 @@
 
                 {{! The author and date. }}
                 <div class="author" role="heading" aria-level="2">
-                    {{{ bytext }}}
+                    <span class="user-details">
+                        by {{{ byname }}}
+                        {{#byrating}}({{#pix}}star, moodleoverflow, {{#str}}reputation, moodleoverflow{{/str}}{{/pix}}<span>{{ byrating }}</span>){{/byrating}} -
+                            {{ bydate }}
+                    </span>
                 </div>
 
                 {{^isfirstpost}}