From 351b399991094e57e890a9291484c4ab69ca628b Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Wed, 18 Jul 2018 22:42:56 -0400
Subject: Bug 1476288 - Replace moz_nick with (new, revised) nick and also
 attempt to disallow duplicate nicks

---
 Bugzilla/User.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 9faed25cc..4a58043a0 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -482,11 +482,15 @@ sub set_login {
 }
 
 sub _generate_nickname {
-    my ($name, $login) = @_;
+    my ($name, $login, $id) = @_;
     my ($nick) = extract_nicks($name);
     if (!$nick) {
         $nick = "";
     }
+    my ($count) = Bugzilla->dbh->selectrow_array('SELECT COUNT(*) FROM profiles WHERE nickname = ? AND userid != ?', undef, $nick, $id);
+    if ($count) {
+        $nick = "";
+    }
     return $nick;
 }
 
@@ -494,7 +498,7 @@ sub set_name {
     my ($self, $name) = @_;
     $self->set('realname', $name);
     delete $self->{identity};
-    $self->set('nickname', _generate_nickname($name, $self->login));
+    $self->set('nickname', _generate_nickname($name, $self->login, $self->id));
 }
 
 sub set_nick {
@@ -2532,7 +2536,7 @@ sub create {
     my $dbh = Bugzilla->dbh;
 
     $dbh->bz_start_transaction();
-    $params->{nickname} = _generate_nickname($params->{realname}, $params->{login_name});
+    $params->{nickname} = _generate_nickname($params->{realname}, $params->{login_name}, 0);
     my $user = $class->SUPER::create($params);
 
     # Turn on all email for the new user
-- 
cgit v1.2.3-24-g4f1b