Index: mod/elluminatelive/lib.php
===================================================================
RCS file: /cvsroot/moodle/contrib/patches/elluminate_elm/mod/elluminatelive/lib.php,v
retrieving revision 1.16
diff -u -r1.16 lib.php
--- mod/elluminatelive/lib.php 31 Jul 2009 19:29:00 -0000 1.16
+++ mod/elluminatelive/lib.php 29 Sep 2009 14:03:23 -0000
@@ -2948,8 +2948,16 @@
$parameters = new stdClass;
$parameters->meetingid = $result->ServerParametersAdapter->MeetingId;
- $parameters->boundaryminutes = $result->ServerParametersAdapter->BoundaryMinutes;
- $parameters->seats = $result->ServerParametersAdapter->Seats;
+ if (exists($result->ServerParametersAdapter->BoundaryMinutes)) {
+ $parameters->boundaryminutes = $result->ServerParametersAdapter->BoundaryMinutes;
+ } else {
+ $parameters->boundaryminutes = $result->ServerParametersAdapter->BoundaryTime;
+ }
+ if (exists($result->ServerParametersAdapter->Seats)) {
+ $parameters->seats = $result->ServerParametersAdapter->Seats;
+ } else {
+ $parameters->seats = $result->ServerParametersAdapter->RequiredSeats;
+ }
$parameters->supervised = $result->ServerParametersAdapter->Supervised;
$parameters->fullpermissions = $result->ServerParametersAdapter->FullPermissions;
@@ -2982,8 +2990,16 @@
$parameters = new stdClass;
$parameters->meetingid = $result->ServerParametersAdapter->MeetingId;
- $parameters->boundaryminutes = $result->ServerParametersAdapter->BoundaryMinutes;
- $parameters->seats = $result->ServerParametersAdapter->Seats;
+ if (exists($result->ServerParametersAdapter->BoundaryMinutes)) {
+ $parameters->boundaryminutes = $result->ServerParametersAdapter->BoundaryMinutes;
+ } else {
+ $parameters->boundaryminutes = $result->ServerParametersAdapter->BoundaryTime;
+ }
+ if (exists($result->ServerParametersAdapter->Seats)) {
+ $parameters->seats = $result->ServerParametersAdapter->Seats;
+ } else {
+ $parameters->seats = $result->ServerParametersAdapter->RequiredSeats;
+ }
$parameters->supervised = $result->ServerParametersAdapter->Supervised;
$parameters->fullpermissions = $result->ServerParametersAdapter->FullPermissions;
@@ -3211,6 +3227,10 @@
$args[2]['value'] = $elmuser->elm_password;
$args[2]['type'] = 'xsd:string';
+ $args[3]['name'] = 'displayName';
+ $args[3]['value'] = $user->firstname . ' ' . $user->lastname;
+ $args[3]['type'] = 'xsd:string';
+
$result = elluminatelive_send_command('buildMeetingJNLP', $args);
if (!is_string($result)) {
Index: mod/elluminatelive/elluminate_addons/moodleadapterconfiguration-3_0.xml
===================================================================
RCS file: mod/elluminatelive/elluminate_addons/moodleadapterconfiguration-3_0.xml
diff -N mod/elluminatelive/elluminate_addons/moodleadapterconfiguration-3_0.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mod/elluminatelive/elluminate_addons/moodleadapterconfiguration-3_0.xml 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: mod/elluminatelive/elluminate_addons/moodleproxyconfiguration-3_0.xml
===================================================================
RCS file: mod/elluminatelive/elluminate_addons/moodleproxyconfiguration-3_0.xml
diff -N mod/elluminatelive/elluminate_addons/moodleproxyconfiguration-3_0.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mod/elluminatelive/elluminate_addons/moodleproxyconfiguration-3_0.xml 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file