"; -// Link to the selfenrollment if not allowed. -if (!$canreply) { - if (!is_enrolled($modulecontext) AND !is_viewing($modulecontext)) { - $canreply = enrol_selfenrol_available($course->id); - } -} +echo '
';
-echo "
"; +moodleoverflow_print_discussion($course, $cm, $moodleoverflow, $discussion, $post); -moodleoverflow_print_discussion($course, $cm, $moodleoverflow, $discussion, $post, $canreply); +echo '
';
echo $OUTPUT->footer();
diff --git a/externallib.php b/externallib.php
index 1b56d144db6..91f8b1f8860 100644
--- a/externallib.php
+++ b/externallib.php
@@ -22,9 +22,13 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+use mod_moodleoverflow\output\moodleoverflow_email;
+use mod_moodleoverflow\review;
+
defined('MOODLE_INTERNAL') || die;
require_once("$CFG->libdir/externallib.php");
+require_once($CFG->dirroot . '/mod/moodleoverflow/locallib.php');
/**
* Class implementing the external API, esp. for AJAX functions.
@@ -143,4 +147,161 @@ public static function record_vote($discussionid, $postid, $ratingid, $sesskey)
return $params;
}
+
+ /**
+ * Returns description of method parameters.
+ * @return external_function_parameters
+ */
+ public static function review_approve_post_parameters() {
+ return new external_function_parameters([
+ 'postid' => new external_value(PARAM_INT, 'id of post')
+ ]);
+ }
+
+ /**
+ * Returns description of return value.
+ * @return external_value
+ */
+ public static function review_approve_post_returns() {
+ return new external_value(PARAM_TEXT, 'the url of the next post to review');
+ }
+
+ /**
+ * Approve a post.
+ *
+ * @param int $postid ID of post to approve.
+ * @return string|null Url of next post to review.
+ */
+ public static function review_approve_post($postid) {
+ global $DB;
+
+ $params = self::validate_parameters(self::review_approve_post_parameters(), ['postid' => $postid]);
+ $postid = $params['postid'];
+
+ $post = $DB->get_record('moodleoverflow_posts', ['id' => $postid], '*', MUST_EXIST);
+ $discussion = $DB->get_record('moodleoverflow_discussions', ['id' => $post->discussion], '*', MUST_EXIST);
+ $moodleoverflow = $DB->get_record('moodleoverflow', ['id' => $discussion->moodleoverflow], '*', MUST_EXIST);
+
+ $cm = get_coursemodule_from_instance('moodleoverflow', $moodleoverflow->id);
+ $context = context_module::instance($cm->id);
+
+ require_capability('mod/moodleoverflow:reviewpost', $context);
+
+ if ($post->reviewed) {
+ throw new coding_exception('post was already approved!');
+ }
+
+ if (!review::is_post_in_review_period($post)) {
+ throw new coding_exception('post is not yet in review period!');
+ }
+
+ $post->reviewed = 1;
+ $post->timereviewed = time();
+
+ $DB->update_record('moodleoverflow_posts', $post);
+
+ if ($post->modified > $discussion->timemodified) {
+ $discussion->timemodified = $post->modified;
+ $discussion->usermodified = $post->userid;
+ $DB->update_record('moodleoverflow_discussions', $discussion);
+ }
+
+ return review::get_first_review_post($moodleoverflow->id, $post->id);
+ }
+
+ /**
+ * Returns description of method parameters.
+ * @return external_function_parameters
+ */
+ public static function review_reject_post_parameters() {
+ return new external_function_parameters([
+ 'postid' => new external_value(PARAM_INT, 'id of post'),
+ 'reason' => new external_value(PARAM_RAW, 'reason of rejection')
+ ]);
+ }
+
+ /**
+ * Returns description of return value.
+ * @return external_value
+ */
+ public static function review_reject_post_returns() {
+ return new external_value(PARAM_TEXT, 'the url of the next post to review');
+ }
+
+ /**
+ * Rejects a post.
+ *
+ * @param int $postid ID of post to reject.
+ * @param string|null $reason The reason for rejection.
+ * @return string|null Url of next post to review.
+ */
+ public static function review_reject_post($postid, $reason = null) {
+ global $DB, $PAGE, $OUTPUT;
+
+ $params = self::validate_parameters(self::review_reject_post_parameters(), ['postid' => $postid, 'reason' => $reason]);
+ $postid = $params['postid'];
+
+ $post = $DB->get_record('moodleoverflow_posts', ['id' => $postid], '*', MUST_EXIST);
+ $discussion = $DB->get_record('moodleoverflow_discussions', ['id' => $post->discussion], '*', MUST_EXIST);
+ $moodleoverflow = $DB->get_record('moodleoverflow', ['id' => $discussion->moodleoverflow], '*', MUST_EXIST);
+ $cm = get_coursemodule_from_instance('moodleoverflow', $moodleoverflow->id);
+ $course = get_course($cm->course);
+ $context = context_module::instance($cm->id);
+
+ $PAGE->set_context($context);
+
+ require_capability('mod/moodleoverflow:reviewpost', $context);
+
+ if ($post->reviewed) {
+ throw new coding_exception('post was already approved!');
+ }
+
+ if (!review::is_post_in_review_period($post)) {
+ throw new coding_exception('post is not yet in review period!');
+ }
+
+ // Has to be done before deleting the post.
+ $rendererhtml = $PAGE->get_renderer('mod_moodleoverflow', 'email', 'htmlemail');
+ $renderertext = $PAGE->get_renderer('mod_moodleoverflow', 'email', 'textemail');
+
+ $userto = core_user::get_user($post->userid);
+
+ $maildata = new moodleoverflow_email(
+ $course,
+ $cm,
+ $moodleoverflow,
+ $discussion,
+ $post,
+ $userto,
+ $userto,
+ false
+ );
+
+ $textcontext = $maildata->export_for_template($renderertext, true);
+ $htmlcontext = $maildata->export_for_template($rendererhtml, false);
+
+ if ($params['reason'] ?? null) {
+ $htmlcontext['reason'] = format_text_email($params['reason'], FORMAT_PLAIN);
+ $textcontext['reason'] = $htmlcontext['reason'];
+ }
+
+ email_to_user(
+ $userto,
+ \core_user::get_noreply_user(),
+ get_string('email_rejected_subject', 'moodleoverflow', $textcontext),
+ $OUTPUT->render_from_template('mod_moodleoverflow/email_rejected_text', $textcontext),
+ $OUTPUT->render_from_template('mod_moodleoverflow/email_rejected_html', $htmlcontext)
+ );
+
+ $url = review::get_first_review_post($moodleoverflow->id, $post->id);
+
+ if (!$post->parent) {
+ // Delete discussion, if this is the question.
+ moodleoverflow_delete_discussion($discussion, $course, $cm, $moodleoverflow);
+ } else {
+ moodleoverflow_delete_post($post, true, $cm, $moodleoverflow);
+ }
+
+ return $url;
+ }
}
diff --git a/index.php b/index.php
index 63d159a73a7..716f499eaab 100644
--- a/index.php
+++ b/index.php
@@ -251,8 +251,7 @@
if (isset($untracked[$moodleoverflow->id])) {
$unreadlink = '-';
- } else if ($unread = \mod_moodleoverflow\readtracking::moodleoverflow_count_unread_posts_moodleoverflow($cm,
- $course)
+ } else if ($unread = \mod_moodleoverflow\readtracking::moodleoverflow_count_unread_posts_moodleoverflow($cm)
) {
// There are unread posts in the moodleoverflow instance.
diff --git a/lang/en/moodleoverflow.php b/lang/en/moodleoverflow.php
index 5c6f5154c64..4b6f937df5d 100644
--- a/lang/en/moodleoverflow.php
+++ b/lang/en/moodleoverflow.php
@@ -65,7 +65,7 @@
$string['headerdiscussion'] = 'Discussion';
$string['headerstartedby'] = 'Started by';
$string['headerreplies'] = 'Replies';
-$string['headerlastpost'] = 'Last post';
+$string['headerlastpost'] = 'Last published post';
$string['headerunread'] = 'Unread';
$string['headervotes'] = 'Votes';
$string['headerstatus'] = 'Status';
@@ -92,7 +92,7 @@
$string['maxattachments_help'] = 'This setting specifies the maximum number of files that can be attached to a forum post.';
$string['configmaxattachments'] = 'Default maximum number of attachments allowed per post.';
$string['maxeditingtime'] = 'Maximum amount of time during which a post can be edited by its owner (sec)';
-$string['configmaxeditingtime'] = 'Default maximum seconds are 3600 (= one hour).';
+$string['configmaxeditingtime'] = 'Default maximum seconds are 3600 (= one hour). Regarding editing posts, please also consider the "Review possible after" setting for moderated forums.';
$string['configoldpostdays'] = 'Number of days old any post is considered read.';
$string['oldpostdays'] = 'Read after days';
$string['trackingoff'] = 'Off';
@@ -418,3 +418,34 @@
$string['desc:only_questions'] = 'The name of questioners will not be displayed in their question and comments.';
$string['desc:anonymous'] = 'No names will be displayed.';
$string['resetanonymous_warning'] = 'Are you sure? If you are in production, this is most certainly a bad decision because your students and teachers posted their questions and answers, believing they would remain anonymous. "; +moodleoverflow_print_discussion($course, $cm, $moodleoverflow, $discussion, $post); -moodleoverflow_print_discussion($course, $cm, $moodleoverflow, $discussion, $post, $canreply); +echo '
{$a->fullanoncount} forums are currently fully anonymized, and in {$a->questionanoncount} additional forums the questioners are anonymized.
In all these forums, the real names of posters will be displayed again, even in already existing posts!
There is no way of reverting those changes!'; + +// Review feature +$string['review'] = 'Review'; +$string['review_help'] = 'Select what has to be approved by a teacher before being shown to students.'; +$string['nothing'] = 'Nothing'; +$string['questions'] = 'Questions'; +$string['questions_and_posts'] = 'Questions and answers'; +$string['desc:review_questions'] = 'All questions are going to be reviewed by a teacher before being published.'; +$string['desc:review_everything'] = 'All questions and answers are going to be reviewed by a teacher before being published.'; +$string['allowreview'] = 'Allow moderated forums'; +$string['allowreview_desc'] = 'Allow teachers to enable that all posts (or only all questions) have to be reviewed by them in order to be published.'; +$string['amount_waiting_for_review'] = '{$a} post(s) need to be reviewed!'; +$string['pending_review'] = 'Pending review'; +$string['post_was_approved'] = 'The post was approved.'; +$string['post_was_rejected'] = 'The post was rejected.'; +$string['jump_to_next_post_needing_review'] = 'Jump to next post needing to be reviewed.'; +$string['there_are_no_posts_needing_review'] = 'There are no more posts in this forum that need to be reviewed.'; +$string['give_a_reason'] = 'Give a reason (optional)'; +$string['approve'] = 'Approve'; +$string['reject'] = 'Reject'; +$string['reviewpossibleaftertime'] = 'Review possible after (secs)'; +$string['reviewpossibleaftertime_desc'] = 'A teacher can only reject or approve a post at least this amount of time (in seconds) after the creation of the post. After a teacher has approved a post, the post cannot be edited by it\'s author anymore, even if still within the maxeditingtime duration.'; +$string['pending_review_but_cannot_now'] = 'Pending review, but can only be approved at least {$a} after the creation of this post to allow the author a bit of time to edit it.'; + +$string['review_needed'] = 'Review needed!'; + +$string['email_review_needed_subject'] = 'Review needed in {$a->coursename}: {$a->subject}'; +$string['email_rejected_subject'] = '{$a->coursename}: One of your posts has been rejected.'; +$string['your_post_was_rejected'] = 'Your post was rejected.'; +$string['your_post_was_rejected_with_reason'] = 'Your post was rejected with the following reason:'; +$string['original_post'] = 'Original post'; diff --git a/lib.php b/lib.php index d29fa21dae4..b3d21e50ce3 100644 --- a/lib.php +++ b/lib.php @@ -48,6 +48,7 @@ define('MOODLEOVERFLOW_MAILED_PENDING', 0); define('MOODLEOVERFLOW_MAILED_SUCCESS', 1); define('MOODLEOVERFLOW_MAILED_ERROR', 2); +define('MOODLEOVERFLOW_MAILED_REVIEW_SUCCESS', 3); // Constants for the post rating. define('MOODLEOVERFLOW_PREFERENCE_STARTER', 0); @@ -829,7 +830,7 @@ function moodleoverflow_send_mails() { $modulecontext = context_module::instance($cm->id); // Check the users capabilities. - $canpost = moodleoverflow_user_can_post($moodleoverflow, $userto, $cm, $course, $modulecontext); + $canpost = moodleoverflow_user_can_post($modulecontext, $post, $userto->id); $userto->canpost[$discussion->id] = $canpost; } @@ -863,7 +864,7 @@ function moodleoverflow_send_mails() { // Cache the users capabilities. if (!isset($userto->canpost[$discussion->id])) { - $canreply = moodleoverflow_user_can_post($moodleoverflow, $userto, $cm, $course, $modulecontext); + $canreply = moodleoverflow_user_can_post($modulecontext, $post, $userto->id); } else { $canreply = $userto->canpost[$discussion->id]; } @@ -1005,15 +1006,18 @@ function moodleoverflow_get_unmailed_posts($starttime, $endtime) { // Set params for the sql query. $params = array(); - $params['mailed'] = MOODLEOVERFLOW_MAILED_PENDING; $params['ptimestart'] = $starttime; $params['ptimeend'] = $endtime; + $pendingmail = MOODLEOVERFLOW_MAILED_PENDING; + $reviewsent = MOODLEOVERFLOW_MAILED_REVIEW_SUCCESS; + // Retrieve the records. $sql = "SELECT p.*, d.course, d.moodleoverflow FROM {moodleoverflow_posts} p JOIN {moodleoverflow_discussions} d ON d.id = p.discussion - WHERE p.mailed = :mailed AND p.created >= :ptimestart AND p.created < :ptimeend + WHERE p.mailed IN ($pendingmail, $reviewsent) AND p.reviewed = 1 + AND COALESCE(p.timereviewed, p.created) >= :ptimestart AND p.created < :ptimeend ORDER BY p.modified ASC"; return $DB->get_records_sql($sql, $params); @@ -1035,6 +1039,7 @@ function moodleoverflow_mark_old_posts_as_mailed($endtime) { // Define variables for the sql query. $params = array(); $params['mailedsuccess'] = MOODLEOVERFLOW_MAILED_SUCCESS; + $params['mailedreviewsent'] = MOODLEOVERFLOW_MAILED_REVIEW_SUCCESS; $params['now'] = $now; $params['endtime'] = $endtime; $params['mailedpending'] = MOODLEOVERFLOW_MAILED_PENDING; @@ -1042,7 +1047,7 @@ function moodleoverflow_mark_old_posts_as_mailed($endtime) { // Define the sql query. $sql = "UPDATE {moodleoverflow_posts} SET mailed = :mailedsuccess - WHERE (created < :endtime) AND mailed = :mailedpending"; + WHERE (created < :endtime) AND mailed IN (:mailedpending, :mailedreviewsent) AND reviewed = 1"; return $DB->execute($sql, $params); @@ -1075,27 +1080,37 @@ function moodleoverflow_minimise_user_record(stdClass $user) { function moodleoverflow_cm_info_view(cm_info $cm) { $cantrack = \mod_moodleoverflow\readtracking::moodleoverflow_can_track_moodleoverflows(); + $out = ""; + if (has_capability('mod/moodleoverflow:reviewpost', $cm->context)) { + $reviewcount = \mod_moodleoverflow\review::count_outstanding_reviews_in_moodleoverflow($cm->instance); + if ($reviewcount) { + $out .= ''; + $out .= get_string('amount_waiting_for_review', 'mod_moodleoverflow', $reviewcount); + $out .= ' '; + } + } if ($cantrack) { - $unread = \mod_moodleoverflow\readtracking::moodleoverflow_count_unread_posts_moodleoverflow($cm, - $cm->get_course()); + $unread = \mod_moodleoverflow\readtracking::moodleoverflow_count_unread_posts_moodleoverflow($cm); if ($unread) { - $out = ' '; + $out .= ' '; if ($unread == 1) { $out .= get_string('unreadpostsone', 'moodleoverflow'); } else { $out .= get_string('unreadpostsnumber', 'moodleoverflow', $unread); } $out .= ''; - $cm->set_after_link($out); } } + if ($out) { + $cm->set_after_link($out); + } } /** * Check if the user can create attachments in moodleoverflow. * * @param stdClass $moodleoverflow moodleoverflow object - * @param stdClass $context context object + * @param context_module $context context object * * @return bool true if the user can create attachments, false otherwise * @since Moodle 3.3 @@ -1210,3 +1225,13 @@ function moodleoverflow_grade_item_update($moodleoverflow, $grades=null) { return $gradeupdate; } + +/** + * Map icons for font-awesome themes. + */ +function moodleoverflow_get_fontawesome_icon_map() { + return [ + 'mod_moodleoverflow:i/commenting' => 'fa-commenting', + 'mod_moodleoverflow:i/pending-big' => 'fa-clock-o text-danger moodleoverflow-icon-big' + ]; +} diff --git a/locallib.php b/locallib.php index ecd379ea57a..b6e04cc208f 100644 --- a/locallib.php +++ b/locallib.php @@ -26,6 +26,7 @@ */ use mod_moodleoverflow\anonymous; +use mod_moodleoverflow\review; defined('MOODLE_INTERNAL') || die(); @@ -41,9 +42,7 @@ * @return array */ function moodleoverflow_get_discussions($cm, $page = -1, $perpage = 0) { - global $DB, $CFG; - - $params = array($cm->instance); + global $DB, $CFG, $USER; // User must have the permission to view the discussions. $modcontext = context_module::instance($cm->id); @@ -69,7 +68,7 @@ function moodleoverflow_get_discussions($cm, $page = -1, $perpage = 0) { } else { $allnames = get_all_user_name_fields(true, 'u'); } - $postdata = 'p.id, p.modified, p.discussion, p.userid'; + $postdata = 'p.id, p.modified, p.discussion, p.userid, p.reviewed'; $discussiondata = 'd.name, d.timemodified, d.timestart, d.usermodified'; $userdata = 'u.email, u.picture, u.imagealt'; @@ -81,15 +80,24 @@ function moodleoverflow_get_discussions($cm, $page = -1, $perpage = 0) { $usermodifiedfields = get_all_user_name_fields(true, 'um', null, 'um') . ', um.email AS umemail, um.picture AS umpicture, um.imagealt AS umimagealt'; } - $usermodifiedtable = " LEFT JOIN {user} um ON (d.usermodified = um.id)"; + + $params = [$cm->instance]; + $whereconditions = ['d.moodleoverflow = ?', 'p.parent = 0']; + + if (!has_capability('mod/moodleoverflow:reviewpost', $modcontext)) { + $whereconditions[] = '(p.reviewed = 1 OR p.userid = ?)'; + $params[] = $USER->id; + } + + $wheresql = join(' AND ', $whereconditions); // Retrieve and return all discussions from the database. $sql = "SELECT $postdata, $discussiondata, $allnames, $userdata, $usermodifiedfields FROM {moodleoverflow_discussions} d JOIN {moodleoverflow_posts} p ON p.discussion = d.id LEFT JOIN {user} u ON p.userid = u.id - $usermodifiedtable - WHERE d.moodleoverflow = ? AND p.parent = 0 + LEFT JOIN {user} um ON d.usermodified = um.id + WHERE $wheresql ORDER BY d.timestart DESC, d.id DESC"; return $DB->get_records_sql($sql, $params, $limitfrom, $limitamount); @@ -125,6 +133,7 @@ function moodleoverflow_print_latest_discussions($moodleoverflow, $cm, $page = - // Check some capabilities. $canstartdiscussion = moodleoverflow_user_can_post_discussion($moodleoverflow, $cm, $context); $canviewdiscussions = has_capability('mod/moodleoverflow:viewdiscussion', $context); + $canreviewposts = has_capability('mod/moodleoverflow:reviewpost', $context); // Print a button if the user is capable of starting // a new discussion or if the selfenrol is aviable. @@ -132,7 +141,7 @@ function moodleoverflow_print_latest_discussions($moodleoverflow, $cm, $page = - $buttontext = get_string('addanewdiscussion', 'moodleoverflow'); $buttonurl = new moodle_url('/mod/moodleoverflow/post.php', ['moodleoverflow' => $moodleoverflow->id]); $button = new single_button($buttonurl, $buttontext, 'get'); - $button->class = 'singlebutton moodleoverflowaddnew'; + $button->class = 'singlebutton align-middle m-2'; $button->formid = 'newdiscussionform'; echo $OUTPUT->render($button); } @@ -151,7 +160,7 @@ function moodleoverflow_print_latest_discussions($moodleoverflow, $cm, $page = - } // Get the number of replies for each discussion. - $replies = moodleoverflow_count_discussion_replies($moodleoverflow->id); + $replies = moodleoverflow_count_discussion_replies($cm); // Check whether the moodleoverflow instance can be tracked and is tracked. if ($cantrack = \mod_moodleoverflow\readtracking::moodleoverflow_can_track_moodleoverflows($moodleoverflow)) { @@ -282,6 +291,7 @@ function moodleoverflow_print_latest_discussions($moodleoverflow, $cm, $page = - // Get the amount of replies and the link to the discussion. $preparedarray[$i]['replyamount'] = $discussion->replies; + $preparedarray[$i]['questionunderreview'] = $discussion->reviewed == 0; // Are there unread messages? Create a link to them. $preparedarray[$i]['unreadamount'] = $discussion->unread; @@ -328,6 +338,14 @@ function moodleoverflow_print_latest_discussions($moodleoverflow, $cm, $page = - } } + if ($canreviewposts) { + $reviewinfo = review::get_short_review_info_for_discussion($discussion->discussion); + $preparedarray[$i]['needreview'] = $reviewinfo->count; + $preparedarray[$i]['reviewlink'] = (new moodle_url('/mod/moodleoverflow/discussion.php', [ + 'd' => $discussion->discussion + ], 'p' . $reviewinfo->first))->out(false); + } + // Add all created data to an array. $preparedarray[$i]['statusstarter'] = $statusstarter; @@ -346,6 +364,7 @@ function moodleoverflow_print_latest_discussions($moodleoverflow, $cm, $page = - $mustachedata = new stdClass(); $mustachedata->cantrack = $cantrack; $mustachedata->canviewdiscussions = $canviewdiscussions; + $mustachedata->canreview = $canreviewposts; $mustachedata->discussions = $preparedarray; $mustachedata->hasdiscussions = (count($discussions) >= 0) ? true : false; $mustachedata->istracked = $istracked; @@ -364,20 +383,32 @@ function moodleoverflow_print_latest_discussions($moodleoverflow, $cm, $page = - /** * Returns an array of counts of replies for each discussion. * - * @param int $moodleoverflowid + * @param object $cm coursemodule * * @return array */ -function moodleoverflow_count_discussion_replies($moodleoverflowid) { - global $DB; +function moodleoverflow_count_discussion_replies($cm) { + global $DB, $USER; + + $modcontext = context_module::instance($cm->id); + + $params = [$cm->instance]; + $whereconditions = ['d.moodleoverflow = ?', 'p.parent > 0']; + + if (!has_capability('mod/moodleoverflow:reviewpost', $modcontext)) { + $whereconditions[] = '(p.reviewed = 1 OR p.userid = ?)'; + $params[] = $USER->id; + } + + $wheresql = join(' AND ', $whereconditions); $sql = "SELECT p.discussion, COUNT(p.id) AS replies, MAX(p.id) AS lastpostid FROM {moodleoverflow_posts} p JOIN {moodleoverflow_discussions} d ON p.discussion = d.id - WHERE p.parent > 0 AND d.moodleoverflow = ? + WHERE $wheresql GROUP BY p.discussion"; - return $DB->get_records_sql($sql, array($moodleoverflowid)); + return $DB->get_records_sql($sql, $params); } /** @@ -424,14 +455,24 @@ function moodleoverflow_user_can_post_discussion($moodleoverflow, $cm = null, $c * @return array */ function moodleoverflow_get_discussions_count($cm) { - global $DB; + global $DB, $USER; + + $modcontext = context_module::instance($cm->id); - $params = array($cm->instance); + $params = [$cm->instance]; + $whereconditions = ['d.moodleoverflow = ?', 'p.parent = 0']; + + if (!has_capability('mod/moodleoverflow:reviewpost', $modcontext)) { + $whereconditions[] = '(p.reviewed = 1 OR p.userid = ?)'; + $params[] = $USER->id; + } + + $wheresql = join(' AND ', $whereconditions); $sql = 'SELECT COUNT(d.id) FROM {moodleoverflow_discussions} d JOIN {moodleoverflow_posts} p ON p.discussion = d.id - WHERE d.moodleoverflow = ? AND p.parent = 0'; + WHERE ' . $wheresql; return $DB->get_field_sql($sql, $params); } @@ -447,29 +488,40 @@ function moodleoverflow_get_discussions_unread($cm) { global $DB, $USER; // Get the current timestamp and the oldpost-timestamp. - $params = array(); $now = round(time(), -2); $cutoffdate = $now - (get_config('moodleoverflow', 'oldpostdays') * 24 * 60 * 60); + $modcontext = context_module::instance($cm->id); + + $whereconditions = ['d.moodleoverflow = :instance', 'p.modified >= :cutoffdate', 'r.id is NULL']; + $params = [ + 'userid' => $USER->id, + 'instance' => $cm->instance, + 'cutoffdate' => $cutoffdate + ]; + + if (!has_capability('mod/moodleoverflow:reviewpost', $modcontext)) { + $whereconditions[] = '(p.reviewed = 1 OR p.userid = :userid2)'; + $params['userid2'] = $USER->id; + } + + $wheresql = join(' AND ', $whereconditions); + // Define the sql-query. $sql = "SELECT d.id, COUNT(p.id) AS unread - FROM {moodleoverflow_discussions} d - JOIN {moodleoverflow_posts} p ON p.discussion = d.id - LEFT JOIN {moodleoverflow_read} r ON (r.postid = p.id AND r.userid = :userid) - WHERE d.moodleoverflow = :instance - AND p.modified >= :cutoffdate AND r.id is NULL - GROUP BY d.id"; - $params['userid'] = $USER->id; - $params['instance'] = $cm->instance; - $params['cutoffdate'] = $cutoffdate; + FROM {moodleoverflow_discussions} d + JOIN {moodleoverflow_posts} p ON p.discussion = d.id + LEFT JOIN {moodleoverflow_read} r ON (r.postid = p.id AND r.userid = :userid) + WHERE $wheresql + GROUP BY d.id"; // Return the unread messages as an array. if ($unreads = $DB->get_records_sql($sql, $params)) { + $returnarray = []; foreach ($unreads as $unread) { - $unreads[$unread->id] = $unread->unread; + $returnarray[$unread->id] = $unread->unread; } - - return $unreads; + return $returnarray; } else { // If there are no unread messages, return an empty array. @@ -516,11 +568,10 @@ function moodleoverflow_get_post_full($postid) { * @param object $discussion * @param object $post * @param object $cm - * @param null $user * * @return bool */ -function moodleoverflow_user_can_see_post($moodleoverflow, $discussion, $post, $cm, $user = null) { +function moodleoverflow_user_can_see_post($moodleoverflow, $discussion, $post, $cm) { global $USER, $DB; // Retrieve the modulecontext. @@ -570,7 +621,7 @@ function moodleoverflow_user_can_see_post($moodleoverflow, $discussion, $post, $ // Check if the user can view the discussion. $canviewdiscussion = !empty($cm->cache->caps['mod/moodleoverflow:viewdiscussion']) || - has_capability('mod/moodleoverflow:viewdiscussion', $modulecontext, $user->id); + has_capability('mod/moodleoverflow:viewdiscussion', $modulecontext, $user); if (!$canviewdiscussion && !has_all_capabilities(array('moodle/user:viewdetails', 'moodle/user:readuserposts'), context_user::instance($post->userid)) @@ -578,6 +629,11 @@ function moodleoverflow_user_can_see_post($moodleoverflow, $discussion, $post, $ return false; } + if (!($post->reviewed == 1 || $post->userid == $user->id || + has_capability('mod/moodleoverflow:reviewpost', $modulecontext, $user))) { + return false; + } + // Check the coursemodule settings. if (isset($cm->uservisible)) { if (!$cm->uservisible) { @@ -640,7 +696,7 @@ function moodleoverflow_user_can_see_discussion($moodleoverflow, $discussion, $c * Creates a new moodleoverflow discussion. * * @param stdClass $discussion The discussion object - * @param object $modulecontext + * @param context_module $modulecontext * @param int $userid The user ID * * @return bool|int The id of the created discussion @@ -681,6 +737,12 @@ function moodleoverflow_add_discussion($discussion, $modulecontext, $userid = nu $post->moodleoverflow = $moodleoverflow->id; $post->course = $moodleoverflow->course; + // Set to not reviewed, if questions should be reviewed, and user is not a reviewer themselves. + if (review::get_review_level($moodleoverflow) >= review::QUESTIONS && + !has_capability('mod/moodleoverflow:reviewpost', $modulecontext, $userid)) { + $post->reviewed = 0; + } + // Submit the post to the database and get its id. $post->id = $DB->insert_record('moodleoverflow_posts', $post); @@ -754,50 +816,19 @@ function moodleoverflow_go_back_to($default) { * * @return bool Whether the user can reply */ -function moodleoverflow_user_can_post($moodleoverflow, $user = null, $cm = null, $course = null, $modulecontext = null) { - global $USER, $DB; +function moodleoverflow_user_can_post($modulecontext, $posttoreplyto, $considerreviewstatus = true, $userid = null) { + global $USER; // If not user is submitted, use the current one. - if (empty($user)) { - $user = $USER; - } - - // Guests can not post. - if (isguestuser($user) OR empty($user->id)) { - return false; - } - - // Fetch the coursemodule. - if (!$cm) { - if (!$cm = get_coursemodule_from_instance('moodleoverflow', $moodleoverflow->id, $moodleoverflow->course)) { - throw new moodle_exception('invalidcoursemodule'); - } - } - - // Fetch the related course. - if (!$course) { - if (!$course = $DB->get_record('course', array('id' => $moodleoverflow->course))) { - throw new moodle_exception('invalidcourseid'); - } - } - - // Fetch the related modulecontext. - if (!$modulecontext) { - $modulecontext = context_module::instance($cm->id); - } - - // Users with temporary guest access can not post. - if (!is_viewing($modulecontext, $user->id) AND !is_enrolled($modulecontext, $user->id, '', true)) { - return false; + if (empty($userid)) { + $userid = $USER->id; } // Check the users capability. - if (has_capability('mod/moodleoverflow:replypost', $modulecontext, $user->id)) { - return true; + if (!has_capability('mod/moodleoverflow:replypost', $modulecontext, $userid)) { + return false; } - - // The user does not have the capability. - return false; + return !$considerreviewstatus || $posttoreplyto->reviewed == 1; } /** @@ -808,10 +839,9 @@ function moodleoverflow_user_can_post($moodleoverflow, $user = null, $cm = null, * @param stdClass $moodleoverflow The moodleoverflow object * @param stdClass $discussion The discussion object * @param stdClass $post The post object - * @param boolean $canreply Whether the user can reply in this discussion */ -function moodleoverflow_print_discussion($course, $cm, $moodleoverflow, $discussion, $post, $canreply) { - global $USER, $OUTPUT; +function moodleoverflow_print_discussion($course, $cm, $moodleoverflow, $discussion, $post) { + global $USER; // Check if the current is the starter of the discussion. $ownpost = (isloggedin() AND ($USER->id == $post->userid)); @@ -823,7 +853,7 @@ function moodleoverflow_print_discussion($course, $cm, $moodleoverflow, $discuss $istracked = \mod_moodleoverflow\readtracking::moodleoverflow_is_tracked($moodleoverflow); // Retrieve all posts of the discussion. - $posts = moodleoverflow_get_all_discussion_posts($discussion->id, $istracked); + $posts = moodleoverflow_get_all_discussion_posts($discussion->id, $istracked, $modulecontext); $usermapping = anonymous::get_userid_mapping($moodleoverflow, $discussion->id); @@ -864,7 +894,7 @@ function moodleoverflow_print_discussion($course, $cm, $moodleoverflow, $discuss // Print the starting post. echo moodleoverflow_print_post($post, $discussion, $moodleoverflow, $cm, $course, - $ownpost, $canreply, false, '', '', $postread, true, $istracked, 0, $usermapping); + $ownpost, false, '', '', $postread, true, $istracked, 0, $usermapping); // Print answer divider. if ($answercount == 1) { @@ -874,8 +904,12 @@ function moodleoverflow_print_discussion($course, $cm, $moodleoverflow, $discuss } echo "
$answerstring
"; + echo '';
+
// Print the other posts.
- echo moodleoverflow_print_posts_nested($course, $cm, $moodleoverflow, $discussion, $post, $canreply, $istracked, $posts, null, $usermapping);
+ echo moodleoverflow_print_posts_nested($course, $cm, $moodleoverflow, $discussion, $post, $istracked, $posts, null, $usermapping);
+
+ echo '
';
}
/**
@@ -883,10 +917,11 @@ function moodleoverflow_print_discussion($course, $cm, $moodleoverflow, $discuss
*
* @param int $discussionid The ID of the discussion
* @param boolean $tracking Whether tracking is activated
+ * @param context_module $modcontext Context of the module
*
* @return array
*/
-function moodleoverflow_get_all_discussion_posts($discussionid, $tracking) {
+function moodleoverflow_get_all_discussion_posts($discussionid, $tracking, $modcontext) {
global $DB, $USER, $CFG;
// Initiate tracking settings.
@@ -909,6 +944,13 @@ function moodleoverflow_get_all_discussion_posts($discussionid, $tracking) {
$allnames = get_all_user_name_fields(true, 'u');
}
+ $additionalwhere = '';
+
+ if (!has_capability('mod/moodleoverflow:reviewpost', $modcontext)) {
+ $additionalwhere = ' AND (p.reviewed = 1 OR p.userid = :userid2) ';
+ $params['userid2'] = $USER->id;
+ }
+
// Create the sql array.
$sql = "SELECT p.*, m.ratingpreference, $allnames, d.name as subject, u.email, u.picture, u.imagealt $trackingselector
FROM {moodleoverflow_posts} p
@@ -916,7 +958,7 @@ function moodleoverflow_get_all_discussion_posts($discussionid, $tracking) {
LEFT JOIN {moodleoverflow_discussions} d ON d.id = p.discussion
LEFT JOIN {moodleoverflow} m on m.id = d.moodleoverflow
$trackingjoin
- WHERE p.discussion = :discussion
+ WHERE p.discussion = :discussion $additionalwhere
ORDER BY p.created ASC";
$params['discussion'] = $discussionid;
@@ -984,7 +1026,6 @@ function moodleoverflow_get_all_discussion_posts($discussionid, $tracking) {
* @param object $cm
* @param stdClass $course The course object
* @param bool $ownpost Whether the post was submitted by this user
- * @param bool $canreply Whether the user can reply to the post
* @param bool $link Whether there is a link to this post
* @param string $footer A default footer for posts
* @param string $highlight A word to highlight in the post
@@ -997,7 +1038,7 @@ function moodleoverflow_get_all_discussion_posts($discussionid, $tracking) {
* @return null The output
*/
function moodleoverflow_print_post($post, $discussion, $moodleoverflow, $cm, $course,
- $ownpost = false, $canreply = false, $link = false,
+ $ownpost = false, $link = false,
$footer = '', $highlight = '', $postisread = null,
$dummyifcantsee = true, $istracked = false,
$iscomment = false, $usermapping = [], $level = 0) {
@@ -1041,6 +1082,7 @@ function moodleoverflow_print_post($post, $discussion, $moodleoverflow, $cm, $co
$cm->cache->caps['mod/moodleoverflow:viewanyrating'] = has_capability('mod/moodleoverflow:viewanyrating', $modulecontext);
$cm->cache->caps['moodle/site:viewfullnames'] = has_capability('moodle/site:viewfullnames', $modulecontext);
$cm->cache->caps['mod/moodleoverflow:marksolved'] = has_capability('mod/moodleoverflow:marksolved', $modulecontext);
+ $cm->cache->caps['mod/moodleoverflow:reviewpost'] = has_capability('mod/moodleoverflow:reviewpost', $modulecontext);
}
// Check if the user has the capability to see posts.
@@ -1123,10 +1165,10 @@ function moodleoverflow_print_post($post, $discussion, $moodleoverflow, $cm, $co
$link = '/mod/moodleoverflow/discussion.php';
if ($post->statusstarter) {
$commands[] = html_writer::tag('a', $str->marknothelpful,
- array('class' => 'markhelpful', 'role' => 'button', 'tabindex' => '0'));
+ array('class' => 'markhelpful onlyifreviewed', 'role' => 'button', 'tabindex' => '0'));
} else {
$commands[] = html_writer::tag('a', $str->markhelpful,
- array('class' => 'markhelpful', 'role' => 'button', 'tabindex' => '0'));
+ array('class' => 'markhelpful onlyifreviewed', 'role' => 'button', 'tabindex' => '0'));
}
}
@@ -1139,18 +1181,19 @@ function moodleoverflow_print_post($post, $discussion, $moodleoverflow, $cm, $co
$link = '/mod/moodleoverflow/discussion.php';
if ($post->statusteacher) {
$commands[] = html_writer::tag('a', $str->marknotsolved,
- array('class' => 'marksolved', 'role' => 'button', 'tabindex' => '0'));
+ array('class' => 'marksolved onlyifreviewed', 'role' => 'button', 'tabindex' => '0'));
} else {
$commands[] = html_writer::tag('a', $str->marksolved,
- array('class' => 'marksolved', 'role' => 'button', 'tabindex' => '0'));
+ array('class' => 'marksolved onlyifreviewed', 'role' => 'button', 'tabindex' => '0'));
}
}
// Calculate the age of the post.
$age = time() - $post->created;
- // Make a link to edit your own post within the given time.
- if (($ownpost AND ($age < get_config('moodleoverflow', 'maxeditingtime')))
+ // Make a link to edit your own post within the given time and not already reviewed.
+ if (($ownpost AND ($age < get_config('moodleoverflow', 'maxeditingtime')) &&
+ (!review::should_post_be_reviewed($post, $moodleoverflow) || !$post->reviewed))
OR $cm->cache->caps['mod/moodleoverflow:editanypost']
) {
$editurl = new moodle_url('/mod/moodleoverflow/post.php', array('edit' => $post->id));
@@ -1167,22 +1210,26 @@ function moodleoverflow_print_post($post, $discussion, $moodleoverflow, $cm, $co
}
// Give the option to reply to a post.
- if ($canreply) {
+ if (moodleoverflow_user_can_post($modulecontext, $post, false)) {
+
+ $attributes = [
+ 'class' => 'onlyifreviewed'
+ ];
// Answer to the parent post.
if (empty($post->parent)) {
$replyurl = new moodle_url('/mod/moodleoverflow/post.php#mformmoodleoverflow', array('reply' => $post->id));
- $commands[] = array('url' => $replyurl, 'text' => $str->replyfirst);
+ $commands[] = array('url' => $replyurl, 'text' => $str->replyfirst, 'attributes' => $attributes);
// If the post is a comment, answer to the parent post.
} else if (!$iscomment) {
$replyurl = new moodle_url('/mod/moodleoverflow/post.php#mformmoodleoverflow', array('reply' => $post->id));
- $commands[] = array('url' => $replyurl, 'text' => $str->reply);
+ $commands[] = array('url' => $replyurl, 'text' => $str->reply, 'attributes' => $attributes);
// Else simple respond to the answer.
} else {
$replyurl = new moodle_url('/mod/moodleoverflow/post.php#mformmoodleoverflow', array('reply' => $iscomment));
- $commands[] = array('url' => $replyurl, 'text' => $str->reply);
+ $commands[] = array('url' => $replyurl, 'text' => $str->reply, 'attributes' => $attributes);
}
}
@@ -1317,6 +1364,13 @@ function moodleoverflow_print_post($post, $discussion, $moodleoverflow, $cm, $co
$options->trusted = false;
$options->context = $modulecontext;
+ $reviewdelay = get_config('moodleoverflow', 'reviewpossibleaftertime');
+ $mustachedata->reviewdelay = format_time($reviewdelay);
+ $mustachedata->needsreview = !$post->reviewed;
+ $reviewable = time() - $post->created > $reviewdelay;
+ $mustachedata->canreview = $cm->cache->caps['mod/moodleoverflow:reviewpost'];
+ $mustachedata->withinreviewperiod = $reviewable;
+
// Prepare the post.
$mustachedata->postcontent = format_text($post->message, $post->messageformat, $options, $course->id);
@@ -1327,12 +1381,12 @@ function moodleoverflow_print_post($post, $discussion, $moodleoverflow, $cm, $co
$commandhtml = array();
foreach ($commands as $command) {
if (is_array($command)) {
- $commandhtml[] = html_writer::link($command['url'], $command['text']);
+ $commandhtml[] = html_writer::link($command['url'], $command['text'], $command['attributes'] ?? null);
} else {
$commandhtml[] = $command;
}
}
- $mustachedata->commands = implode(' | ', $commandhtml);
+ $mustachedata->commands = implode('', $commandhtml);
// Print a footer if requested.
$mustachedata->footer = $footer;
@@ -1365,7 +1419,6 @@ function moodleoverflow_print_post($post, $discussion, $moodleoverflow, $cm, $co
* @param object $moodleoverflow The moodleoverflow object
* @param object $discussion The discussion object
* @param object $parent The object of the parent post
- * @param bool $canreply Whether the user has capabilities to reply
* @param bool $istracked Whether the user tracks the discussion
* @param array $posts Array of posts within the discussion
* @param bool $iscomment Whether the current post is a comment
@@ -1373,7 +1426,7 @@ function moodleoverflow_print_post($post, $discussion, $moodleoverflow, $cm, $co
* @return string The html output.
*/
function moodleoverflow_print_posts_nested($course, &$cm, $moodleoverflow, $discussion, $parent,
- $canreply, $istracked, $posts, $iscomment = null, $usermapping = []) {
+ $istracked, $posts, $iscomment = null, $usermapping = []) {
global $USER;
// Prepare the output.
@@ -1415,11 +1468,11 @@ function moodleoverflow_print_posts_nested($course, &$cm, $moodleoverflow, $disc
// Print the answer.
$output .= moodleoverflow_print_post($post, $discussion, $moodleoverflow, $cm, $course,
- $ownpost, $canreply, false, '', '', $postread, true, $istracked, $parentid, $usermapping, $level);
+ $ownpost, false, '', '', $postread, true, $istracked, $parentid, $usermapping, $level);
// Print its children.
$output .= moodleoverflow_print_posts_nested($course, $cm, $moodleoverflow,
- $discussion, $post, $canreply, $istracked, $posts, $parentid, $usermapping);
+ $discussion, $post, $istracked, $posts, $parentid, $usermapping);
// End the div.
$output .= "\n";
@@ -1516,6 +1569,7 @@ function moodleoverflow_add_attachment($post, $forum, $cm) {
* Adds a new post in an existing discussion.
*
* @param object $post The post object
+ * @param context_module $modulecontext
*
* @return bool|int The Id of the post if operation was successful
*/
@@ -1535,14 +1589,24 @@ function moodleoverflow_add_new_post($post) {
$post->totalscore = 0;
}
+ // Set to not reviewed, if posts should be reviewed, and user is not a reviewer themselves.
+ if (review::get_review_level($moodleoverflow) == review::EVERYTHING &&
+ !has_capability('mod/moodleoverflow:reviewpost', context_module::instance($cm->id))) {
+ $post->reviewed = 0;
+ } else {
+ $post->reviewed = 1;
+ }
+
// Add the post to the database.
$post->id = $DB->insert_record('moodleoverflow_posts', $post);
- $DB->set_field('moodleoverflow_posts', 'message', $post->message, array('id' => $post->id));
+ $DB->set_field('moodleoverflow_posts', 'message', $post->message, array('id' => $post->id)); // ??
moodleoverflow_add_attachment($post, $moodleoverflow, $cm);
- // Update the discussion.
- $DB->set_field('moodleoverflow_discussions', 'timemodified', $post->modified, array('id' => $post->discussion));
- $DB->set_field('moodleoverflow_discussions', 'usermodified', $post->userid, array('id' => $post->discussion));
+ if ($post->reviewed) {
+ // Update the discussion.
+ $DB->set_field('moodleoverflow_discussions', 'timemodified', $post->modified, array('id' => $post->discussion));
+ $DB->set_field('moodleoverflow_discussions', 'usermodified', $post->userid, array('id' => $post->discussion));
+ }
// Mark the created post as read if the user is tracking the discussion.
$cantrack = \mod_moodleoverflow\readtracking::moodleoverflow_can_track_moodleoverflows($moodleoverflow);
@@ -1585,10 +1649,12 @@ function moodleoverflow_update_post($newpost) {
}
}
- // Update the date and the user of the post and the discussion.
$post->modified = time();
- $discussion->timemodified = $post->modified;
- $discussion->usermodified = $post->userid;
+ if ($newpost->reviewed ?? $post->reviewed) {
+ // Update the date and the user of the post and the discussion.
+ $discussion->timemodified = $post->modified;
+ $discussion->usermodified = $post->userid;
+ }
// When editing the starting post of a discussion.
if (!$post->parent) {
@@ -1616,35 +1682,22 @@ function moodleoverflow_update_post($newpost) {
/**
* Count all replies of a post.
*
- * @param object $post The post object
- * @param bool $recursive Whether the deletion should be recursive
+ * @param object $post The post object
+ * @param bool $onlyreviewed Whether to count only reviewed posts.
*
* @return int Amount of replies
*/
-function moodleoverflow_count_replies($post, $recursive = null) {
+function moodleoverflow_count_replies($post, $onlyreviewed) {
global $DB;
- // Initiate the variable.
- $count = 0;
+ $conditions = ['parent' => $post->id];
- // Count the posts recursively?
- if (isset($recursive)) {
- // Get all the direct children.
- if ($childposts = $DB->get_records('moodleoverflow_posts', array('parent' => $post->id))) {
-
- // And count their children as well.
- foreach ($childposts as $childpost) {
- $count++;
- $count += moodleoverflow_count_replies($childpost, true);
- }
- }
- } else {
- // Just count the direct children.
- $count += $DB->count_records('moodleoverflow_posts', array('parent' => $post->id));
+ if ($onlyreviewed) {
+ $conditions['reviewed'] = '1';
}
// Return the amount of replies.
- return $count;
+ return $DB->count_records('moodleoverflow_posts', $conditions);
}
/**
@@ -1670,7 +1723,7 @@ function moodleoverflow_delete_discussion($discussion, $course, $cm, $moodleover
foreach ($posts as $post) {
$post->course = $discussion->course;
$post->moodleoverflow = $discussion->moodleoverflow;
- if (!moodleoverflow_delete_post($post, 'ignore', $course, $cm, $moodleoverflow)) {
+ if (!moodleoverflow_delete_post($post, 'ignore', $cm, $moodleoverflow)) {
// If the deletion failed, change the pointer.
$result = false;
@@ -1694,28 +1747,21 @@ function moodleoverflow_delete_discussion($discussion, $course, $cm, $moodleover
/**
* Deletes a single moodleoverflow post.
*
- * @param int $post The post ID
- * @param array $children The child posts
- * @param object $course The course object.
+ * @param object $post The post ID
+ * @param bool $deletechildren The child posts
* @param object $cm The course module
- * @param int $moodleoverflow The moodleoverflow ID
+ * @param object $moodleoverflow The moodleoverflow ID
*
* @return bool Whether the deletion was successful
*/
-function moodleoverflow_delete_post($post, $children, $course, $cm, $moodleoverflow) {
+function moodleoverflow_delete_post($post, $deletechildren, $cm, $moodleoverflow) {
global $DB, $USER;
// Iterate through all children and delete them.
$childposts = $DB->get_records('moodleoverflow_posts', array('parent' => $post->id));
- if (($children !== 'ignore') AND $childposts) {
- if ($children) {
- foreach ($childposts as $childpost) {
- moodleoverflow_delete_post($childpost, true, $course, $cm, $moodleoverflow);
- }
-
- } else {
- // If there are no children, return false.
- return false;
+ if ($deletechildren AND $childposts) {
+ foreach ($childposts as $childpost) {
+ moodleoverflow_delete_post($childpost, true, $cm, $moodleoverflow);
}
}
@@ -1773,10 +1819,11 @@ function moodleoverflow_discussion_update_last_post($discussionid) {
return false;
}
- // Find the last post of the discussion.
+ // Find the last reviewed post of the discussion. (even if user has review capability, because it is written to DB)
$sql = "SELECT id, userid, modified
FROM {moodleoverflow_posts}
WHERE discussion = ?
+ AND reviewed = 1
ORDER BY modified DESC";
// Find the new last post of the discussion.
diff --git a/markposts.php b/markposts.php
index 00f7889d7fb..9c1ba8b1d1e 100644
--- a/markposts.php
+++ b/markposts.php
@@ -106,7 +106,7 @@
}
// Mark all the discussions read.
- if (!\mod_moodleoverflow\readtracking::moodleoverflow_mark_discussion_read($discussionid, $user->id)) {
+ if (!\mod_moodleoverflow\readtracking::moodleoverflow_mark_discussion_read($discussionid, context_module::instance($cm->id), $user->id)) {
// Display an error, if something failes.
$message = get_string('markreadfailed', 'moodleoverflow');
diff --git a/mod_form.php b/mod_form.php
index 94107763161..a49187c1109 100644
--- a/mod_form.php
+++ b/mod_form.php
@@ -26,6 +26,7 @@
*/
use mod_moodleoverflow\anonymous;
+use mod_moodleoverflow\review;
defined('MOODLE_INTERNAL') || die();
@@ -88,6 +89,18 @@ public function definition() {
$mform->setDefault('anonymous', anonymous::NOT_ANONYMOUS);
}
+ if (get_config('moodleoverflow', 'allowreview') == 1) {
+ $possiblesettings = [
+ review::NOTHING => get_string('nothing', 'moodleoverflow'),
+ review::QUESTIONS => get_string('questions', 'moodleoverflow'),
+ review::EVERYTHING => get_string('questions_and_posts', 'moodleoverflow')
+ ];
+
+ $mform->addElement('select', 'needsreview', get_string('review', 'moodleoverflow'), $possiblesettings);
+ $mform->addHelpButton('needsreview', 'review', 'moodleoverflow');
+ $mform->setDefault('needsreview', review::NOTHING);
+ }
+
// Attachments.
$mform->addElement('header', 'attachmentshdr', get_string('attachments', 'moodleoverflow'));
diff --git a/post.php b/post.php
index 606c5b45d1c..530789f4f6c 100644
--- a/post.php
+++ b/post.php
@@ -22,8 +22,13 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+// TODO refactor this. For more readability, and to avoid security issues.
+
// Include config and locallib.
+use mod_moodleoverflow\review;
+
require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
+global $CFG, $USER, $DB, $PAGE, $SESSION, $OUTPUT;
require_once(dirname(__FILE__) . '/locallib.php');
require_once($CFG->libdir . '/completionlib.php');
@@ -213,7 +218,7 @@
$coursecontext = context_course::instance($course->id);
// Check whether the user is allowed to post.
- if (!moodleoverflow_user_can_post($moodleoverflow, $USER, $cm, $course, $modulecontext)) {
+ if (!moodleoverflow_user_can_post($modulecontext, $parent)) {
// Give the user the chance to enroll himself to the course.
if (!isguestuser() AND !is_enrolled($coursecontext)) {
@@ -295,12 +300,15 @@
$PAGE->set_cm($cm, $course, $moodleoverflow);
// Check if the post can be edited.
- $intime = ((time() - $post->created) > get_config('moodleoverflow', 'maxeditingtime'));
- if ($intime AND !has_capability('mod/moodleoverflow:editanypost', $modulecontext)) {
+ $beyondtime = ((time() - $post->created) > get_config('moodleoverflow', 'maxeditingtime'));
+ $alreadyreviewed = review::should_post_be_reviewed($post, $moodleoverflow) && $post->reviewed;
+ if (($beyondtime || $alreadyreviewed) AND !has_capability('mod/moodleoverflow:editanypost', $modulecontext)) {
throw new moodle_exception('maxtimehaspassed', 'moodleoverflow', '',
format_time(get_config('moodleoverflow', 'maxeditingtime')));
}
+
+
// If the current user is not the one who posted this post.
if ($post->userid <> $USER->id) {
@@ -360,7 +368,7 @@
}
// Count all replies of this post.
- $replycount = moodleoverflow_count_replies($post);
+ $replycount = moodleoverflow_count_replies($post, false);
// Has the user confirmed the deletion?
if (!empty($confirm) AND confirm_sesskey()) {
@@ -396,7 +404,7 @@
redirect("view.php?m=$discussion->moodleoverflow");
exit;
- } else if (moodleoverflow_delete_post($post, $deleteanypost, $course, $cm, $moodleoverflow)) {
+ } else if (moodleoverflow_delete_post($post, $deleteanypost, $cm, $moodleoverflow)) {
// Delete a single post.
// Redirect back to the discussion.
$discussionurl = new moodle_url('/mod/moodleoverflow/discussion.php', array('d' => $discussion->id));
@@ -527,6 +535,7 @@
$postmessage = empty($post->message) ? null : $post->message;
// Set data for the form.
+// TODO Refactor.
$param1 = (isset($discussion->id) ? array($discussion->id) : array());
$param2 = (isset($post->format) ? array('format' => $post->format) : array());
$param3 = (isset($discussion->timestart) ? array('timestart' => $discussion->timestart) : array());
@@ -598,7 +607,7 @@
$replypost = has_capability('mod/moodleoverflow:replypost', $modulecontext);
$startdiscussion = has_capability('mod/moodleoverflow:startdiscussion', $modulecontext);
$ownpost = ($realpost->userid == $USER->id);
- if (!((($ownpost AND $replypost OR $startdiscussion)) OR $editanypost)) {
+ if (!(($ownpost AND ($replypost OR $startdiscussion)) OR $editanypost)) {
throw new moodle_exception('cannotupdatepost', 'moodleoverflow');
}
diff --git a/renderer.php b/renderer.php
index 7ce983ebb5d..6790e97726b 100644
--- a/renderer.php
+++ b/renderer.php
@@ -66,7 +66,7 @@ public function render_post_dummy_cantsee($data) {
* @return bool|string
*/
public function render_question($data) {
- return $this->render_from_template('mod_moodleoverflow/question', $data);
+ return $this->render_from_template('mod_moodleoverflow/answer', $data);
}
/**
diff --git a/settings.php b/settings.php
index 09957e082f7..17f0359ee6e 100644
--- a/settings.php
+++ b/settings.php
@@ -93,6 +93,13 @@
$settings->add(new admin_setting_configcheckbox('moodleoverflow/allowratingchange',
get_string('allowratingchange', 'moodleoverflow'), get_string('configallowratingchange', 'moodleoverflow'), 1));
+ // Allow teachers to enable review before publish.
+ $settings->add(new admin_setting_configcheckbox('moodleoverflow/allowreview',
+ get_string('allowreview', 'moodleoverflow'), get_string('allowreview_desc', 'moodleoverflow'), 1));
+
+ $settings->add(new admin_setting_configtext('moodleoverflow/reviewpossibleaftertime', get_string('reviewpossibleaftertime', 'moodleoverflow'),
+ get_string('reviewpossibleaftertime_desc', 'moodleoverflow'), 3600, PARAM_INT));
+
// Set scales for the reputation.
$votesettings = [];
diff --git a/styles.css b/styles.css
index 9f517a65910..9127790d098 100644
--- a/styles.css
+++ b/styles.css
@@ -129,77 +129,17 @@
* The styles for the discussion.php
*/
.moodleoverflowpost {
- border: 1px solid #000;
- display: block;
margin: 0 0 1em 0;
max-width: 100%;
- padding: 0;
- position: relative;
-}
-
-.moodleoverflowpost .row {
position: relative;
- width: 100%;
-}
-
-.moodleoverflowpost .row .left {
- float: left;
- overflow: hidden;
- width: 43px;
-}
-
-.moodleoverflowpost .row .left + .no-overflow {
- max-width: calc(100% - 43px);
-}
-
-.moodleoverflowpost .row .left .votes {
- display: block;
- margin: 0 8px 0 0;
- text-align: center;
-}
-
-.moodleoverflowpost .row .left .votes p {
- margin-bottom: 0;
- margin-top: 0;
-}
-
-.moodleoverflowpost .row .left .votes .icon {
- color: #0a0;
- height: 24px;
- margin: 0;
- width: 24px;
-}
-
-.moodleoverflowpost .row .topic,
-.moodleoverflowpost .row .content-mask,
-.moodleoverflowpost .row .options {
- margin-left: 43px;
+ border-radius: 0;
+ display: flex;
}
.moodleoverflowpost .picture img {
margin: 4px;
}
-.moodleoverflowpost .options .commands,
-.moodleoverflowpost .content .attachments,
-.moodleoverflowpost .options .footer,
-.moodleoverflowpost .options .link {
- text-align: right;
-}
-
-.moodleoverflowpost .options .moodleoverflow-post-rating {
- float: left;
-}
-
-.moodleoverflowpost .content .posting {
- max-width: 100%;
- overflow: auto;
-}
-
-.moodleoverflowpost .content .attachedimages img {
- max-width: 100%;
-}
-
.moodleoverflowpost .post-word-count {
font-size: .85em;
font-style: italic;
@@ -210,7 +150,7 @@
padding: 0 .3em;
}
-:target ~ .moodleoverflowpost:before {
+.moodleoverflowpost:target:before {
background: #0070a8;
bottom: -1px;
content: "";
@@ -221,14 +161,6 @@
width: 4px;
}
-.moodleoverflowpost {
- border-radius: 0;
- display: flex;
- margin-bottom: 5px;
- position: relative;
- padding: 6px;
-}
-
.moodleoverflowpost.statusboth:before {
background: linear-gradient(80deg, rgba(234, 133, 22, 1) 50%, rgba(112, 160, 52, 1) 50%);
bottom: -1px;
@@ -296,45 +228,19 @@
margin-right: 10px;
}
-.moodleoverflowpost .content .posting.fullpost {
- margin-top: 8px;
-}
-
-.moodleoverflowpost .row.side {
- clear: both;
-}
-
-.moodleoverflowpost .options .commands {
- margin-left: 0;
-}
-
-.moodleoverflowpost .options .moodleoverflow-post-rating .icon {
- height: 20px;
- width: 24px;
-}
-
.moodleoverflowpost .subject {
font-weight: 700;
}
.moodleoverflowpost.unread .row.header,
-span.unread {
- background-color: #ffd;
+.mod_moodleoverflow-label-unread {
+ background-color: #fff38a;
}
.moodleoverflowpost.unread .row.header {
border-bottom: 1px solid #ddd;
}
-.moodleoverflowpost .row {
- margin-left: 0;
-}
-
-.moodleoverflowpost .row:before,
-.moodleoverflowpost .row:after {
- content: none;
-}
-
.moodleoverflowpost .topic .author {
color: #848d95;
}
@@ -391,6 +297,12 @@ span.unread {
color: grey;
}
+.moodleoverflowpost .post-menu > :not(:last-child) {
+ border-right: 2px solid #bbb;
+ padding-right: 4px;
+ margin-right: 4px;
+}
+
/*
* The Answers.
*/
@@ -531,8 +443,41 @@ span.unread {
border-color: #900000;
}
+.moodleoverflowpost.pendingreview > :first-child {
+ opacity: 0.6;
+ transition: opacity 200ms linear;
+}
+
+.moodleoverflowpost.pendingreview:hover > :first-child {
+ opacity: 1;
+}
+
+.moodleoverflowpost.pendingreview .onlyifreviewed {
+ display: none;
+}
+
+.moodleoverflowpost:not(.pendingreview) .onlyifnotreviewed {
+ display: none;
+}
+
@media (max-width: 600px) {
.hide-600 {
display: none;
}
+}
+
+.icon.moodleoverflow-icon-big {
+ font-size: 2em;
+ width: 32px;
+ height: 32px;
+}
+
+.mod_moodleoverflow-label-review,
+.mod_moodleoverflow-label-unread {
+ padding: 4px;
+ border-radius: 8px;
+}
+
+.mod_moodleoverflow-label-review {
+ background-color: #ffd3d3;
}
\ No newline at end of file
diff --git a/templates/answer.mustache b/templates/answer.mustache
index 193ac4ea624..f56562fcc56 100644
--- a/templates/answer.mustache
+++ b/templates/answer.mustache
@@ -30,93 +30,118 @@
{{/ isfirstunread}}
-{{! Print the anchor to the post. }}
-
-
{{! Start the post. Mark it read or unread. }}
-
- {{#showvotes}}
-
-
- {{> mod_moodleoverflow/postvoting }}
+
+
+ {{#showvotes}}
+
- {{/showvotes}}
- {{^showvotes}}
-
- {{/showvotes}}
-
+
-
+ {{> mod_moodleoverflow/postvoting }}
+
-
- {{{ postcontent }}}
-
-
- {{#attachments}}
- {{#image}}
- 
+ {{/showvotes}}
+ {{^showvotes}}
+
+ {{/showvotes}}
+ {{#needsreview}}
+
+ {{#pix}}i/pending-big, mod_moodleoverflow,
+ {{#withinreviewperiod}}
+ {{#str}}pending_review, mod_moodleoverflow{{/str}}
+ {{/withinreviewperiod}}
+ {{^withinreviewperiod}}
+ {{#str}}pending_review_but_cannot_now, mod_moodleoverflow, {{reviewdelay}} {{/str}}
+ {{/withinreviewperiod}}
+ {{/pix}}
+
+ {{/needsreview}}
+
+
+ {{{ postcontent }}}
+
+
+ {{#attachments}}
+ {{#image}}
+
+
+ {{/image}} + {{^image}} + + {{{icon}}} + + + {{filename}} + + {{/image}}
- {{/image}} - {{^image}} - - {{{icon}}} - - - {{filename}} - - {{/image}} -
- {{/attachments}} -
- + {{/image}} + {{^image}} + + {{{icon}}} + + + {{filename}} + + {{/image}}
- {{/image}} - {{^image}} - - {{{icon}}} - - - {{filename}} - - {{/image}} -
- {{/attachments}} -
-
-
+ {{/image}} + {{^image}} + + {{{icon}}} + + + {{filename}} + + {{/image}}
- {{/image}} - {{^image}} - - {{{icon}}} - - - {{filename}} - - {{/image}} -
- {{/attachments}} -
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum et auctor libero. Quisque porta egestas neque, et bibendum libero dignissim at. Nulla facilisi. Morbi eget accumsan felis. Nunc et vulputate odio, vel venenatis nisl. Nunc maximus ipsum sed tincidunt mollis. Integer nunc erat, luctus sit amet arcu tincidunt, volutpat dignissim mi. Sed ut magna quam. Mauris accumsan porta turpis sed aliquam. Etiam at justo tristique, imperdiet augue quis, consectetur sapien. Ut nec erat malesuada sem suscipit lobortis. Vivamus posuere nibh eu ipsum porta fringilla. Sed vitae dapibus ipsum, ac condimentum enim. Sed dignissim ante at elit mollis, ac tempor lacus iaculis. Etiam nec lectus vitae nibh vulputate volutpat. Nulla quis tellus aliquam, commodo nisi et, dictum est.
", + "parentpostlink": "", + "canreply": 1, + "replylink": "https://example.com/mod/moodleoverflow/post.php?reply=2", + "permalink": "https://example.com/mod/moodleoverflow/discuss.php?d=2#2", + "unsubscribemoodleoverflowlink": "https://example.com/mod/moodleoverflow/subscribe.php?id=2", + "unsubscribediscussionlink": "https://example.com/mod/discussion/subscribe.php?id=2&d=2" + } +}} ++ {{reason}} +{{/reason}} + +
+
+{{#str}}original_post, mod_moodleoverflow{{/str}} +
+
+ +
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum et auctor libero. Quisque porta egestas neque, et bibendum libero dignissim at. Nulla facilisi. Morbi eget accumsan felis. Nunc et vulputate odio, vel venenatis nisl. Nunc maximus ipsum sed tincidunt mollis. Integer nunc erat, luctus sit amet arcu tincidunt, volutpat dignissim mi. Sed ut magna quam. Mauris accumsan porta turpis sed aliquam. Etiam at justo tristique, imperdiet augue quis, consectetur sapien. Ut nec erat malesuada sem suscipit lobortis. Vivamus posuere nibh eu ipsum porta fringilla. Sed vitae dapibus ipsum, ac condimentum enim. Sed dignissim ante at elit mollis, ac tempor lacus iaculis. Etiam nec lectus vitae nibh vulputate volutpat. Nulla quis tellus aliquam, commodo nisi et, dictum est.
", + "parentpostlink": "", + "canreply": 1, + "replylink": "https://example.com/mod/moodleoverflow/post.php?reply=2", + "permalink": "https://example.com/mod/moodleoverflow/discuss.php?d=2#2", + "unsubscribemoodleoverflowlink": "https://example.com/mod/moodleoverflow/subscribe.php?id=2", + "unsubscribediscussionlink": "https://example.com/mod/discussion/subscribe.php?id=2&d=2" + } +}} +{{{ coursename }}} -> {{{ moodleoverflowname }}}{{# showdiscussionname }} -> {{{ discussionname }}} {{/ showdiscussionname }} + +{{^reason}} + {{#str}} your_post_was_rejected, mod_moodleoverflow {{/str}} +{{/reason}} +{{#reason}} + {{#str}} your_post_was_rejected_with_reason, mod_moodleoverflow {{/str}}: {{reason}} +{{/reason}} + + +{{#str}}original_post, mod_moodleoverflow{{/str}} +===================================================================== + + +{{{ subject }}} +{{# str }} bynameondate, mod_moodleoverflow, { +"name": {{# quote }}{{{ authorfullname }}}{{/ quote }}, +"date": {{# quote}}{{ postdate }}{{/ quote }} +} {{/ str }} +--------------------------------------------------------------------- +{{{ message }}} +--------------------------------------------------------------------- diff --git a/templates/email_review_needed_html.mustache b/templates/email_review_needed_html.mustache new file mode 100644 index 00000000000..933339da62b --- /dev/null +++ b/templates/email_review_needed_html.mustache @@ -0,0 +1,129 @@ +{{! + This file is part of Moodle - http://moodle.org/ + + Moodle is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Moodle is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Moodle. If not, seeLorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum et auctor libero. Quisque porta egestas neque, et bibendum libero dignissim at. Nulla facilisi. Morbi eget accumsan felis. Nunc et vulputate odio, vel venenatis nisl. Nunc maximus ipsum sed tincidunt mollis. Integer nunc erat, luctus sit amet arcu tincidunt, volutpat dignissim mi. Sed ut magna quam. Mauris accumsan porta turpis sed aliquam. Etiam at justo tristique, imperdiet augue quis, consectetur sapien. Ut nec erat malesuada sem suscipit lobortis. Vivamus posuere nibh eu ipsum porta fringilla. Sed vitae dapibus ipsum, ac condimentum enim. Sed dignissim ante at elit mollis, ac tempor lacus iaculis. Etiam nec lectus vitae nibh vulputate volutpat. Nulla quis tellus aliquam, commodo nisi et, dictum est.
", + "parentpostlink": "", + "canreply": 1, + "replylink": "https://example.com/mod/moodleoverflow/post.php?reply=2", + "permalink": "https://example.com/mod/moodleoverflow/discuss.php?d=2#2", + "unsubscribemoodleoverflowlink": "https://example.com/mod/moodleoverflow/subscribe.php?id=2", + "unsubscribediscussionlink": "https://example.com/mod/discussion/subscribe.php?id=2&d=2" + } +}} +{{#str}}review_needed, mod_moodleoverflow{{/str}}
+ +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum et auctor libero. Quisque porta egestas neque, et bibendum libero dignissim at. Nulla facilisi. Morbi eget accumsan felis. Nunc et vulputate odio, vel venenatis nisl. Nunc maximus ipsum sed tincidunt mollis. Integer nunc erat, luctus sit amet arcu tincidunt, volutpat dignissim mi. Sed ut magna quam. Mauris accumsan porta turpis sed aliquam. Etiam at justo tristique, imperdiet augue quis, consectetur sapien. Ut nec erat malesuada sem suscipit lobortis. Vivamus posuere nibh eu ipsum porta fringilla. Sed vitae dapibus ipsum, ac condimentum enim. Sed dignissim ante at elit mollis, ac tempor lacus iaculis. Etiam nec lectus vitae nibh vulputate volutpat. Nulla quis tellus aliquam, commodo nisi et, dictum est.
", + "parentpostlink": "", + "canreply": 1, + "replylink": "https://example.com/mod/moodleoverflow/post.php?reply=2", + "permalink": "https://example.com/mod/moodleoverflow/discuss.php?d=2#2", + "unsubscribemoodleoverflowlink": "https://example.com/mod/moodleoverflow/subscribe.php?id=2", + "unsubscribediscussionlink": "https://example.com/mod/discussion/subscribe.php?id=2&d=2" + } +}} +{{{ coursename }}} -> {{{ moodleoverflowname }}}{{# showdiscussionname }} -> {{{ discussionname }}} {{/ showdiscussionname }} + +{{# str }}review_needed, mod_moodleoverflow {{/str}}: {{ permalink }} + +{{{ subject }}} +{{# str }} bynameondate, mod_moodleoverflow, { +"name": {{# quote }}{{{ authorfullname }}}{{/ quote }}, +"date": {{# quote}}{{ postdate }}{{/ quote }} +} {{/ str }} +--------------------------------------------------------------------- +{{{ message }}} +--------------------------------------------------------------------- diff --git a/templates/question.mustache b/templates/question.mustache deleted file mode 100644 index 0787589f3b9..00000000000 --- a/templates/question.mustache +++ /dev/null @@ -1,102 +0,0 @@ -{{! - This file is part of Moodle - http://moodle.org/ - - Moodle is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Moodle is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Moodle. If not, see- {{/image}} - {{^image}} - - {{{icon}}} - - - {{filename}} - - {{/image}} -
- {{/attachments}} -