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

Bug #5909 - Fix use of user_group() because it returns arrays now - part 1; merged from MOODLE_16_STABLE

Browse Source
This commit is contained in:
skodak 2006-07-03 21:11:17 +00:00
parent 13d32e2297
commit f262874bbe
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
calendar/event.php
View File

@ -484,15 +484,17 @@
echo '<div class="header">'.get_string('newevent', 'calendar').$header.'</div>';
if($eventtype == 'select') {
$defaultcourse = $SESSION->cal_course_referer;
if(isteacheredit($defaultcourse, $USER->id)) {
$defaultgroup = $groupid = 0;
$courseid = optional_param('courseid', $SESSION->cal_course_referer, PARAM_INT);
if (!$course = get_record('course', 'id', $courseid)) {
error('Incorrect course ID');
}
else {
$defaultgroup = user_group($defaultcourse, $USER->id);
$groupid = optional_param('groupid', $defaultgroup->id, PARAM_INT);
if ($groupmode = groupmode($course)) { // Groups are being used
$changegroup = optional_param('group', -1, PARAM_INT);
$groupid = get_and_set_current_group($course, $groupmode, $changegroup);
} else {
$groupid = 0;
}
$courseid = optional_param('courseid', $defaultcourse, PARAM_INT);
echo '<h2>'.get_string('eventkind', 'calendar').':</h2>';
echo '<div id="selecteventtype">';
include('event_select.html');

6
lib/moodlelib.php
View File

@ -3646,11 +3646,7 @@ function setup_and_print_groups($course, $groupmode, $urlroot) {
global $USER, $SESSION; //needs his id, need to hack his groups in session
if (isset($_GET['group'])) {
$changegroup = $_GET['group']; /// 0 or higher
} else {
$changegroup = -1; /// This means no group change was specified
}
$changegroup = optional_param('group', -1, PARAM_INT);
$currentgroup = get_and_set_current_group($course, $groupmode, $changegroup);
if ($currentgroup === false) {

12
mod/assignment/lib.php
View File

@ -274,7 +274,7 @@ class assignment_base {
$submitted = '';
if (isteacher($this->course->id)) {
if (!isteacheredit($this->course->id) and user_group($this->course->id, $USER->id)) {
if (!isteacheredit($this->course->id) and (groupmode($this->course, $this->cm) == SEPARATEGROUPS)) {
$count = $this->count_real_submissions($this->currentgroup); // Only their group
} else {
$count = $this->count_real_submissions(); // Everyone
@ -1362,10 +1362,14 @@ class assignment_base {
$user = get_record('user', 'id', $submission->userid);
if (groupmode($this->course, $this->cm) == SEPARATEGROUPS) { // Separate groups are being used
if (!$group = user_group($this->course->id, $user->id)) { // Try to find a group
$group->id = 0; // Not in a group, never mind
if ($groups = user_group($this->course->id, $user->id)) { // Try to find groups
$teachers = array();
foreach ($groups as $group) {
$teachers = array_merge($teachers, get_group_teachers($this->course->id, $group->id));
}
} else {
$teachers = get_group_teachers($this->course->id, 0); // Works even if not in group
}
$teachers = get_group_teachers($this->course->id, $group->id); // Works even if not in group
} else {
$teachers = get_course_teachers($this->course->id);
}

10
mod/choice/report.php
View File

@ -115,9 +115,8 @@
$studentid=(!empty($user->idnumber) ? $user->idnumber : " ");
$myxls->write_string($row,2,$studentid);
$ug2 = '';
$usergrp = user_group($course->id, $user->id);
if (!empty($usergrp)) {
foreach ($usergrp as $ug) {
if ($usergrps = user_group($course->id, $user->id)) {
foreach ($usergrps as $ug) {
$ug2 = $ug2. $ug->name;
}
}
@ -170,9 +169,8 @@
}
echo "\t". $studentid."\t";
$ug2 = '';
$usergrp = user_group($course->id, $user->id);
if (!empty($usergrp)) {
foreach ($usergrp as $ug) {
if ($usergrps = user_group($course->id, $user->id)) {
foreach ($usergrps as $ug) {
$ug2 = $ug2. $ug->name;
}
}

4
mod/data/lib.php
View File

@ -1175,8 +1175,8 @@ function data_print_comment($data, $comment, $page=0) {
echo '</div></td></tr>';
echo '<tr><td class="left side">';
if ($group = user_group($data->course, $comment->userid)) {
print_group_picture($group, $data->course, false, false, true);
if ($groups = user_group($data->course, $comment->userid)) {
print_group_picture($groups, $data->course, false, false, true);
} else {
echo '&nbsp;';
}