Index: moodle/mod/lamslesson/lib.php =================================================================== diff -u -rac2c8057d322cb0ff6e24de12c0c25e946b7afa8 -r2e199e6752ced8849b6e67e788652a4459a15aa5 --- moodle/mod/lamslesson/lib.php (.../lib.php) (revision ac2c8057d322cb0ff6e24de12c0c25e946b7afa8) +++ moodle/mod/lamslesson/lib.php (.../lib.php) (revision 2e199e6752ced8849b6e67e788652a4459a15aa5) @@ -42,6 +42,9 @@ define('LAMSLESSON_LOGIN_REQUEST', '/LoginRequest'); define('LAMSLESSON_PARAM_UID', 'uid'); +define('LAMSLESSON_PARAM_FIRSTNAME', 'firstName'); +define('LAMSLESSON_PARAM_LASTNAME', 'lastName'); +define('LAMSLESSON_PARAM_EMAIL', 'email'); define('LAMSLESSON_PARAM_SERVERID', 'sid'); define('LAMSLESSON_PARAM_TIMESTAMP', 'ts'); define('LAMSLESSON_PARAM_HASH', 'hash'); @@ -297,7 +300,7 @@ * @return string to define the tree structure * */ -function lamslesson_get_sequences_rest($username,$courseid,$coursename,$coursecreatedate,$country,$lang) { +function lamslesson_get_sequences_rest($username,$firstname,$lastname,$email,$courseid,$coursename,$coursecreatedate,$country,$lang) { global $CFG,$USER; if(!isset($CFG->lamslesson_serverurl)||!isset($CFG->lamslesson_serverid)||!isset($CFG->lamslesson_serverkey)) { @@ -315,7 +318,7 @@ // Put together REST URL - $request = "$CFG->lamslesson_serverurl".LAMSLESSON_LD_SERVICE."?serverId=" . $CFG->lamslesson_serverid . "&datetime=" . $datetime_encoded . "&hashValue=" . $hashvalue . "&username=" . $username . "&courseId=" . $courseid . "&courseName=" . urlencode($coursename) . "&mode=2&country=" . $country . "&lang=$lang"; + $request = "$CFG->lamslesson_serverurl".LAMSLESSON_LD_SERVICE."?serverId=" . $CFG->lamslesson_serverid . "&datetime=" . $datetime_encoded . "&hashValue=" . $hashvalue . "&username=" . $username . "&firstName=" . $firstname . "&lastName=" . $lastname . "&email=" . $email . "&courseId=" . $courseid . "&courseName=" . urlencode($coursename) . "&mode=2&country=" . $country . "&lang=$lang"; // GET call to LAMS $xml = lamslesson_http_call($request); @@ -637,7 +640,7 @@ * Return URL to join a LAMS lesson as a learner or staff depending on method. * URL redirects LAMS to learner or monitor interface depending on method. */ -function lamslesson_get_url($username, $lang, $country, $lessonid, $courseid, $coursename, $coursecreatedate, $method, $customcsv='') { +function lamslesson_get_url($username, $firstname, $lastname, $email, $lang, $country, $lessonid, $courseid, $coursename, $coursecreatedate, $method, $customcsv='') { global $CFG; // append month/year to course name @@ -652,6 +655,9 @@ $hash = sha1(strtolower($plaintext)); $url = $CFG->lamslesson_serverurl. LAMSLESSON_LOGIN_REQUEST . '?'.LAMSLESSON_PARAM_UID.'='.$username. + '&'.LAMSLESSON_PARAM_FIRSTNAME.'='.urlencode($firstname). + '&'.LAMSLESSON_PARAM_LASTNAME.'='.urlencode($lastname). + '&'.LAMSLESSON_PARAM_EMAIL.'='.urlencode($email). '&'.LAMSLESSON_PARAM_METHOD.'='.$method. '&'.LAMSLESSON_PARAM_TIMESTAMP.'='.urlencode($datetime). '&'.LAMSLESSON_PARAM_SERVERID.'='.$CFG->lamslesson_serverid. Index: moodle/mod/lamslesson/mod_form.php =================================================================== diff -u -rc058b1f0ea1a4d522299671cd6bec6b597875385 -r2e199e6752ced8849b6e67e788652a4459a15aa5 --- moodle/mod/lamslesson/mod_form.php (.../mod_form.php) (revision c058b1f0ea1a4d522299671cd6bec6b597875385) +++ moodle/mod/lamslesson/mod_form.php (.../mod_form.php) (revision 2e199e6752ced8849b6e67e788652a4459a15aa5) @@ -81,15 +81,15 @@ if ($canmanage) { $customcsv = "$USER->username,$COURSE->id,$CFG->lamslesson_serverid"; - $authorurl = lamslesson_get_url($USER->username, $locale['lang'], $locale['country'], 0, $COURSE->id, $COURSE->fullname, $COURSE->timecreated, LAMSLESSON_PARAM_AUTHOR_METHOD, $customcsv); + $authorurl = lamslesson_get_url($USER->username, $USER->firstname, $USER->lastname, $USER->email, $locale['lang'], $locale['country'], 0, $COURSE->id, $COURSE->fullname, $COURSE->timecreated, LAMSLESSON_PARAM_AUTHOR_METHOD, $customcsv); $previewurl = $CFG->wwwroot.'/mod/lamslesson/preview.php?'; $popupoptions = LAMSLESSON_POPUP_OPTIONS; $openauthorlabel = get_string('openauthor', 'lamslesson'); $openpreviewlabel = get_string('previewthislesson', 'lamslesson'); // display user's lams workspace - $lds = lamslesson_get_sequences_rest($USER->username, $COURSE->id, $COURSE->fullname, $COURSE->timecreated, $USER->country, $USER->lang) ; + $lds = lamslesson_get_sequences_rest($USER->username, $USER->firstname, $USER->lastname, $USER->email, $COURSE->id, $COURSE->fullname, $COURSE->timecreated, $USER->country, $USER->lang) ; // html "chunk" for open Author button Index: moodle/mod/lamslesson/preview.php =================================================================== diff -u -rc35069ead69cd62058df201bd7f75d289d20dd1c -r2e199e6752ced8849b6e67e788652a4459a15aa5 --- moodle/mod/lamslesson/preview.php (.../preview.php) (revision c35069ead69cd62058df201bd7f75d289d20dd1c) +++ moodle/mod/lamslesson/preview.php (.../preview.php) (revision 2e199e6752ced8849b6e67e788652a4459a15aa5) @@ -51,7 +51,7 @@ $lessonID = lamslesson_get_lesson($USER->username, $ldId, $course->id, 'preview', 'preview', LAMSLESSON_PARAM_PREVIEW_METHOD, $locale['country'], $locale['lang'],''); // With the lesson now we put together the URL - $learnerurl = lamslesson_get_url($USER->username, $locale['lang'], $locale['country'], $lessonID, $course->id, $course->fullname, $course->timecreated, LAMSLESSON_PARAM_LEARNER_METHOD); + $learnerurl = lamslesson_get_url($USER->username, $USER->firstname, $USER->lastname, $USER->email, $locale['lang'], $locale['country'], $lessonID, $course->id, $course->fullname, $course->timecreated, LAMSLESSON_PARAM_LEARNER_METHOD); header('Location:'.$learnerurl."'"); die(); Index: moodle/mod/lamslesson/view.php =================================================================== diff -u -r26759e4a3721b0115d50efc85b883261c0ded334 -r2e199e6752ced8849b6e67e788652a4459a15aa5 --- moodle/mod/lamslesson/view.php (.../view.php) (revision 26759e4a3721b0115d50efc85b883261c0ded334) +++ moodle/mod/lamslesson/view.php (.../view.php) (revision 2e199e6752ced8849b6e67e788652a4459a15aa5) @@ -95,15 +95,15 @@ echo $OUTPUT->box_start('generalbox', 'intro'); if ($canparticipate || $canmanage) { - $learnerurl = lamslesson_get_url($USER->username, $locale['lang'], $locale['country'], $lamslesson->lesson_id, $course->id, $course->fullname, $course->timecreated, LAMSLESSON_PARAM_LEARNER_METHOD); + $learnerurl = lamslesson_get_url($USER->username, $USER->firstname, $USER->lastname, $USER->email, $locale['lang'], $locale['country'], $lamslesson->lesson_id, $course->id, $course->fullname, $course->timecreated, LAMSLESSON_PARAM_LEARNER_METHOD); echo ''; } if ($canmanage) { - $monitorurl = lamslesson_get_url($USER->username, $locale['lang'], $locale['country'], $lamslesson->lesson_id, $course->id, $course->fullname, $course->timecreated, LAMSLESSON_PARAM_MONITOR_METHOD); + $monitorurl = lamslesson_get_url($USER->username, $USER->firstname, $USER->lastname, $USER->email, $locale['lang'], $locale['country'], $lamslesson->lesson_id, $course->id, $course->fullname, $course->timecreated, LAMSLESSON_PARAM_MONITOR_METHOD); echo '