Fixing user registration to not sign the user in after account creation if new user accounts must be approved before use.

via the "Users must be approved before they can log in" site setting

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs

@@ -125,6 +125,10 @@ namespace Orchard.Users.Controllers {
                         return RedirectToAction("ChallengeEmailSent");
                     }
 
+                    if (user.As<UserPart>().RegistrationStatus == UserStatus.Pending) {
+                        return RedirectToAction("RegistrationPending");
+                    }
+
                     _authenticationService.SignIn(user, false /* createPersistentCookie */);
                     return Redirect("~/");
                 }
@@ -174,6 +178,10 @@ namespace Orchard.Users.Controllers {
             }
         }
 
+        public ActionResult RegistrationPending() {
+            return View();
+        }
+
         public ActionResult ChangePasswordSuccess() {
             return View();
         }

src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj

@@ -128,6 +128,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Views\Account\RegistrationPending.cshtml" />
     <None Include="Views\EditorTemplates\Parts\User.Edit.cshtml" />
     <None Include="Views\EditorTemplates\Parts\User.Create.cshtml" />
   </ItemGroup>

src/Orchard.Web/Modules/Orchard.Users/Views/Account/RegistrationPending.cshtml

@@ -0,0 +1,3 @@
+@model dynamic
+<h1>@Html.TitleForPage(T("User Registration Pending").ToString()) </h1>
+<p>@T("Your user account has been created but has to be approved before it can be used.")</p>

src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Parts/Users.RegistrationSettings.cshtml

@@ -9,7 +9,7 @@
     </div>
     <div>
         @Html.EditorFor(m => m.UsersMustValidateEmail)
-        <label class="forcheckbox" for="@Html.FieldIdFor( m => m.UsersMustValidateEmail)">@T("Users must justify their email address")</label>
+        <label class="forcheckbox" for="@Html.FieldIdFor( m => m.UsersMustValidateEmail)">@T("Users must verify their email address")</label>
         @Html.ValidationMessage("UsersMustValidateEmail", "*")
     </div>
     <div>