mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
nfreear 2006-11-07 14:37:32 +00:00
parent 6ea1cd02cb
commit 7ba3e75aac
30 changed files with 71 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
group/db/dbbasicgrouplib.php
View File

@ -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;
}
?>
?>

5
group/db/dbgroupinglib.php
View File

@ -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) {
}
?>
?>

4
group/db/dbsetup.php
View File

@ -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

4
group/groupui/addgroupstogrouping-xml.php
View File

@ -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');

4
group/groupui/addmembers-xml.php
View File

@ -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');

4
group/groupui/createautomaticgrouping-xml.php
View File

@ -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);

6
group/groupui/creategroup-xml.php
View File

@ -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");

4
group/groupui/creategrouping-xml.php
View File

@ -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);

4
group/groupui/deletegroup-xml.php
View File

@ -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);

4
group/groupui/deletegrouping-xml.php
View File

@ -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);

4
group/groupui/editgroupingpermissions-xml.php
View File

@ -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);

4
group/groupui/editgroupingsettings-xml.php
View File

@ -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);

6
group/groupui/editgroupsettings-xml.php
View File

@ -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");

5
group/groupui/getgroupingpermissions-xml.php
View File

@ -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);

4
group/groupui/getgroupings-xml.php
View File

@ -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);

5
group/groupui/getgroupingsettings-xml.php
View File

@ -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);

4
group/groupui/getgroupsettings-xml.php
View File

@ -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");

4
group/groupui/getgroupsingrouping-xml.php
View File

@ -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);

4
group/groupui/getgroupsnotingrouping-xml.php
View File

@ -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');

4
group/groupui/getmembers-xml.php
View File

@ -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);

4
group/groupui/getnonmembers-xml.php
View File

@ -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);

12
group/groupui/index.php
View File

@ -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);
}
?>
?>

8
group/groupui/printgrouping.php
View File

@ -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)) {
}
?>
?>

4
group/groupui/removegroupfromgrouping-xml.php
View File

@ -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);

4
group/groupui/removemembers-xml.php
View File

@ -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');

9
group/install.php
View File

@ -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;
}
?>
?>

2
group/lib/basicgrouplib.php
View File

@ -17,7 +17,7 @@
* course.
******************************************************************************/
include_once($CFG->dirroot.'/course/groups/db/dbbasicgrouplib.php');
require_once($CFG->dirroot.'/group/db/dbbasicgrouplib.php');
/*****************************

4
group/lib/groupinglib.php
View File

@ -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

8
group/lib/lib.php
View File

@ -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');
?>

2
group/lib/utillib.php
View File

@ -6,7 +6,7 @@
********************************************************/
include_once($CFG->dirroot.'/lib/moodlelib.php');
require_once($CFG->libdir.'/moodlelib.php');
/**********************************