Index: mod/elluminatelive/preload.php =================================================================== RCS file: /cvsroot/moodle/contrib/patches/elluminate_elm/mod/elluminatelive/preload.php,v retrieving revision 1.1 diff -u -r1.1 preload.php --- mod/elluminatelive/preload.php 9 Apr 2009 19:18:02 -0000 1.1 +++ mod/elluminatelive/preload.php 2 Jun 2009 14:26:45 -0000 @@ -44,14 +44,14 @@ /// Print the page header $strelluminatelives = get_string('modulenameplural', 'elluminatelive'); - $strelluminatelive = get_string('modulename", "elluminatelive'); + $strelluminatelive = get_string('modulename', 'elluminatelive'); $straddpreload = get_string('addwhiteboardpreload', 'elluminatelive'); $strdelpreload = get_string('deletewhiteboardpreload', 'elluminatelive'); $buttontext = update_module_button($cm->id, $course->id, $strelluminatelive); $navigation = build_navigation(empty($delete) ? $straddpreload : $strdelpreload, $cm); - print_header_simple(format_string($elluminatelive->name), "", $navigation, "", "", true, + print_header_simple(format_string($elluminatelive->name), '', $navigation, '', '', true, $buttontext, navmenu($course, $cm)); @@ -156,14 +156,14 @@ } - groups_print_activity_menu($cm, 'view.php?id=' . $cm->id); + groups_print_activity_menu($cm, 'preload.php?id=' . $elluminatelive->id, false, true); $sesskey = !empty($USER->sesskey) ? $USER->sesskey : ''; /// Print the main part of the page print_simple_box_start('center', '50%'); - echo '

Choose a whiteboard file to upload:

'; + echo '

'. get_string('preloadchoosewhiteboardfile', 'elluminatelive') . '

