Skip to content

Commit

Permalink
resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@TamaroWalter
TamaroWalter committed Jul 2, 2024
2 parents 0552964 + 17514af commit 714236b
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 87 deletions.
117 changes: 40 additions & 77 deletions classes/ratings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ratings {
* @return bool|int
*/
public static function moodleoverflow_add_rating($moodleoverflow, $postid, $rating, $cm, $userid) {
global $DB, $SESSION;
global $DB;

// Is the submitted rating valid?
$possibleratings = [RATING_NEUTRAL, RATING_DOWNVOTE, RATING_UPVOTE, RATING_SOLVED,
Expand Down Expand Up @@ -78,16 +78,8 @@ public static function moodleoverflow_add_rating($moodleoverflow, $postid, $rati
if (!self::moodleoverflow_user_can_rate($post, $modulecontext, $userid)) {

// Catch unenrolled users.
if (!isguestuser() && !is_enrolled($coursecontext)) {
$SESSION->wantsurl = qualified_me();
$SESSION->enrolcancel = get_local_referer(false);
redirect(new \moodle_url('/enrol/index.php', [
'id' => $course->id,
'returnurl' => '/mod/moodleoverflow/view.php?m' . $moodleoverflow->id,
]), get_string('youneedtoenrol'));
}
//$returnurl = '/mod/moodleoverflow/view.php?m' . $moodleoverflow->id;
//moodleoverflow_catch_unenrolled_user($coursecontext, $course->id, $returnurl);
$returnurl = '/mod/moodleoverflow/view.php?m' . $moodleoverflow->id;
moodleoverflow_catch_unenrolled_user($coursecontext, $course->id, $returnurl);

// Notify the user, that he can not post a new discussion.
throw new moodle_exception('noratemoodleoverflow', 'moodleoverflow');
Expand All @@ -112,22 +104,13 @@ public static function moodleoverflow_add_rating($moodleoverflow, $postid, $rati

// Mark a post as solution or as helpful.
if ($rating == RATING_SOLVED || $rating == RATING_HELPFUL) {

// Check if the current user is the startuser.
if ($rating == RATING_HELPFUL && $userid != $discussion->userid) {
throw new moodle_exception('notstartuser', 'moodleoverflow');
}
// Make sure that a helpful mark is made by the user who started the discussion.
//$isnotstartuser = $rating == RATING_HELPFUL && $userid != $discussion->userid;
//moodleoverflow_throw_exception_with_check($isnotstartuser, 'nostartuser');
$isnotstartuser = $rating == RATING_HELPFUL && $userid != $discussion->userid;
moodleoverflow_throw_exception_with_check($isnotstartuser, 'nostartuser');

// Check if the current user is a teacher.
if ($rating == RATING_SOLVED && !has_capability('mod/moodleoverflow:marksolved', $modulecontext)) {
throw new moodle_exception('notteacher', 'moodleoverflow');
}
// Make sure that a solution mark is made by a teacher (or someone with the right capability).
//$isnotteacher = $rating == RATING_SOLVED && !has_capability('mod/moodleoverflow:marksolved', $modulecontext);
//moodleoverflow_throw_exception_with_check($isnotteacher, 'notteacher');
$isnotteacher = $rating == RATING_SOLVED && !has_capability('mod/moodleoverflow:marksolved', $modulecontext);
moodleoverflow_throw_exception_with_check($isnotteacher, 'notteacher');

// Check if multiple marks are not enabled.
if (!$multiplemarks) {
Expand Down Expand Up @@ -400,53 +383,37 @@ public static function moodleoverflow_get_reputation_instance($moodleoverflowid,

// Initiate a variable.
$reputation = 0;
// Get all posts of this user in this module.
// Do not count votes for own posts.
$sql = "SELECT r.id, r.postid as post, r.rating
FROM {moodleoverflow_posts} p
JOIN {moodleoverflow_ratings} r ON p.id = r.postid
JOIN {moodleoverflow} m ON r.moodleoverflowid = m.id
WHERE p.userid = ? AND NOT r.userid = ? AND r.moodleoverflowid = ? AND m.anonymous <> ?";

if ($moodleoverflow->anonymous == anonymous::QUESTION_ANONYMOUS) {
$sql .= " AND p.parent <> 0 ";
}

if ($moodleoverflow->anonymous != anonymous::EVERYTHING_ANONYMOUS) {

// Get all posts of this user in this module.
// Do not count votes for own posts.
$sql = "SELECT r.id, r.postid as post, r.rating
FROM {moodleoverflow_posts} p
JOIN {moodleoverflow_ratings} r ON p.id = r.postid
WHERE p.userid = ? AND NOT r.userid = ? AND r.moodleoverflowid = ? ";

if ($moodleoverflow->anonymous == anonymous::QUESTION_ANONYMOUS) {
$sql .= " AND p.parent <> 0 ";
}

$sql .= "ORDER BY r.postid ASC";

$params = [$userid, $userid, $moodleoverflowid];
$records = $DB->get_records_sql($sql, $params);

// Check if there are results.
$records = (isset($records)) ? $records : [];

// Iterate through all ratings.
foreach ($records as $record) {
$sql .= "ORDER BY r.postid ASC";

// The rating is a downvote.
if ($record->rating == RATING_DOWNVOTE) {
$params = [$userid, $userid, $moodleoverflowid, anonymous::EVERYTHING_ANONYMOUS];
$records = $DB->get_records_sql($sql, $params);
// Iterate through all ratings.
foreach ($records as $record) {
switch ($record->rating) {
case RATING_DOWNVOTE:
$reputation += get_config('moodleoverflow', 'votescaledownvote');
continue;
}

// The rating is an upvote.
if ($record->rating == RATING_UPVOTE) {
break;
case RATING_UPVOTE:
$reputation += get_config('moodleoverflow', 'votescaleupvote');
continue;
}

// The post has been marked as helpful by the question owner.
if ($record->rating == RATING_HELPFUL) {
break;
case RATING_HELPFUL:
$reputation += get_config('moodleoverflow', 'votescalehelpful');
continue;
}

// The post has been marked as solved by a teacher.
if ($record->rating == RATING_SOLVED) {
break;
case RATING_SOLVED:
$reputation += get_config('moodleoverflow', 'votescalesolved');
}
break;
}
}

Expand Down Expand Up @@ -524,33 +491,29 @@ private static function moodleoverflow_check_old_rating($postid, $userid, $oldra
// Initiate the array.
$rating = [];

// Get the normal rating.
$sql = "SELECT *
FROM {moodleoverflow_ratings}
WHERE userid = ? AND postid = ? AND (rating = 1 OR rating = 2)";
$rating['normal'] = $DB->get_record_sql($sql, [ $userid, $postid ]);
FROM {moodleoverflow_ratings}";
// Get the normal rating.
$condition = "WHERE userid = ? AND postid = ? AND (rating = 1 OR rating = 2)";
$rating['normal'] = $DB->get_record_sql($sql . $condition, [ $userid, $postid ]);

// Return the rating if it is requested.
if ($oldrating == RATING_DOWNVOTE || $oldrating == RATING_UPVOTE) {
return $rating['normal'];
}

// Get the solved rating.
$sql = "SELECT *
FROM {moodleoverflow_ratings}
WHERE postid = ? AND rating = 3";
$rating['solved'] = $DB->get_record_sql($sql, [ $postid ]);
$condition = "WHERE postid = ? AND rating = 3";
$rating['solved'] = $DB->get_record_sql($sql . $condition, [ $postid ]);

// Return the rating if it is requested.
if ($oldrating == RATING_SOLVED) {
return $rating['solved'];
}

// Get the helpful rating.
$sql = "SELECT *
FROM {moodleoverflow_ratings}
WHERE postid = ? AND rating = 4";
$rating['helpful'] = $DB->get_record_sql($sql, [ $postid ]);
$condition = "WHERE postid = ? AND rating = 4";
$rating['helpful'] = $DB->get_record_sql($sql . $condition, [ $postid ]);

// Return the rating if it is requested.
if ($oldrating == RATING_HELPFUL) {
Expand Down
14 changes: 4 additions & 10 deletions classes/readtracking.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,8 @@ public static function moodleoverflow_mark_moodleoverflow_read($cm, $userid = nu
// Iterate through all of this discussions.
foreach ($discussions as $discussionid) {
// Mark the discussion as read.
if (!self::moodleoverflow_mark_discussion_read($discussionid, context_module::instance($cm->id), $userid)) {
throw new moodle_exception('markreadfailed', 'moodleoverflow');
}
// $markedcheck = self::moodleoverflow_mark_discussion_read($discussionid, context_module::instance($cm->id), $userid);
// moodleoverflow_throw_exception_with_check($markedcheck !== true, 'markreadfailed');
$markedcheck = self::moodleoverflow_mark_discussion_read($discussionid, context_module::instance($cm->id), $userid);
moodleoverflow_throw_exception_with_check($markedcheck !== true, 'markreadfailed');
}

return true;
Expand Down Expand Up @@ -168,11 +165,8 @@ public static function moodleoverflow_mark_discussion_read($discussionid, $modco
}

// Mark the post as read.
if (!self::moodleoverflow_mark_post_read($userid, $post)) {
throw new moodle_exception('markreadfailed', 'moodleoverflow');
}
//$postreadcheck = self::moodleoverflow_mark_post_read($userid, $post);
//moodleoverflow_throw_exception_with_check(!$postreadcheck, 'markreadfailed');
$postreadcheck = self::moodleoverflow_mark_post_read($userid, $post);
moodleoverflow_throw_exception_with_check(!$postreadcheck, 'markreadfailed');
}

// The discussion has been marked as read.
Expand Down
3 changes: 3 additions & 0 deletions discussion.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
* @copyright 2017 Kennet Winter <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();

global $CFG, $DB, $PAGE, $USER, $SESSION, $OUTPUT;

// Include config and locallib.
require_once('../../config.php');
Expand Down
3 changes: 3 additions & 0 deletions index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
* @copyright 2017 Kennet Winter <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();

global $CFG, $DB, $PAGE, $USER, $SESSION, $OUTPUT;

// Require needed files.
use core\context\course;
Expand Down

0 comments on commit 714236b

Please sign in to comment.