Merge pull request #545 from juancs/mnetuser

danmarsden · web-flow · commit d2ea4b411ce0 · 2021-06-08T09:27:24.000+12:00
Improve user search in saml_login_complete method.
diff --git a/classes/auth.php b/classes/auth.php
@@ -594,7 +594,10 @@ public function saml_login_complete($attributes) {
                 $this->log(__FUNCTION__ . " to lowercase for $key => $uid");
                 $uid = strtolower($uid);
             }
-            if ($user = $DB->get_record('user', array( $this->config->mdlattr => $uid, 'deleted' => 0 ))) {
+            if ($user = $DB->get_record('user', array(
+                    $this->config->mdlattr => $uid,
+                    'deleted' => 0,
+                    'mnethostid' => $CFG->mnet_localhost_id))) {
                 continue;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -594,7 +594,10 @@ public function saml_login_complete($attributes) {`
`594`	`594`	`$this->log(__FUNCTION__ . " to lowercase for $key => $uid");`
`595`	`595`	`$uid = strtolower($uid);`
`596`	`596`	`}`
`597`		`- if ($user = $DB->get_record('user', array( $this->config->mdlattr => $uid, 'deleted' => 0 ))) {`
	`597`	`+ if ($user = $DB->get_record('user', array(`
	`598`	`+ $this->config->mdlattr => $uid,`
	`599`	`+ 'deleted' => 0,`
	`600`	`+ 'mnethostid' => $CFG->mnet_localhost_id))) {`
`598`	`601`	`continue;`
`599`	`602`	`}`
`600`	`603`	`}`