MDL-34225 course completion : moved criteria classes into criteria su…

…bdir
interlegis · Jul 12, 2012 · 60829d8 · 60829d8
1 parent 7534234
commit 60829d8
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 12 deletions.
diff --git a/completion/completion_criteria.php → completion/criteria/completion_criteria.php b/completion/completion_criteria.php → completion/criteria/completion_criteria.php
@@ -172,7 +172,7 @@ public static function factory($params) {
         }
 
         $class = 'completion_criteria_'.$COMPLETION_CRITERIA_TYPES[$params['criteriatype']];
-        require_once($CFG->dirroot.'/completion/'.$class.'.php');
+        require_once($CFG->dirroot.'/completion/criteria/'.$class.'.php');
 
         return new $class($params, false);
     }

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

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->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->dirroot.'/completion/criteria/completion_criteria_self.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_date.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_unenrol.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_activity.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_duration.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_grade.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_role.php');
+require_once($CFG->dirroot.'/completion/criteria/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
@@ -32,7 +32,7 @@
  * Include the required completion libraries
  */
 require_once $CFG->dirroot.'/completion/completion_aggregation.php';
-require_once $CFG->dirroot.'/completion/completion_criteria.php';
+require_once $CFG->dirroot.'/completion/criteria/completion_criteria.php';
 require_once $CFG->dirroot.'/completion/completion_completion.php';
 require_once $CFG->dirroot.'/completion/completion_criteria_completion.php';
 

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->dirroot.'/completion/completion_criteria.php');
+        require_once($CFG->dirroot.'/completion/criteria/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