Index: moodle/mod/lamslesson/backup/moodle2/restore_lamslesson_stepslib.php
===================================================================
diff -u -rdc4433e7db0cc6cd393d4ceefceca25fb2d23cdc -r5977cea84c5550b8300ed41bf8ce6482ef7b6326
--- moodle/mod/lamslesson/backup/moodle2/restore_lamslesson_stepslib.php (.../restore_lamslesson_stepslib.php) (revision dc4433e7db0cc6cd393d4ceefceca25fb2d23cdc)
+++ moodle/mod/lamslesson/backup/moodle2/restore_lamslesson_stepslib.php (.../restore_lamslesson_stepslib.php) (revision 5977cea84c5550b8300ed41bf8ce6482ef7b6326)
@@ -82,10 +82,8 @@
$username = $USER->username;
$plaintext = $datetime.$username.$CFG->lamslesson_serverid.$CFG->lamslesson_serverkey;
$hashvalue = sha1(strtolower($plaintext));
-
- $locale = lamslesson_get_locale($form->course);
- $country = $locale['country'];
- $lang = $locale['lang'];
+ $country = $USER->country;
+ $lang = $USER->lang;
$request = "$CFG->lamslesson_serverurl" . "/services/xml/LessonManager";
Index: moodle/mod/lamslesson/lib.php
===================================================================
diff -u -r7c213fca0b500eef6ff18849dea168572436ee6c -r5977cea84c5550b8300ed41bf8ce6482ef7b6326
--- moodle/mod/lamslesson/lib.php (.../lib.php) (revision 7c213fca0b500eef6ff18849dea168572436ee6c)
+++ moodle/mod/lamslesson/lib.php (.../lib.php) (revision 5977cea84c5550b8300ed41bf8ce6482ef7b6326)
@@ -452,13 +452,11 @@
$form->timemodified = time();
- $locale = lamslesson_get_locale($form->course);
-
// start the lesson
$form->lesson_id = lamslesson_get_lesson(
$USER->username, $form->sequence_id, $form->course,
$form->name, $form->intro, 'start',
- $locale['country'], $locale['lang'], $form->customCSV, $form->displaydesign
+ $USER->country, $USER->lang, $form->customCSV, $form->displaydesign
);
if (!isset($form->lesson_id) || $form->lesson_id <= 0) {
@@ -469,7 +467,7 @@
// call threaded lams servlet to populate the class
$result = lamslesson_fill_lesson($USER->username, $form->lesson_id,
- $form->course, $locale['country'], $locale['lang'], $members
+ $form->course, $USER->country, $USER->lang, $members
);
// log adding of lesson
@@ -479,36 +477,6 @@
}
}
-/**
- * Return array with 2 keys 'country' and 'lang', to be sent to LAMS as the
- * basis for a LAMS locale like en_AU. Makes best effort to choose appropriate
- * locale based on course, user, or server setting.
- */
-function lamslesson_get_locale($courseid) {
-
- global $CFG, $USER, $DB;
- $locale = array('country' => '', 'lang' => '');
-
- if ($CFG->country != '') {
- $locale['country'] = trim($CFG->country);
- }
-
- // return course's language and server's country, if either exist
- if ($course = $DB->get_record('course', array('id' => $courseid))) {
- if ($course->lang != '') {
- $locale['lang'] = substr(trim($course->lang), 0, 2);
- return $locale;
- }
- }
-
-
- // use user's country and language if course has no language set
- $locale['country'] = trim($USER->country);
- $locale['lang'] = substr(trim($USER->lang), 0, 2);
-
- return $locale;
-}
-
/*
* Returns a list of learners and monitors in the given course or group.
*/
Index: moodle/mod/lamslesson/mod_form.php
===================================================================
diff -u -rae5e990cc15af5507fbc326ab637c058893d79fb -r5977cea84c5550b8300ed41bf8ce6482ef7b6326
--- moodle/mod/lamslesson/mod_form.php (.../mod_form.php) (revision ae5e990cc15af5507fbc326ab637c058893d79fb)
+++ moodle/mod/lamslesson/mod_form.php (.../mod_form.php) (revision 5977cea84c5550b8300ed41bf8ce6482ef7b6326)
@@ -72,7 +72,6 @@
// Set needed vars
$context = get_context_instance(CONTEXT_COURSE, $COURSE->id);
- $locale = lamslesson_get_locale($COURSE->id);
$canmanage = has_capability('mod/lamslesson:manage', $context);
//-- Open Author & Preview URL buttons
@@ -81,7 +80,7 @@
if ($canmanage) {
$customcsv = "$USER->username,$COURSE->id,$CFG->lamslesson_serverid";
- $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);
+ $authorurl = lamslesson_get_url($USER->username, $USER->firstname, $USER->lastname, $USER->email, $USER->lang, $USER->country, 0, $COURSE->id, $COURSE->fullname, $COURSE->timecreated, LAMSLESSON_PARAM_AUTHOR_METHOD, $customcsv);
$previewurl = $CFG->wwwroot.'/mod/lamslesson/preview.php?';
$popupoptions = LAMSLESSON_POPUP_OPTIONS;
Index: moodle/mod/lamslesson/preview.php
===================================================================
diff -u -rf18fbc545a0ae4d46669f82d3cfe74868c5da668 -r5977cea84c5550b8300ed41bf8ce6482ef7b6326
--- moodle/mod/lamslesson/preview.php (.../preview.php) (revision f18fbc545a0ae4d46669f82d3cfe74868c5da668)
+++ moodle/mod/lamslesson/preview.php (.../preview.php) (revision 5977cea84c5550b8300ed41bf8ce6482ef7b6326)
@@ -41,17 +41,15 @@
// Check permissions and capabilities:
$context = get_context_instance(CONTEXT_COURSE, $course->id);
-$locale = lamslesson_get_locale($course->id);
$canmanage = has_capability('mod/lamslesson:manage', $context);
-
if ($canmanage) {
// Get a lessonID from LAMS first
- $lessonID = lamslesson_get_lesson($USER->username, $ldId, $course->id, 'preview', 'preview', LAMSLESSON_PARAM_PREVIEW_METHOD, $locale['country'], $locale['lang'],'');
+ $lessonID = lamslesson_get_lesson($USER->username, $ldId, $course->id, 'preview', 'preview', LAMSLESSON_PARAM_PREVIEW_METHOD, $USER->country, $USER->lang,'');
// With the lesson now we put together the URL
- $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);
+ $learnerurl = lamslesson_get_url($USER->username, $USER->firstname, $USER->lastname, $USER->email, $USER->lang, $USER->country, $lessonID, $course->id, $course->fullname, $course->timecreated, LAMSLESSON_PARAM_LEARNER_METHOD);
header('Location:'.$learnerurl."'");
die();
Index: moodle/mod/lamslesson/userinfo.php
===================================================================
diff -u -r08e45019af7fc96652f04b0303550ecabd40a65e -r5977cea84c5550b8300ed41bf8ce6482ef7b6326
--- moodle/mod/lamslesson/userinfo.php (.../userinfo.php) (revision 08e45019af7fc96652f04b0303550ecabd40a65e)
+++ moodle/mod/lamslesson/userinfo.php (.../userinfo.php) (revision 5977cea84c5550b8300ed41bf8ce6482ef7b6326)
@@ -44,7 +44,7 @@
header('HTTP/1.1 401 Unauthenticated');
exit(1);
}
- $array = array('',$user->firstname,$user->lastname,$user->address,$user->city,'','',$user->country,$user->phone1,'','',$user->email,$user->country,substr($user->lang,0,2));
+ $array = array('',$user->firstname,$user->lastname,$user->address,$user->city,'','',$user->country,$user->phone1,'','',$user->email,$user->country,$USER->lang);
$comma_separated = implode(",", $array);//need more sophiscated algorithm to generate CSV formatted string
echo $comma_separated;
Index: moodle/mod/lamslesson/view.php
===================================================================
diff -u -r8b6bca47a049736fbc71ca5f06ca233ad40dd471 -r5977cea84c5550b8300ed41bf8ce6482ef7b6326
--- moodle/mod/lamslesson/view.php (.../view.php) (revision 8b6bca47a049736fbc71ca5f06ca233ad40dd471)
+++ moodle/mod/lamslesson/view.php (.../view.php) (revision 5977cea84c5550b8300ed41bf8ce6482ef7b6326)
@@ -48,7 +48,6 @@
require_login($course, true, $cm);
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
-$locale = lamslesson_get_locale($course->id);
add_to_log($course->id, 'lamslesson', 'view', "view.php?id=$cm->id", $lamslesson->name, $cm->id);
@@ -95,15 +94,15 @@
echo $OUTPUT->box_start('generalbox', 'intro');
if ($canparticipate || $canmanage) {
- $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_STRICT_METHOD);
+ $learnerurl = lamslesson_get_url($USER->username, $USER->firstname, $USER->lastname, $USER->email, $USER->lang, $USER->country, $lamslesson->lesson_id, $course->id, $course->fullname, $course->timecreated, LAMSLESSON_PARAM_LEARNER_STRICT_METHOD);
echo '';
echo ' ';
echo $OUTPUT->action_link($learnerurl, get_string('openlesson', 'lamslesson'), new popup_action('click', $learnerurl, '', array('height' => 600, 'width' => 996)));
echo '';
echo '
';
}
if ($canmanage) {
- $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);
+ $monitorurl = lamslesson_get_url($USER->username, $USER->firstname, $USER->lastname, $USER->email, $USER->lang, $USER->country, $lamslesson->lesson_id, $course->id, $course->fullname, $course->timecreated, LAMSLESSON_PARAM_MONITOR_METHOD);
echo '';
echo ' ';
echo $OUTPUT->action_link($monitorurl, get_string('openmonitor', 'lamslesson'), new popup_action('click', $monitorurl, '', array('height' => 600, 'width' => 996)));
@@ -115,7 +114,7 @@
// Once we have progress info ready
-$progress = lamslesson_get_student_progress($USER->username,$lamslesson->lesson_id, $course->id,$USER->firstname,$USER->lastname,$USER->email,$locale['country'],$locale['lang']);
+$progress = lamslesson_get_student_progress($USER->username,$lamslesson->lesson_id, $course->id,$USER->firstname,$USER->lastname,$USER->email,$USER->country,$USER->lang);
// Progress details