Merge pull request #92 from oat-sa/release-3.4.3

Release 3.4.3
oat-sa · Oct 23, 2017 · 6d462ed · 6d462ed
2 parents a954967 + 261e260
commit 6d462ed
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/manifest.php b/manifest.php
@@ -35,7 +35,7 @@
 	'label' => 'LTI library',
     'description' => 'TAO LTI library and helpers',
     'license' => 'GPL-2.0',
-    'version' => '3.4.2',
+    'version' => '3.4.3',
 	'author' => 'Open Assessment Technologies SA',
 	'requires' => array(
 	   'tao' => '>=10.8.0'

diff --git a/models/classes/user/OntologyLtiUserService.php b/models/classes/user/OntologyLtiUserService.php
@@ -79,14 +79,23 @@ public function findUser(\taoLti_models_classes_LtiLaunchData $ltiContext)
             );
 
             $roles = $this->determineTaoRoles($ltiContext);
-
-            $ltiUser = new LtiUser($ltiContext, $instance->getUri(), $properties[PROPERTY_USER_ROLES], (string)current($properties[PROPERTY_USER_UILG]), (string)current($properties[PROPERTY_USER_FIRSTNAME]), (string)current($properties[PROPERTY_USER_LASTNAME]), (string)current($properties[PROPERTY_USER_MAIL]));
+            $lang = current($properties[PROPERTY_USER_UILG]);
+
+            // In case of the language is a Language Resource in Ontology, get its code.
+            if ($lang instanceof \core_kernel_classes_Resource) {
+                $lang = \tao_models_classes_LanguageService::singleton()->getCode($lang);
+            } elseif (empty($lang)) {
+                $lang = DEFAULT_LANG;
+            }
+
+            $ltiUser = new LtiUser($ltiContext, $instance->getUri(), $properties[PROPERTY_USER_ROLES], $lang, (string)current($properties[PROPERTY_USER_FIRSTNAME]), (string)current($properties[PROPERTY_USER_LASTNAME]), (string)current($properties[PROPERTY_USER_MAIL]));
 
             if($roles !== array(INSTANCE_ROLE_LTI_BASE)){
                 $ltiUser->setRoles($roles);
                 $instance->editPropertyValues(new \core_kernel_classes_Property(PROPERTY_USER_ROLES), $roles);
             }
 
+            \common_Logger::t("LTI User '" . $ltiUser->getIdentifier() . "' found.");
             return $ltiUser;
         } else {
             return null;
@@ -131,7 +140,6 @@ public function getUserIdentifier($userId, $ltiConsumer)
     public function spawnUser(\taoLti_models_classes_LtiLaunchData $ltiContext)
     {
         $class = new \core_kernel_classes_Class(self::CLASS_LTI_USER);
-        //$lang = tao_models_classes_LanguageService::singleton()->getLanguageByCode(DEFAULT_LANG);
 
         $props = array(
             self::PROPERTY_USER_LTIKEY => $ltiContext->getUserID(),
@@ -149,7 +157,8 @@ public function spawnUser(\taoLti_models_classes_LtiLaunchData $ltiContext)
             $uiLanguage = DEFAULT_LANG;
         }
 
-        $props[PROPERTY_USER_UILG] = $uiLanguage;
+        $languageResource = \tao_models_classes_LanguageService::singleton()->getLanguageByCode($uiLanguage);
+        $props[PROPERTY_USER_UILG] = $languageResource->getUri();
 
         if ($ltiContext->hasVariable(\taoLti_models_classes_LtiLaunchData::LIS_PERSON_NAME_FULL)) {
             $label = $ltiContext->getUserFullName();

diff --git a/scripts/update/class.Updater.php b/scripts/update/class.Updater.php
@@ -86,7 +86,7 @@ public function update($initialVersion)
 
             $this->setVersion('3.4.0');
         }
-        $this->skip('3.4.0', '3.4.2');
+        $this->skip('3.4.0', '3.4.3');
 
     }
 }