Cicalese has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208178
Change subject: improved getAvailableUsername algorithm
......................................................................
improved getAvailableUsername algorithm
Change-Id: I50e6f61d68546435c85bfd72837fb7dbb6b30226
---
M OpenIDConnect.class.php
1 file changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenIDConnect
refs/changes/78/208178/1
diff --git a/OpenIDConnect.class.php b/OpenIDConnect.class.php
index 34f1be0..e737ad1 100644
--- a/OpenIDConnect.class.php
+++ b/OpenIDConnect.class.php
@@ -248,25 +248,28 @@
$realname, $email, $subject ) {
if ( strlen( $preferred_username ) > 0 ) {
$name = $preferred_username;
- } elseif ( strlen( $email ) > 0 ) {
+ } elseif ( strlen ( $realname ) > 0 &&
+ isset( $GLOBALS['OpenIDConnect_UseRealNameAsUserName']
) &&
+ $GLOBALS['OpenIDConnect_UseRealNameAsUserName'] ===
true ) {
+ $name = $realname;
+ } elseif ( strlen( $email ) > 0 &&
+ isset( $GLOBALS['OpenIDConnect_UseEmailNameAsUserName']
) &&
+ $GLOBALS['OpenIDConnect_UseEmailNameAsUserName'] ===
true ) {
$pos = strpos ( $email, '@' );
if ( $pos !== false && $pos > 0 ) {
$name = substr( $email, 0, $pos );
} else {
$name = $email;
}
- } elseif ( strlen ( $realname ) > 0 ) {
- $name = $realname;
- } else {
- $name = $subject;
}
$nt = Title::makeTitleSafe( NS_USER, $name );
if ( is_null( $nt ) ) {
$name = "User";
} elseif ( is_null( User::idFromName( $name ) ) ) {
return $nt->getText();
+ } else {
+ $name = $nt->getText();
}
- $name = $nt->getText();
$count = 1;
while ( !is_null( User::idFromName( $name . $count ) ) ) {
$count++;
--
To view, visit https://gerrit.wikimedia.org/r/208178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I50e6f61d68546435c85bfd72837fb7dbb6b30226
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenIDConnect
Gerrit-Branch: master
Gerrit-Owner: Cicalese <cical...@mitre.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
