Index: temp_moodle_dev/lamstwo/add_form.php =================================================================== diff -u -rc440b24fcf2fa3d03b1820c66628ac217d56344a -r0878683fa8df8ae2224a2d9a43f7509919e02274 --- temp_moodle_dev/lamstwo/add_form.php (.../add_form.php) (revision c440b24fcf2fa3d03b1820c66628ac217d56344a) +++ temp_moodle_dev/lamstwo/add_form.php (.../add_form.php) (revision 0878683fa8df8ae2224a2d9a43f7509919e02274) @@ -26,7 +26,7 @@ // display user's lams workspace $sequencelabel = get_string('selectsequence', 'lamstwo'); - $lds = '[' . lamstwo_get_sequences_rest($USER->username, $course->id, $USER->country, $USER->lang) . ']'; + $lds = '[' . lamstwo_get_sequences_rest($USER->username, $course->id, $course->fullname, $course->timecreated, $USER->country, $USER->lang) . ']'; $html = << Index: temp_moodle_dev/lamstwo/lib.php =================================================================== diff -u -r8a3d03f59a9f03598814905f63dd12120ef054c3 -r0878683fa8df8ae2224a2d9a43f7509919e02274 --- temp_moodle_dev/lamstwo/lib.php (.../lib.php) (revision 8a3d03f59a9f03598814905f63dd12120ef054c3) +++ temp_moodle_dev/lamstwo/lib.php (.../lib.php) (revision 0878683fa8df8ae2224a2d9a43f7509919e02274) @@ -13,6 +13,7 @@ $LAMS2CONSTANTS->param_hash = 'hash'; $LAMS2CONSTANTS->param_method = 'method'; $LAMS2CONSTANTS->param_courseid = 'courseid'; +$LAMS2CONSTANTS->param_coursename = 'courseName'; $LAMS2CONSTANTS->param_country = 'country'; $LAMS2CONSTANTS->param_lang = 'lang'; $LAMS2CONSTANTS->param_lsid = 'lsid'; @@ -271,13 +272,16 @@ * @return string to define the tree structure * @TODO complete the documentation of this function */ -function lamstwo_get_sequences_rest($username,$courseid,$country,$lang) { +function lamstwo_get_sequences_rest($username,$courseid,$coursename,$coursecreatedate,$country,$lang) { global $CFG,$USER; if(!isset($CFG->lamstwo_serverid)||!isset($CFG->lamstwo_serverkey)||!isset($CFG->lamstwo_serverurl)) { return get_string('notsetup', 'lamstwo'); } + // append month/year to course name + $coursename = $coursename.' '.date('n/Y', $coursecreatedate); + // generate hash $datetime = date('F d,Y g:i a'); $datetime_encoded = urlencode($datetime); @@ -286,7 +290,7 @@ // Put together REST URL $service = '/services/xml/LearningDesignRepository'; - $request = "$CFG->lamstwo_serverurl$service?serverId=$CFG->lamstwo_serverid&datetime=$datetime_encoded&hashValue=$hashvalue&username=$username&courseId=$courseid&mode=2&country=$country&lang=$lang"; + $request = "$CFG->lamstwo_serverurl$service?serverId=$CFG->lamstwo_serverid&datetime=$datetime_encoded&hashValue=$hashvalue&username=$username&courseId=$courseid&courseName=".urlencode($coursename)."&mode=2&country=$country&lang=$lang"; // GET call to LAMS $xml = file_get_contents($request); @@ -613,8 +617,11 @@ * 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 lamstwo_get_url($username, $lang, $country, $lessonid, $courseid, $method, $customcsv='') { +function lamstwo_get_url($username, $lang, $country, $lessonid, $courseid, $coursename, $coursecreatedate, $method, $customcsv='') { global $CFG, $LAMS2CONSTANTS; + + // append month/year to course name + $coursename = $coursename.' '.date('n/Y', $coursecreatedate); $datetime = date('F d,Y g:i a'); $plaintext = trim($datetime) @@ -631,10 +638,11 @@ '&'.$LAMS2CONSTANTS->param_hash.'='.$hash. ($method==$LAMS2CONSTANTS->author_method ? '' : '&'.$LAMS2CONSTANTS->param_lsid.'='.$lessonid). '&'.$LAMS2CONSTANTS->param_courseid.'='.$courseid. + '&'.$LAMS2CONSTANTS->param_coursename.'='.urlencode($coursename). '&'.$LAMS2CONSTANTS->param_country.'='.trim($country). '&'.$LAMS2CONSTANTS->param_lang.'='.substr(trim($lang),0,2); if ($customcsv != '') { - $url .= '&'.$LAMS2CONSTANTS->custom_csv.'='.$customcsv; + $url .= '&'.$LAMS2CONSTANTS->custom_csv.'='.urlencode($customcsv); } return $url; } Index: temp_moodle_dev/lamstwo/version.php =================================================================== diff -u -ra6b67669ecc2aa5b2a1546521a12d36210eee6af -r0878683fa8df8ae2224a2d9a43f7509919e02274 --- temp_moodle_dev/lamstwo/version.php (.../version.php) (revision a6b67669ecc2aa5b2a1546521a12d36210eee6af) +++ temp_moodle_dev/lamstwo/version.php (.../version.php) (revision 0878683fa8df8ae2224a2d9a43f7509919e02274) @@ -5,7 +5,7 @@ /// This fragment is called by moodle_needs_upgrading() and /admin/index.php ///////////////////////////////////////////////////////////////////////////////// -$module->version = 2008052100; // The current module version (Date: YYYYMMDDXX) +$module->version = 2008091800; // The current module version (Date: YYYYMMDDXX) $module->requires = 2007021400; // Requires this Moodle version (1.8) $module->cron = 0; // Period for cron to check this module (secs) Index: temp_moodle_dev/lamstwo/view.php =================================================================== diff -u -refa28348a96b4e32952ad0562ce54e74b93d227a -r0878683fa8df8ae2224a2d9a43f7509919e02274 --- temp_moodle_dev/lamstwo/view.php (.../view.php) (revision efa28348a96b4e32952ad0562ce54e74b93d227a) +++ temp_moodle_dev/lamstwo/view.php (.../view.php) (revision 0878683fa8df8ae2224a2d9a43f7509919e02274) @@ -61,7 +61,7 @@ XXX; $customcsv = "$USER->username,$course->id,$cm->section"; - $authorurl = lamstwo_get_url($USER->username, $locale['lang'], $locale['country'], 0, $course->id, $LAMS2CONSTANTS->author_method, $customcsv); + $authorurl = lamstwo_get_url($USER->username, $locale['lang'], $locale['country'], 0, $course->id, $course->fullname, $course->timecreated, $LAMS2CONSTANTS->author_method, $customcsv); echo $openauthorjs; @@ -102,12 +102,12 @@ $links = ''; $lessonlink = $lesson->name; if ($canparticipate) { - $learnerurl = lamstwo_get_url($USER->username, $locale['lang'], $locale['country'], $lesson->lesson_id, $course->id, $LAMS2CONSTANTS->learner_method); + $learnerurl = lamstwo_get_url($USER->username, $locale['lang'], $locale['country'], $lesson->lesson_id, $course->id, $course->fullname, $course->timecreated, $LAMS2CONSTANTS->learner_method); $learnerurl = "onclick=\"javascript:window.open('".$learnerurl."','learner','location=0,toolbar=0,menubar=0,statusbar=0,width=996,height=600,resizable',0)\""; $lessonlink = "$lesson->name"; } if ($canmanage) { - $monitorurl = lamstwo_get_url($USER->username, $locale['lang'], $locale['country'], $lesson->lesson_id, $course->id, $LAMS2CONSTANTS->monitor_method); + $monitorurl = lamstwo_get_url($USER->username, $locale['lang'], $locale['country'], $lesson->lesson_id, $course->id, $course->fullname, $course->timecreated, $LAMS2CONSTANTS->monitor_method); $monitorurl = "onclick=\"javascript:window.open('".$monitorurl."','monitor','location=0,toolbar=0,menubar=0,statusbar=0,width=996,height=600,resizable',0)\""; $monitorlink = "".get_string('openmonitor', 'lamstwo').""; $links .= $monitorlink;