MDL-34225 course completion : move /lib/completion/* up to /completion

NoelDeMartin · Jul 10, 2012 · 7534234 · 7534234
1 parent d71b79a
commit 7534234
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 21 deletions.
diff --git a/lib/completion/completion_aggregation.php → completion/completion_aggregation.php b/lib/completion/completion_aggregation.php → completion/completion_aggregation.php
@@ -26,7 +26,7 @@
  */
 
 defined('MOODLE_INTERNAL') || die();
-require_once($CFG->libdir.'/completion/data_object.php');
+require_once($CFG->dirroot.'/completion/data_object.php');
 
 /**
  * Course completion critieria aggregation

diff --git a/lib/completion/completion_completion.php → completion/completion_completion.php b/lib/completion/completion_completion.php → completion/completion_completion.php
@@ -25,7 +25,7 @@
  */
 
 defined('MOODLE_INTERNAL') || die();
-require_once($CFG->libdir.'/completion/data_object.php');
+require_once($CFG->dirroot.'/completion/data_object.php');
 
 /**
  * Course completion status for a particular user/course

diff --git a/lib/completion/completion_criteria.php → completion/completion_criteria.php b/lib/completion/completion_criteria.php → completion/completion_criteria.php
@@ -25,8 +25,8 @@
  */
 
 defined('MOODLE_INTERNAL') || die();
-require_once($CFG->libdir.'/completion/data_object.php');
-require_once($CFG->libdir.'/completion/completion_criteria_completion.php');
+require_once($CFG->dirroot.'/completion/data_object.php');
+require_once($CFG->dirroot.'/completion/completion_criteria_completion.php');
 
 /**
  * Self completion criteria type
@@ -172,7 +172,7 @@ public static function factory($params) {
         }
 
         $class = 'completion_criteria_'.$COMPLETION_CRITERIA_TYPES[$params['criteriatype']];
-        require_once($CFG->libdir.'/completion/'.$class.'.php');
+        require_once($CFG->dirroot.'/completion/'.$class.'.php');
 
         return new $class($params, false);
     }

diff --git a/...mpletion/completion_criteria_activity.php → completion/completion_criteria_activity.php b/...mpletion/completion_criteria_activity.php → completion/completion_criteria_activity.php
diff --git a/...letion/completion_criteria_completion.php → ...letion/completion_criteria_completion.php b/...letion/completion_criteria_completion.php → ...letion/completion_criteria_completion.php
@@ -25,7 +25,7 @@
  */
 
 defined('MOODLE_INTERNAL') || die();
