Fixed include-paths, replaced include, include_once with require_once. (Bug MDL-7380...

diff --git a/group/db/dbbasicgrouplib.php b/group/db/dbbasicgrouplib.php
index 5cf61172b9a62f825923764afa5d611ddabe3ae4..b9b67cbbf719f3604f40e24c563e087c4f8a6981 100644 (file)
--- 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 90e241f62ca99f717cac6c2f794f294c9151cf21..52f8755ce38763a2366d8404e1b19e16152e06a3 100644 (file)
--- 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 7e6b5006f8228b056bb3cb4fb69323c451793a0a..a3b01c701e2eabccfe21e66c4d65f8256fb47581 100644 (file)
--- 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 82f98e3852a67bf64c4204f787b74615ee340d26..1aa682cb9387a8cd588002ce3863155cc4fa91f9 100644 (file)
--- a/group/groupui/addgroupstogrouping-xml.php
+++ b/group/groupui/addgroupstogrouping-xml.php
@@ -7,8 +7,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 834ca29aeffd18c05ad4ffdf8cfb56cc17de755d..210486472709bbefce803dc9a380d2ec61d8c3d4 100644 (file)
--- a/group/groupui/addmembers-xml.php
+++ b/group/groupui/addmembers-xml.php
@@ -7,8 +7,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 775c6c2438ca4f2c6d6f1a1237bb4ae8426f7b3b..f0ea5a2d632fc8d9ad5107cd8a0da6122d7a1339 100644 (file)
--- a/group/groupui/createautomaticgrouping-xml.php
+++ b/group/groupui/createautomaticgrouping-xml.php
@@ -8,8 +8,8 @@ echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
 
-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 5336b628e6d0d7a58f8699aa26e3446b11a7b3b9..4c9c6a55f54c62c98768e9a957fb912d26e174f5 100644 (file)
--- a/group/groupui/creategroup-xml.php
+++ b/group/groupui/creategroup-xml.php
@@ -7,8 +7,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 '<error>Failed to add group to grouping</error>';
                } 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 bac4b49fa4af429bcc6add6ebe02fe4d91187682..112983731101631d03cfa494f3f3651fc54d0110 100644 (file)
--- a/group/groupui/creategrouping-xml.php
+++ b/group/groupui/creategrouping-xml.php
@@ -7,8 +7,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 6ff439f01a974df098b17e02c3021527057086b0..5b2fa8365091ca9f4dcb59e5257c7ba3dfb89be5 100644 (file)
--- a/group/groupui/deletegroup-xml.php
+++ b/group/groupui/deletegroup-xml.php
@@ -6,8 +6,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 863a3161a0ab1dd692ff568f346e1373819d1746..058ef49134156aaacb23fcb1230da8611f8fa34c 100644 (file)
--- a/group/groupui/deletegrouping-xml.php
+++ b/group/groupui/deletegrouping-xml.php
@@ -7,8 +7,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 2531ed0259f0cd9d148d2ab3952bd9a51e4a6687..d086a54dab16fff037be66fd1bc64a06f5515b05 100644 (file)
--- a/group/groupui/editgroupingpermissions-xml.php
+++ b/group/groupui/editgroupingpermissions-xml.php
@@ -7,8 +7,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 0ffc0d258075663da3afd9afbb549831b969546d..2cbaf8e8efe6120984a90d5d635e8a62724f4691 100644 (file)
--- a/group/groupui/editgroupingsettings-xml.php
+++ b/group/groupui/editgroupingsettings-xml.php
@@ -7,8 +7,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 f9baae05b9dafe9516a1808d6769a87cb812624a..97d848ff4a13c19bdaae2371b08aad7de58f9a35 100644 (file)
--- a/group/groupui/editgroupsettings-xml.php
+++ b/group/groupui/editgroupsettings-xml.php
@@ -7,8 +7,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 eecd903104bba3db5a22f0b33b3abf3120b6f438..a9df026f0835d27141707e89b9ed7bda84abad3f 100644 (file)
--- a/group/groupui/getgroupingpermissions-xml.php
+++ b/group/groupui/getgroupingpermissions-xml.php
@@ -8,9 +8,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 13ab9174c1b5698cb40465e70c9e983685c45954..892e618125dd53b360d4ea822a7288863b559689 100644 (file)
--- a/group/groupui/getgroupings-xml.php
+++ b/group/groupui/getgroupings-xml.php
@@ -8,8 +8,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 5c4d51f7746740f52b12d7ab1b7573dacb9393c4..673d616506e1b792300c647969fbc469967c87ea 100644 (file)
--- a/group/groupui/getgroupingsettings-xml.php
+++ b/group/groupui/getgroupingsettings-xml.php
@@ -8,9 +8,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 1a4f3ba99fcb6eb119cbae20d06e99be0ca4a825..cafd1626a1469ae2b8fb945f1e782d671c5db92f 100644 (file)
--- a/group/groupui/getgroupsettings-xml.php
+++ b/group/groupui/getgroupsettings-xml.php
@@ -8,8 +8,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 c7d210ca4315725e9799d77a046f2f610c3c26ae..dd836422c3e0ffaabf067fecc428c1474136bbc8 100644 (file)
--- a/group/groupui/getgroupsingrouping-xml.php
+++ b/group/groupui/getgroupsingrouping-xml.php
@@ -6,8 +6,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 9adcb00b54a00eac118b58bd926d90ef48fce908..24ae334c932ac81bdd76aea6a3315d2167894744 100644 (file)
--- a/group/groupui/getgroupsnotingrouping-xml.php
+++ b/group/groupui/getgroupsnotingrouping-xml.php
@@ -7,8 +7,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 fa6695836fc29e553c4b71e7ae281b4a28c75aed..2f3d0c8aa555122961f189b84e98e7acb45c9871 100644 (file)
--- a/group/groupui/getmembers-xml.php
+++ b/group/groupui/getmembers-xml.php
@@ -8,8 +8,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 5ec6457864e5daac3aaa6bfa72adff0858efeefa..c7ada79231d0279304e53e39c842751bf13cb19e 100644 (file)
--- a/group/groupui/getnonmembers-xml.php
+++ b/group/groupui/getnonmembers-xml.php
@@ -8,8 +8,8 @@
 header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
