From 7534234322c9646f5f8770721fb82c3403f1de6c Mon Sep 17 00:00:00 2001 From: Aparup Banerjee Date: Mon, 9 Jul 2012 20:57:09 +0800 Subject: [PATCH] MDL-34225 course completion : move /lib/completion/* up to /completion --- .../completion_aggregation.php | 2 +- .../completion_completion.php | 2 +- .../completion_criteria.php | 6 +++--- .../completion_criteria_activity.php | 0 .../completion_criteria_completion.php | 2 +- .../completion_criteria_course.php | 0 .../completion_criteria_date.php | 0 .../completion_criteria_duration.php | 0 .../completion_criteria_grade.php | 0 .../completion_criteria_role.php | 0 .../completion_criteria_self.php | 0 .../completion_criteria_unenrol.php | 0 {lib/completion => completion}/cron.php | 2 +- {lib/completion => completion}/data_object.php | 0 course/completion.php | 16 ++++++++-------- lib/completionlib.php | 8 ++++---- lib/cronlib.php | 2 +- lib/db/upgrade.php | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) rename {lib/completion => completion}/completion_aggregation.php (98%) rename {lib/completion => completion}/completion_completion.php (98%) rename {lib/completion => completion}/completion_criteria.php (97%) rename {lib/completion => completion}/completion_criteria_activity.php (100%) rename {lib/completion => completion}/completion_criteria_completion.php (98%) rename {lib/completion => completion}/completion_criteria_course.php (100%) rename {lib/completion => completion}/completion_criteria_date.php (100%) rename {lib/completion => completion}/completion_criteria_duration.php (100%) rename {lib/completion => completion}/completion_criteria_grade.php (100%) rename {lib/completion => completion}/completion_criteria_role.php (100%) rename {lib/completion => completion}/completion_criteria_self.php (100%) rename {lib/completion => completion}/completion_criteria_unenrol.php (100%) rename {lib/completion => completion}/cron.php (99%) rename {lib/completion => completion}/data_object.php (100%) diff --git a/lib/completion/completion_aggregation.php b/completion/completion_aggregation.php similarity index 98% rename from lib/completion/completion_aggregation.php rename to completion/completion_aggregation.php index e6e626a4de970..0c4d457550504 100644 --- a/lib/completion/completion_aggregation.php +++ b/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 b/completion/completion_completion.php similarity index 98% rename from lib/completion/completion_completion.php rename to completion/completion_completion.php index e6523eadf2638..a250b194cdfa9 100644 --- a/lib/completion/completion_completion.php +++ b/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 b/completion/completion_criteria.php similarity index 97% rename from lib/completion/completion_criteria.php rename to completion/completion_criteria.php index 31f5187edcb35..d597b44decb63 100644 --- a/lib/completion/completion_criteria.php +++ b/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/lib/completion/completion_criteria_activity.php b/completion/completion_criteria_activity.php similarity index 100% rename from lib/completion/completion_criteria_activity.php rename to completion/completion_criteria_activity.php diff --git a/lib/completion/completion_criteria_completion.php b/completion/completion_criteria_completion.php similarity index 98% rename from lib/completion/completion_criteria_completion.php rename to completion/completion_criteria_completion.php index 7f448001d20a4..48496964c945b 100644 --- a/lib/completion/completion_criteria_completion.php +++ b/completion/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/lib/completion/completion_criteria_course.php b/completion/completion_criteria_course.php similarity index 100% rename from lib/completion/completion_criteria_course.php rename to completion/completion_criteria_course.php diff --git a/lib/completion/completion_criteria_date.php b/completion/completion_criteria_date.php similarity index 100% rename from lib/completion/completion_criteria_date.php rename to completion/completion_criteria_date.php diff --git a/lib/completion/completion_criteria_duration.php b/completion/completion_criteria_duration.php similarity index 100% rename from lib/completion/completion_criteria_duration.php rename to completion/completion_criteria_duration.php diff --git a/lib/completion/completion_criteria_grade.php b/completion/completion_criteria_grade.php similarity index 100% rename from lib/completion/completion_criteria_grade.php rename to completion/completion_criteria_grade.php diff --git a/lib/completion/completion_criteria_role.php b/completion/completion_criteria_role.php similarity index 100% rename from lib/completion/completion_criteria_role.php rename to completion/completion_criteria_role.php diff --git a/lib/completion/completion_criteria_self.php b/completion/completion_criteria_self.php similarity index 100% rename from lib/completion/completion_criteria_self.php rename to completion/completion_criteria_self.php diff --git a/lib/completion/completion_criteria_unenrol.php b/completion/completion_criteria_unenrol.php similarity index 100% rename from lib/completion/completion_criteria_unenrol.php rename to completion/completion_criteria_unenrol.php diff --git a/lib/completion/cron.php b/completion/cron.php similarity index 99% rename from lib/completion/cron.php rename to completion/cron.php index 3645c0618d6b8..038577935bd0c 100644 --- a/lib/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 $CFG->libdir.'/completion/'.$object.'.php'; + require_once 'completion/'.$object.'.php'; $class = new $object(); diff --git a/lib/completion/data_object.php b/completion/data_object.php similarity index 100% rename from lib/completion/data_object.php rename to completion/data_object.php diff --git a/course/completion.php b/course/completion.php index a25c2af30f912..2a4d77a458f33 100644 --- 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 index 4df3bc0cc8c4c..c26e49acaa92a 100644 --- 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 index b0347606e13cd..e4d18f30bf847 100644 --- 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 index dd52946a46354..42d99027be896 100644 --- 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