From 7a4b98aec9e5d78e4e65de1affcd66742c9c36aa Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Tue, 29 Jul 2025 16:36:28 -0400
Subject: [PATCH] use consistent naming

---
 Oqtane.Client/Modules/Admin/Users/Index.razor          | 10 +++++-----
 Oqtane.Client/Resources/Modules/Admin/Users/Index.resx |  8 ++++----
 Oqtane.Server/Managers/UserManager.cs                  |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
index 9ce05876..7e53d87e 100644
--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -75,9 +75,9 @@ else
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="requirevalidemail" HelpText="Do you want to require registered users to validate their email address before they are allowed to log in?" ResourceKey="RequireValidEmail">Require Valid Email?</Label>
+                        <Label Class="col-sm-3" For="requireconfirmedemail" HelpText="Do you want to require registered users to verify their email address before they are allowed to log in?" ResourceKey="RequireConfirmedEmail">Require Verified Email?</Label>
                         <div class="col-sm-9">
-                            <select id="requirevalidemail" class="form-select" @bind="@_requirevalidemail">
+                            <select id="requireconfirmedemail" class="form-select" @bind="@_requireconfirmedemail">
                                 <option value="true">@SharedLocalizer["Yes"]</option>
                                 <option value="false">@SharedLocalizer["No"]</option>
                             </select>
@@ -499,7 +499,7 @@ else
     private string _allowregistration;
     private string _registerurl;
     private string _profileurl;
-    private string _requirevalidemail;
+    private string _requireconfirmedemail;
     private string _twofactor;
     private string _cookiename;
     private string _cookieexpiration;
@@ -570,7 +570,7 @@ else
         _allowregistration = PageState.Site.AllowRegistration.ToString().ToLower();
         _registerurl = SettingService.GetSetting(settings, "LoginOptions:RegisterUrl", "");
         _profileurl = SettingService.GetSetting(settings, "LoginOptions:ProfileUrl", "");
-        _requirevalidemail = SettingService.GetSetting(settings, "LoginOptions:RequireValidEmail", "true");
+        _requireconfirmedemail = SettingService.GetSetting(settings, "LoginOptions:RequireConfirmedEmail", "true");
 
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
@@ -696,7 +696,7 @@ else
             {
                 settings = SettingService.SetSetting(settings, "LoginOptions:RegisterUrl", _registerurl, false);
                 settings = SettingService.SetSetting(settings, "LoginOptions:ProfileUrl", _profileurl, false);
-                settings = SettingService.SetSetting(settings, "LoginOptions:RequireValidEmail", _requirevalidemail, false);
+                settings = SettingService.SetSetting(settings, "LoginOptions:RequireConfirmedEmail", _requireconfirmedemail, false);
                 settings = SettingService.SetSetting(settings, "LoginOptions:TwoFactor", _twofactor, false);
                 settings = SettingService.SetSetting(settings, "LoginOptions:CookieName", _cookiename, true);
                 settings = SettingService.SetSetting(settings, "LoginOptions:CookieExpiration", _cookieexpiration, true);
diff --git a/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx
index 2bbf1f75..79144098 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx
@@ -372,11 +372,11 @@
   <data name="TwoFactor.Text" xml:space="preserve">
     <value>Two Factor Authentication?</value>
   </data>
-  <data name="RequireValidEmail.HelpText" xml:space="preserve">
-    <value>Do you want to require registered users to validate their email address before they are allowed to log in?</value>
+  <data name="RequireConfirmedEmail.HelpText" xml:space="preserve">
+    <value>Do you want to require registered users to verify their email address before they are allowed to log in?</value>
   </data>
-  <data name="RequireValidEmail.Text" xml:space="preserve">
-    <value>Require Valid Email?</value>
+  <data name="RequireConfirmedEmail.Text" xml:space="preserve">
+    <value>Require Verified Email?</value>
   </data>
   <data name="Disabled" xml:space="preserve">
     <value>Disabled</value>
diff --git a/Oqtane.Server/Managers/UserManager.cs b/Oqtane.Server/Managers/UserManager.cs
index 7a60e785..5f9cd8dc 100644
--- a/Oqtane.Server/Managers/UserManager.cs
+++ b/Oqtane.Server/Managers/UserManager.cs
@@ -180,7 +180,7 @@ namespace Oqtane.Managers
             if (User != null)
             {
                 string siteName = _sites.GetSite(user.SiteId).Name;
-                if (!user.EmailConfirmed && bool.Parse(_settings.GetSettingValue(EntityNames.Site, alias.SiteId, "LoginOptions:RequireValidEmail", "true")))
+                if (!user.EmailConfirmed && bool.Parse(_settings.GetSettingValue(EntityNames.Site, alias.SiteId, "LoginOptions:RequireConfirmedEmail", "true")))
                 {
                     string token = await _identityUserManager.GenerateEmailConfirmationTokenAsync(identityuser);
                     string url = alias.Protocol + alias.Name + "/login?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token);
@@ -252,7 +252,7 @@ namespace Oqtane.Managers
                     await _identityUserManager.UpdateAsync(identityuser); // security stamp not updated
                 }
 
-                if (bool.Parse(_settings.GetSettingValue(EntityNames.Site, alias.SiteId, "LoginOptions:RequireValidEmail", "true")))
+                if (bool.Parse(_settings.GetSettingValue(EntityNames.Site, alias.SiteId, "LoginOptions:RequireConfirmedEmail", "true")))
                 {
                     if (user.EmailConfirmed)
                     {
@@ -379,7 +379,7 @@ namespace Oqtane.Managers
                         }
                         else
                         {
-                            if (!bool.Parse(_settings.GetSettingValue(EntityNames.Site, alias.SiteId, "LoginOptions:RequireValidEmail", "true")) || await _identityUserManager.IsEmailConfirmedAsync(identityuser))
+                            if (!bool.Parse(_settings.GetSettingValue(EntityNames.Site, alias.SiteId, "LoginOptions:RequireConfirmedEmail", "true")) || await _identityUserManager.IsEmailConfirmedAsync(identityuser))
                             {
                                 user = GetUser(identityuser.UserName, alias.SiteId);
                                 if (user != null)