From: nfreear Date: Tue, 7 Nov 2006 14:37:32 +0000 (+0000) Subject: Fixed include-paths, replaced include, include_once with require_once. (Bug MDL-7380... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=7ba3e75aaca037b4a45f6e1251dca060aeafc154;p=moodle.git Fixed include-paths, replaced include, include_once with require_once. (Bug MDL-7380 "groups".) --- diff --git a/group/db/dbbasicgrouplib.php b/group/db/dbbasicgrouplib.php index 5cf61172b9..b9b67cbbf7 100644 --- a/group/db/dbbasicgrouplib.php +++ b/group/db/dbbasicgrouplib.php @@ -5,8 +5,8 @@ * groups_groups and groups_groups_users. ******************************************************************************/ -include_once($CFG->dirroot.'/lib/datalib.php'); -include_once($CFG->dirroot.'/course/groups/lib/lib.php'); +require_once($CFG->libdir.'/datalib.php'); +require_once($CFG->dirroot.'/group/lib/lib.php'); /******************************************************************************* @@ -399,4 +399,4 @@ function groups_db_delete_group($groupid) { return $success; } -?> +?> \ No newline at end of file diff --git a/group/db/dbgroupinglib.php b/group/db/dbgroupinglib.php index 90e241f62c..52f8755ce3 100644 --- a/group/db/dbgroupinglib.php +++ b/group/db/dbgroupinglib.php @@ -6,7 +6,7 @@ * tables that store information about groups. ******************************************************************************/ -include_once($CFG->dirroot.'/lib/datalib.php'); +require_once($CFG->libdir.'/datalib.php'); /******************************************************************************* Access/List functions @@ -421,5 +421,4 @@ function groups_db_delete_grouping($groupingid) { } -?> - +?> \ No newline at end of file diff --git a/group/db/dbsetup.php b/group/db/dbsetup.php index 7e6b5006f8..a3b01c701e 100644 --- a/group/db/dbsetup.php +++ b/group/db/dbsetup.php @@ -3,8 +3,8 @@ /*************************************************************************** * Functions required for setting up the database to use the new groups **************************************************************************/ -include_once('../../../config.php'); -include_once($CFG->dirroot.'/lib/datalib.php'); +//require_once('../../config.php'); +require_once($CFG->libdir.'/datalib.php'); // @@@ TO DO Needs lots of sorting out so proper install/upgrade and also diff --git a/group/groupui/addgroupstogrouping-xml.php b/group/groupui/addgroupstogrouping-xml.php index 82f98e3852..1aa682cb93 100644 --- a/group/groupui/addgroupstogrouping-xml.php +++ b/group/groupui/addgroupstogrouping-xml.php @@ -7,8 +7,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once('../../../config.php'); -include('../lib/lib.php'); +require_once('../../config.php'); +require_once('../lib/lib.php'); $groupingid = required_param('groupingid', PARAM_INT); $groups = required_param('groups'); diff --git a/group/groupui/addmembers-xml.php b/group/groupui/addmembers-xml.php index 834ca29aef..2104864727 100644 --- a/group/groupui/addmembers-xml.php +++ b/group/groupui/addmembers-xml.php @@ -7,8 +7,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once('../../../config.php'); -include('../lib/lib.php'); +require_once('../../config.php'); +require_once('../lib/lib.php'); $groupid = required_param('groupid', PARAM_INT); $users = required_param('users'); diff --git a/group/groupui/createautomaticgrouping-xml.php b/group/groupui/createautomaticgrouping-xml.php index 775c6c2438..f0ea5a2d63 100644 --- a/group/groupui/createautomaticgrouping-xml.php +++ b/group/groupui/createautomaticgrouping-xml.php @@ -8,8 +8,8 @@ echo ""; echo ''; -include_once("../../../config.php"); -include("../lib/lib.php"); +require_once('../../config.php'); +require_once('../lib/lib.php'); require_login($courseid); diff --git a/group/groupui/creategroup-xml.php b/group/groupui/creategroup-xml.php index 5336b628e6..4c9c6a55f5 100644 --- a/group/groupui/creategroup-xml.php +++ b/group/groupui/creategroup-xml.php @@ -7,8 +7,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once('../../../config.php'); -include('../lib/lib.php'); +require_once('../../config.php'); +require_once('../lib/lib.php'); $groupingid = required_param('groupingid', PARAM_INT); $groupsettings->name = required_param('groupname'); @@ -31,7 +31,7 @@ if (confirm_sesskey() and isteacheredit($courseid)) { echo 'Failed to add group to grouping'; } else { // Upload a picture file if there was one - note that we don't remove any previous icons - require_once($CFG->dirroot.'/lib/uploadlib.php'); + require_once($CFG->libdir.'/uploadlib.php'); $um = new upload_manager('newgroupicon', false, false, null, false, 0, true, true); if ($um->preprocess_files()) { require_once("$CFG->libdir/gdlib.php"); diff --git a/group/groupui/creategrouping-xml.php b/group/groupui/creategrouping-xml.php index bac4b49fa4..1129837311 100644 --- a/group/groupui/creategrouping-xml.php +++ b/group/groupui/creategrouping-xml.php @@ -7,8 +7,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once('../../../config.php'); -include('../lib/lib.php'); +require_once('../../config.php'); +require_once('../lib/lib.php'); $courseid= required_param('courseid', PARAM_INT); diff --git a/group/groupui/deletegroup-xml.php b/group/groupui/deletegroup-xml.php index 6ff439f01a..5b2fa83650 100644 --- a/group/groupui/deletegroup-xml.php +++ b/group/groupui/deletegroup-xml.php @@ -6,8 +6,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once('../../../config.php'); -include("../lib/lib.php"); +require_once('../../config.php'); +require_once('../lib/lib.php'); $groupid = required_param('groupid', PARAM_INT); $courseid = required_param('courseid', PARAM_INT); diff --git a/group/groupui/deletegrouping-xml.php b/group/groupui/deletegrouping-xml.php index 863a3161a0..058ef49134 100644 --- a/group/groupui/deletegrouping-xml.php +++ b/group/groupui/deletegrouping-xml.php @@ -7,8 +7,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once("../../../config.php"); -include("../lib/lib.php"); +require_once('../../config.php'); +require_once('../lib/lib.php'); $groupingid = required_param('groupingid', PARAM_INT); $courseid = required_param('courseid', PARAM_INT); diff --git a/group/groupui/editgroupingpermissions-xml.php b/group/groupui/editgroupingpermissions-xml.php index 2531ed0259..d086a54dab 100644 --- a/group/groupui/editgroupingpermissions-xml.php +++ b/group/groupui/editgroupingpermissions-xml.php @@ -7,8 +7,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once('../../../config.php'); -include('../lib/lib.php'); +require_once('../../config.php'); +require_once('../lib/lib.php'); $groupingid = required_param('groupingid'); $courseid = required_param('courseid', PARAM_INT); diff --git a/group/groupui/editgroupingsettings-xml.php b/group/groupui/editgroupingsettings-xml.php index 0ffc0d2580..2cbaf8e8ef 100644 --- a/group/groupui/editgroupingsettings-xml.php +++ b/group/groupui/editgroupingsettings-xml.php @@ -7,8 +7,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once('../../../config.php'); -include('../lib/lib.php'); +require_once('../../config.php'); +require_once('../lib/lib.php'); $groupingid = required_param('groupingid'); $courseid = required_param('courseid', PARAM_INT); diff --git a/group/groupui/editgroupsettings-xml.php b/group/groupui/editgroupsettings-xml.php index f9baae05b9..97d848ff4a 100644 --- a/group/groupui/editgroupsettings-xml.php +++ b/group/groupui/editgroupsettings-xml.php @@ -7,8 +7,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once('../../../config.php'); -include('../lib/lib.php'); +require_once('../../config.php'); +require_once('../lib/lib.php'); $groupid = required_param('groupid'); $groupname = required_param('groupname'); $description = required_param('description'); @@ -25,7 +25,7 @@ if (confirm_sesskey() and isteacheredit($courseid)) { $groupsettings->hidepicture = $hidepicture; // Upload the group icon if there is one - note that we don't remove any previous icons - require_once($CFG->dirroot.'/lib/uploadlib.php'); + require_once($CFG->libdir.'/uploadlib.php'); $um = new upload_manager('groupicon', false, false, null, false, 0, true, true); if ($um->preprocess_files()) { require_once("$CFG->libdir/gdlib.php"); diff --git a/group/groupui/getgroupingpermissions-xml.php b/group/groupui/getgroupingpermissions-xml.php index eecd903104..a9df026f08 100644 --- a/group/groupui/getgroupingpermissions-xml.php +++ b/group/groupui/getgroupingpermissions-xml.php @@ -8,9 +8,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once("../../../config.php"); -include("../lib/lib.php"); - +require_once('../../config.php'); +require_once('../lib/lib.php'); $courseid = required_param('courseid', PARAM_INT); diff --git a/group/groupui/getgroupings-xml.php b/group/groupui/getgroupings-xml.php index 13ab9174c1..892e618125 100644 --- a/group/groupui/getgroupings-xml.php +++ b/group/groupui/getgroupings-xml.php @@ -8,8 +8,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once("../../../config.php"); -include("../lib/lib.php"); +require_once("../../config.php"); +require_once("../lib/lib.php"); $courseid = required_param('courseid', PARAM_INT); diff --git a/group/groupui/getgroupingsettings-xml.php b/group/groupui/getgroupingsettings-xml.php index 5c4d51f774..673d616506 100644 --- a/group/groupui/getgroupingsettings-xml.php +++ b/group/groupui/getgroupingsettings-xml.php @@ -8,9 +8,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once("../../../config.php"); -include("../lib/lib.php"); - +require_once('../../config.php'); +require_once('../lib/lib.php'); $courseid = required_param('courseid', PARAM_INT); diff --git a/group/groupui/getgroupsettings-xml.php b/group/groupui/getgroupsettings-xml.php index 1a4f3ba99f..cafd1626a1 100644 --- a/group/groupui/getgroupsettings-xml.php +++ b/group/groupui/getgroupsettings-xml.php @@ -8,8 +8,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once("../../../config.php"); -include("../lib/lib.php"); +require_once("../../config.php"); +require_once("../lib/lib.php"); diff --git a/group/groupui/getgroupsingrouping-xml.php b/group/groupui/getgroupsingrouping-xml.php index c7d210ca43..dd836422c3 100644 --- a/group/groupui/getgroupsingrouping-xml.php +++ b/group/groupui/getgroupsingrouping-xml.php @@ -6,8 +6,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once("../../../config.php"); -include_once("../lib/lib.php"); +require_once("../../config.php"); +require_once("../lib/lib.php"); $groupingid = required_param('groupingid', PARAM_INT); $courseid = required_param('courseid', PARAM_INT); diff --git a/group/groupui/getgroupsnotingrouping-xml.php b/group/groupui/getgroupsnotingrouping-xml.php index 9adcb00b54..24ae334c93 100644 --- a/group/groupui/getgroupsnotingrouping-xml.php +++ b/group/groupui/getgroupsnotingrouping-xml.php @@ -7,8 +7,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once("../lib/lib.php"); -include_once("../../../config.php"); +require_once("../lib/lib.php"); +require_once("../../config.php"); $groupingid = required_param('groupingid'); $courseid = required_param('courseid'); diff --git a/group/groupui/getmembers-xml.php b/group/groupui/getmembers-xml.php index fa6695836f..2f3d0c8aa5 100644 --- a/group/groupui/getmembers-xml.php +++ b/group/groupui/getmembers-xml.php @@ -8,8 +8,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once("../../../config.php"); -include_once("../lib/lib.php"); +require_once("../../config.php"); +require_once("../lib/lib.php"); $groupid = required_param('groupid', PARAM_INT); diff --git a/group/groupui/getnonmembers-xml.php b/group/groupui/getnonmembers-xml.php index 5ec6457864..c7ada79231 100644 --- a/group/groupui/getnonmembers-xml.php +++ b/group/groupui/getnonmembers-xml.php @@ -8,8 +8,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once("../../../config.php"); -include_once("../lib/lib.php"); +require_once("../../config.php"); +require_once("../lib/lib.php"); $groupid = required_param('groupid', PARAM_INT); diff --git a/group/groupui/index.php b/group/groupui/index.php index d6d3a6e8c2..6053252bbd 100644 --- a/group/groupui/index.php +++ b/group/groupui/index.php @@ -4,11 +4,11 @@ * The main group management user interface ************************************************/ -require_once('../../../config.php'); -require_once('../../lib.php'); -require_once('../../../lib/moodlelib.php'); +require_once('../../config.php'); require_once('../lib/lib.php'); -require_once($CFG->dirroot.'/lib/uploadlib.php'); +//require_once('../../course/lib.php'); +require_once($CFG->libdir.'/moodlelib.php'); +require_once($CFG->libdir.'/uploadlib.php'); $error = false; @@ -50,10 +50,10 @@ if (!$error) { "-> wwwroot/user/index.php?id=$courseid\">$strparticipants ". "-> $strgroups", "", "", true, '', user_login_string($course, $USER)); - include('form.html'); + require_once('form.html'); print_footer($course); } -?> +?> \ No newline at end of file diff --git a/group/groupui/printgrouping.php b/group/groupui/printgrouping.php index 2f1927597c..9e3dca384e 100644 --- a/group/groupui/printgrouping.php +++ b/group/groupui/printgrouping.php @@ -1,6 +1,6 @@ shortname: $strgroups", "$course->fullname", "wwwroot/course/view.php?id=$courseid\">$course->shortname ". "-> wwwroot/user/index.php?id=$courseid\">$strparticipants ". - "-> wwwroot/course/groups/groupui/index.php?id=$courseid\">$strgroups". + "-> wwwroot/group/groupui/index.php?id=$courseid\">$strgroups". "-> Display grouping", "", "", true, '', user_login_string($course, $USER)); $groupingsettings = groups_get_grouping_settings($groupingid); @@ -61,4 +61,4 @@ if (isteacheredit($courseid)) { } -?> +?> \ No newline at end of file diff --git a/group/groupui/removegroupfromgrouping-xml.php b/group/groupui/removegroupfromgrouping-xml.php index 604ed7ef6f..888d945ffd 100644 --- a/group/groupui/removegroupfromgrouping-xml.php +++ b/group/groupui/removegroupfromgrouping-xml.php @@ -8,8 +8,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once("../../../config.php"); -include("../lib/lib.php"); +require_once("../../config.php"); +require_once("../lib/lib.php"); $groupid = required_param('groupid', PARAM_INT); $groupingid = required_param('groupingid', PARAM_INT); diff --git a/group/groupui/removemembers-xml.php b/group/groupui/removemembers-xml.php index 2da318847b..eb565fc661 100644 --- a/group/groupui/removemembers-xml.php +++ b/group/groupui/removemembers-xml.php @@ -10,8 +10,8 @@ header("Content-Type: text/xml"); echo ""; echo ''; -include_once("../../../config.php"); -include("../lib/lib.php"); +require_once("../../config.php"); +require_once("../lib/lib.php"); $groupid = required_param('groupid', PARAM_INT); $users = required_param('users'); diff --git a/group/install.php b/group/install.php index 512446db6d..52fded7d07 100644 --- a/group/install.php +++ b/group/install.php @@ -1,9 +1,8 @@ dirroot.'/course/groups/lib/configlib.php'); -include_once($CFG->dirroot.'/course/groups/db/dbsetup.php'); -include_once($CFG->dirroot.'/course/groups/lib/utillib.php'); +require_once('../config.php'); +require_once($CFG->dirroot.'/group/db/dbsetup.php'); +require_once($CFG->dirroot.'/group/lib/utillib.php'); // Set up the database groups_create_database_tables(); @@ -45,4 +44,4 @@ function groups_copy_moodle_groups_to_groups($courseid) { return $groupingid; } -?> +?> \ No newline at end of file diff --git a/group/lib/basicgrouplib.php b/group/lib/basicgrouplib.php index e46030da5c..c8a450db2d 100644 --- a/group/lib/basicgrouplib.php +++ b/group/lib/basicgrouplib.php @@ -17,7 +17,7 @@ * course. ******************************************************************************/ -include_once($CFG->dirroot.'/course/groups/db/dbbasicgrouplib.php'); +require_once($CFG->dirroot.'/group/db/dbbasicgrouplib.php'); /***************************** diff --git a/group/lib/groupinglib.php b/group/lib/groupinglib.php index b8ebd3f977..297d0655c7 100644 --- a/group/lib/groupinglib.php +++ b/group/lib/groupinglib.php @@ -5,8 +5,8 @@ * more than one grouping. ******************************************************************************/ -include_once($CFG->dirroot.'/course/groups/lib/basicgrouplib.php'); -include_once($CFG->dirroot.'/course/groups/db/dbgroupinglib.php'); +require_once($CFG->dirroot.'/group/lib/basicgrouplib.php'); +require_once($CFG->dirroot.'/group/db/dbgroupinglib.php'); /***************************** Access/List functions diff --git a/group/lib/lib.php b/group/lib/lib.php index 7cff57308b..16afc1878a 100644 --- a/group/lib/lib.php +++ b/group/lib/lib.php @@ -1,10 +1,10 @@ dirroot.'/course/groups/lib/basicgrouplib.php'); +require_once($CFG->dirroot.'/group/lib/basicgrouplib.php'); -include_once($CFG->dirroot.'/course/groups/lib/groupinglib.php'); +require_once($CFG->dirroot.'/group/lib/groupinglib.php'); -include_once($CFG->dirroot.'/course/groups/lib/utillib.php'); +require_once($CFG->dirroot.'/group/lib/utillib.php'); -include_once($CFG->dirroot.'/course/groups/lib/automaticgroupinglib.php'); +require_once($CFG->dirroot.'/group/lib/automaticgroupinglib.php'); ?> \ No newline at end of file diff --git a/group/lib/utillib.php b/group/lib/utillib.php index a79d6a3c47..fde15fcb79 100644 --- a/group/lib/utillib.php +++ b/group/lib/utillib.php @@ -6,7 +6,7 @@ ********************************************************/ -include_once($CFG->dirroot.'/lib/moodlelib.php'); +require_once($CFG->libdir.'/moodlelib.php'); /**********************************