Merge branch 'master' into redesign/post

.github/workflows/moodle-ci.yml

@@ -8,8 +8,8 @@ jobs:
 
     strategy:
       matrix:
-        php: ['8.1']
-        moodle-branch: ['MOODLE_402_STABLE']
+        php: ['8.2']
+        moodle-branch: ['MOODLE_403_STABLE']
         database: ['pgsql']
 
     steps:
@@ -110,27 +110,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.0', '8.1']
-        moodle-branch: ['MOODLE_401_STABLE', 'MOODLE_402_STABLE']
+        php: [8.1']
+        moodle-branch: ['MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE']
         database: ['mariadb', 'pgsql']
         include:
-          - php: '7.4'
-            moodle-branch: 'MOODLE_39_STABLE'
+          - php: '8.2'
+            moodle-branch: 'MOODLE_402_STABLE'
             database: 'mariadb'
-          - php: '7.4'
-            moodle-branch: 'MOODLE_39_STABLE'
+          - php: '8.2'
+            moodle-branch: 'MOODLE_402_STABLE'
             database: 'pgsql'
-          - php: '8.0'
-            moodle-branch: 'MOODLE_311_STABLE'
+          - php: '8.2'
+            moodle-branch: 'MOODLE_403_STABLE'
             database: 'mariadb'
-          - php: '8.0'
-            moodle-branch: 'MOODLE_311_STABLE'
-            database: 'pgsql'
-          - php: '8.0'
-            moodle-branch: 'MOODLE_400_STABLE'
-            database: 'mariadb'
-          - php: '8.0'
-            moodle-branch: 'MOODLE_400_STABLE'
+          - php: '8.2'
+            moodle-branch: 'MOODLE_403_STABLE'
             database: 'pgsql'
 
     steps:
@@ -193,4 +187,4 @@ jobs:
 
       - name: Behat features
         if: ${{ always() }}
-        run: moodle-plugin-ci behat --auto-rerun 0
+        run: moodle-plugin-ci behat --auto-rerun 0

README.md

@@ -1,11 +1,11 @@
 # ![moodle-mod_groupmembers](pix/icon.png) Activity Module: Moodleoverflow
 
-[![Build Status](https://travis-ci.org/learnweb/moodle-mod_moodleoverflow.svg?branch=master)](https://travis-ci.org/learnweb/moodle-mod_moodleoverflow)
+[![Coverage Status](https://coveralls.io/repos/github/learnweb/moodle-mod_moodleoverflow/badge.svg?branch=master)](https://coveralls.io/github/learnweb/moodle-mod_moodleoverflow?branch=master)
 
 This plugin enables Moodle users to create a non-linear, non-chronologic discussion forum.
 The plugin has similar features as the Moodle forum, but is not intended for general discussions, but rather for straightforward question-and-answer discussions.
-Additionally, users can rate posts and can gain a rating score ("reputation") by being rated by other users.
-Users who have started a discussion can mark a post as helpful; and teachers can mark a post as a (correct) solution to the posed question.
+Additionally, users can rate posts and gain a rating score ("reputation") by being rated by other users.
+Users who have started a discussion can mark a post as helpful, and teachers can mark a post as a (correct) solution to the posed question.
 
 This plugin is developed by Kennet Winter, [Tamara Gunkel](https://github.com/TamaraGunkel), and [Jan Dageförde](https://github.com/Dagefoerde) 
 and is maintained by Learnweb (University of Münster).
@@ -15,7 +15,7 @@ This plugin should go into `mod/mooodleoverflow`. Upon installation, several def
 
 ## Rating
 If a post is rated up or down, the post owner's rating score increases or decreases. The rating score of a user is always shown after the user name.
-In the settings you can define what amount of reputation a downvote or upvote gives. 
+In the settings, you can define what amount of reputation a downvote or upvote gives. 
 Posts with a high score are displayed further up than posts with a lower score. 
 If a post is marked as helpful or solved, the post owner's rating score also increases. By default, a mark gives a higher amount of reputation than an upvote.
 A marked post is always displayed first, but you can choose which mark (solved or helpful) is more important.
@@ -31,12 +31,12 @@ The discussion overview shows the status, among other things. Thus users can see
 <img src="https://user-images.githubusercontent.com/432117/31946826-26981d72-b8d3-11e7-9773-b6547ea9276f.png" width="500">
 <br><br>
 Posts can be marked as helpful (orange) by the question owner or as solved (green) by a teacher. The current post is marked blue.
-Additionally, everybody can vote posts up or down. The post are ordered by the number of upvotes. The post owner's reputation increases if the post is upvoted and decreases it the post is downvoted.
-Post owners can edit their posts until 30 minutes after posting. Teachers can edit and delete posts from everybody without the time restriction.
+Additionally, everybody can vote posts up or down. The posts are ordered by the number of upvotes. The post owner's reputation increases if the post is upvoted and decreases if it is downvoted.
+Post owners can edit their posts until 30 minutes after posting. Teachers can edit and delete posts from everybody without time restrictions.
 <br><br>
 <img src="https://user-images.githubusercontent.com/432117/31946825-267c07d6-b8d3-11e7-8ae1-4f86ea375fd5.png" width="500">
 <br><br>
-Users can attach files. If a picture is attached, it will be displayed as image. If another file type is attached, the file will be shown but not the content.
+Users can attach files. If a picture is attached, it will be displayed as an image. If another file type is attached, the file will be shown but not the content.
 <br><br>
 <img src="https://user-images.githubusercontent.com/432117/31946824-2660a64e-b8d3-11e7-879f-70fc5cd2fc98.png" width="500">
 <br><br>
@@ -50,15 +50,15 @@ Unlike teachers, students can't edit or delete a post or mark it as solved.
 
 ## Settings
 ### Global
-In the global settings you can set e.g. the number of discussions per page, the maximum attachment size or read tracking.
+In the global settings, you can set e.g. the number of discussions per page, the maximum attachment size, or read tracking.
 In addition to these settings which are the same as in the forum, you can define the amount of reputation a vote or mark gives.
 <br><br>
 <img src="https://user-images.githubusercontent.com/432117/31946822-262bb664-b8d3-11e7-88fd-1a400864f8aa.png" width="500">
 <br><br>
 
 ### Course wide
 In the course settings you can override a few settings like maximum attachment size or read tracking.
-Moreover, you can decide if helpful or solved posts are displayed first and how the reputation is calucated.
+Moreover, you can decide if helpful or solved posts are displayed first and how the reputation is calculated.
 <br><br>
 <img src="https://user-images.githubusercontent.com/432117/31946820-260d778a-b8d3-11e7-9425-2af44f00e716.png" width="500">
 <br><br>

classes/anonymous.php

@@ -94,7 +94,7 @@ public static function get_userid_mapping($moodleoverflow, $discussionid) {
         $userids = $DB->get_records_sql(
             'SELECT userid ' .
             'FROM {moodleoverflow_posts} ' .
-            'WHERE discussion = :discussion' .
+            'WHERE discussion = :discussion ' .
             'GROUP BY userid ' .
             'ORDER BY MIN(created) ASC;', ['discussion' => $discussionid]);