Permalink
Browse files

Moved a couple of functions back to lib.php from locallib.php

  • Loading branch information...
1 parent c8c6d4e commit de7200645a1c59c865bef923e2141b523bbe9a20 rkingdon committed Jun 18, 2004
Showing with 20 additions and 17 deletions.
  1. +18 −0 mod/exercise/lib.php
  2. +2 −17 mod/exercise/locallib.php
View
@@ -594,6 +594,24 @@ function exercise_get_participants($exerciseid) {
return ($st_submissions);
}
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+// Non-standard Exercise functions
+///////////////////////////////////////////////////////////////////////////////////////////////
+function exercise_file_area($exercise, $submission) {
+ return make_upload_directory( exercise_file_area_name($exercise, $submission) );
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+function exercise_file_area_name($exercise, $submission) {
+// Creates a directory file name, suitable for make_upload_directory()
+ global $CFG;
+
+ return "$exercise->course/$CFG->moddata/exercise/$submission->id";
+}
+
+
///////////////////////////////////////////////////////////////////////////////////////////////
function exercise_get_assess_logs($course, $timestart) {
// get the "assess" entries for this user and add the first and last names...
View
@@ -24,8 +24,8 @@ function exercise_count_user_submissions($exercise, $user) {
function exercise_delete_submitted_files($exercise, $submission) {
function exercise_delete_user_files($exercise, $user, $exception) {
-function exercise_file_area($exercise, $submission) {
-function exercise_file_area_name($exercise, $submission) {
+function exercise_file_area($exercise, $submission) { <--- in lib.php
+function exercise_file_area_name($exercise, $submission) { <--- in lib.php
function exercise_get_assess_logs($course, $timestart) { <--- in lib.php
function exercise_get_assessments($submission) <--- in lib.php{
@@ -400,21 +400,6 @@ function exercise_delete_user_files($exercise, $user, $exception) {
///////////////////////////////////////////////////////////////////////////////////////////////
-function exercise_file_area($exercise, $submission) {
- return make_upload_directory( exercise_file_area_name($exercise, $submission) );
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-function exercise_file_area_name($exercise, $submission) {
-// Creates a directory file name, suitable for make_upload_directory()
- global $CFG;
-
- return "$exercise->course/$CFG->moddata/exercise/$submission->id";
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////
function exercise_get_best_submission_grades($exercise) {
// Returns the grades of students' best submissions
global $CFG;

0 comments on commit de72006

Please sign in to comment.