Merge branch 'hotfix/sso-name-clash' of github.com:vanilla/vanilla

vanilla · Jul 19, 2015 · e24fcd4 · e24fcd4
2 parents e5a9a4c + 965bc38
commit e24fcd4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/applications/dashboard/controllers/class.entrycontroller.php b/applications/dashboard/controllers/class.entrycontroller.php
@@ -380,6 +380,7 @@ public function connect($Method) {
         $this->addJsFile('entry.js');
         $this->View = 'connect';
         $IsPostBack = $this->Form->isPostBack() && $this->Form->getFormValue('Connect', null) !== null;
+        $UserSelect = $this->Form->getFormValue('UserSelect');
 
         if (!$IsPostBack) {
             // Here are the initial data array values. that can be set by a plugin.
@@ -517,6 +518,10 @@ public function connect($Method) {
                 $UserModel->SQL->orWhere('Email', $this->Form->getFormValue('Email'));
                 $Search = true;
             }
+            if (is_numeric($UserSelect)) {
+                $UserModel->SQL->orWhere('UserID', $UserSelect);
+                $Search = true;
+            }
 
             if ($Search) {
                 $ExistingUsers = $UserModel->getWhere()->resultArray();
@@ -604,7 +609,10 @@ public function connect($Method) {
                 $EmailValid = validateRequired($this->Form->getFormValue('Email'));
             }
 
-            if ($this->Form->getFormValue('Name') && $EmailValid && (!is_array($ExistingUsers) || count($ExistingUsers) == 0)) {
+            if ((!$UserSelect || $UserSelect == 'other') &&
+                $this->Form->getFormValue('Name') && $EmailValid &&
+                (!is_array($ExistingUsers) || count($ExistingUsers) == 0)) {
+
                 // There is no existing user with the suggested name so we can just create the user.
                 $User = $this->Form->formValues();
                 $User = $this->UserModel->filterForm($User, true);
@@ -627,6 +635,7 @@ public function connect($Method) {
                         'UniqueID' => $this->Form->getFormValue('UniqueID')));
 
                     $this->Form->setFormValue('UserID', $UserID);
+                    $this->Form->setFormValue('UserSelect', false);
 
                     Gdn::session()->start($UserID, true, (bool)$this->Form->getFormValue('RememberMe', true));
                     Gdn::userModel()->fireEvent('AfterSignIn');
@@ -650,8 +659,6 @@ public function connect($Method) {
             // The user has made their decision.
             $PasswordHash = new Gdn_PasswordHash();
 
-            $UserSelect = $this->Form->getFormValue('UserSelect');
-
             if (!$UserSelect || $UserSelect == 'other') {
                 // The user entered a username.
                 $ConnectNameEntered = true;

diff --git a/conf/config-defaults.php b/conf/config-defaults.php
@@ -63,6 +63,7 @@
 $Configuration['Garden']['Registration']['ConfirmEmail']        = FALSE;
 $Configuration['Garden']['Registration']['ConfirmEmailRole']    = 3;
 $Configuration['Garden']['Registration']['MinPasswordLength']   = 6;
+$Configuration['Garden']['Registration']['NameUnique']          = true;
 $Configuration['Garden']['TermsOfService']                      = '/home/termsofservice'; // The url to the terms of service.
 $Configuration['Garden']['Email']['UseSmtp']                    = FALSE;
 $Configuration['Garden']['Email']['SmtpHost']                   = '';