Merge branch 'MDL-40531_24' of https://github.com/stronk7/moodle into…

… MOODLE_24_STABLE
moodle · Oct 23, 2013 · 7a2db63 · 7a2db63
2 parents 8a3894d + 4673a6a
commit 7a2db63
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/mod/lti/service.php b/mod/lti/service.php
@@ -106,7 +106,7 @@
         $grade = lti_read_grade($ltiinstance, $parsed->userid);
 
         $responsexml = lti_get_response_xml(
-                isset($grade) ? 'success' : 'failure',
+                'success',  // Empty grade is also 'success'
                 'Result read',
                 $parsed->messageid,
                 'readResultResponse'

diff --git a/mod/lti/servicelib.php b/mod/lti/servicelib.php
@@ -37,7 +37,7 @@
 
 function lti_get_response_xml($codemajor, $description, $messageref, $messagetype) {
     $xml = new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><imsx_POXEnvelopeResponse />');
-    $xml->addAttribute('xmlns', 'http://www.imsglobal.org/lis/oms1p0/pox');
+    $xml->addAttribute('xmlns', 'http://www.imsglobal.org/services/ltiv1p1/xsd/imsoms_v1p0');
 
     $headerinfo = $xml->addChild('imsx_POXHeader')->addChild('imsx_POXResponseHeaderInfo');
 
@@ -49,6 +49,8 @@ function lti_get_response_xml($codemajor, $description, $messageref, $messagetyp
     $statusinfo->addChild('imsx_severity', 'status');
     $statusinfo->addChild('imsx_description', $description);
     $statusinfo->addChild('imsx_messageRefIdentifier', $messageref);
+    $incomingtype = str_replace('Response','Request', $messagetype);
+    $statusinfo->addChild('imsx_operationRefIdentifier', $incomingtype);
 
     $xml->addChild('imsx_POXBody')->addChild($messagetype);
 

diff --git a/mod/lti/tests/locallib_test.php b/mod/lti/tests/locallib_test.php
@@ -104,7 +104,7 @@ public function disabled_test_sign_parameters() {
      */
     public function disabled_test_parse_grade_replace_message() {
         $message = '
-            <imsx_POXEnvelopeRequest xmlns = "http://www.imsglobal.org/lis/oms1p0/pox">
+            <imsx_POXEnvelopeRequest xmlns = "http://www.imsglobal.org/services/ltiv1p1/xsd/imsoms_v1p0">
               <imsx_POXHeader>
                 <imsx_POXRequestHeaderInfo>
                   <imsx_version>V1.0</imsx_version>