Recent activity functions should have been in lib.php, not locallib.php

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 6e256d89d60dedd837e2b8ea6e34f6bb8002040f..ecb53d03c6382cf2cc999a8b5b5def9a4a3cc68b 100644 (file)
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -394,4 +394,107 @@ function quiz_refresh_events($courseid = 0) {
     return true;
 }
 
+
+function quiz_get_recent_mod_activity(&$activities, &$index, $sincetime, $courseid, $quiz="0", $user="", $groupid="") {
+// Returns all quizzes since a given time.  If quiz is specified then
+// this restricts the results
+
+    global $CFG;
+
+    if ($quiz) {
+        $quizselect = " AND cm.id = '$quiz'";
+    } else {
+        $quizselect = "";
+    }
+    if ($user) {
+        $userselect = " AND u.id = '$user'";
+    } else {
+        $userselect = "";
+    }
+
+    $quizzes = get_records_sql("SELECT qa.*, q.name, u.firstname, u.lastname, u.picture,
+                                       q.course, q.sumgrades as maxgrade, cm.instance, cm.section
+                                  FROM {$CFG->prefix}quiz_attempts qa,
+                                       {$CFG->prefix}quiz q,
+                                       {$CFG->prefix}user u,
+                                       {$CFG->prefix}course_modules cm
+                                 WHERE qa.timefinish > '$sincetime'
+                                   AND qa.userid = u.id $userselect
+                                   AND qa.quiz = q.id $quizselect
+                                   AND cm.instance = q.id
+                                   AND cm.course = '$courseid'
+                                   AND q.course = cm.course
+                                 ORDER BY qa.timefinish ASC");
+
+    if (empty($quizzes))
+      return;
+
+    foreach ($quizzes as $quiz) {
+        if (empty($groupid) || ismember($groupid, $quiz->userid)) {
+
+          $tmpactivity->type = "quiz";
+          $tmpactivity->defaultindex = $index;
+          $tmpactivity->instance = $quiz->quiz;
+
+          $tmpactivity->name = $quiz->name;
+          $tmpactivity->section = $quiz->section;
+
+          $tmpactivity->content->attemptid = $quiz->id;
+          $tmpactivity->content->sumgrades = $quiz->sumgrades;
+          $tmpactivity->content->maxgrade = $quiz->maxgrade;
+          $tmpactivity->content->attempt = $quiz->attempt;
+
+          $tmpactivity->user->userid = $quiz->userid;
+          $tmpactivity->user->fullname = fullname($quiz);
+          $tmpactivity->user->picture = $quiz->picture;
+
+          $tmpactivity->timestamp = $quiz->timefinish;
+
+          $activities[] = $tmpactivity;
+
+          $index++;
+        }
+    }
+
+  return;
+}
+
+
+function quiz_print_recent_mod_activity($activity, $course, $detail=false) {
+    global $CFG, $THEME;
+
+    echo '<table border="0" cellpadding="3" cellspacing="0">';
+
+    echo "<tr><td bgcolor=\"$THEME->cellcontent2\" class=\"forumpostpicture\" width=\"35\" valign=\"top\">";
+    print_user_picture($activity->user->userid, $course, $activity->user->picture);
+    echo "</td><td width=\"100%\"><font size=\"2\">";
+
+    if ($detail) {
+        echo "<img src=\"$CFG->modpixpath/$activity->type/icon.gif\" ".
+             "height=\"16\" width=\"16\" alt=\"$activity->type\" />  ";
+        echo "<a href=\"$CFG->wwwroot/mod/quiz/view.php?id=" . $activity->instance . "\">"
+             . $activity->name . "</a> - ";
+
+    }
+
+    if (isteacher($course)) {
+        $grades = "(" .  $activity->content->sumgrades . " / " . $activity->content->maxgrade . ") ";
+        echo "<a href=\"$CFG->wwwroot/mod/quiz/review.php?q="
+             . $activity->instance . "&amp;attempt="
+             . $activity->content->attemptid . "\">" . $grades . "</a> ";
+
+        echo  get_string("attempt", "quiz") . " - " . $activity->content->attempt . "<br />";
+    }
+    echo "<a href=\"$CFG->wwwroot/user/view.php?id="
+         . $activity->user->userid . "&amp;course=$course\">"
+         . $activity->user->fullname . "</a> ";
+
+    echo " - " . userdate($activity->timestamp);
+
+    echo "</font></td></tr>";
+    echo "</table>";
+
+    return;
+}
+
 ?>

diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index 65cf19090a2682591c862f74d4b1f4dda5b69f1e..f6e0d4b572e73b22381c876da96f22451fae819d 100644 (file)
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -1650,107 +1650,6 @@ function quiz_grade_responses($quiz, $questions, $attemptid=0) {
     return $result;
 }
 
-function quiz_get_recent_mod_activity(&$activities, &$index, $sincetime, $courseid, $quiz="0", $user="", $groupid="") {
-// Returns all quizzes since a given time.  If quiz is specified then
-// this restricts the results
-
-    global $CFG;
-
-    if ($quiz) {
-        $quizselect = " AND cm.id = '$quiz'";
-    } else {
-        $quizselect = "";
-    }
-    if ($user) {
-        $userselect = " AND u.id = '$user'";
-    } else {
-        $userselect = "";
-    }
-
-    $quizzes = get_records_sql("SELECT qa.*, q.name, u.firstname, u.lastname, u.picture,
-                                       q.course, q.sumgrades as maxgrade, cm.instance, cm.section
-                                  FROM {$CFG->prefix}quiz_attempts qa,
-                                       {$CFG->prefix}quiz q,
-                                       {$CFG->prefix}user u,
-                                       {$CFG->prefix}course_modules cm
-                                 WHERE qa.timefinish > '$sincetime'
-                                   AND qa.userid = u.id $userselect
-                                   AND qa.quiz = q.id $quizselect
-                                   AND cm.instance = q.id
-                                   AND cm.course = '$courseid'
-                                   AND q.course = cm.course
-                                 ORDER BY qa.timefinish ASC");
-
-    if (empty($quizzes))
-      return;
-
-    foreach ($quizzes as $quiz) {
-        if (empty($groupid) || ismember($groupid, $quiz->userid)) {
-
-          $tmpactivity->type = "quiz";
-          $tmpactivity->defaultindex = $index;
-          $tmpactivity->instance = $quiz->quiz;
-
-          $tmpactivity->name = $quiz->name;
-          $tmpactivity->section = $quiz->section;
-
-          $tmpactivity->content->attemptid = $quiz->id;
-          $tmpactivity->content->sumgrades = $quiz->sumgrades;
-          $tmpactivity->content->maxgrade = $quiz->maxgrade;
-          $tmpactivity->content->attempt = $quiz->attempt;
-
-          $tmpactivity->user->userid = $quiz->userid;
-          $tmpactivity->user->fullname = fullname($quiz);
-          $tmpactivity->user->picture = $quiz->picture;
-
-          $tmpactivity->timestamp = $quiz->timefinish;
-
-          $activities[] = $tmpactivity;
-
-          $index++;
-        }
-    }
-
-  return;
-}
-
-
-function quiz_print_recent_mod_activity($activity, $course, $detail=false) {
-    global $CFG, $THEME;
-
-    echo '<table border="0" cellpadding="3" cellspacing="0">';
-
-    echo "<tr><td bgcolor=\"$THEME->cellcontent2\" class=\"forumpostpicture\" width=\"35\" valign=\"top\">";
-    print_user_picture($activity->user->userid, $course, $activity->user->picture);
-    echo "</td><td width=\"100%\"><font size=\"2\">";
-
-    if ($detail) {
-        echo "<img src=\"$CFG->modpixpath/$activity->type/icon.gif\" ".
-             "height=\"16\" width=\"16\" alt=\"$activity->type\" />  ";
-        echo "<a href=\"$CFG->wwwroot/mod/quiz/view.php?id=" . $activity->instance . "\">"
-             . $activity->name . "</a> - ";
-
-    }
-
-    if (isteacher($USER)) {
-        $grades = "(" .  $activity->content->sumgrades . " / " . $activity->content->maxgrade . ") ";
-        echo "<a href=\"$CFG->wwwroot/mod/quiz/review.php?q="
-             . $activity->instance . "&amp;attempt="
-             . $activity->content->attemptid . "\">" . $grades . "</a> ";
-
-        echo  get_string("attempt", "quiz") . " - " . $activity->content->attempt . "<br />";
-    }
-    echo "<a href=\"$CFG->wwwroot/user/view.php?id="
-         . $activity->user->userid . "&amp;course=$course\">"
-         . $activity->user->fullname . "</a> ";
-
-    echo " - " . userdate($activity->timestamp);
-
-    echo "</font></td></tr>";
-    echo "</table>";
-
-    return;
-}
 
 // this function creates default export filename
 function default_export_filename($course,$category) {