Skip to content
Browse files

Fix to account for people not in course

  • Loading branch information...
1 parent ab2eafe commit 96e0ad26b6149c4799835829ed9e1bb3f4cb1905 martin committed Jul 27, 2002
Showing with 12 additions and 7 deletions.
  1. +12 −7 mod/journal/lib.php
View
19 mod/journal/lib.php
@@ -80,10 +80,10 @@ function journal_cron () {
$cutofftime = time() - $CFG->maxeditingtime;
- if ($entries = get_records_sql("SELECT e.*, j.course, j.name
+ if ($entries = get_records_sql("SELECT e.*, j.course, j.name
FROM journal_entries e, journal j
- WHERE e.mailed = '0' AND
- e.timemarked < '$cutofftime' AND e.timemarked > 0
+ WHERE e.mailed = '0'
+ AND e.timemarked < '$cutofftime' AND e.timemarked > 0
AND e.journal = j.id")) {
$timenow = time();
@@ -96,16 +96,21 @@ function journal_cron () {
continue;
}
- if (! $teacher = get_record("user", "id", "$entry->teacher")) {
- echo "Could not find teacher $entry->teacher\n";
+ if (! $course = get_record("course", "id", "$entry->course")) {
+ echo "Could not find course $entry->course\n";
continue;
}
- if (! $course = get_record("course", "id", "$entry->course")) {
- echo "Could not find course $entry->course\n";
+ if (! isstudent($course->id, $user->id) and !isteacher($course->id, $user->id)) {
+ continue; // Not an active participant
+ }
+
+ if (! $teacher = get_record("user", "id", "$entry->teacher")) {
+ echo "Could not find teacher $entry->teacher\n";
continue;
}
+
if (! $mod = get_coursemodule_from_instance("journal", $entry->journal, $course->id)) {
echo "Could not find course module for journal id $entry->journal\n";
continue;

0 comments on commit 96e0ad2

Please sign in to comment.
Something went wrong with that request. Please try again.