commit cac3985d1f81b48dd1d08f3e313759c139dd2dcc
Author: Mario Mendoza <mmendoza@2u.com>
Date:   Tue Jun 30 13:37:50 2020 -0500

    MDL-69181 mod_lti : Enabling the ability of the External Tool capability to pull custom parameters from User and Profile scopes

diff --git a/mod/lti/locallib.php b/mod/lti/locallib.php
index d3f4810550f..5f3d8ce185f 100644
--- a/mod/lti/locallib.php
+++ b/mod/lti/locallib.php
@@ -1896,13 +1896,16 @@ function lti_parse_custom_parameter($toolproxy, $tool, $params, $value, $islti2)
                     }
                 } else {
                     $val = $value;
-                    $services = lti_get_services();
-                    foreach ($services as $service) {
-                        $service->set_tool_proxy($toolproxy);
-                        $service->set_type($tool);
-                        $value = $service->parse_value($val);
-                        if ($val != $value) {
-                            break;
+                    $value = format_string(lti_calculate_custom_parameter($value));
+                    if ($value == null) {
+                        $services = lticustom_get_services();
+                        foreach ($services as $service) {
+                            $service->set_tool_proxy($toolproxy);
+                            $service->set_type($tool);
+                            $value = $service->parse_value($val);
+                            if ($val != $value) {
+                                break;
+                            }
                         }
                     }
                 }
@@ -1925,7 +1928,20 @@ function lti_calculate_custom_parameter($value) {
     switch ($value) {
         case 'Moodle.Person.userGroupIds':
             return implode(",", groups_get_user_groups($COURSE->id, $USER->id)[0]);
+            break;
+        default:
+            $valueinfo = explode('.', str_replace('$', '', $value));
+            $property = $valueinfo[1];
+            if (property_exists($USER, $property)) {
+                return $USER->{$property} == "" ? null : $USER->{$property};
+            }
+            $PROFILE = profile_user_record($USER->id);
+            if (property_exists((object)$PROFILE, $property)) {
+                return $PROFILE->{$property} == "" ? null : $PROFILE->{$property};
+            }
+            break;
     }
+
     return null;
 }