moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

"MDL-14129, fix print_error"

Browse source
This commit is contained in:
dongsheng 2008-05-14 06:15:56 +00:00
parent 02dc703298
commit b121a4eed9
8 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
group/assign.php
View file

@ -9,7 +9,7 @@ require_once('lib.php');
$groupingid = required_param('id', PARAM_INT);
if (!$grouping = get_record('groupings', 'id', $groupingid)) {
print_error('Incorrect group id');
print_error('invalidgroupid');
}
if (! $course = get_record('course', 'id', $grouping->courseid)) {

6
group/autogroup.php
View file

@ -19,7 +19,7 @@ if (!defined('AUTOGROUP_MIN_RATIO')) {
$courseid = required_param('courseid', PARAM_INT);
if (!$course = get_record('course', 'id', $courseid)) {
print_error('invalidcourse');
print_error('invalidcourseid');
}
// Make sure that the user has permissions to manage groups.
@ -82,7 +82,7 @@ if ($editform->is_cancelled()) {
case 'idnumber':
$orderby = 'idnumber'; break;
default:
print_error('Unknown ordering');
print_error('unknoworder');
}
$users = groups_get_potential_members($data->courseid, $data->roleid, $orderby);
$usercnt = count($users);
@ -255,4 +255,4 @@ if($preview !== '') {
}
print_footer($course);
?>
?>

12
group/group.php
View file

@ -21,23 +21,23 @@ $confirm = optional_param('confirm', 0, PARAM_BOOL);
if ($id) {
if (!$group = get_record('groups', 'id', $id)) {
print_error('Group ID was incorrect');
print_error('invalidgroupid');
}
$group->description = clean_text($group->description);
if (empty($courseid)) {
$courseid = $group->courseid;
} else if ($courseid != $group->courseid) {
print_error('Course ID was incorrect');
print_error('invalidcourseid');
}
if (!$course = get_record('course', 'id', $courseid)) {
print_error('Course ID was incorrect');
print_error('invalidcourseid');
}
} else {
if (!$course = get_record('course', 'id', $courseid)) {
print_error('Course ID was incorrect');
print_error('invalidcourseid');
}
$group = new object();
$group->courseid = $course->id;
@ -83,11 +83,11 @@ if ($editform->is_cancelled()) {
if ($data->id) {
if (!groups_update_group($data, $editform->_upload_manager)) {
print_error('Error updating group');
print_error('cannotupdategroup');
}
} else {
if (!$id = groups_create_group($data, $editform->_upload_manager)) {
print_error('Error creating group');
print_error('cannotcreategroup');
}
$returnurl = $CFG->wwwroot.'/group/index.php?id='.$course->id.'&group='.$id;
}

12
group/grouping.php
View file

@ -20,23 +20,23 @@ $confirm = optional_param('confirm', 0, PARAM_BOOL);
if ($id) {
if (!$grouping = get_record('groupings', 'id', $id)) {
print_error('Group ID was incorrect');
print_error('invalidgroupid');
}
$grouping->description = clean_text($grouping->description);
if (empty($courseid)) {
$courseid = $grouping->courseid;
} else if ($courseid != $grouping->courseid) {
print_error('Course ID was incorrect');
print_error('invalidcourseid');
}
if (!$course = get_record('course', 'id', $courseid)) {
print_error('Course ID was incorrect');
print_error('invalidcourseid');
}
} else {
if (!$course = get_record('course', 'id', $courseid)) {
print_error('Course ID was incorrect');
print_error('invalidcourseid');
}
$grouping = new object();
$grouping->courseid = $course->id;
@ -84,12 +84,12 @@ if ($editform->is_cancelled()) {
if ($data->id) {
if (!groups_update_grouping($data)) {
print_error('Error updating grouping');
print_error('cannotupdategroup');
}
} else {
if (!groups_create_grouping($data)) {
print_error('Error creating grouping');
print_error('cannotcreategroup');
}
}

4
group/index.php
View file

@ -96,7 +96,7 @@ switch ($action) {
default: //ERROR.
if (debugging()) {
print_error('Error, unknown button/action. Probably a user-interface bug!', '', $returnurl);
print_error('unknowaction', '', $returnurl);
break;
}
}
@ -269,7 +269,7 @@ function groups_param_action($prefix = 'act_') {
}
if ($action && !preg_match('/^\w+$/', $action)) {
$action = false;
print_error('Action had wrong type.');
print_error('unknowaction');
}
///if (debugging()) echo 'Debug: '.$action;
return $action;

2
group/members.php
View file

@ -22,7 +22,7 @@ if ($showall) {
}
if (!$group = get_record('groups', 'id', $groupid)) {
print_error('Incorrect group id');
print_error('invalidgroupid');
}
if (!$course = get_record('course', 'id', $group->courseid)) {