-require_once($CFG->libdir.'/completion/data_object.php');
+require_once($CFG->dirroot.'/completion/data_object.php');
 
 /**
  * Completion data for a specific user, course and critieria

diff --git a/...completion/completion_criteria_course.php → completion/completion_criteria_course.php b/...completion/completion_criteria_course.php → completion/completion_criteria_course.php
diff --git a/lib/completion/completion_criteria_date.php → completion/completion_criteria_date.php b/lib/completion/completion_criteria_date.php → completion/completion_criteria_date.php
diff --git a/...mpletion/completion_criteria_duration.php → completion/completion_criteria_duration.php b/...mpletion/completion_criteria_duration.php → completion/completion_criteria_duration.php
diff --git a/lib/completion/completion_criteria_grade.php → completion/completion_criteria_grade.php b/lib/completion/completion_criteria_grade.php → completion/completion_criteria_grade.php
diff --git a/lib/completion/completion_criteria_role.php → completion/completion_criteria_role.php b/lib/completion/completion_criteria_role.php → completion/completion_criteria_role.php
diff --git a/lib/completion/completion_criteria_self.php → completion/completion_criteria_self.php b/lib/completion/completion_criteria_self.php → completion/completion_criteria_self.php
diff --git a/...ompletion/completion_criteria_unenrol.php → completion/completion_criteria_unenrol.php b/...ompletion/completion_criteria_unenrol.php → completion/completion_criteria_unenrol.php
diff --git a/lib/completion/cron.php → completion/cron.php b/lib/completion/cron.php → completion/cron.php
@@ -207,7 +207,7 @@ function completion_cron_criteria() {
     foreach ($COMPLETION_CRITERIA_TYPES as $type) {
 
         $object = 'completion_criteria_'.$type;
-        require_once $CFG->libdir.'/completion/'.$object.'.php';
+        require_once 'completion/'.$object.'.php';
 
         $class = new $object();
 

diff --git a/lib/completion/data_object.php → completion/data_object.php b/lib/completion/data_object.php → completion/data_object.php
diff --git a/course/completion.php b/course/completion.php
@@ -28,14 +28,14 @@
 require_once('../config.php');
 require_once('lib.php');
 require_once($CFG->libdir.'/completionlib.php');
-require_once($CFG->libdir.'/completion/completion_criteria_self.php');
-require_once($CFG->libdir.'/completion/completion_criteria_date.php');
-require_once($CFG->libdir.'/completion/completion_criteria_unenrol.php');
-require_once($CFG->libdir.'/completion/completion_criteria_activity.php');
-require_once($CFG->libdir.'/completion/completion_criteria_duration.php');
-require_once($CFG->libdir.'/completion/completion_criteria_grade.php');
-require_once($CFG->libdir.'/completion/completion_criteria_role.php');
-require_once($CFG->libdir.'/completion/completion_criteria_course.php');
+require_once($CFG->dirroot.'/completion/completion_criteria_self.php');
+require_once($CFG->dirroot.'/completion/completion_criteria_date.php');
+require_once($CFG->dirroot.'/completion/completion_criteria_unenrol.php');
+require_once($CFG->dirroot.'/completion/completion_criteria_activity.php');
+require_once($CFG->dirroot.'/completion/completion_criteria_duration.php');
+require_once($CFG->dirroot.'/completion/completion_criteria_grade.php');
+require_once($CFG->dirroot.'/completion/completion_criteria_role.php');
+require_once($CFG->dirroot.'/completion/completion_criteria_course.php');
 require_once $CFG->libdir.'/gradelib.php';
 require_once('completion_form.php');
 

diff --git a/lib/completionlib.php b/lib/completionlib.php
@@ -31,10 +31,10 @@
 /**
  * Include the required completion libraries
  */
-require_once $CFG->libdir.'/completion/completion_aggregation.php';
-require_once $CFG->libdir.'/completion/completion_criteria.php';
-require_once $CFG->libdir.'/completion/completion_completion.php';
-require_once $CFG->libdir.'/completion/completion_criteria_completion.php';
+require_once $CFG->dirroot.'/completion/completion_aggregation.php';
+require_once $CFG->dirroot.'/completion/completion_criteria.php';
+require_once $CFG->dirroot.'/completion/completion_completion.php';
+require_once $CFG->dirroot.'/completion/completion_criteria_completion.php';
 
 
 /**

diff --git a/lib/cronlib.php b/lib/cronlib.php
@@ -318,7 +318,7 @@ function cron_run() {
     if ($CFG->enablecompletion) {
         // Completion cron
         mtrace('Starting the completion cron...');
-        require_once($CFG->libdir . '/completion/cron.php');
+        require_once($CFG->dirroot.'/completion/cron.php');
         completion_cron();
         mtrace('done');
     }

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
@@ -405,7 +405,7 @@ function xmldb_main_upgrade($oldversion) {
     }
 
     if ($oldversion < 2012042300.02) {
-        require_once($CFG->libdir . '/completion/completion_criteria.php');
+        require_once($CFG->dirroot.'/completion/completion_criteria.php');
         // Delete orphaned criteria which were left when modules were removed
         if ($DB->get_dbfamily() === 'mysql') {
             $sql = "DELETE cc FROM {course_completion_criteria} cc