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

diff --git a/mod/exercise/lib.php b/mod/exercise/lib.php
index 0ca4a5631122c7083d25c890500e3596602db9e9..6b262d5e49052e955688240e35d1554cc5611113 100644 (file)
--- a/mod/exercise/lib.php
+++ b/mod/exercise/lib.php
@@ -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...

diff --git a/mod/exercise/locallib.php b/mod/exercise/locallib.php
index 17f54323ac81ea6b2e1fc13fa592022fca7bb08b..be30932af94b33e7228e473b1232950486698634 100644 (file)
--- a/mod/exercise/locallib.php
+++ b/mod/exercise/locallib.php
@@ -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{
@@ -399,21 +399,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