Skip to content
Browse files

MDL-10311 - further groups import fixes

  • Loading branch information...
1 parent bdf5dce commit 3b5d49f20cf091022e8ecf40ceacb7e5defb0d97 poltawski committed Jul 6, 2007
Showing with 15 additions and 10 deletions.
  1. +12 −10 course/import/groups/index.php
  2. +3 −0 lang/en_utf8/group.php
View
22 course/import/groups/index.php
@@ -6,14 +6,14 @@
require_once('../../lib.php');
require_once($CFG->dirroot . '/group/lib/basicgrouplib.php');
- $mycourseid = required_param('id', PARAM_INT); // Course id
+ $id = required_param('id', PARAM_INT); // Course id
- if (! $course = get_record('course', 'id', $mycourseid) ) {
+ if (! $course = get_record('course', 'id', $id) ) {
error("That's an invalid course id");
}
require_login($course->id);
- $context = get_context_instance(CONTEXT_COURSE, $mycourseid);
+ $context = get_context_instance(CONTEXT_COURSE, $id);
if (!has_capability('moodle/course:managegroups', $context)) {
@@ -78,10 +78,12 @@
// check for valid field names
foreach ($header as $i => $h) {
$h = trim($h); $header[$i] = $h; // remove whitespace
- if (!($required[$h] or $optionalDefaults[$h] or $optional[$h])) {
+ if ( !(isset($required[$h]) or
+ isset($optionalDefaults[$h]) or
+ isset($optional[$h])) ) {
error(get_string('invalidfieldname', 'error', $h), 'index.php?id='.$id.'&sesskey='.$USER->sesskey);
}
- if ($required[$h]) {
+ if ( isset($required[$h]) ) {
$required[$h] = 2;
}
}
@@ -112,7 +114,7 @@
// add fields to object $user
foreach ($record as $name => $value) {
// check for required values
- if ($required[$name] and !$value) {
+ if (isset($required[$name]) and !$value) {
error(get_string('missingfield', 'error', $name). " ".
get_string('erroronline', 'error', $linenum) .". ".
get_string('processingstops', 'error'),
@@ -149,7 +151,7 @@
}
//else juse use current id
else{
- $newgroup->courseid = $mycourseid;
+ $newgroup->courseid = $id;
}
//if courseid is set
@@ -162,20 +164,20 @@
///Users cannot upload groups in courses they cannot update.
if (!has_capability('moodle/course:managegroups', $newgrpcoursecontext)){
- notify("$newgroup->name ".get_string('notaddedto').$newgroup->coursename.get_string('notinyourcapacity'));
+ notify( get_string('nopermissionforcreation','group',$newgroup->name) );
} else {
if ( $group = groups_group_name_exists($newgroup->courseid, $groupname) || !($newgroup->id = groups_create_group($newgroup->courseid, $newgroup)) ) {
//Record not added - probably because group is already registered
//In this case, output groupname from previous registration
if ($group) {
- notify("$newgroup->name ".get_string('groupexistforcourse', 'error', $groupname));
+ notify("$newgroup->name :".get_string('groupexistforcourse', 'error', $groupname));
} else {
notify(get_string('groupnotaddederror', 'error', $groupname));
}
}
else {
- notify(get_string('group')." $newgroup->name ".get_string('addedsuccessfully'));
+ notify( get_string('groupaddedsuccesfully', 'group', $newgroup->name) );
}
}
} //close courseid validity check
View
3 lang/en_utf8/group.php
@@ -114,4 +114,7 @@
$string['groupsseparate'] = 'Separate groups';
$string['groupsvisible'] = 'Visible groups';
+$string['groupaddedsuccesfully'] = 'Group $a added succesfully';
+$string['nopermissionforcreation'] = 'Can\'t create group \"$a\" as you dont have the required permissions';
+
?>

0 comments on commit 3b5d49f

Please sign in to comment.
Something went wrong with that request. Please try again.