-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 d6d3a6e8c2e2f5ceccf6451e80aba96dd24ee058..6053252bbdbfc56dde6202f787f563a43a232b1b 100644 (file)
--- 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) {
                     "-> <a href=\"$CFG->wwwroot/user/index.php?id=$courseid\">$strparticipants</a> ".
                     "-> $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 2f1927597c3fd95ec7d4fc85ea26670ca8ce4699..9e3dca384e2c524b1379851ca681dbe35b31ed79 100644 (file)
--- a/group/groupui/printgrouping.php
+++ b/group/groupui/printgrouping.php
@@ -1,6 +1,6 @@
 <?php
-include_once("../../../config.php");
-include("../lib/lib.php");
+require_once('../../config.php');
+require_once('../lib/lib.php');
 
 $courseid     = required_param('courseid', PARAM_INT);
 $groupingid = required_param('groupingid', PARAM_INT);
@@ -17,7 +17,7 @@ if (isteacheredit($courseid)) {
        print_header("$course->shortname: $strgroups", "$course->fullname", 
                     "<a href=\"$CFG->wwwroot/course/view.php?id=$courseid\">$course->shortname</a> ".
                     "-> <a href=\"$CFG->wwwroot/user/index.php?id=$courseid\">$strparticipants</a> ".
-                    "-> <a href=\"$CFG->wwwroot/course/groups/groupui/index.php?id=$courseid\">$strgroups</a>".
+                    "-> <a href=\"$CFG->wwwroot/group/groupui/index.php?id=$courseid\">$strgroups</a>".
                     "-> 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 604ed7ef6f40c98f5c26a18838f33108feb15bf0..888d945ffd07252622018946df496c098d7e245b 100644 (file)
--- a/group/groupui/removegroupfromgrouping-xml.php
+++ b/group/groupui/removegroupfromgrouping-xml.php
@@ -8,8 +8,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 2da318847b071b928c3a1cb59ea2904e38cb6ab5..eb565fc661b348974044f5863c21a4aea84e3852 100644 (file)
--- a/group/groupui/removemembers-xml.php
+++ b/group/groupui/removemembers-xml.php
@@ -10,8 +10,8 @@ header("Content-Type: text/xml");
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 echo '<groupsresponse>';
 
-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 512446db6d119138b9a745e670fd693154aea883..52fded7d07e689f0e935c580471aa9350eb1af7d 100644 (file)
--- a/group/install.php
+++ b/group/install.php
@@ -1,9 +1,8 @@
 <?php
 
-include_once('../../config.php');
-include_once($CFG->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 e46030da5cb0983f244ccb8cf1cfb085066e3626..c8a450db2db6b4b06d18f0f3c02466396084430a 100644 (file)
--- 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 b8ebd3f9779d06ac3905c04228bcef1306e14172..297d0655c7b6303d7770b2ba108bcc1cb040f72b 100644 (file)
--- 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 7cff57308b697b33a2eeeed7f2df6e206515eef3..16afc1878a5bd42e265ffb192b836ff93e00458f 100644 (file)
--- a/group/lib/lib.php
+++ b/group/lib/lib.php
@@ -1,10 +1,10 @@
 <?php
 
-include_once($CFG->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 a79d6a3c474d9de8122d9a91b44681a9036db624..fde15fcb79385777cf44b3fbae2bf3004180174c 100644 (file)
--- 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');
 
 
 /**********************************