'; echo '
'; echo ''; echo ''; Index: mod/elluminatelive/attendance.php =================================================================== RCS file: /cvsroot/moodle/contrib/patches/elluminate_elm/mod/elluminatelive/attendance.php,v retrieving revision 1.6 diff -u -r1.6 attendance.php --- mod/elluminatelive/attendance.php 2 Apr 2009 18:40:48 -0000 1.6 +++ mod/elluminatelive/attendance.php 2 Jun 2009 14:26:45 -0000 @@ -103,7 +103,7 @@ print_header_simple(format_string($meeting->name), "", $navigation, "", "", true, ''); - groups_print_activity_menu($cm, 'attendance.php?id=' . $meeting->id); + groups_print_activity_menu($cm, 'attendance.php?id=' . $meeting->id, false, true); /// Get a list of user IDs for students who are allowed to participate in this meeting. $userids = array(); @@ -122,7 +122,7 @@ /// If groupmembersonly used, remove users who are not in any group if (!empty($userids) and !empty($CFG->enablegroupings) and $cm->groupmembersonly) { - $userids = array_intersect($userids, array_keys(groups_get_grouping_members($cm->groupingid, 'u.id', 'u.id'))); + $userids = array_intersect($userids, array_keys(groups_get_grouping_members($cm->groupingid, 'distinct u.id', 'u.id'))); } /// Only care about non-moderators of the activity. Index: mod/elluminatelive/lib.php =================================================================== RCS file: /cvsroot/moodle/contrib/patches/elluminate_elm/mod/elluminatelive/lib.php,v retrieving revision 1.12 diff -u -r1.12 lib.php --- mod/elluminatelive/lib.php 19 May 2009 14:31:50 -0000 1.12 +++ mod/elluminatelive/lib.php 2 Jun 2009 14:26:45 -0000 @@ -997,7 +997,7 @@ /// Add a new event for this user. $event->userid = $userid; $event->timemodified = time(); - + $event = addslashes_object($event); $event->id = insert_record('event', $event); } @@ -1139,7 +1139,7 @@ $event->timeduration = $duration; } $event->timemodified = time(); - + $event = addslashes_object($event); $event->id = insert_record('event', $event); return true; @@ -3665,7 +3665,7 @@ } if ($needsupdate) { - addslashes_object($elluminatelive); + $elluminatelive = addslashes_object($elluminatelive); update_record('elluminatelive', $elluminatelive); $elluminatelive = get_record('elluminatelive', 'id', $elluminatelive->id); } @@ -3718,7 +3718,7 @@ /// Change the local seat reservation value to reflect this. $elluminatelive->seats = $seats; - addslashes_object($elluminatelive); + $elluminatelive = addslashes_object($elluminatelive); update_record('elluminatelive', $elluminatelive); $elluminatelive = get_record('elluminatelive', 'id', $elluminatelive->id); } @@ -3811,7 +3811,7 @@ /// Change the local seat reservation value to reflect this. $elluminatelive->seats = $seats; - addslashes_object($elluminatelive); + $elluminatelive = addslashes_object($elluminatelive); update_record('elluminatelive', $elluminatelive); $elluminatelive = get_record('elluminatelive', 'id', $elluminatelive->id); } Index: mod/elluminatelive/moderators.php =================================================================== RCS file: /cvsroot/moodle/contrib/patches/elluminate_elm/mod/elluminatelive/moderators.php,v retrieving revision 1.5 diff -u -r1.5 moderators.php --- mod/elluminatelive/moderators.php 1 Apr 2009 15:40:47 -0000 1.5 +++ mod/elluminatelive/moderators.php 2 Jun 2009 14:26:45 -0000 @@ -133,7 +133,7 @@ print_header_simple(format_string($meeting->name), "", $navigation, "", "", true, ''); - groups_print_activity_menu($cm, 'participants.php?id=' . $meeting->id); + groups_print_activity_menu($cm, 'moderators.php?id=' . $meeting->id, false, true); print_simple_box_start('center', '50%'); Index: mod/elluminatelive/styles.php =================================================================== RCS file: /cvsroot/moodle/contrib/patches/elluminate_elm/mod/elluminatelive/styles.php,v retrieving revision 1.4 diff -u -r1.4 styles.php --- mod/elluminatelive/styles.php 9 Apr 2009 19:18:02 -0000 1.4 +++ mod/elluminatelive/styles.php 2 Jun 2009 14:26:45 -0000 @@ -42,7 +42,7 @@ .elluminateliveverifysetup { text-align: center; - font-size: 1.7em; + font-size: 1em; font-weight: bold; } Index: mod/elluminatelive/view.php =================================================================== RCS file: /cvsroot/moodle/contrib/patches/elluminate_elm/mod/elluminatelive/view.php,v retrieving revision 1.15 diff -u -r1.15 view.php --- mod/elluminatelive/view.php 29 Apr 2009 20:32:37 -0000 1.15 +++ mod/elluminatelive/view.php 2 Jun 2009 14:26:45 -0000 @@ -129,7 +129,7 @@ $navigation, "", "", true, $buttontext, navmenu($course, $cm)); - groups_print_activity_menu($cm, 'view.php?id=' . $cm->id); + groups_print_activity_menu($cm, 'view.php?id=' . $cm->id, false, true); $sesskey = !empty($USER->sesskey) ? $USER->sesskey : ''; @@ -163,7 +163,7 @@ if ($recording = get_record('elluminatelive_recordings', 'id', $data->recordingid)) { $recording->description = $data->recordingdesc; - addslashes_object($recording); + $recording = addslashes_object($recording); if (!update_record('elluminatelive_recordings', $recording)) { debugging('Unable to edit recording description!'); @@ -174,7 +174,7 @@ /// Handle a request to delete a recording. if (!empty($delrecording) && - ($candeleteanyrecordings || ($candeleteownrecordings && ($elluminatelive->creator == $USER->id)))) { + ($candeleteanyrecordings || ($candeleterecordings && ($elluminatelive->creator == $USER->id)))) { if (!$recording = get_record('elluminatelive_recordings', 'id', $delrecording)) { error('Could not find meeting recording record'); @@ -206,7 +206,7 @@ if (!empty($hiderecording) && ($canmanageanyrecordings || $canmanagerecordings)) { if ($recording = get_record('elluminatelive_recordings', 'id', $hiderecording)) { $recording->visible = 0; - addslashes_object($recording); + $recording = addslashes_object($recording); if (!update_record('elluminatelive_recordings', $recording)) { debugging('Unable to hide recording!'); @@ -218,7 +218,7 @@ if (!empty($showrecording) && ($canmanageanyrecordings || $canmanagerecordings)) { if ($recording = get_record('elluminatelive_recordings', 'id', $showrecording)) { $recording->visible = 1; - addslashes_object($recording); + $recording = addslashes_object($recording); if (!update_record('elluminatelive_recordings', $recording)) { debugging('Unable to change recording group visibility!'); @@ -232,7 +232,7 @@ if ($recording = get_record('elluminatelive_recordings', 'id', $hidegrouprecording)) { $recording->groupvisible = 0; - addslashes_object($recording); + $recording = addslashes_object($recording); if (!update_record('elluminatelive_recordings', $recording)) { debugging('Unable to change recording group visibility!'); @@ -246,7 +246,7 @@ if ($recording = get_record('elluminatelive_recordings', 'id', $showgrouprecording)) { $recording->groupvisible = 1; - addslashes_object($recording); + $recording = addslashes_object($recording); if (!update_record('elluminatelive_recordings', $recording)) { debugging('Unable to hide recording!'); Index: mod/elluminatelive/participants.php =================================================================== RCS file: /cvsroot/moodle/contrib/patches/elluminate_elm/mod/elluminatelive/participants.php,v retrieving revision 1.6 diff -u -r1.6 participants.php --- mod/elluminatelive/participants.php 1 Apr 2009 15:40:46 -0000 1.6 +++ mod/elluminatelive/participants.php 2 Jun 2009 14:26:45 -0000 @@ -129,7 +129,7 @@ $navigation = build_navigation($strparticipants, $cm); print_header_simple($strparticipants, "", $navigation, "", "", true, ''); - groups_print_activity_menu($cm, 'participants.php?id=' . $meeting->id); + groups_print_activity_menu($cm, 'participants.php?id=' . $meeting->id, false, true); print_simple_box_start('center', '50%'); Index: mod/elluminatelive/db/upgrade.php =================================================================== RCS file: /cvsroot/moodle/contrib/patches/elluminate_elm/mod/elluminatelive/db/upgrade.php,v retrieving revision 1.5 diff -u -r1.5 upgrade.php --- mod/elluminatelive/db/upgrade.php 6 Apr 2009 18:50:13 -0000 1.5 +++ mod/elluminatelive/db/upgrade.php 2 Jun 2009 14:26:45 -0000 @@ -115,7 +115,7 @@ $umeeting = new stdClass; $umeeting->id = $meeting->id; - $umeeting->sessionname = $meeting->name; + $umeeting->sessionname = addslashes($meeting->name); $umeeting->timestart = $elmmeeting->start; $umeeting->timeend = $elmmeeting->end; Index: mod/elluminatelive/db/install.xml =================================================================== RCS file: /cvsroot/moodle/contrib/patches/elluminate_elm/mod/elluminatelive/db/install.xml,v retrieving revision 1.4 diff -u -r1.4 install.xml --- mod/elluminatelive/db/install.xml 6 Apr 2009 18:50:13 -0000 1.4 +++ mod/elluminatelive/db/install.xml 2 Jun 2009 14:26:45 -0000 @@ -55,7 +55,7 @@ - + Index: mod/elluminatelive/lang/en_utf8/elluminatelive.php =================================================================== RCS file: /cvsroot/moodle/contrib/patches/elluminate_elm/mod/elluminatelive/lang/en_utf8/elluminatelive.php,v retrieving revision 1.7 diff -u -r1.7 elluminatelive.php --- mod/elluminatelive/lang/en_utf8/elluminatelive.php 9 Apr 2009 19:18:03 -0000 1.7 +++ mod/elluminatelive/lang/en_utf8/elluminatelive.php 2 Jun 2009 14:26:45 -0000 @@ -115,6 +115,7 @@ $string['notattendedyet'] = 'Not attended yet'; $string['participantfilterdesc'] = 'Use these filters to limit the available users displayed.'; $string['playrecording'] = 'Play recording'; +$string['preloadchoosewhiteboardfile'] = 'Choose a whiteboard file (*.wbd) to upload:'; $string['preloadcouldnotaddpreloadtomeeting'] = 'Could not add preload to meeting'; $string['preloadcouldnotcreatepreload'] = 'Could not create preload'; $string['preloadcouldnotreadfilecontents'] = 'Could not read uploaded file contents';