Merge pull request #5439 from oqtane/master

6.1.4 Release

Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -53,6 +53,7 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddScoped<ISyncService, SyncService>();
             services.AddScoped<ILocalizationCookieService, LocalizationCookieService>();
             services.AddScoped<ICookieConsentService, CookieConsentService>();
+            services.AddScoped<ITimeZoneService, TimeZoneService>();
             services.AddScoped<IOutputCacheService, OutputCacheService>();
 
             // providers

Oqtane.Client/Modules/Admin/Files/Edit.razor

@@ -15,22 +15,34 @@
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="parent" HelpText="Select the parent folder" ResourceKey="Parent">Parent: </Label>
                         <div class="col-sm-9">
-                            <select id="parent" class="form-select" @bind="@_parentId" required>
-                                @if (PageState.QueryString.ContainsKey("id"))
-                                {
+                            @if (_parentId == -1)
+                            {
+                                <select id="parent" class="form-select" @bind="@_parentId" required>
                                     <option value="-1">&lt;@Localizer["NoParent"]&gt;</option>
-                                }
+                                </select>
+                            }
+                            else
+                            {
+                                <select id="parent" class="form-select" @bind="@_parentId" required>
                                 @foreach (Folder folder in _folders)
                                 {
                                     <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
                                 }
-                            </select>
+                                </select>
+                            }
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="name" HelpText="Enter the folder name" ResourceKey="Name">Name: </Label>
                         <div class="col-sm-9">
-                            <input id="name" class="form-control" @bind="@_name" maxlength="256" required />
+                            @if (_isSystem)
+                            {
+                                <input id="name" class="form-control" @bind="@_name" readonly />
+                            }
+                            else
+                            {
+                                <input id="name" class="form-control" @bind="@_name" maxlength="256" required />
+                            }
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
@@ -229,7 +241,6 @@
 
                 if (folder != null)
                 {
-                    await FolderService.UpdateFolderOrderAsync(folder.SiteId, folder.FolderId, folder.ParentId);
                     await logger.LogInformation("Folder Saved {Folder}", folder);
                     NavigationManager.NavigateTo(NavigateUrl());
                 }
@@ -265,17 +276,9 @@
             }
             if (!isparent)
             {
-                var files = await FileService.GetFilesAsync(_folderId);
-                if (files.Count == 0)
-                {
-                    await FolderService.DeleteFolderAsync(_folderId);
-                    await logger.LogInformation("Folder Deleted {Folder}", _folderId);
-                    NavigationManager.NavigateTo(NavigateUrl());
-                }
-                else
-                {
-                    AddModuleMessage(Localizer["Message.Folder.Files.InvalidDelete"], MessageType.Warning);
-                }
+                await FolderService.DeleteFolderAsync(_folderId);
+                await logger.LogInformation("Folder Deleted {Folder}", _folderId);
+                NavigationManager.NavigateTo(NavigateUrl());
             }
             else
             {

Oqtane.Client/Modules/Admin/Files/Index.razor

@@ -53,7 +53,7 @@ else
                         <td><ActionLink Action="Details" Text="Edit" Parameters="@($"id=" + context.FileId.ToString())" ResourceKey="Details" /></td>
                         <td><ActionDialog Header="Delete File" Message="@string.Format(Localizer["Confirm.File.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" ResourceKey="DeleteFile" /></td>
                         <td><a href="@context.Url" target="_new">@context.Name</a></td>
-                        <td>@context.ModifiedOn</td>
+                        <td>@UtcToLocal(context.ModifiedOn)</td>
                         <td>@context.Extension.ToUpper() @SharedLocalizer["File"]</td>
                         <td>@string.Format("{0:0.00}", ((decimal)context.Size / 1000)) KB</td>
                     </Row>

Oqtane.Client/Modules/Admin/Jobs/Edit.razor

@@ -56,7 +56,7 @@
                         <input id="starting" type="date" class="form-control" @bind="@_startDate" />
                     </div>
                     <div class="col">
-                        <input id="starting" type="time" class="form-control" placeholder="hh:mm" @bind="@_startTime" />
+                        <input id="starting" type="time" class="form-control" @bind="@_startTime" placeholder="hh:mm" required="@(_startDate.HasValue)" />
                     </div>
                 </div>
             </div>
@@ -69,7 +69,7 @@
                         <input id="ending" type="date" class="form-control" @bind="@_endDate" />
                     </div>
                     <div class="col">
-                        <input id="ending" type="time" class="form-control" placeholder="hh:mm" @bind="@_endTime" />
+                        <input id="ending" type="time" class="form-control" placeholder="hh:mm" @bind="@_endTime" required="@(_endDate.HasValue)" />
                     </div>
                 </div>
             </div>
@@ -82,7 +82,7 @@
                         <input id="next" type="date" class="form-control" @bind="@_nextDate" />
                     </div>
                     <div class="col">
-                        <input id="next" type="time" class="form-control" placeholder="hh:mm" @bind="@_nextTime" />
+                        <input id="next" type="time" class="form-control" placeholder="hh:mm" @bind="@_nextTime" required="@(_nextDate.HasValue)" />
                     </div>
                 </div>
             </div>
@@ -132,13 +132,13 @@
 				_isEnabled = job.IsEnabled.ToString();
 				_interval = job.Interval.ToString();
 				_frequency = job.Frequency;
-				_startDate = Utilities.UtcAsLocalDate(job.StartDate);
-                _startTime = Utilities.UtcAsLocalDateTime(job.StartDate);
-                _endDate = Utilities.UtcAsLocalDate(job.EndDate);
-                _endTime = Utilities.UtcAsLocalDateTime(job.EndDate);
+				_startDate = UtcToLocal(job.StartDate);
+                _startTime = UtcToLocal(job.StartDate);
+                _endDate = UtcToLocal(job.EndDate);
+                _endTime = UtcToLocal(job.EndDate);
                 _retentionHistory = job.RetentionHistory.ToString();
-                _nextDate = Utilities.UtcAsLocalDate(job.NextExecution);
-                _nextTime = Utilities.UtcAsLocalDateTime(job.NextExecution);
+                _nextDate = UtcToLocal(job.NextExecution);
+                _nextTime = UtcToLocal(job.NextExecution);
                 createdby = job.CreatedBy;
 				createdon = job.CreatedOn;
 				modifiedby = job.ModifiedBy;
@@ -176,10 +176,18 @@
 			{
 				job.Interval = int.Parse(_interval);
 			}
-			job.StartDate = Utilities.LocalDateAndTimeAsUtc(_startDate, _startTime);
-			job.EndDate = Utilities.LocalDateAndTimeAsUtc(_endDate, _endTime);
-			job.RetentionHistory = int.Parse(_retentionHistory);
-			job.NextExecution = Utilities.LocalDateAndTimeAsUtc(_nextDate, _nextTime);
+            job.StartDate = _startDate.HasValue && _startTime.HasValue
+                ? LocalToUtc(_startDate.GetValueOrDefault().Date.Add(_startTime.GetValueOrDefault().TimeOfDay))
+                : null;
+
+            job.EndDate = _endDate.HasValue && _endTime.HasValue
+                ? LocalToUtc(_endDate.GetValueOrDefault().Date.Add(_endTime.GetValueOrDefault().TimeOfDay))
+                : null;
+
+            job.NextExecution = _nextDate.HasValue && _nextTime.HasValue
+                ? LocalToUtc(_nextDate.GetValueOrDefault().Date.Add(_nextTime.GetValueOrDefault().TimeOfDay))
+                : null;
+            job.RetentionHistory = int.Parse(_retentionHistory);
 
 			try
 			{
@@ -198,5 +206,4 @@
 			AddModuleMessage(Localizer["Message.Required.JobInfo"], MessageType.Warning);
 		}
 	}
-
 }

Oqtane.Client/Modules/Admin/Jobs/Index.razor

@@ -29,7 +29,7 @@ else
             <td>@context.Name</td>
             <td>@DisplayStatus(context.IsEnabled, context.IsExecuting)</td>
             <td>@DisplayFrequency(context.Interval, context.Frequency)</td>
-            <td>@context.NextExecution?.ToLocalTime()</td>
+            <td>@UtcToLocal(context.NextExecution)</td>
             <td>
                 @if (context.IsStarted)
                 {

Oqtane.Client/Modules/Admin/Jobs/Log.razor

@@ -23,8 +23,8 @@ else
         <Row>
             <td>@context.Job.Name</td>
             <td>@DisplayStatus(context.Job.IsExecuting, context.Succeeded)</td>
-            <td>@context.StartDate</td>
-            <td>@context.FinishDate</td>
+            <td>@UtcToLocal(context.StartDate)</td>
+            <td>@UtcToLocal(context.FinishDate)</td>
         </Row>
         <Detail>
             <td colspan="4">@((MarkupString)context.Notes)</td>

Oqtane.Client/Modules/Admin/Login/Index.razor

@@ -21,9 +21,7 @@ else
                 @if (_allowexternallogin)
                 {
                     <button type="button" class="btn btn-primary" @onclick="ExternalLogin">@Localizer["Use"] @PageState.Site.Settings["ExternalLogin:ProviderName"]</button>
-                    <br />
-
-                    <br />
+                    <br /><br />
                 }
                 @if (_allowsitelogin)
                 {
@@ -49,15 +47,11 @@ else
                     </div>
                     <button type="button" class="btn btn-primary" @onclick="Login">@SharedLocalizer["Login"]</button>
                     <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-                    <br />
-
-                    <br />
+                    <br /><br />
                     <button type="button" class="btn btn-secondary" @onclick="Forgot">@Localizer["ForgotPassword"]</button>
                     @if (PageState.Site.AllowRegistration)
                     {
-                        <br />
-
-                        <br />
+                        <br /><br />
                         <NavLink href="@NavigateUrl("register")">@Localizer["Register"]</NavLink>
                     }
                 }
@@ -144,7 +138,7 @@ else
                     user = await UserService.VerifyEmailAsync(user, PageState.QueryString["token"]);
                     if (user != null)
                     {
-                        await logger.LogInformation(LogFunction.Security, "Email Verified For For Username {Username}", _username);
+                        await logger.LogInformation(LogFunction.Security, "Email Verified For Username {Username}", _username);
                         AddModuleMessage(Localizer["Success.Account.Verified"], MessageType.Info);						
                     }
                     else

Oqtane.Client/Modules/Admin/Logs/Detail.razor

@@ -141,7 +141,7 @@
             var log = await LogService.GetLogAsync(_logId);
             if (log != null)
             {
-                _logDate = log.LogDate.ToString(CultureInfo.CurrentCulture);
+                _logDate = UtcToLocal(log.LogDate).Value.ToString(CultureInfo.CurrentCulture);
                 _level = log.Level;
                 _feature = log.Feature;
                 _function = log.Function;

Oqtane.Client/Modules/Admin/Logs/Index.razor

@@ -64,7 +64,7 @@ else
 					</Header>
 					<Row>
                         <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Text="Details" Parameters="@($"/{context.LogId}")" ReturnUrl="@(NavigateUrl(PageState.Page.Path, AddUrlParameters(_level, _function, _rows, _page)))" ResourceKey="LogDetails" /></td>
-						<td class="@GetClass(context.Function)">@context.LogDate</td>
+						<td class="@GetClass(context.Function)">@UtcToLocal(context.LogDate)</td>
 						<td class="@GetClass(context.Function)">@context.Level</td>
 						<td class="@GetClass(context.Function)">@context.Feature</td>
 						<td class="@GetClass(context.Function)">@context.Function</td>

Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor

@@ -17,8 +17,8 @@ else
         <div class="row mb-3 align-items-center">
             <div class="col-sm-6">
                 <ActionLink Action="Add" Text="Install Module" ResourceKey="InstallModule" />
-                <ActionLink Action="Create" Text="Create Module" ResourceKey="CreateModule" Class="btn btn-secondary ps-2" />
-                <button type="button" class="btn btn-secondary pw-2" @onclick="@Synchronize">@Localizer["Synchronize"]</button>
+                <ActionLink Action="Create" Text="Create Module" ResourceKey="CreateModule" Class="btn btn-secondary ms-1" />
+                <button type="button" class="btn btn-secondary ms-1" @onclick="@Synchronize">@Localizer["Synchronize"]</button>
             </div>
             <div class="col-sm-6">
                 <select class="form-select" @onchange="(e => CategoryChanged(e))">

Oqtane.Client/Modules/Admin/Modules/Export.razor

@@ -5,24 +5,57 @@
 @inject IStringLocalizer<Export> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<div class="container">
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="content" HelpText="The Exported Module Content" ResourceKey="Content">Content: </Label>
-        <div class="col-sm-9">
-            <textarea id="content" class="form-control" @bind="@_content" rows="5" readonly></textarea>
+<TabStrip>
+    <TabPanel Name="Content" Heading="Content" ResourceKey="Content">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="content" HelpText="Select the Export option and you will be able to view the module content" ResourceKey="Content">Content: </Label>
+                <div class="col-sm-9">
+                    <textarea id="content" class="form-control" @bind="@_content" rows="5" readonly></textarea>
+                </div>
+            </div>
         </div>
-    </div>
-</div>
+        <br />
+        <button type="button" class="btn btn-success" @onclick="ExportText">@Localizer["Export"]</button>
+        <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
+    </TabPanel>
+    <TabPanel Name="File" Heading="File" ResourceKey="File">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="folder" HelpText="Select a folder where you wish to save the exported content" ResourceKey="Folder">Folder: </Label>
+                <div class="col-sm-9">
+                    <FileManager ShowFiles="false" ShowUpload="false" @ref="_filemanager" />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="filename" HelpText="Specify a name for the file (without an extension)" ResourceKey="Filename">Filename: </Label>
+                <div class="col-sm-9">
+                    <input id="content" type="text" class="form-control" @bind="@_filename" />
+                </div>
+            </div>
+        </div>
+        <br />
+        <button type="button" class="btn btn-success" @onclick="ExportFile">@Localizer["Export"]</button>
+        <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
+    </TabPanel>
+</TabStrip>
+
 
-<button type="button" class="btn btn-success" @onclick="ExportModule">@Localizer["Export"]</button>
-<NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
     private string _content = string.Empty;
+    private FileManager _filemanager;
+    private string _filename = string.Empty;
+
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
     public override string Title => "Export Content";
 
-    private async Task ExportModule()
+    protected override void OnInitialized()
+    {
+        _filename = Utilities.GetFriendlyUrl(ModuleState.Title);
+    }
+
+    private async Task ExportText()
     {
         try
         {
@@ -35,4 +68,34 @@
             AddModuleMessage(Localizer["Error.Module.Export"], MessageType.Error);
         }
     }
+
+    private async Task ExportFile()
+    {
+        try
+        {
+            var folderid = _filemanager.GetFolderId();
+            if (folderid != -1 && !string.IsNullOrEmpty(_filename))
+            {
+                var fileid = await ModuleService.ExportModuleAsync(ModuleState.ModuleId, PageState.Page.PageId, folderid, _filename);
+                if (fileid != -1)
+                {
+                    AddModuleMessage(Localizer["Success.Content.Export"], MessageType.Success);
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Error.Module.Export"], MessageType.Error);
+                }
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.Content.Export"], MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Exporting Module {ModuleId} {Error}", ModuleState.ModuleId, ex.Message);
+            AddModuleMessage(Localizer["Error.Module.Export"], MessageType.Error);
+        }
+    }
+
 }

Oqtane.Client/Modules/Admin/Modules/Import.razor

@@ -2,20 +2,27 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IModuleService ModuleService
+@inject IFileService FileService
 @inject IStringLocalizer<Import> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
     <div class="container">
         <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="content" HelpText="Enter The Module Content To Import" ResourceKey="Content">Content: </Label>
+            <Label Class="col-sm-3" For="file" HelpText="Optionally upload or select a file to import for this module" ResourceKey="File">File: </Label>
+            <div class="col-sm-9">
+                <FileManager Filter="json" OnSelectFile="OnSelectFile" />
+            </div>
+        </div>
+        <hr />
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="content" HelpText="Provide the module content to import" ResourceKey="Content">Content: </Label>
             <div class="col-sm-9">
                 <textarea id="content" class="form-control" @bind="@_content" rows="5" required></textarea>
-
             </div>
         </div>
     </div>
-
+    <br />
     <button type="button" class="btn btn-success" @onclick="ImportModule">@Localizer["Import"]</button>
     <NavLink class="btn btn-secondary" href="@PageState.ReturnUrl">@SharedLocalizer["Cancel"]</NavLink>
 </form>
@@ -28,6 +35,12 @@
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
     public override string Title => "Import Content";
 
+    private async Task OnSelectFile(int fileId)
+    {
+        var bytes = await FileService.DownloadFileAsync(fileId);
+        _content = System.Text.Encoding.UTF8.GetString(bytes, 0, bytes.Length);
+    }
+
     private async Task ImportModule()
     {
         validated = true;

Oqtane.Client/Modules/Admin/Modules/Settings.razor

@@ -97,6 +97,23 @@
                             </div>
                         </div>
                     </div>
+                    <br />
+                    <Section Name="ModuleContent" Heading="Content" ResourceKey="ModuleContent">
+                        <div class="container">
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="moduleheader" HelpText="Optionally provide content to be injected above the module instance" ResourceKey="Header">Header: </Label>
+                                <div class="col-sm-9">
+                                    <textarea id="moduleheader" class="form-control" @bind="@_header" rows="3" maxlength="4000"></textarea>
+                                </div>
+                            </div>
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="modulefooter" HelpText="Optionally provide content to be injected below the module instance" ResourceKey="Footer">Footer: </Label>
+                                <div class="col-sm-9">
+                                    <textarea id="modulefooter" class="form-control" @bind="@_footer" rows="3" maxlength="4000"></textarea>
+                                </div>
+                            </div>
+                        </div>
+                    </Section>
                 }
             </TabPanel>
             <TabPanel Name="Permissions" Heading="Permissions" ResourceKey="Permissions">
@@ -144,6 +161,8 @@
     private string _pane;
     private string _containerType;
     private string _allPages = "false";
+    private string _header = "";
+    private string _footer = "";
     private string _permissionNames = "";
     private List<Permission> _permissions = null;
     private string _pageId;
@@ -167,37 +186,47 @@
     protected override async Task OnInitializedAsync()
     {
         SetModuleTitle(Localizer["ModuleSettings.Title"]);
-
-        _title = ModuleState.Title;
         _moduleSettingsTitle = Localizer["ModuleSettings.Heading"];
-        _pane = ModuleState.Pane;
+
         _containers = ThemeService.GetContainerControls(PageState.Site.Themes, PageState.Page.ThemeType);
-        _containerType = ModuleState.ContainerType;
-        _allPages = ModuleState.AllPages.ToString();
-        _permissions = ModuleState.PermissionList;
-        _pageId = ModuleState.PageId.ToString();
-        createdby = ModuleState.CreatedBy;
-        createdon = ModuleState.CreatedOn;
-        modifiedby = ModuleState.ModifiedBy;
-        modifiedon = ModuleState.ModifiedOn;
-        _effectivedate = Utilities.UtcAsLocalDate(ModuleState.EffectiveDate);
-        _expirydate = Utilities.UtcAsLocalDate(ModuleState.ExpiryDate);
         _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
 
-        if (ModuleState.ModuleDefinition != null)
-        {
-            _module = ModuleState.ModuleDefinition.Name;
-            _permissionNames = ModuleState.ModuleDefinition?.PermissionNames;
+        var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
 
-            if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType))
+        _pageId = pagemodule.PageId.ToString();
+        _title = pagemodule.Title;
+        _pane = pagemodule.Pane;
+        _containerType = pagemodule.ContainerType;
+        if (string.IsNullOrEmpty(_containerType))
+        {
+            _containerType = (!string.IsNullOrEmpty(PageState.Page.DefaultContainerType)) ? PageState.Page.DefaultContainerType : PageState.Site.DefaultContainerType;
+        }
+        _header = pagemodule.Header;
+        _footer = pagemodule.Footer;
+        _effectivedate = Utilities.UtcAsLocalDate(pagemodule.EffectiveDate);
+        _expirydate = Utilities.UtcAsLocalDate(pagemodule.ExpiryDate);
+
+        _allPages = pagemodule.Module.AllPages.ToString();
+        createdby = pagemodule.Module.CreatedBy;
+        createdon = pagemodule.Module.CreatedOn;
+        modifiedby = pagemodule.Module.ModifiedBy;
+        modifiedon = pagemodule.Module.ModifiedOn;
+        _permissions = pagemodule.Module.PermissionList;
+
+        if (pagemodule.Module.ModuleDefinition != null)
+        {
+            _module = pagemodule.Module.ModuleDefinition.Name;
+            _permissionNames = pagemodule.Module.ModuleDefinition?.PermissionNames;
+
+            if (!string.IsNullOrEmpty(pagemodule.Module.ModuleDefinition.SettingsType))
             {
                 // module settings type explicitly declared in IModule interface
-                _moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.SettingsType);
+                _moduleSettingsType = Type.GetType(pagemodule.Module.ModuleDefinition.SettingsType);
             }
             else
             {
                 // legacy support - module settings type determined by convention ( ie. existence of a "Settings.razor" component in module )
-                _moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.ControlTypeTemplate.Replace(Constants.ActionToken, PageState.Action), false, true);
+                _moduleSettingsType = Type.GetType(pagemodule.Module.ModuleDefinition.ControlTypeTemplate.Replace(Constants.ActionToken, PageState.Action), false, true);
             }
             if (_moduleSettingsType != null)
             {
@@ -218,7 +247,7 @@
         }
         else
         {
-            AddModuleMessage(string.Format(Localizer["Error.Module.Load"], ModuleState.ModuleDefinitionName), MessageType.Error);
+            AddModuleMessage(string.Format(Localizer["Error.Module.Load"], pagemodule.Module.ModuleDefinitionName), MessageType.Error);
         }
 
         var theme = PageState.Site.Themes.FirstOrDefault(item => item.Containers.Any(themecontrol => themecontrol.TypeName.Equals(_containerType)));
@@ -270,10 +299,12 @@
                 {
                     pagemodule.ContainerType = string.Empty;
                 }
+                pagemodule.Header = _header;
+                pagemodule.Footer = _footer;
                 await PageModuleService.UpdatePageModuleAsync(pagemodule);
                 await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
 
-                var module = ModuleState;
+                var module = await ModuleService.GetModuleAsync(ModuleState.ModuleId);
                 module.AllPages = bool.Parse(_allPages);
                 module.PageModuleId = ModuleState.PageModuleId;
                 module.PermissionList = _permissionGrid.GetPermissionList();

Oqtane.Client/Modules/Admin/Pages/Edit.razor

@@ -30,16 +30,16 @@
                             <div class="row mb-1 align-items-center">
                                 <Label Class="col-sm-3" For="parent" HelpText="Select the parent for the page in the site hierarchy" ResourceKey="Parent">Parent: </Label>
                                 <div class="col-sm-9">
-                                        <select id="parent" class="form-select" value="@_parentid" @onchange="(e => ParentChanged(e))" required>
-                                            <option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option>
-                                            @foreach (Page page in _pages)
+                                    <select id="parent" class="form-select" value="@_parentid" @onchange="(e => ParentChanged(e))" required>
+                                        <option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option>
+                                        @foreach (Page page in _pages)
+                                        {
+                                            if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, page.PermissionList) && page.PageId != _pageId)
                                             {
-                                                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, page.PermissionList) && page.PageId != _pageId)
-                                                {
-                                                    <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
-                                                }
+                                                <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
                                             }
-                                        </select>
+                                        }
+                                    </select>
                                 </div>
                             </div>
                             <div class="row mb-1 align-items-center">
@@ -217,6 +217,9 @@
                         </div>
                     </Section>
                     <br />
+                    <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+                    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+                    <br />
                     <br />
                     <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo>
                 </TabPanel>
@@ -225,15 +228,28 @@
                         <div class="row mb-1 align-items-center">
                             <PermissionGrid EntityName="@EntityNames.Page" PermissionList="@_permissions" @ref="_permissionGrid" />
                         </div>
+                        <br /><br />
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="updatemodulepermissions" HelpText="Specify if changes made to page permissions should be propagated to the modules on this page" ResourceKey="UpdateModulePermissions">Update Module Permissions? </Label>
+                            <div class="col-sm-9">
+                                <select id="updatemodulepermissions" class="form-select" @bind="@_updatemodulepermissions" required>
+                                    <option value="True">@SharedLocalizer["Yes"]</option>
+                                    <option value="False">@SharedLocalizer["No"]</option>
+                                </select>
+                            </div>
+                        </div>
+                        <br />
+                        <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
                     </div>
                 </TabPanel>
                 <TabPanel Name="PageModules" Heading="Modules" ResourceKey="PageModules">
                     <Pager Items="_pageModules">
                         <Header>
-                        <th style="width: 1px;">&nbsp;</th>
-                        <th style="width: 1px;">&nbsp;</th>
-                        <th>@Localizer["ModuleTitle"]</th>
-                        <th>@Localizer["ModuleDefinition"]</th>
+                            <th style="width: 1px;">&nbsp;</th>
+                            <th style="width: 1px;">&nbsp;</th>
+                            <th>@Localizer["ModuleTitle"]</th>
+                            <th>@Localizer["ModuleDefinition"]</th>
                         </Header>
                         <Row>
                             <td><ActionLink Action="Settings" Text="Edit" Path="@_actualpath" ModuleId="@context.ModuleId" Security="SecurityAccessLevel.Edit" PermissionList="@context.PermissionList" ResourceKey="ModuleSettings" /></td>
@@ -247,8 +263,10 @@
                 {
                     <TabPanel Name="ThemeSettings" Heading="Theme Settings" ResourceKey="ThemeSettings">
                         @_themeSettingsComponent
+                        <br />
+                        <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
                     </TabPanel>
-                    <br />
                 }
             </TabStrip>
         }
@@ -299,19 +317,21 @@
                             </div>
                         </div>
                     </div>
+                    <br />
+                    <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+                    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
                 </TabPanel>
                 @if (_themeSettingsType != null)
                 {
                     <TabPanel Name="ThemeSettings" Heading="Theme Settings" ResourceKey="ThemeSettings">
                         @_themeSettingsComponent
+                        <br />
+                        <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
                     </TabPanel>
-                    <br />
                 }
             </TabStrip>
         }
-        <br />
-        <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
-        <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
     </form>
 }
 
@@ -348,6 +368,7 @@
     private string _bodycontent;
     private List<Permission> _permissions = null;
     private PermissionGrid _permissionGrid;
+    private string _updatemodulepermissions;
     private List<Module> _pageModules;
     private string _createdby;
     private DateTime _createdon;
@@ -436,6 +457,7 @@
 
                 // permissions
                 _permissions = _page.PermissionList;
+                _updatemodulepermissions = "True";
 
                 // page modules
                 var modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
@@ -651,6 +673,7 @@
                     if (_page.UserId == null)
                     {
                         _page.PermissionList = _permissionGrid.GetPermissionList();
+                        _page.UpdateModulePermissions = bool.Parse(_updatemodulepermissions);
                     }
 
                     _page = await PageService.UpdatePageAsync(_page);

Oqtane.Client/Modules/Admin/Register/Index.razor

@@ -6,77 +6,95 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 @inject ISettingService SettingService
+@inject ITimeZoneService TimeZoneService
 
-@if (PageState.Site.AllowRegistration)
+@if (_initialized)
 {
-    if (!_userCreated)
+    @if (PageState.Site.AllowRegistration)
     {
-        if (PageState.User != null)
+        if (!_userCreated)
         {
-            <ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" />
-        }
-        else
-        {
-            <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
-            <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-                <div class="container">
-                    <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="username" HelpText="Your username. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label>
-                        <div class="col-sm-9">
-                            <input id="username" class="form-control" @bind="@_username" maxlength="256" required />
+            if (PageState.User != null)
+            {
+                <ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" />
+            }
+            else
+            {
+                <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
+                <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+                    <div class="container">
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="username" HelpText="Your username. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label>
+                            <div class="col-sm-9">
+                                <input id="username" class="form-control" @bind="@_username" maxlength="256" required />
+                            </div>
                         </div>
-                    </div>
-                    <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="password" HelpText="Please choose a sufficiently secure password and enter it here" ResourceKey="Password"></Label>
-                        <div class="col-sm-9">
-                            <div class="input-group">
-                                <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" required />
-                                <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="password" HelpText="Please choose a sufficiently secure password and enter it here" ResourceKey="Password"></Label>
+                            <div class="col-sm-9">
+                                <div class="input-group">
+                                    <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" required />
+                                    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="confirm" HelpText="Enter your password again to confirm it matches the value entered above" ResourceKey="Confirm"></Label>
+                            <div class="col-sm-9">
+                                <div class="input-group">
+                                    <input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
+                                    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label>
+                            <div class="col-sm-9">
+                                <input id="email" class="form-control" @bind="@_email" maxlength="256" required />
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label>
+                            <div class="col-sm-9">
+                                <input id="displayname" class="form-control" @bind="@_displayname" maxlength="50" />
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="timezone" HelpText="Your time zone" ResourceKey="TimeZone">Time Zone:</Label>
+                            <div class="col-sm-9">
+                                <select id="timezone" class="form-select" @bind="@_timezoneid">
+                                    <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                                    @foreach (var timezone in _timezones)
+                                    {
+                                        <option value="@timezone.Id">@timezone.DisplayName</option>
+                                    }
+                                </select>
                             </div>
                         </div>
                     </div>
-                    <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="confirm" HelpText="Enter your password again to confirm it matches the value entered above" ResourceKey="Confirm"></Label>
-                        <div class="col-sm-9">
-                            <div class="input-group">
-                                <input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
-                                <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label>
-                        <div class="col-sm-9">
-                            <input id="email" class="form-control" @bind="@_email" maxlength="256" required />
-                        </div>
-                    </div>
-                    <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label>
-                        <div class="col-sm-9">
-                            <input id="displayname" class="form-control" @bind="@_displayname" maxlength="50" />
-                        </div>
-                    </div>
-                </div>
-                <br />
-                <button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button>
-                <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
-                @if (_allowsitelogin)
-                {
                     <br />
+                    <button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button>
+                    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+                    @if (_allowsitelogin)
+                    {
+                        <br />
 
-                    <br />
-                    <NavLink href="@NavigateUrl("login")">@Localizer["Login"]</NavLink>
-                }
-            </form>
+                        <br />
+                        <NavLink href="@NavigateUrl("login")">@Localizer["Login"]</NavLink>
+                    }
+                </form>
+            }
         }
-    }    
-}
-else
-{
-    <ModuleMessage Message="@Localizer["Info.Registration.Disabled"]" Type="MessageType.Info" />
+    }
+    else
+    {
+        <ModuleMessage Message="@Localizer["Info.Registration.Disabled"]" Type="MessageType.Info" />
+    }
 }
 
 @code {
+    private bool _initialized = false;
+    private List<Models.TimeZone> _timezones;
     private string _passwordrequirements;
     private string _username = string.Empty;
     private ElementReference form;
@@ -87,6 +105,7 @@ else
     private string _confirm = string.Empty;
     private string _email = string.Empty;
     private string _displayname = string.Empty;
+    private string _timezoneid = string.Empty;
     private bool _userCreated = false;
     private bool _allowsitelogin = true;
 
@@ -96,6 +115,9 @@ else
     {
         _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId); 
         _allowsitelogin = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:AllowSiteLogin", "true"));
+        _timezones = TimeZoneService.GetTimeZones();
+        _timezoneid = PageState.Site.TimeZoneId;
+        _initialized = true;
     }
 
     protected override void OnParametersSet()
@@ -124,6 +146,7 @@ else
                             Password = _password,
                             Email = _email,
                             DisplayName = (_displayname == string.Empty ? _username : _displayname),
+                            TimeZoneId = _timezoneid,
 							PhotoFileId = null
                         };
                         user = await UserService.AddUserAsync(user);

Oqtane.Client/Modules/Admin/SearchResults/Index.razor

@@ -46,7 +46,7 @@
                             <Row>
                                 <div class="search-item mb-2">
                                     <h4 class="mb-1"><a href="@context.Url">@context.Title</a></h4>
-                                    <p class="mb-0 text-muted">@((MarkupString)context.Snippet)</p>
+                                    <p class="mb-0 text-body-secondary">@((MarkupString)context.Snippet)</p>
                                 </div>
                             </Row>
                         </Pager>

Oqtane.Client/Modules/Admin/Site/Index.razor

@@ -10,6 +10,7 @@
 @inject IAliasService AliasService
 @inject IThemeService  ThemeService
 @inject ISettingService  SettingService
+@inject ITimeZoneService TimeZoneService
 @inject IServiceProvider ServiceProvider
 @inject IStringLocalizer<Index> Localizer
 @inject INotificationService NotificationService
@@ -41,6 +42,18 @@
                     </select>
                 </div>
             </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="timezone" HelpText="Your time zone" ResourceKey="TimeZone">Time Zone:</Label>
+                <div class="col-sm-9">
+                    <select id="timezone" class="form-select" @bind="@_timezoneid">
+                        <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                        @foreach (var timezone in _timezones)
+                        {
+                            <option value="@timezone.Id">@timezone.DisplayName</option>
+                        }
+                    </select>
+                </div>
+            </div>
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Deleted? </Label>
                 <div class="col-sm-9">
@@ -133,7 +146,7 @@
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label>
                     <div class="col-sm-9">
-                        <FileManager FileId="@_logofileid" Filter="@_imageFiles" @ref="_logofilemanager" />
+                        <FileManager FileId="@_logofileid" Filter="@_imagefiles" @ref="_logofilemanager" />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -181,80 +194,125 @@
         <Section Name="SMTP" Heading="SMTP Settings" ResourceKey="SMTPSettings">
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    <div class="col-sm-3">
-                    </div>
+                    <Label Class="col-sm-3" For="smtpenabled" HelpText="Specify if SMTP is enabled for this site" ResourceKey="SmtpEnabled">Enabled? </Label>
                     <div class="col-sm-9">
-                        <strong>@Localizer["Smtp.Required.EnableNotificationJob"]</strong><br />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="host" HelpText="Enter the host name of the SMTP server" ResourceKey="Host">Host: </Label>
-                    <div class="col-sm-9">
-                        <input id="host" class="form-control" @bind="@_smtphost" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="port" HelpText="Enter the port number for the SMTP server. Please note this field is required if you provide a host name." ResourceKey="Port">Port: </Label>
-                    <div class="col-sm-9">
-                        <input id="port" class="form-control" @bind="@_smtpport" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="smtpssl" HelpText="Specify if SSL is required for your SMTP server" ResourceKey="UseSsl">SSL Enabled: </Label>
-                    <div class="col-sm-9">
-                        <select id="smtpssl" class="form-select" @bind="@_smtpssl" >
+                        <select id="smtpenabled" class="form-select" value="@_smtpenabled" @onchange="(e => SMTPEnabledChanged(e))">
                             <option value="True">@SharedLocalizer["Yes"]</option>
                             <option value="False">@SharedLocalizer["No"]</option>
                         </select>
                     </div>
                 </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="username" HelpText="Enter the username for your SMTP account" ResourceKey="SmtpUsername">Username: </Label>
-                    <div class="col-sm-9">
-                        <input id="username" class="form-control" @bind="@_smtpusername" autocomplete="off"/>
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="password" HelpText="Enter the password for your SMTP account" ResourceKey="SmtpPassword">Password: </Label>
-                    <div class="col-sm-9">
-                        <div class="input-group">
-                            <input id="password" type="@_smtppasswordtype" class="form-control" @bind="@_smtppassword" autocomplete="off"/>
-                            <button type="button" class="btn btn-secondary" @onclick="@ToggleSMTPPassword" tabindex="-1">@_togglesmtppassword</button>
+                @if (_smtpenabled == "True")
+                {
+                    <div class="row mb-1 align-items-center">
+                        <div class="col-sm-3">
+                        </div>
+                        <div class="col-sm-9">
+                            <strong>@Localizer["Smtp.Required.EnableNotificationJob"]</strong><br />
                         </div>
                     </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="sender" HelpText="Enter the email which emails will be sent from. Please note that this email address may need to be authorized with the SMTP server." ResourceKey="SmtpSender">Email Sender: </Label>
-                    <div class="col-sm-9">
-                        <input id="sender" class="form-control" @bind="@_smtpsender" />
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="host" HelpText="Enter the host name of the SMTP server" ResourceKey="Host">Host: </Label>
+                        <div class="col-sm-9">
+                            <input id="host" class="form-control" @bind="@_smtphost" />
+                        </div>
                     </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="relay" HelpText="Only specify this option if you have properly configured an SMTP Relay Service to route your outgoing mail. This option will send notifications from the user's email rather than from the Email Sender specified above." ResourceKey="SmtpRelay">Relay Configured? </Label>
-                    <div class="col-sm-9">
-                        <select id="relay" class="form-select" @bind="@_smtprelay" required>
-                            <option value="True">@SharedLocalizer["Yes"]</option>
-                            <option value="False">@SharedLocalizer["No"]</option>
-                        </select>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="port" HelpText="Enter the port number for the SMTP server. Please note this field is required if you provide a host name." ResourceKey="Port">Port: </Label>
+                        <div class="col-sm-9">
+                            <input id="port" class="form-control" @bind="@_smtpport" />
+                        </div>
                     </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="smtpenabled" HelpText="Specify if SMTP is enabled for this site" ResourceKey="SMTPEnabled">Enabled? </Label>
-                    <div class="col-sm-9">
-                        <select id="smtpenabled" class="form-select" @bind="@_smtpenabled">
-                            <option value="True">@SharedLocalizer["Yes"]</option>
-                            <option value="False">@SharedLocalizer["No"]</option>
-                        </select>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="smtpssl" HelpText="Specify if SSL is required for your SMTP server" ResourceKey="SmtpSSL">SSL Required: </Label>
+                        <div class="col-sm-9">
+                            <select id="smtpssl" class="form-select" @bind="@_smtpssl" >
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
                     </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="retention" HelpText="Number of days of notifications to retain" ResourceKey="Retention">Retention (Days): </Label>
-                    <div class="col-sm-9">
-                        <input id="retention" class="form-control" type="number" min="0" step="1" @bind="@_retention" />
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="smtpauthentication" HelpText="Specify the SMTP authentication type" ResourceKey="SMTPAuthentication">Authentication: </Label>
+                        <div class="col-sm-9">
+                            <select id="smtpauthentication" class="form-select" value="@_smtpauthentication" @onchange="(e => SMTPAuthenticationChanged(e))">
+                                <option value="Basic">@Localizer["Basic"]</option>
+                                <option value="OAuth2">@Localizer["OAuth2"]</option>
+                            </select>
+                        </div>
                     </div>
-                </div>
-                <button type="button" class="btn btn-secondary" @onclick="SendEmail">@Localizer["Smtp.TestConfig"]</button>
-                <br /><br />
+                    @if (_smtpauthentication == "Basic")
+                    {
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="username" HelpText="Enter the username for your SMTP account" ResourceKey="SmtpUsername">Username: </Label>
+                            <div class="col-sm-9">
+                                <input id="username" class="form-control" @bind="@_smtpusername" autocomplete="off" />
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="password" HelpText="Enter the password for your SMTP account" ResourceKey="SmtpPassword">Password: </Label>
+                            <div class="col-sm-9">
+                                <div class="input-group">
+                                    <input id="password" type="@_smtppasswordtype" class="form-control" @bind="@_smtppassword" autocomplete="off" />
+                                    <button type="button" class="btn btn-secondary" @onclick="@ToggleSMTPPassword" tabindex="-1">@_togglesmtppassword</button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="relay" HelpText="Only specify this option if you have properly configured an SMTP Relay Service to route your outgoing mail. This option will send notifications from the user's email rather than from the Email Sender specified below." ResourceKey="SmtpRelay">Relay Configured? </Label>
+                            <div class="col-sm-9">
+                                <select id="relay" class="form-select" @bind="@_smtprelay" required>
+                                    <option value="True">@SharedLocalizer["Yes"]</option>
+                                    <option value="False">@SharedLocalizer["No"]</option>
+                                </select>
+                            </div>
+                        </div>
+                    }
+                    else
+                    {
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="smtpauthority" HelpText="The Authority Url for the SMTP provider" ResourceKey="SmtpAuthority">Authority Url:</Label>
+                            <div class="col-sm-9">
+                                <input id="smtpauthority" class="form-control" @bind="@_smtpauthority" />
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="smtpclientid" HelpText="The Client ID for the SMTP provider" ResourceKey="SmtpClientID">Client ID:</Label>
+                            <div class="col-sm-9">
+                                <input id="smtpclientid" class="form-control" @bind="@_smtpclientid" />
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="smtpclientsecret" HelpText="The Client Secret for the SMTP provider" ResourceKey="SmtpClientSecret">Client Secret:</Label>
+                            <div class="col-sm-9">
+                                <div class="input-group">
+                                    <input type="@_smtpclientsecrettype" id="smtpclientsecret" class="form-control" @bind="@_smtpclientsecret" />
+                                    <button type="button" class="btn btn-secondary" @onclick="@ToggleSmtpClientSecret">@_togglesmtpclientsecret</button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="smtpscopes" HelpText="A list of Scopes for the SMTP provider (separated by commas)" ResourceKey="SmtpScopes">Scopes:</Label>
+                            <div class="col-sm-9">
+                                <input id="smtpscopes" class="form-control" @bind="@_smtpscopes" />
+                            </div>
+                        </div>
+                    }
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="sender" HelpText="Enter the email address which emails will be sent from. Please note that this email address usually needs to be authorized with the SMTP provider." ResourceKey="SmtpSender">Email Sender: </Label>
+                        <div class="col-sm-9">
+                            <input id="sender" class="form-control" @bind="@_smtpsender" />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="retention" HelpText="Number of days of notifications to retain" ResourceKey="Retention">Retention (Days): </Label>
+                        <div class="col-sm-9">
+                            <input id="retention" class="form-control" type="number" min="0" step="1" @bind="@_retention" />
+                        </div>
+                    </div>
+                    <button type="button" class="btn btn-secondary" @onclick="SendEmail">@Localizer["Smtp.TestConfig"]</button>
+                    <br /><br />
+                }
             </div>
         </Section>
         <Section Name="PWA" Heading="Progressive Web Application Settings" ResourceKey="PWASettings">
@@ -416,9 +474,11 @@
     private List<ThemeControl> _themes = new List<ThemeControl>();
     private List<ThemeControl> _containers = new List<ThemeControl>();
     private List<Page> _pages;
+    private List<Models.TimeZone> _timezones;
 
     private string _name = string.Empty;
     private string _homepageid = "-";
+    private string _timezoneid = string.Empty;
     private string _isdeleted;
     private string _sitemap = "";
     private string _siteguid = "";
@@ -435,21 +495,28 @@
 
     private Dictionary<string, string> _textEditors = new Dictionary<string, string>();
     private string _textEditor = "";
-    private string _imageFiles = string.Empty;
+    private string _imagefiles = string.Empty;
 
     private string _headcontent = string.Empty;
     private string _bodycontent = string.Empty;
 
+    private string _smtpenabled = "False";
+    private string _smtpauthentication = "Basic";
     private string _smtphost = string.Empty;
     private string _smtpport = string.Empty;
-    private string _smtpssl = "False";
+    private string _smtpssl = "True";
     private string _smtpusername = string.Empty;
     private string _smtppassword = string.Empty;
     private string _smtppasswordtype = "password";
     private string _togglesmtppassword = string.Empty;
+    private string _smtpauthority = string.Empty;
+    private string _smtpclientid = string.Empty;
+    private string _smtpclientsecret = string.Empty;
+    private string _smtpclientsecrettype = "password";
+    private string _togglesmtpclientsecret = string.Empty;
+    private string _smtpscopes = string.Empty;
     private string _smtpsender = string.Empty;
     private string _smtprelay = "False";
-    private string _smtpenabled = "True";
     private int _retention = 30;
 
     private string _pwaisenabled;
@@ -493,11 +560,13 @@
             Site site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
             if (site != null)
             {
+                _timezones = TimeZoneService.GetTimeZones();
                 var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
 
                 _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
 
                 _name = site.Name;
+                _timezoneid = site.TimeZoneId;
                 if (site.HomePageId != null)
                 {
                     _homepageid = site.HomePageId.Value.ToString();
@@ -531,23 +600,29 @@
                     _textEditors.Add(textEditor.Name, Utilities.GetFullTypeName(textEditor.GetType().AssemblyQualifiedName));
                 }
                 _textEditor = SettingService.GetSetting(settings, "TextEditor", Constants.DefaultTextEditor);
-                _imageFiles = SettingService.GetSetting(settings, "ImageFiles", Constants.ImageFiles);
-                _imageFiles = (string.IsNullOrEmpty(_imageFiles)) ? Constants.ImageFiles : _imageFiles;
+                _imagefiles = SettingService.GetSetting(settings, "ImageFiles", Constants.ImageFiles);
+                _imagefiles = (string.IsNullOrEmpty(_imagefiles)) ? Constants.ImageFiles : _imagefiles;
 
                 // page content
                 _headcontent = site.HeadContent;
                 _bodycontent = site.BodyContent;
 
                 // SMTP
+                _smtpenabled = SettingService.GetSetting(settings, "SMTPEnabled", "False");
                 _smtphost = SettingService.GetSetting(settings, "SMTPHost", string.Empty);
                 _smtpport = SettingService.GetSetting(settings, "SMTPPort", string.Empty);
                 _smtpssl = SettingService.GetSetting(settings, "SMTPSSL", "False");
+                _smtpauthentication = SettingService.GetSetting(settings, "SMTPAuthentication", "Basic");
                 _smtpusername = SettingService.GetSetting(settings, "SMTPUsername", string.Empty);
                 _smtppassword = SettingService.GetSetting(settings, "SMTPPassword", string.Empty);
                 _togglesmtppassword = SharedLocalizer["ShowPassword"];
+                _smtpauthority = SettingService.GetSetting(settings, "SMTPAuthority", string.Empty);
+                _smtpclientid = SettingService.GetSetting(settings, "SMTPClientId", string.Empty);
+                _smtpclientsecret = SettingService.GetSetting(settings, "SMTPClientSecret", string.Empty);
+                _togglesmtpclientsecret = SharedLocalizer["ShowPassword"];
+                _smtpscopes = SettingService.GetSetting(settings, "SMTPScopes", string.Empty);
                 _smtpsender = SettingService.GetSetting(settings, "SMTPSender", string.Empty);
                 _smtprelay = SettingService.GetSetting(settings, "SMTPRelay", "False");
-                _smtpenabled = SettingService.GetSetting(settings, "SMTPEnabled", "True");
                 _retention = int.Parse(SettingService.GetSetting(settings, "NotificationRetention", "30"));
 
                 // PWA
@@ -650,6 +725,7 @@
                     if (site != null)
                     {
                         site.Name = _name;
+                        site.TimeZoneId = _timezoneid;
                         site.HomePageId = (_homepageid != "-" ? int.Parse(_homepageid) : null);
                         site.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
 
@@ -727,8 +803,13 @@
                         settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
                         settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
                         settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+                        settings = SettingService.SetSetting(settings, "SMTPAuthentication", _smtpauthentication, true);
                         settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
                         settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
+                        settings = SettingService.SetSetting(settings, "SMTPAuthority", _smtpauthority, true);
+                        settings = SettingService.SetSetting(settings, "SMTPClientId", _smtpclientid, true);
+                        settings = SettingService.SetSetting(settings, "SMTPClientSecret", _smtpclientsecret, true);
+                        settings = SettingService.SetSetting(settings, "SMTPScopes", _smtpscopes, true);
                         settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
                         settings = SettingService.SetSetting(settings, "SMTPRelay", _smtprelay, true);
                         settings = SettingService.SetSetting(settings, "SMTPEnabled", _smtpenabled, true);
@@ -795,6 +876,46 @@
         }
     }
 
+    private void SMTPAuthenticationChanged(ChangeEventArgs e)
+    {
+        _smtpauthentication = (string)e.Value;
+        StateHasChanged();
+    }
+
+    private void SMTPEnabledChanged(ChangeEventArgs e)
+    {
+        _smtpenabled = (string)e.Value;
+        StateHasChanged();
+    }
+
+    private void ToggleSMTPPassword()
+    {
+        if (_smtppasswordtype == "password")
+        {
+            _smtppasswordtype = "text";
+            _togglesmtppassword = SharedLocalizer["HidePassword"];
+        }
+        else
+        {
+            _smtppasswordtype = "password";
+            _togglesmtppassword = SharedLocalizer["ShowPassword"];
+        }
+    }
+
+    private void ToggleSmtpClientSecret()
+    {
+        if (_smtpclientsecrettype == "password")
+        {
+            _smtpclientsecrettype = "text";
+            _togglesmtpclientsecret = SharedLocalizer["HidePassword"];
+        }
+        else
+        {
+            _smtpclientsecrettype = "password";
+            _togglesmtpclientsecret = SharedLocalizer["ShowPassword"];
+        }
+    }
+
     private async Task SendEmail()
     {
         if (_smtphost != "" && _smtpport != "" && _smtpsender != "")
@@ -805,8 +926,13 @@
                 settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
                 settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
                 settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+                settings = SettingService.SetSetting(settings, "SMTPAuthentication", _smtpauthentication, true);
                 settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
                 settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
+                settings = SettingService.SetSetting(settings, "SMTPAuthority", _smtpauthority, true);
+                settings = SettingService.SetSetting(settings, "SMTPClientId", _smtpclientid, true);
+                settings = SettingService.SetSetting(settings, "SMTPClientSecret", _smtpclientsecret, true);
+                settings = SettingService.SetSetting(settings, "SMTPScopes", _smtpscopes, true);
                 settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
                 await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
                 await logger.LogInformation("Site SMTP Settings Saved");
@@ -827,20 +953,6 @@
         }
     }
 
-    private void ToggleSMTPPassword()
-    {
-        if (_smtppasswordtype == "password")
-        {
-            _smtppasswordtype = "text";
-            _togglesmtppassword = SharedLocalizer["HidePassword"];
-        }
-        else
-        {
-            _smtppasswordtype = "password";
-            _togglesmtppassword = SharedLocalizer["ShowPassword"];
-        }
-    }
-
     private async Task GetAliases()
     {
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))

Oqtane.Client/Modules/Admin/Themes/Index.razor

@@ -15,8 +15,8 @@
 else
 {
     <ActionLink Action="Add" Text="Install Theme" ResourceKey="InstallTheme" />
-    <ActionLink Action="Create" Text="Create Theme" ResourceKey="CreateTheme" Class="btn btn-secondary ps-2" />
-    <button type="button" class="btn btn-secondary pw-2" @onclick="@Synchronize">@Localizer["Synchronize"]</button>
+    <ActionLink Action="Create" Text="Create Theme" ResourceKey="CreateTheme" Class="btn btn-secondary ms-1" />
+    <button type="button" class="btn btn-secondary ms-1" @onclick="@Synchronize">@Localizer["Synchronize"]</button>
 
     <Pager Items="@_themes">
         <Header>

Oqtane.Client/Modules/Admin/Upgrade/Index.razor

@@ -15,7 +15,7 @@
             {
                 <div class="container">
                     <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" HelpText="Specify if you want to backup files during the upgrade process. Disabling this option will result in a better experience in some environments." ResourceKey="Backup">Backup Files? </Label>
+                        <Label Class="col-sm-3" HelpText="Specify if you want to backup files during the upgrade process. Disabling this option will reduce the time required for the upgrade." ResourceKey="Backup">Backup Files? </Label>
                         <div class="col-sm-9">
                             <select id="backup" class="form-select" @bind="@_backup">
                                 <option value="True">@SharedLocalizer["Yes"]</option>
@@ -24,10 +24,15 @@
                         </div>
                     </div>
                 </div>
-                <button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@SharedLocalizer["Download"] @_package.Version</button>
-                <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
-                <br /><br />
-                <ModuleMessage Type="MessageType.Info" Message="Select The Download Button To Download The Framework Upgrade Package And Then Select Upgrade"></ModuleMessage>
+                <br />
+                @if (!_downloaded)
+                {
+                    <button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@SharedLocalizer["Download"] @_package.Version</button>
+                }
+                else
+                {
+                    <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
+                }
             }
             else
             {
@@ -43,7 +48,7 @@
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" HelpText="Specify if you want to backup files during the upgrade process. Disabling this option will result in a better experience in some environments." ResourceKey="Backup">Backup Files? </Label>
+                    <Label Class="col-sm-3" HelpText="Specify if you want to backup files during the upgrade process. Disabling this option will reduce the time required for the upgrade." ResourceKey="Backup">Backup Files? </Label>
                     <div class="col-sm-9">
                         <select id="backup" class="form-select" @bind="@_backup">
                             <option value="True">@SharedLocalizer["Yes"]</option>
@@ -52,15 +57,15 @@
                     </div>
                 </div>
             </div>
+            <br />
             <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
-            <br /><br />
-            <ModuleMessage Type="MessageType.Info" Message=@Localizer["MessageUpgrade.Text"]></ModuleMessage>
         </TabPanel>
     </TabStrip>
 }
 
 @code {
     private bool _initialized = false;
+    private bool _downloaded = false;
     private Package _package;
     private bool _upgradeavailable = false;
     private string _backup = "True";
@@ -125,6 +130,7 @@
             ShowProgressIndicator();
             await PackageService.DownloadPackageAsync(packageid, version);
             await PackageService.DownloadPackageAsync(Constants.UpdaterPackageId, version);
+            _downloaded = true;
             HideProgressIndicator();
             AddModuleMessage(Localizer["Success.Framework.Download"], MessageType.Success);
         }

Oqtane.Client/Modules/Admin/UrlMappings/Add.razor

@@ -8,13 +8,16 @@
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
     <div class="container">
         <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="url" HelpText="The fully qualified Url for this site" ResourceKey="Url">Url:</Label>
+            <Label Class="col-sm-3" For="url" HelpText="A Url identifying a path to a specific page in the site (absolute or relative)" ResourceKey="Url">Url:</Label>
             <div class="col-sm-9">
-                <input id="url" class="form-control" @bind="@_url" maxlength="500" required />
+                <div class="input-group">
+                    <input id="url" class="form-control" @bind="@_url" maxlength="500" required />
+                    <button type="button" class="btn btn-primary" @onclick="GenerateUrl">@Localizer["Generate"]</button>
+                </div>
             </div>
         </div>
         <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="mappedurl" HelpText="A fully qualified Url where the user will be redirected" ResourceKey="MappedUrl">Redirect To:</Label>
+            <Label Class="col-sm-3" For="mappedurl" HelpText="A Url where the user will be redirected (absolute or relative). Use '/' for site root path." ResourceKey="MappedUrl">Redirect To:</Label>
             <div class="col-sm-9">
                 <input id="mappedurl" class="form-control" @bind="@_mappedurl" maxlength="500" required />
             </div>
@@ -26,64 +29,80 @@
 </form>
 
 @code {
-	private ElementReference form;
-	private bool validated = false;
+    private ElementReference form;
+    private bool validated = false;
 
-	private string _url = string.Empty;
-	private string _mappedurl = string.Empty;
+    private string _url = string.Empty;
+    private string _mappedurl = string.Empty;
 
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-	private async Task SaveUrlMapping()
-	{
-		validated = true;
-		var interop = new Interop(JSRuntime);
-		if (await interop.FormValid(form))
-		{
-			if (_url != _mappedurl)
-			{
-				var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
-				url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
+    private async Task SaveUrlMapping()
+    {
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            if (_url != _mappedurl)
+            {
+                var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
+                url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
 
-				_url = (_url.StartsWith("/")) ? _url.Substring(1) : _url;
-				_url = (!_url.StartsWith("http")) ? url + _url : _url;
+                _url = (_url.StartsWith("/")) ? _url.Substring(1) : _url;
+                _url = (!_url.StartsWith("http")) ? url + _url : _url;
 
-				if (_url.StartsWith(url))
-				{
-					var urlmapping = new UrlMapping();
-					urlmapping.SiteId = PageState.Site.SiteId;
-					var route = new Route(_url, PageState.Alias.Path);
-					urlmapping.Url = route.PagePath;
-					urlmapping.MappedUrl = _mappedurl.Replace(url, "");
-					urlmapping.Requests = 0;
-					urlmapping.CreatedOn = DateTime.UtcNow;
-					urlmapping.RequestedOn = DateTime.UtcNow;
+                _mappedurl = _mappedurl.Replace(url, "");
+                _mappedurl = (_mappedurl.StartsWith("/") && _mappedurl != "/") ? _mappedurl.Substring(1) : _mappedurl;
 
-					try
-					{
-						urlmapping = await UrlMappingService.AddUrlMappingAsync(urlmapping);
-						await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
-						NavigationManager.NavigateTo(NavigateUrl());
-					}
-					catch (Exception ex)
-					{
-						await logger.LogError(ex, "Error Saving UrlMapping {UrlMapping} {Error}", urlmapping, ex.Message);
-						AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
-					}
-				}
-				else
-				{
-					AddModuleMessage(Localizer["Message.SaveUrlMapping"], MessageType.Warning);
-				}
-			}
-			else
-			{
+                if (_url.StartsWith(url))
+                {
+                    var urlmapping = new UrlMapping();
+                    urlmapping.SiteId = PageState.Site.SiteId;
+                    urlmapping.Url = new Route(_url, PageState.Alias.Path).PagePath;
+                    urlmapping.MappedUrl = _mappedurl;
+                    urlmapping.Requests = 0;
+                    urlmapping.CreatedOn = DateTime.UtcNow;
+                    urlmapping.RequestedOn = DateTime.UtcNow;
+
+                    try
+                    {
+                        urlmapping = await UrlMappingService.AddUrlMappingAsync(urlmapping);
+                        await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
+                        NavigationManager.NavigateTo(NavigateUrl());
+                    }
+                    catch (Exception ex)
+                    {
+                        await logger.LogError(ex, "Error Saving UrlMapping {UrlMapping} {Error}", urlmapping, ex.Message);
+                        AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
+                    }
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.SaveUrlMapping"], MessageType.Warning);
+                }
+            }
+            else
+            {
                 AddModuleMessage(Localizer["Message.DuplicateUrlMapping"], MessageType.Warning);
-			}
+            }
         }
         else
         {
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
+
+    private void GenerateUrl()
+    {
+        var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
+        url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
+
+        var chars = "abcdefghijklmnopqrstuvwxyz";
+        Random rnd = new Random();
+        for (int i = 0; i < 5; i++)
+        {
+            url += chars.Substring(rnd.Next(0, chars.Length - 1), 1);
+        }
+        _url = url;
+    }
 }

Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor

@@ -8,13 +8,13 @@
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
     <div class="container">
         <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="url" HelpText="A fully qualified Url for this site" ResourceKey="Url">Url:</Label>
+            <Label Class="col-sm-3" For="url" HelpText="A Url identifying a path to a specific page in the site (absolute or relative)" ResourceKey="Url">Url:</Label>
             <div class="col-sm-9">
                 <input id="url" class="form-control" @bind="@_url" maxlength="500" readonly />
             </div>
         </div>
         <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="mappedurl" HelpText="A fully qualified Url where the user will be redirected" ResourceKey="MappedUrl">Redirect To:</Label>
+            <Label Class="col-sm-3" For="mappedurl" HelpText="A Url where the user will be redirected (absolute or relative). Use '/' for site root path." ResourceKey="MappedUrl">Redirect To:</Label>
             <div class="col-sm-9">
                 <input id="mappedurl" class="form-control" @bind="@_mappedurl" maxlength="500" required />
             </div>
@@ -67,8 +67,11 @@
 					var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
 					url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
 
+                    _mappedurl = _mappedurl.Replace(url, "");
+                    _mappedurl = (_mappedurl.StartsWith("/") && _mappedurl != "/") ? _mappedurl.Substring(1) : _mappedurl;
+
 					var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
-					urlmapping.MappedUrl = _mappedurl.Replace(url, "");
+					urlmapping.MappedUrl = _mappedurl;
 					urlmapping = await UrlMappingService.UpdateUrlMappingAsync(urlmapping);
 					await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
 					NavigationManager.NavigateTo(NavigateUrl());

Oqtane.Client/Modules/Admin/UrlMappings/Index.razor

@@ -48,7 +48,7 @@ else
 						}
 					</td>
 					<td>@context.Requests</td>
-					<td>@context.RequestedOn</td>
+					<td>@UtcToLocal(context.RequestedOn)</td>
 				</Row>
 			</Pager>
 		</TabPanel>

Oqtane.Client/Modules/Admin/UserProfile/Index.razor

@@ -9,6 +9,7 @@
 @inject INotificationService NotificationService
 @inject IFileService FileService
 @inject IFolderService FolderService
+@inject ITimeZoneService TimeZoneService
 @inject IJSRuntime jsRuntime
 @inject IServiceProvider ServiceProvider
 @inject IStringLocalizer<Index> Localizer
@@ -16,9 +17,9 @@
 
 @if (_initialized)
 {
-    @if (PageState.User != null && photo != null)
+    @if (PageState.User != null && _photo != null)
     {
-        <img src="@ImageUrl(photofileid, 400, 400)" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
+        <img src="@ImageUrl(_photofileid, 400, 400)" alt="@_displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
     }
     else
     {
@@ -31,7 +32,7 @@
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="username" HelpText="Your username. Note that this field can not be modified." ResourceKey="Username"></Label>
                     <div class="col-sm-9">
-                        <input id="username" class="form-control" @bind="@username" readonly />
+                        <input id="username" class="form-control" @bind="@_username" readonly />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -47,17 +48,17 @@
                     <Label Class="col-sm-3" For="confirm" HelpText="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label>
                     <div class="col-sm-9">
                         <div class="input-group">
-                            <input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" />
+                            <input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" />
                             <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
                         </div>
                     </div>
                 </div>
-                @if (allowtwofactor)
+                @if (_allowtwofactor)
                 {
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="twofactor" HelpText="Indicates if you are using two factor authentication. Two factor authentication requires you to enter a verification code sent via email after you sign in." ResourceKey="TwoFactor"></Label>
                         <div class="col-sm-9">
-                            <select id="twofactor" class="form-select" @bind="@twofactor" required>
+                            <select id="twofactor" class="form-select" @bind="@_twofactor" required>
                                 <option value="True">@SharedLocalizer["Yes"]</option>
                                 <option value="False">@SharedLocalizer["No"]</option>
                             </select>
@@ -67,19 +68,31 @@
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label>
                     <div class="col-sm-9">
-                        <input id="email" class="form-control" @bind="@email" />
+                        <input id="email" class="form-control" @bind="@_email" />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label>
                     <div class="col-sm-9">
-                        <input id="displayname" class="form-control" @bind="@displayname" />
+                        <input id="displayname" class="form-control" @bind="@_displayname" />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="@photofileid.ToString()" HelpText="A photo of yourself" ResourceKey="Photo"></Label>
+                    <Label Class="col-sm-3" For="timezone" HelpText="Your time zone" ResourceKey="TimeZone">Time Zone:</Label>
                     <div class="col-sm-9">
-                        <FileManager FileId="@photofileid" Filter="@PageState.Site.ImageFiles" ShowFolders="false" ShowFiles="true" UploadMultiple="false" FolderId="@folderid" @ref="filemanager" />
+                        <select id="timezone" class="form-select" @bind="@_timezoneid">
+                            <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                            @foreach (var timezone in _timezones)
+                            {
+                                <option value="@timezone.Id">@timezone.DisplayName</option>
+                            }
+                        </select>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="@_photofileid.ToString()" HelpText="A photo of yourself" ResourceKey="Photo"></Label>
+                    <div class="col-sm-9">
+                        <FileManager FileId="@_photofileid" Filter="@PageState.Site.ImageFiles" ShowFolders="false" ShowFiles="true" UploadMultiple="false" FolderId="@_folderid" @ref="_filemanager" />
                     </div>
                 </div>
             </div>
@@ -91,17 +104,17 @@
         <TabPanel Name="Profile" ResourceKey="Profile">
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    @foreach (Profile profile in profiles)
+                    @foreach (Profile profile in _profiles)
                     {
                         var p = profile;
                         if (!p.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
                         {
-                            if (p.Category != category)
+                            if (p.Category != _category)
                             {
                                 <div class="col text-center pb-2">
                                     @p.Category
                                 </div>
-                                category = p.Category;
+                                _category = p.Category;
                             }
                             <div class="row mb-1 align-items-center">
                                 <Label Class="col-sm-3" For="@p.Name" HelpText="@p.Description">@p.Title</Label>
@@ -150,12 +163,12 @@
                                                 @if (p.IsRequired)
                                                 {
                                                     <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete"
-                                                           @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
                                                 }
                                                 else
                                                 {
                                                     <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete"
-                                                           @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
                                                 }
                                             }
                                             else
@@ -163,12 +176,12 @@
                                                 @if (p.IsRequired)
                                                 {
                                                     <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))"
-                                                           @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
                                                 }
                                                 else
                                                 {
                                                     <input id="@p.Name" class="form-control" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))"
-                                                           @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)" />
                                                 }
                                             }
                                         }
@@ -179,12 +192,12 @@
                                                 @if (p.IsRequired)
                                                 {
                                                     <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete"
-                                                              @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
                                                 }
                                                 else
                                                 {
                                                     <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete"
-                                                              @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
                                                 }
                                             }
                                             else
@@ -192,12 +205,12 @@
                                                 @if (p.IsRequired)
                                                 {
                                                     <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))"
-                                                              @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
                                                 }
                                                 else
                                                 {
                                                     <textarea id="@p.Name" class="form-control" rows="@p.Rows" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))"
-                                                              @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
+                                                    @attributes="@(p.MaxLength > 0 ? new Dictionary<string, object> {{"maxlength", p.MaxLength }} : null)"></textarea>
                                                 }
                                             }
                                         }
@@ -220,11 +233,11 @@
                 <option value="from">@Localizer["Items.Sent"]</option>
             </select>
             <br />
-            @if (filter == "to")
+            @if (_filter == "to")
             {
-                @if (notifications.Any())
+                @if (_notifications.Any())
                 {
-                    <Pager Items="@notifications">
+                    <Pager Items="@_notifications">
                         <Header>
                             <th style="width: 1px;">&nbsp;</th>
                             <th style="width: 1px;">&nbsp;</th>
@@ -260,15 +273,15 @@
                                         context.Body = context.Body.Replace("\n", "");
                                         context.Body = context.Body.Replace("\r", "");
                                     }
-                                    notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
+                                    _notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
                                 }
                                 @if (context.IsRead)
                                 {
-                                    @notificationSummary
+                                    @_notificationSummary
                                 }
                                 else
                                 {
-                                    <b>@notificationSummary</b>
+                                    <b>@_notificationSummary</b>
                                 }
                             </td>
                         </Detail>
@@ -285,9 +298,9 @@
             }
             else
             {
-                @if (notifications.Any())
+                @if (_notifications.Any())
                 {
-                    <Pager Items="@notifications">
+                    <Pager Items="@_notifications">
                         <Header>
                             <th style="width: 1px;"></th>
                             <th style="width: 1px;"></th>
@@ -324,15 +337,15 @@
                                         context.Body = context.Body.Replace("\n", "");
                                         context.Body = context.Body.Replace("\r", "");
                                     }
-                                    notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
+                                    _notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
                                 }
                                 @if (context.IsRead)
                                 {
-                                    @notificationSummary
+                                    @_notificationSummary
                                 }
                                 else
                                 {
-                                    <b>@notificationSummary</b>
+                                    <b>@_notificationSummary</b>
                                 }
                             </td>
                         </Detail>
@@ -356,27 +369,30 @@
 @code {
     private bool _initialized = false;
     private string _passwordrequirements;
-    private string username = string.Empty;
+    private string _username = string.Empty;
     private string _password = string.Empty;
     private string _passwordtype = "password";
     private string _togglepassword = string.Empty;
-    private string confirm = string.Empty;
-    private bool allowtwofactor = false;
-    private string twofactor = "False";
-    private string email = string.Empty;
-    private string displayname = string.Empty;
-    private FileManager filemanager;
-    private int folderid = -1;
-    private int photofileid = -1;
-    private File photo = null;
-    private string _ImageFiles = string.Empty;
-    private List<Profile> profiles;
-    private Dictionary<string, string> userSettings;
-    private string category = string.Empty;
+    private string _confirm = string.Empty;
+    private bool _allowtwofactor = false;
+    private string _twofactor = "False";
+    private string _email = string.Empty;
+    private string _displayname = string.Empty;
+    private FileManager _filemanager;
+    private int _folderid = -1;
+    private List<Models.TimeZone> _timezones;
+    private string _timezoneid = string.Empty;
+    private int _photofileid = -1;
+    private File _photo = null;
+    private string _imagefiles = string.Empty;
 
-    private string filter = "to";
-    private List<Notification> notifications;
-    private string notificationSummary = string.Empty;
+    private List<Profile> _profiles;
+    private Dictionary<string, string> _userSettings;
+    private string _category = string.Empty;
+
+    private string _filter = "to";
+    private List<Notification> _notifications;
+    private string _notificationSummary = string.Empty;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
@@ -386,43 +402,40 @@
         {
             _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
             _togglepassword = SharedLocalizer["ShowPassword"];
-            allowtwofactor = (SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:TwoFactor", "false") == "true");
-            profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
+            _allowtwofactor = (SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:TwoFactor", "false") == "true");
+            _profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
+            _timezones = TimeZoneService.GetTimeZones();
 
             if (PageState.User != null)
             {
-                username = PageState.User.Username;
-                twofactor = PageState.User.TwoFactorRequired.ToString();
-                email = PageState.User.Email;
-                displayname = PageState.User.DisplayName;
-
-                if (string.IsNullOrEmpty(email))
-                {
-                    AddModuleMessage(Localizer["Message.User.NoEmail"], MessageType.Warning);
-                }
+                _username = PageState.User.Username;
+                _twofactor = PageState.User.TwoFactorRequired.ToString();
+                _email = PageState.User.Email;
+                _displayname = PageState.User.DisplayName;
+                _timezoneid = PageState.User.TimeZoneId;
 
                 // get user folder
                 var folder = await FolderService.GetFolderAsync(ModuleState.SiteId, PageState.User.FolderPath);
                 if (folder != null)
                 {
-                    folderid = folder.FolderId;
+                    _folderid = folder.FolderId;
                 }
 
                 if (PageState.User.PhotoFileId != null)
                 {
-                    photofileid = PageState.User.PhotoFileId.Value;
-                    photo = await FileService.GetFileAsync(photofileid);
+                    _photofileid = PageState.User.PhotoFileId.Value;
+                    _photo = await FileService.GetFileAsync(_photofileid);
                 }
                 else
                 {
-                    photofileid = -1;
-                    photo = null;
+                    _photofileid = -1;
+                    _photo = null;
                 }
 
-                userSettings = PageState.User.Settings;
+                _userSettings = PageState.User.Settings;
                 var sitesettings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-                _ImageFiles = SettingService.GetSetting(userSettings, "ImageFiles", Constants.ImageFiles);
-                _ImageFiles = (string.IsNullOrEmpty(_ImageFiles)) ? Constants.ImageFiles : _ImageFiles;
+                _imagefiles = SettingService.GetSetting(_userSettings, "ImageFiles", Constants.ImageFiles);
+                _imagefiles = (string.IsNullOrEmpty(_imagefiles)) ? Constants.ImageFiles : _imagefiles;
 
                 await LoadNotificationsAsync();
 
@@ -442,13 +455,13 @@
 
     private async Task LoadNotificationsAsync()
     {
-        notifications = await NotificationService.GetNotificationsAsync(PageState.Site.SiteId, filter, PageState.User.UserId);
-        notifications = notifications.Where(item => item.DeletedBy != PageState.User.Username).ToList();
+        _notifications = await NotificationService.GetNotificationsAsync(PageState.Site.SiteId, _filter, PageState.User.UserId);
+        _notifications = _notifications.Where(item => item.DeletedBy != PageState.User.Username).ToList();
     }
 
     private string GetProfileValue(string SettingName, string DefaultValue)
     {
-        string value = SettingService.GetSetting(userSettings, SettingName, DefaultValue);
+        string value = SettingService.GetSetting(_userSettings, SettingName, DefaultValue);
         if (value.Contains("]"))
         {
             value = value.Substring(value.IndexOf("]") + 1);
@@ -460,38 +473,39 @@
     {
         try
         {
-            if (username != string.Empty && email != string.Empty)
+            if (_username != string.Empty && _email != string.Empty)
             {
-                if (_password == confirm)
+                if (_password == _confirm)
                 {
                     if (ValidateProfiles())
                     {
                         var user = PageState.User;
-                        user.Username = username;
+                        user.Username = _username;
                         user.Password = _password;
-                        user.TwoFactorRequired = bool.Parse(twofactor);
-                        user.Email = email;
-                        user.DisplayName = (displayname == string.Empty ? username : displayname);
-                        user.PhotoFileId = filemanager.GetFileId();
+                        user.TwoFactorRequired = bool.Parse(_twofactor);
+                        user.Email = _email;
+                        user.DisplayName = (_displayname == string.Empty ? _username : _displayname);
+                        user.TimeZoneId = _timezoneid;
+                        user.PhotoFileId = _filemanager.GetFileId();
                         if (user.PhotoFileId == -1)
                         {
                             user.PhotoFileId = null;
                         }
                         if (user.PhotoFileId != null)
                         {
-                            photofileid = user.PhotoFileId.Value;
-                            photo = await FileService.GetFileAsync(photofileid);
+                            _photofileid = user.PhotoFileId.Value;
+                            _photo = await FileService.GetFileAsync(_photofileid);
                         }
                         else
                         {
-                            photofileid = -1;
-                            photo = null;
+                            _photofileid = -1;
+                            _photo = null;
                         }
 
                         user = await UserService.UpdateUserAsync(user);
                         if (user != null)
                         {
-                            await SettingService.UpdateUserSettingsAsync(userSettings, PageState.User.UserId);
+                            await SettingService.UpdateUserSettingsAsync(_userSettings, PageState.User.UserId);
                             await logger.LogInformation("User Profile Saved");
 
                             if (!string.IsNullOrEmpty(PageState.ReturnUrl))
@@ -557,12 +571,12 @@
 
     private bool ValidateProfiles()
     {
-        foreach (Profile profile in profiles)
+        foreach (Profile profile in _profiles)
         {
             var value = GetProfileValue(profile.Name, string.Empty);
             if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
-                userSettings = SettingService.SetSetting(userSettings, profile.Name, profile.DefaultValue);
+                _userSettings = SettingService.SetSetting(_userSettings, profile.Name, profile.DefaultValue);
             }
             if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
@@ -594,7 +608,7 @@
     private void ProfileChanged(ChangeEventArgs e, string SettingName)
     {
         var value = (string)e.Value;
-        userSettings = SettingService.SetSetting(userSettings, SettingName, value);
+        _userSettings = SettingService.SetSetting(_userSettings, SettingName, value);
     }
 
     private async Task Delete(Notification Notification)
@@ -624,7 +638,7 @@
 
     private async void FilterChanged(ChangeEventArgs e)
     {
-        filter = (string)e.Value;
+        _filter = (string)e.Value;
         await LoadNotificationsAsync();
         StateHasChanged();
     }
@@ -634,7 +648,7 @@
         try
         {
             ShowProgressIndicator();
-            foreach(var Notification in notifications)
+            foreach(var Notification in _notifications)
             {
                 if (!Notification.IsDeleted)
                 {

Oqtane.Client/Modules/Admin/Users/Add.razor

@@ -5,6 +5,7 @@
 @inject IUserService UserService
 @inject IProfileService ProfileService
 @inject ISettingService SettingService
+@inject ITimeZoneService TimeZoneService
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -12,7 +13,7 @@
 {
     <TabStrip>
         <TabPanel Name="Identity" ResourceKey="Identity">
-            @if (profiles != null)
+            @if (_profiles != null)
             {
                 <div class="container">
                     <div class="row mb-1 align-items-center">
@@ -27,12 +28,33 @@
                             <input id="email" class="form-control" @bind="@_email" />
                         </div>
                     </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="confirmed" HelpText="Indicates if the user's email is verified" ResourceKey="Confirmed">Verified?</Label>
+                        <div class="col-sm-9">
+                            <select id="confirmed" class="form-select" @bind="@_confirmed">
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName"></Label>
                         <div class="col-sm-9">
                             <input id="displayname" class="form-control" @bind="@_displayname" />
                         </div>
                     </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="timezone" HelpText="Your time zone" ResourceKey="TimeZone">Time Zone:</Label>
+                        <div class="col-sm-9">
+                            <select id="timezone" class="form-select" @bind="@_timezoneid">
+                                <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                                @foreach (var timezone in _timezones)
+                                {
+                                    <option value="@timezone.Id">@timezone.DisplayName</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="notify" HelpText="Indicate if new users should receive an email notification" ResourceKey="Notify">Notify? </Label>
                         <div class="col-sm-9">
@@ -48,20 +70,20 @@
         <TabPanel Name="Profile" ResourceKey="Profile">
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    @foreach (Profile profile in profiles)
+                    @foreach (Profile profile in _profiles)
                     {
                         var p = profile;
-                        if (p.Category != category)
+                        if (p.Category != _category)
                         {
                             <div class="col text-center pb-2">
                                 <strong>@p.Category</strong>
                             </div>
-                            category = p.Category;
+                            _category = p.Category;
                         }
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="@p.Name" HelpText="@p.Description">@p.Title</Label>
-                                <div class="col-sm-9">
-                                    @if (!string.IsNullOrEmpty(p.Options))
+                            <div class="col-sm-9">
+                                @if (!string.IsNullOrEmpty(p.Options))
                                 {
                                     <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
                                         @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
@@ -103,14 +125,17 @@
 
 
 @code {
+    private List<Models.TimeZone> _timezones;
     private bool _initialized = false;
     private string _username = string.Empty;
     private string _email = string.Empty;
+    private string _confirmed = "True";
     private string _displayname = string.Empty;
+    private string _timezoneid = string.Empty;
     private string _notify = "True";
-    private List<Profile> profiles;
-    private Dictionary<string, string> settings;
-    private string category = string.Empty;
+    private List<Profile> _profiles;
+    private Dictionary<string, string> _settings;
+    private string _category = string.Empty;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
@@ -118,8 +143,10 @@
     {
         try
         {
-            profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
-            settings = new Dictionary<string, string>();
+            _timezones = TimeZoneService.GetTimeZones();
+            _profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
+            _settings = new Dictionary<string, string>();
+            _timezoneid = PageState.Site.TimeZoneId;
             _initialized = true;
         }
         catch (Exception ex)
@@ -131,7 +158,7 @@
 
     private string GetProfileValue(string SettingName, string DefaultValue)
     {
-        string value = SettingService.GetSetting(settings, SettingName, DefaultValue);
+        string value = SettingService.GetSetting(_settings, SettingName, DefaultValue);
         if (value.Contains("]"))
         {
             value = value.Substring(value.IndexOf("]") + 1);
@@ -152,7 +179,9 @@
                     user.Username = _username;
                     user.Password = ""; // will be auto generated
                     user.Email = _email;
+                    user.EmailConfirmed = bool.Parse(_confirmed);
                     user.DisplayName = string.IsNullOrWhiteSpace(_displayname) ? _username : _displayname;
+                    user.TimeZoneId = _timezoneid;
                     user.PhotoFileId = null;
                     user.SuppressNotification = !bool.Parse(_notify);
 
@@ -160,7 +189,7 @@
 
                     if (user != null)
                     {
-                        await SettingService.UpdateUserSettingsAsync(settings, user.UserId);
+                        await SettingService.UpdateUserSettingsAsync(_settings, user.UserId);
                         await logger.LogInformation("User Created {User}", user);
                         NavigationManager.NavigateTo(NavigateUrl());
                     }
@@ -185,12 +214,12 @@
 
     private bool ValidateProfiles()
     {
-        foreach (Profile profile in profiles)
+        foreach (Profile profile in _profiles)
         {
             var value = GetProfileValue(profile.Name, string.Empty);
             if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
-                settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
+                _settings = SettingService.SetSetting(_settings, profile.Name, profile.DefaultValue);
             }
             if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
@@ -217,6 +246,6 @@
     private void ProfileChanged(ChangeEventArgs e, string SettingName)
     {
         var value = (string)e.Value;
-        settings = SettingService.SetSetting(settings, SettingName, value);
+        _settings = SettingService.SetSetting(_settings, SettingName, value);
     }
 }

Oqtane.Client/Modules/Admin/Users/Edit.razor

@@ -6,6 +6,7 @@
 @inject IProfileService ProfileService
 @inject ISettingService SettingService
 @inject IFileService FileService
+@inject ITimeZoneService TimeZoneService
 @inject IServiceProvider ServiceProvider
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
@@ -17,13 +18,13 @@
             <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="username" HelpText="The unique username for a user. Note that this field can not be modified." ResourceKey="Username"></Label>
+                    <Label Class="col-sm-3" For="username" HelpText="The unique username for a user. Note that this field can not be modified." ResourceKey="Username">Username:</Label>
                     <div class="col-sm-9">
-                        <input id="username" class="form-control" @bind="@username" readonly />
+                        <input id="username" class="form-control" @bind="@_username" readonly />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password"></Label>
+                    <Label Class="col-sm-3" For="password" HelpText="The user's password. Please choose a password which is sufficiently secure." ResourceKey="Password">Password:</Label>
                     <div class="col-sm-9">
                         <div class="input-group">
                             <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" />
@@ -32,32 +33,53 @@
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm"></Label>
+                    <Label Class="col-sm-3" For="confirm" HelpText="Please enter the password again to confirm it matches with the value above" ResourceKey="Confirm">Confirm Password:</Label>
                     <div class="col-sm-9">
                         <div class="input-group">
-                            <input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" />
+                            <input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" />
                             <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
                         </div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email"></Label>
+                    <Label Class="col-sm-3" For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email">Email:</Label>
                     <div class="col-sm-9">
-                        <input id="email" class="form-control" @bind="@email" />
+                        <input id="email" class="form-control" @bind="@_email" />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName"></Label>
+                    <Label Class="col-sm-3" For="confirmed" HelpText="Indicates if the user's email is verified" ResourceKey="Confirmed">Verified?</Label>
                     <div class="col-sm-9">
-                        <input id="displayname" class="form-control" @bind="@displayname" />
+                        <select id="confirmed" class="form-select" @bind="@_confirmed">
+                            <option value="True">@SharedLocalizer["Yes"]</option>
+                            <option value="False">@SharedLocalizer["No"]</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="displayname" HelpText="The full name of the user" ResourceKey="DisplayName">Full Name:</Label>
+                    <div class="col-sm-9">
+                        <input id="displayname" class="form-control" @bind="@_displayname" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="timezone" HelpText="Your time zone" ResourceKey="TimeZone">Time Zone:</Label>
+                    <div class="col-sm-9">
+                        <select id="timezone" class="form-select" @bind="@_timezoneid">
+                            <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                            @foreach (var timezone in _timezones)
+                            {
+                                <option value="@timezone.Id">@timezone.DisplayName</option>
+                            }
+                        </select>
                     </div>
                 </div>
                 @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
                 {
                     <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="isdeleted" HelpText="Indicate if the user is active" ResourceKey="IsDeleted"></Label>
+                        <Label Class="col-sm-3" For="isdeleted" HelpText="Indicate if the user is active" ResourceKey="IsDeleted">Deleted?</Label>
                         <div class="col-sm-9">
-                            <select id="isdeleted" class="form-select" @bind="@isdeleted">
+                            <select id="isdeleted" class="form-select" @bind="@_isdeleted">
                                 <option value="True">@SharedLocalizer["Yes"]</option>
                                 <option value="False">@SharedLocalizer["No"]</option>
                             </select>
@@ -65,15 +87,15 @@
                     </div>
                 }
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="lastlogin" HelpText="The date and time when the user last signed in" ResourceKey="LastLogin"></Label>
+                    <Label Class="col-sm-3" For="lastlogin" HelpText="The date and time when the user last signed in" ResourceKey="LastLogin">Last Login:</Label>
                     <div class="col-sm-9">
-                        <input id="lastlogin" class="form-control" @bind="@lastlogin" readonly />
+                        <input id="lastlogin" class="form-control" @bind="@_lastlogin" readonly />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="lastipaddress" HelpText="The IP Address of the user recorded during their last login" ResourceKey="LastIPAddress"></Label>
+                    <Label Class="col-sm-3" For="lastipaddress" HelpText="The IP Address of the user recorded during their last login" ResourceKey="LastIPAddress">Last IP Address:</Label>
                     <div class="col-sm-9">
-                        <input id="lastipaddress" class="form-control" @bind="@lastipaddress" readonly />
+                        <input id="lastipaddress" class="form-control" @bind="@_lastipaddress" readonly />
                     </div>
                 </div>
             </div>
@@ -81,15 +103,15 @@
         <TabPanel Name="Profile" ResourceKey="Profile">
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    @foreach (Profile profile in profiles)
+                    @foreach (Profile profile in _profiles)
                     {
                         var p = profile;
-                        if (p.Category != category)
+                        if (p.Category != _category)
                         {
                             <div class="col text-center pb-2">
                                 <strong>@p.Category</strong>
                             </div>
-                            category = p.Category;
+                            _category = p.Category;
                         }
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="@p.Name" HelpText="@p.Description">@p.Title</Label>
@@ -128,47 +150,50 @@
             </div>
         </TabPanel>
     </TabStrip>
-
+    <br />
     <button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
-    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin) && PageState.Runtime != Shared.Runtime.Hybrid && !ishost)
+    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin) && PageState.Runtime != Shared.Runtime.Hybrid && !_ishost)
     {
         <button type="button" class="btn btn-primary ms-1" @onclick="ImpersonateUser">@Localizer["Impersonate"]</button>
     }
-    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && isdeleted == "True")
+    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && _isdeleted == "True")
     {
-        <ActionDialog Header="Delete User" Message="Are You Sure You Wish To Permanently Delete This User?" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteUser())" ResourceKey="DeleteUser" />
+        <ActionDialog Header="Delete User" Message="Are You Sure You Wish To Permanently Delete This User?" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger ms-1" OnClick="@(async () => await DeleteUser())" ResourceKey="DeleteUser" />
     }
     <br /><br />
-    <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon" DeletedBy="@deletedby" DeletedOn="@deletedon"></AuditInfo>
+    <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo>
 }
 
 @code {
+    private List<Models.TimeZone> _timezones;
     private bool _initialized = false;
     private string _passwordrequirements;
-    private int userid;
-    private string username = string.Empty;
+    private int _userid;
+    private string _username = string.Empty;
     private string _password = string.Empty;
     private string _passwordtype = "password";
     private string _togglepassword = string.Empty;
-    private string confirm = string.Empty;
-    private string email = string.Empty;
-    private string displayname = string.Empty;
-    private string isdeleted;
-    private string lastlogin;
-    private string lastipaddress;
-    private bool ishost = false;
+    private string _confirm = string.Empty;
+    private string _email = string.Empty;
+    private string _confirmed = string.Empty;
+    private string _displayname = string.Empty;
+    private string _timezoneid = string.Empty;
+    private string _isdeleted;
+    private string _lastlogin;
+    private string _lastipaddress;
+    private bool _ishost = false;
 
-    private List<Profile> profiles;
-    private Dictionary<string, string> userSettings;
-    private string category = string.Empty;
+    private List<Profile> _profiles;
+    private Dictionary<string, string> _settings;
+    private string _category = string.Empty;
 
-    private string createdby;
-    private DateTime createdon;
-    private string modifiedby;
-    private DateTime modifiedon;
-    private string deletedby;
-    private DateTime? deletedon;
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
+    private string _deletedby;
+    private DateTime? _deletedon;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
@@ -178,29 +203,32 @@
         {
             _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
             _togglepassword = SharedLocalizer["ShowPassword"];
-            profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
+            _profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
+            _timezones = TimeZoneService.GetTimeZones();
 
             if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int UserId))
             {
-                userid = UserId;
-                var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+                _userid = UserId;
+                var user = await UserService.GetUserAsync(_userid, PageState.Site.SiteId);
                 if (user != null)
                 {
-                    username = user.Username;
-                    email = user.Email;
-                    displayname = user.DisplayName;
-                    isdeleted = user.IsDeleted.ToString();
-                    lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", user.LastLoginOn);
-                    lastipaddress = user.LastIPAddress;
-                    ishost = UserSecurity.ContainsRole(user.Roles, RoleNames.Host);
+                    _username = user.Username;
+                    _email = user.Email;
+                    _confirmed = user.EmailConfirmed.ToString();
+                    _displayname = user.DisplayName;
+                    _timezoneid = PageState.User.TimeZoneId;
+                    _isdeleted = user.IsDeleted.ToString();
+                    _lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", UtcToLocal(user.LastLoginOn));
+                    _lastipaddress = user.LastIPAddress;
+                    _ishost = UserSecurity.ContainsRole(user.Roles, RoleNames.Host);
 
-                    userSettings = user.Settings;
-                    createdby = user.CreatedBy;
-                    createdon = user.CreatedOn;
-                    modifiedby = user.ModifiedBy;
-                    modifiedon = user.ModifiedOn;
-                    deletedby = user.DeletedBy;
-                    deletedon = user.DeletedOn;
+                    _settings = user.Settings;
+                    _createdby = user.CreatedBy;
+                    _createdon = user.CreatedOn;
+                    _modifiedby = user.ModifiedBy;
+                    _modifiedon = user.ModifiedOn;
+                    _deletedby = user.DeletedBy;
+                    _deletedon = user.DeletedOn;
                 }
             }
 
@@ -208,14 +236,14 @@
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading User {UserId} {Error}", userid, ex.Message);
+            await logger.LogError(ex, "Error Loading User {UserId} {Error}", _userid, ex.Message);
             AddModuleMessage(Localizer["Error.User.Load"], MessageType.Error);
         }
     }
 
     private string GetProfileValue(string SettingName, string DefaultValue)
     {
-        string value = SettingService.GetSetting(userSettings, SettingName, DefaultValue);
+        string value = SettingService.GetSetting(_settings, SettingName, DefaultValue);
         if (value.Contains("]"))
         {
             value = value.Substring(value.IndexOf("]") + 1);
@@ -227,27 +255,29 @@
     {
         try
         {
-            if (username != string.Empty && email != string.Empty)
+            if (_username != string.Empty && _email != string.Empty)
             {
-                if (_password == confirm)
+                if (_password == _confirm)
                 {
                     if (ValidateProfiles())
                     {
-                        var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+                        var user = await UserService.GetUserAsync(_userid, PageState.Site.SiteId);
                         user.SiteId = PageState.Site.SiteId;
-                        user.Username = username;
+                        user.Username = _username;
                         user.Password = _password;
-                        user.Email = email;
-                        user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname;
+                        user.Email = _email;
+                        user.EmailConfirmed = bool.Parse(_confirmed);
+                        user.DisplayName = string.IsNullOrWhiteSpace(_displayname) ? _username : _displayname;
+                        user.TimeZoneId = _timezoneid;
                         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
                         {
-                            user.IsDeleted = (isdeleted == null ? true : Boolean.Parse(isdeleted));
+                            user.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
                         }
 
                         user = await UserService.UpdateUserAsync(user);
                         if (user != null)
                         {
-                            await SettingService.UpdateUserSettingsAsync(userSettings, user.UserId);
+                            await SettingService.UpdateUserSettingsAsync(_settings, user.UserId);
                             await logger.LogInformation("User Saved {User}", user);
                             NavigationManager.NavigateTo(NavigateUrl());
                         }
@@ -269,7 +299,7 @@
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Saving User {Username} {Email} {Error}", username, email, ex.Message);
+            await logger.LogError(ex, "Error Saving User {Username} {Email} {Error}", _username, _email, ex.Message);
             AddModuleMessage(Localizer["Error.User.Save"], MessageType.Error);
         }
     }
@@ -278,17 +308,17 @@
     {
         try
         {
-            await logger.LogInformation(LogFunction.Security, "User {Username} Impersonated By Administrator {Administrator}", username, PageState.User.Username);
+            await logger.LogInformation(LogFunction.Security, "User {Username} Impersonated By Administrator {Administrator}", _username, PageState.User.Username);
 
             // post back to the server so that the cookies are set correctly
             var interop = new Interop(JSRuntime);
-            var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, username = username, returnurl = PageState.Alias.Path };
+            var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, username = _username, returnurl = PageState.Alias.Path };
             string url = Utilities.TenantUrl(PageState.Alias, "/pages/impersonate/");
             await interop.SubmitForm(url, fields);
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Impersonating User {Username} {Error}", username, ex.Message);
+            await logger.LogError(ex, "Error Impersonating User {Username} {Error}", _username, ex.Message);
             AddModuleMessage(Localizer["Error.User.Impersonate"], MessageType.Error);
         }
     }
@@ -297,9 +327,9 @@
     {
         try
         {
-            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && userid != PageState.User.UserId)
+            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && _userid != PageState.User.UserId)
             {
-                var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+                var user = await UserService.GetUserAsync(_userid, PageState.Site.SiteId);
                 await UserService.DeleteUserAsync(user.UserId, PageState.Site.SiteId);
                 await logger.LogInformation("User Permanently Deleted {User}", user);
                 NavigationManager.NavigateTo(NavigateUrl());
@@ -307,19 +337,19 @@
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Permanently Deleting User {UserId} {Error}", userid, ex.Message);
+            await logger.LogError(ex, "Error Permanently Deleting User {UserId} {Error}", _userid, ex.Message);
             AddModuleMessage(Localizer["Error.DeleteUser"], MessageType.Error);
         }
     }
 
     private bool ValidateProfiles()
     {
-        foreach (Profile profile in profiles)
+        foreach (Profile profile in _profiles)
         {
             var value = GetProfileValue(profile.Name, string.Empty);
             if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(profile.DefaultValue))
             {
-                userSettings = SettingService.SetSetting(userSettings, profile.Name, profile.DefaultValue);
+                _settings = SettingService.SetSetting(_settings, profile.Name, profile.DefaultValue);
             }
             if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
@@ -346,7 +376,7 @@
     private void ProfileChanged(ChangeEventArgs e, string SettingName)
     {
         var value = (string)e.Value;
-        userSettings = SettingService.SetSetting(userSettings, SettingName, value);
+        _settings = SettingService.SetSetting(_settings, SettingName, value);
     }
 
     private void TogglePassword()

Oqtane.Client/Modules/Admin/Users/Index.razor

@@ -43,7 +43,7 @@ else
                     <td>@context.User.Username</td>
                     <td>@context.User.DisplayName</td>
                     <td>@((MarkupString)string.Format("<a href=\"mailto:{0}\">{1}</a>", @context.User.Email, @context.User.Email))</td>
-                    <td>@((context.User.LastLoginOn != DateTime.MinValue) ? string.Format("{0:dd-MMM-yyyy HH:mm:ss}", context.User.LastLoginOn) : "")</td>
+                    <td>@((context.User.LastLoginOn != DateTime.MinValue) ? string.Format("{0:dd-MMM-yyyy HH:mm:ss}", UtcToLocal(context.User.LastLoginOn)) : "")</td>
                 </Row>
             </Pager>
         </TabPanel>
@@ -59,31 +59,34 @@ else
                             </select>
                         </div>
                     </div>
+                    @if (_allowregistration == "true")
+                    {
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="registerurl" HelpText="Optionally provide a custom registration url" ResourceKey="RegisterUrl">Register Url:</Label>
+                            <div class="col-sm-9">
+                                <input id="registerurl" class="form-control" @bind="@_registerurl" />
+                            </div>
+                        </div>
+                    }
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="profileurl" HelpText="Optionally provide a custom profile url" ResourceKey="ProfileUrl">Profile Url:</Label>
+                        <div class="col-sm-9">
+                            <input id="profileurl" class="form-control" @bind="@_profileurl" />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <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="requireconfirmedemail" class="form-select" @bind="@_requireconfirmedemail">
+                                <option value="true">@SharedLocalizer["Yes"]</option>
+                                <option value="false">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
                     @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
                     {
-                        @if (_providertype != "")
-                        {
-                            <div class="row mb-1 align-items-center">
-                                <Label Class="col-sm-3" For="allowsitelogin" HelpText="Do you want to allow users to sign in using a username and password that is managed locally on this site? Note that you should only disable this option if you have already sucessfully configured an external login provider, or else you may lock yourself out of the site." ResourceKey="AllowSiteLogin">Allow Login?</Label>
-                                <div class="col-sm-9">
-                                    <select id="allowsitelogin" class="form-select" @bind="@_allowsitelogin">
-                                        <option value="true">@SharedLocalizer["Yes"]</option>
-                                        <option value="false">@SharedLocalizer["No"]</option>
-                                    </select>
-                                </div>
-                            </div>
-                        }
-                        else
-                        {
-                            <div class="row mb-1 align-items-center">
-                                <Label Class="col-sm-3" For="allowsitelogin" HelpText="Do you want to allow users to sign in using a username and password that is managed locally on this site? Note that you should only disable this option if you have already sucessfully configured an external login provider, or else you may lock yourself out of the site." ResourceKey="AllowSiteLogin">Allow Login?</Label>
-                                <div class="col-sm-9">
-                                    <input id="allowsitelogin" class="form-control" value="@SharedLocalizer["Yes"]" readonly />
-                                </div>
-                            </div>
-                        }
                         <div class="row mb-1 align-items-center">
-                            <Label Class="col-sm-3" For="twofactor" HelpText="Do you want users to use two factor authentication? Note that you should use the Disabled option until you have successfully verified that the Notification Job in Scheduled Jobs is enabled and your SMTP options in Site Settings are configured or else you will lock yourself out." ResourceKey="TwoFactor">Two Factor?</Label>
+                            <Label Class="col-sm-3" For="twofactor" HelpText="Do you want users to use two factor authentication? Note that you should use the Disabled option until you have successfully verified that the Notification Job in Scheduled Jobs is enabled and your SMTP options in Site Settings are configured or else you will lock yourself out." ResourceKey="TwoFactor">Two Factor Authentication?</Label>
                             <div class="col-sm-9">
                                 <select id="twofactor" class="form-select" @bind="@_twofactor">
                                     <option value="false">@Localizer["Disabled"]</option>
@@ -432,6 +435,15 @@ else
                                         </select>
                                     </div>
                                 </div>
+                                <div class="row mb-1 align-items-center">
+                                    <Label Class="col-sm-3" For="allowsitelogin" HelpText="Do you want to allow users to sign in using a username and password that is managed locally on this site? Note that you should only disable this option if you have already sucessfully configured an external login provider, or else you may lock yourself out of the site." ResourceKey="AllowSiteLogin">Allow Local Login?</Label>
+                                    <div class="col-sm-9">
+                                        <select id="allowsitelogin" class="form-select" @bind="@_allowsitelogin">
+                                            <option value="true">@SharedLocalizer["Yes"]</option>
+                                            <option value="false">@SharedLocalizer["No"]</option>
+                                        </select>
+                                    </div>
+                                </div>
                             }
                         }
                     </Section>
@@ -485,7 +497,9 @@ else
     private List<UserRole> users;
 
     private string _allowregistration;
-    private string _allowsitelogin;
+    private string _registerurl;
+    private string _profileurl;
+    private string _requireconfirmedemail;
     private string _twofactor;
     private string _cookiename;
     private string _cookieexpiration;
@@ -533,6 +547,7 @@ else
     private string _createusers;
     private string _verifyusers;
     private string _allowhostrole;
+    private string _allowsitelogin;
 
     private string _secret;
     private string _secrettype = "password";
@@ -553,7 +568,9 @@ else
 
         var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
         _allowregistration = PageState.Site.AllowRegistration.ToString().ToLower();
-        _allowsitelogin = SettingService.GetSetting(settings, "LoginOptions:AllowSiteLogin", "true");
+        _registerurl = SettingService.GetSetting(settings, "LoginOptions:RegisterUrl", "");
+        _profileurl = SettingService.GetSetting(settings, "LoginOptions:ProfileUrl", "");
+        _requireconfirmedemail = SettingService.GetSetting(settings, "LoginOptions:RequireConfirmedEmail", "true");
 
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
@@ -616,6 +633,7 @@ else
         _createusers = SettingService.GetSetting(settings, "ExternalLogin:CreateUsers", "true");
         _verifyusers = SettingService.GetSetting(settings, "ExternalLogin:VerifyUsers", "true");
         _allowhostrole = SettingService.GetSetting(settings, "ExternalLogin:AllowHostRole", "false");
+        _allowsitelogin = SettingService.GetSetting(settings, "LoginOptions:AllowSiteLogin", "true");
     }
 
     private async Task LoadUsersAsync(bool load)
@@ -673,10 +691,12 @@ else
             await SiteService.UpdateSiteAsync(site);
 
             var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
-            settings = SettingService.SetSetting(settings, "LoginOptions:AllowSiteLogin", _allowsitelogin, false);
 
             if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
             {
+                settings = SettingService.SetSetting(settings, "LoginOptions:RegisterUrl", _registerurl, false);
+                settings = SettingService.SetSetting(settings, "LoginOptions:ProfileUrl", _profileurl, 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);
@@ -720,6 +740,7 @@ else
                 settings = SettingService.SetSetting(settings, "ExternalLogin:CreateUsers", _createusers, true);
                 settings = SettingService.SetSetting(settings, "ExternalLogin:VerifyUsers", _verifyusers, true);
                 settings = SettingService.SetSetting(settings, "ExternalLogin:AllowHostRole", _allowhostrole, true);
+                settings = SettingService.SetSetting(settings, "LoginOptions:AllowSiteLogin", _allowsitelogin, false);
 
                 settings = SettingService.SetSetting(settings, "JwtOptions:Secret", _secret, true);
                 settings = SettingService.SetSetting(settings, "JwtOptions:Issuer", _issuer, true);

Oqtane.Client/Modules/Admin/Visitors/Detail.razor

@@ -101,8 +101,8 @@
 				_url = visitor.Url;
 				_referrer = visitor.Referrer;
 				_visits = visitor.Visits.ToString();
-				_visited = visitor.VisitedOn.ToString(CultureInfo.CurrentCulture);
-				_created = visitor.CreatedOn.ToString(CultureInfo.CurrentCulture);
+				_visited = UtcToLocal(visitor.VisitedOn).Value.ToString(CultureInfo.CurrentCulture);
+				_created = UtcToLocal(visitor.CreatedOn).Value.ToString(CultureInfo.CurrentCulture);
 
 				if (visitor.UserId != null)
 				{

Oqtane.Client/Modules/Admin/Visitors/Index.razor

@@ -53,8 +53,8 @@ else
 					</td>
 					<td>@context.Language</td>
 					<td>@context.Visits</td>
-					<td>@context.VisitedOn</td>
-					<td>@context.CreatedOn</td>
+					<td>@UtcToLocal(context.VisitedOn)</td>
+					<td>@UtcToLocal(context.CreatedOn)</td>
 				</Row>
 			</Pager>
 		</TabPanel>

Oqtane.Client/Modules/Controls/AuditInfo.razor

@@ -52,7 +52,7 @@
 
             if (CreatedOn != null)
             {
-                _text += $" {Localizer["On"]} <b>{CreatedOn.Value.ToString(DateTimeFormat)}</b>";
+                _text += $" {Localizer["On"]} <b>{UtcToLocal(CreatedOn).Value.ToString(DateTimeFormat)}</ b >";
             }
 
             _text += "</p>";
@@ -69,7 +69,7 @@
 
             if (ModifiedOn != null)
             {
-                _text += $" {Localizer["On"]} <b>{ModifiedOn.Value.ToString(DateTimeFormat)}</b>";
+                _text += $" {Localizer["On"]} <b>{UtcToLocal(ModifiedOn).Value.ToString(DateTimeFormat)}</ b >";
             }
 
             _text += "</p>";
@@ -86,7 +86,7 @@
 
             if (DeletedOn != null)
             {
-                _text += $" {Localizer["On"]} <b>{DeletedOn.Value.ToString(DateTimeFormat)}</b>";
+                _text += $" {Localizer["On"]} <b>{UtcToLocal(DeletedOn).Value.ToString(DateTimeFormat)}</ b >";
             }
 
             _text += "</p>";

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -157,6 +157,9 @@
     [Parameter]
     public bool UploadMultiple { get; set; } = false; // optional - enable multiple file uploads - default false
 
+    [Parameter]
+    public bool AnonymizeUploadFilenames { get; set; } = false; // optional - indicate if file names should be anonymized on upload - default false
+
     [Parameter]
     public int ChunkSize { get; set; } = 1; // optional - size of file chunks to upload in MB
 
@@ -408,7 +411,7 @@
                     }
 
                     // upload files
-                    var success = await interop.UploadFiles(posturl, folder, _guid, SiteState.AntiForgeryToken, jwt, chunksize, tokenSource.Token);
+                    var success = await interop.UploadFiles(posturl, folder, _guid, SiteState.AntiForgeryToken, jwt, chunksize, AnonymizeUploadFilenames, tokenSource.Token);
 
                     // reset progress indicators
                     if (ShowProgress)

Oqtane.Client/Modules/Controls/PermissionGrid.razor

@@ -9,62 +9,26 @@
 
 @if (_permissions != null)
 {
-<div class="container">
-    <div class="row">
-        <div class="col">
-            <table class="table table-borderless">
-                <tbody>
-                    <tr>
-                        <th scope="col">@Localizer["Role"]</th>
-                        @foreach (var permissionname in _permissionnames)
-                        {
-							<th style="text-align: center; width: 1px;">@((MarkupString)DisplayPermissionName(permissionname).Replace(" ", "<br />"))</th>
-						}
-                    </tr>
-                    @foreach (Role role in _roles)
-                    {
+    <div class="container">
+        <div class="row">
+            <div class="col">
+                <table class="table table-borderless">
+                    <tbody>
                         <tr>
-                            <td>@role.Name</td>
+                            <th scope="col">@Localizer["Role"]</th>
                             @foreach (var permissionname in _permissionnames)
                             {
-                                <td style="text-align: center;">
-									<TriStateCheckBox Value=@GetPermissionValue(permissionname, role.Name, -1) Disabled="@GetPermissionDisabled(permissionname, role.Name)" OnChange="@(e => PermissionChanged(e, permissionname, role.Name, -1))" />
-                                </td>
+                                <th style="text-align: center; width: 1px;">@((MarkupString)DisplayPermissionName(permissionname).Replace(" ", "<br />"))</th>
                             }
                         </tr>
-                    }
-                </tbody>
-            </table>
-            <br />
-        </div>
-    </div>
-    <div class="row">
-        <div class="col">
-            @if (_users.Count != 0)
-            {
-                <div class="row">
-                    <div class="col">
-                    </div>
-                </div>
-                <table class="table table-borderless">
-                    <thead>
-                        <tr>
-                            <th scope="col">@Localizer["User"]</th>
-								@foreach (var permissionname in _permissionnames)
-								{
-									<th style="text-align: center; width: 1px;">@((MarkupString)DisplayPermissionName(permissionname).Replace(" ", "<br />"))</th>
-								}
-							</tr>
-                    </thead>
-                    <tbody>
-                        @foreach (User user in _users)
+                        @foreach (Role role in _roles)
                         {
                             <tr>
-                                <td>@user.DisplayName (@user.Username)</td>
+                                <td>@role.Name</td>
                                 @foreach (var permissionname in _permissionnames)
                                 {
-                                    <td style="text-align: center; width: 1px;">
-										<TriStateCheckBox Value=@GetPermissionValue(permissionname, "", user.UserId) Disabled="@GetPermissionDisabled(permissionname, "")" OnChange="@(e => PermissionChanged(e, permissionname, "", user.UserId))" />
+                                    <td style="text-align: center;">
+                                        <TriStateCheckBox Value="@GetPermissionValue(permissionname, role.Name, -1)" Disabled="@GetPermissionDisabled(permissionname, role.Name)" OnChange="@(e => PermissionChanged(e, permissionname, role.Name, -1))" />
                                     </td>
                                 }
                             </tr>
@@ -72,200 +36,242 @@
                     </tbody>
                 </table>
                 <br />
-            }
+            </div>
+        </div>
+        <div class="row">
+            <div class="col">
+                @if (_users.Count != 0)
+                {
+                    <div class="row">
+                        <div class="col">
+                        </div>
+                    </div>
+                    <table class="table table-borderless">
+                        <thead>
+                            <tr>
+                                <th scope="col">@Localizer["User"]</th>
+                                @foreach (var permissionname in _permissionnames)
+                                {
+                                    <th style="text-align: center; width: 1px;">@((MarkupString)DisplayPermissionName(permissionname).Replace(" ", "<br />"))</th>
+                                }
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach (User user in _users)
+                            {
+                                <tr>
+                                    <td>@user.DisplayName (@user.Username)</td>
+                                    @foreach (var permissionname in _permissionnames)
+                                    {
+                                        <td style="text-align: center; width: 1px;">
+                                            <TriStateCheckBox Value="@GetPermissionValue(permissionname, "", user.UserId)" Disabled="@GetPermissionDisabled(permissionname, "")" OnChange="@(e => PermissionChanged(e, permissionname, "", user.UserId))" />
+                                        </td>
+                                    }
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                    <br />
+                }
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-11">
+                <AutoComplete OnSearch="GetUsers" Placeholder="@Localizer["Username.Enter"]" @ref="_user" />
+            </div>
+            <div class="col-1">
+                <button type="button" class="btn btn-primary" @onclick="AddUser">@SharedLocalizer["Add"]</button>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col">
+                <ModuleMessage Type="MessageType.Warning" Message="@_message" />
+            </div>
         </div>
     </div>
-    <div class="row">
-        <div class="col-11">
-			<AutoComplete OnSearch="GetUsers" Placeholder="@Localizer["Username.Enter"]" @ref="_user" />
-		</div>
-		<div class="col-1">
-			<button type="button" class="btn btn-primary" @onclick="AddUser">@SharedLocalizer["Add"]</button>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col">
-            <ModuleMessage Type="MessageType.Warning" Message="@_message" />
-        </div>
-    </div>
-</div>
 }
 
 @code {
-	private List<string> _permissionnames;
-	private List<Permission> _permissions;
-	private List<Role> _roles;
-	private List<User> _users = new List<User>();
-	private AutoComplete _user;
-	private string _message = string.Empty;
+    private List<string> _permissionnames;
+    private List<Permission> _permissions;
+    private List<Role> _roles;
+    private List<User> _users = new List<User>();
+    private AutoComplete _user;
+    private string _message = string.Empty;
 
-	[Parameter]
-	public string EntityName { get; set; }
+    [Parameter]
+    public string EntityName { get; set; }
 
-	[Parameter]
-	public string PermissionNames { get; set; }
+    [Parameter]
+    public string PermissionNames { get; set; }
 
-	[Parameter]
-	public string Permissions { get; set; } // deprecated - use PermissionList instead
+    [Parameter]
+    public string Permissions { get; set; } // deprecated - use PermissionList instead
 
-	[Parameter]
-	public List<Permission> PermissionList { get; set; }
+    [Parameter]
+    public List<Permission> PermissionList { get; set; }
 
     protected override async Task OnInitializedAsync()
-	{
-		if (!string.IsNullOrEmpty(Permissions))
-		{
-			PermissionList = JsonSerializer.Deserialize<List<Permission>>(Permissions);			
-		}
+    {
+        if (!string.IsNullOrEmpty(Permissions))
+        {
+            PermissionList = JsonSerializer.Deserialize<List<Permission>>(Permissions);			
+        }
 
-		_roles = await RoleService.GetRolesAsync(ModuleState.SiteId, true);
-		if (!UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-		{
-			_roles.RemoveAll(item => item.Name == RoleNames.Host);
-		}
+        _roles = await RoleService.GetRolesAsync(ModuleState.SiteId, true);
+        _roles.RemoveAll(item => item.Name == RoleNames.Host); // remove host role
 
-		// get permission names
-		if (string.IsNullOrEmpty(PermissionNames))
-		{
-			_permissionnames = new List<string>();
-			_permissionnames.Add(Shared.PermissionNames.View);
-			_permissionnames.Add(Shared.PermissionNames.Edit);
-		}
-		else
-		{
-			_permissionnames = PermissionNames.Split(',', StringSplitOptions.RemoveEmptyEntries).ToList();
-		}
+        // get permission names
+        if (string.IsNullOrEmpty(PermissionNames))
+        {
+            _permissionnames = new List<string>();
+            _permissionnames.Add(Shared.PermissionNames.View);
+            _permissionnames.Add(Shared.PermissionNames.Edit);
+        }
+        else
+        {
+            _permissionnames = PermissionNames.Split(',', StringSplitOptions.RemoveEmptyEntries).ToList();
+        }
 
-		// initialize permissions
-		_permissions = new List<Permission>();
-		if (PermissionList != null && PermissionList.Any())
-		{
-			foreach (var permission in PermissionList)
-			{
-				_permissions.Add(permission);
-				if (permission.UserId != null)
-				{
-					if (!_users.Any(item => item.UserId == permission.UserId.Value))
-					{
-						_users.Add(await UserService.GetUserAsync(permission.UserId.Value, ModuleState.SiteId));
-					}
-				}
-			}
-		}
-		else
-		{
-			foreach (string permissionname in _permissionnames)
-			{
-				// permission names can be in the form of "EntityName:PermissionName:Roles"
-				if (permissionname.Contains(":"))
-				{
-					var segments = permissionname.Split(':');
-					if (segments.Length == 3)
-					{
-						foreach (var role in segments[2].Split(';'))
-						{
-							_permissions.Add(new Permission(ModuleState.SiteId, segments[0], segments[1], role, null, true));
-						}
-						// ensure admin access
-						if (!_permissions.Any(item => item.EntityName == segments[0] && item.PermissionName == segments[1] && item.RoleName == RoleNames.Admin))
-						{
-							_permissions.Add(new Permission(ModuleState.SiteId, segments[0], segments[1], RoleNames.Admin, null, true));
-						}
-					}
-				}
-				else
-				{
-					_permissions.Add(new Permission(ModuleState.SiteId, EntityName, permissionname, RoleNames.Admin, null, true));
-				}
-			}
-		}
-	}
+        // initialize permissions
+        _permissions = new List<Permission>();
+        if (PermissionList != null && PermissionList.Any())
+        {
+            foreach (var permission in PermissionList)
+            {
+                _permissions.Add(permission);
+                if (permission.UserId != null)
+                {
+                    if (!_users.Any(item => item.UserId == permission.UserId.Value))
+                    {
+                        _users.Add(await UserService.GetUserAsync(permission.UserId.Value, ModuleState.SiteId));
+                    }
+                }
+            }
+        }
+        else
+        {
+            foreach (string permissionname in _permissionnames)
+            {
+                // permission names can be in the form of "EntityName:PermissionName:Roles"
+                if (permissionname.Contains(":"))
+                {
+                    var segments = permissionname.Split(':');
+                    if (segments.Length == 3)
+                    {
+                        foreach (var role in segments[2].Split(';'))
+                        {
+                            _permissions.Add(new Permission(ModuleState.SiteId, segments[0], segments[1], role, null, true));
+                        }
+                        // ensure admin access
+                        if (!_permissions.Any(item => item.EntityName == segments[0] && item.PermissionName == segments[1] && item.RoleName == RoleNames.Admin))
+                        {
+                            _permissions.Add(new Permission(ModuleState.SiteId, segments[0], segments[1], RoleNames.Admin, null, true));
+                        }
+                    }
+                }
+                else
+                {
+                    _permissions.Add(new Permission(ModuleState.SiteId, EntityName, permissionname, RoleNames.Admin, null, true));
+                }
+            }
+        }
+    }
 
-	private string GetPermissionName(string permissionName)
-	{
-		return (permissionName.Contains(":")) ? permissionName.Split(':')[1] : permissionName;
-	}
+    private string GetPermissionName(string permissionName)
+    {
+        return (permissionName.Contains(":")) ? permissionName.Split(':')[1] : permissionName;
+    }
 
-	private string GetEntityName(string permissionName)
-	{
-		return (permissionName.Contains(":")) ? permissionName.Split(':')[0] : EntityName;
-	}
+    private string GetEntityName(string permissionName)
+    {
+        return (permissionName.Contains(":")) ? permissionName.Split(':')[0] : EntityName;
+    }
 
-	private string DisplayPermissionName(string permissionName)
-	{
-		var name = Localizer[GetPermissionName(permissionName)].ToString();
-		name += " " + Localizer[GetEntityName(permissionName)].ToString();
-		return name;
-	}
+    private string DisplayPermissionName(string permissionName)
+    {
+        var name = Localizer[GetPermissionName(permissionName)].ToString();
+        name += " " + Localizer[GetEntityName(permissionName)].ToString();
+        return name;
+    }
 
-	private bool? GetPermissionValue(string permissionName, string roleName, int userId)
-	{
-		bool? isauthorized = null;
-		if (roleName != "")
-		{
-			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.RoleName == roleName);
-			if (permission != null)
-			{
-				isauthorized = permission.IsAuthorized;
-			}
-		}
-		else
-		{
-			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.UserId == userId);
-			if (permission != null)
-			{
-				isauthorized = permission.IsAuthorized;
-			}			
-		}
-		return isauthorized;
-	}
+    private bool? GetPermissionValue(string permissionName, string roleName, int userId)
+    {
+        bool? isauthorized = null;
+        if (roleName != "")
+        {
+            var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.RoleName == roleName);
+            if (permission != null)
+            {
+                isauthorized = permission.IsAuthorized;
+            }
+        }
+        else
+        {
+            var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.UserId == userId);
+            if (permission != null)
+            {
+                isauthorized = permission.IsAuthorized;
+            }			
+        }
+        return isauthorized;
+    }
 
-	private bool GetPermissionDisabled(string permissionName, string roleName)
-	{
-		if (roleName == RoleNames.Admin && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-		{
-			return true;
-		}
-		else
-		{
-			if (GetEntityName(permissionName) != EntityName && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
-			{
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		}
-	}
+    private bool GetPermissionDisabled(string permissionName, string roleName)
+    {
+        var disabled = false;
 
-	private void PermissionChanged(bool? value, string permissionName, string roleName, int userId)
-	{
-		if (roleName != "")
-		{
-			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.RoleName == roleName);
-			if (permission != null)
-			{
-				_permissions.Remove(permission);
-			}
-			if (value != null)
-			{
-				_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionName), GetPermissionName(permissionName), roleName, null, value.Value));
-			}
-		}
-		else
-		{
-			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.UserId == userId);
-			if (permission != null)
-			{
-				_permissions.Remove(permission);
-			}
-			if (value != null)
-			{
-				_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionName), GetPermissionName(permissionName), null, userId, value.Value));
-			}
-		}
-	}
+        // administrator role permissions can only be changed by a host
+        if (roleName == RoleNames.Admin && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+        {
+            disabled = true;
+        }
+
+        // API permissions can only be changed by an administrator
+        if (GetEntityName(permissionName) != EntityName && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+        {
+            disabled = true;
+        }
+
+        return disabled;
+    }
+
+    private bool? PermissionChanged(bool? value, string permissionName, string roleName, int userId)
+    {
+        if (roleName != "")
+        {
+            var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.RoleName == roleName);
+            if (permission != null)
+            {
+                _permissions.Remove(permission);
+            }
+
+            // system roles cannot be denied - only custom roles can be denied
+            var role = _roles.FirstOrDefault(item => item.Name == roleName);
+            if (value != null && !value.Value && role.IsSystem)
+            {
+                value = null;
+            }
+
+            if (value != null)
+            {
+                _permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionName), GetPermissionName(permissionName), roleName, null, value.Value));
+            }
+        }
+        else
+        {
+            var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.UserId == userId);
+            if (permission != null)
+            {
+                _permissions.Remove(permission);
+            }
+            if (value != null)
+            {
+                _permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionName), GetPermissionName(permissionName), null, userId, value.Value));
+            }
+        }
+        return value;
+    }
 
 	private async Task<Dictionary<string, string>> GetUsers(string filter)
 	{
@@ -305,29 +311,20 @@
 
 	private void ValidatePermissions()
 	{
-		// remove deny all users, unauthenticated, and registered users
-		var permissions = _permissions.Where(item => !item.IsAuthorized && 
-			(item.RoleName == RoleNames.Everyone || item.RoleName == RoleNames.Unauthenticated || item.RoleName == RoleNames.Registered)).ToList();
-		foreach (var permission in permissions)
-		{
-			_permissions.Remove(permission);
-		}
 		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 		{
-			// remove deny administrators and host users
-			permissions = _permissions.Where(item => !item.IsAuthorized &&
-				(item.RoleName == RoleNames.Admin || item.RoleName == RoleNames.Host)).ToList();
-			foreach (var permission in permissions)
+            // remove host role permissions
+            var permissions = _permissions.Where(item => item.RoleName == RoleNames.Host).ToList();
+            foreach (var permission in permissions)
+            {
+            	_permissions.Remove(permission);
+            }
+            // add host role permissions if administrator role is not assigned (to prevent lockout)
+            foreach (var permissionname in _permissionnames)
 			{
-				_permissions.Remove(permission);
-			}
-			foreach (var permissionname in _permissionnames)
-			{
-				// add administrators role if neither host or administrator is assigned
-				if (!_permissions.Any(item => item.EntityName == GetEntityName(permissionname) && item.PermissionName == GetPermissionName(permissionname) &&
-					(item.RoleName == RoleNames.Admin || item.RoleName == RoleNames.Host)))
+				if (!_permissions.Any(item => item.EntityName == GetEntityName(permissionname) && item.PermissionName == GetPermissionName(permissionname) && item.RoleName == RoleNames.Admin))
 				{
-					_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionname), GetPermissionName(permissionname), RoleNames.Admin, null, true));
+					_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionname), GetPermissionName(permissionname), RoleNames.Host, null, true));
 				}
 			}
 		}

Oqtane.Client/Modules/Controls/TriStateCheckBox.razor

@@ -16,7 +16,7 @@
     public bool Disabled { get; set; }
 
     [Parameter]
-    public Action<bool?> OnChange { get; set; }
+    public Func<bool?, bool?> OnChange { get; set; }
 
     protected override void OnInitialized()
     {
@@ -41,27 +41,35 @@
                     break;
             }
 
+            _value = OnChange(_value);
             SetImage();
-            OnChange(_value);
         }
     }
 
     private void SetImage()
     {
-        switch (_value)
+        if (!Disabled)
         {
-            case true:
-                _src = "images/checked.png";
-                _title = Localizer["PermissionGranted"];
-                break;
-            case false:
-                _src = "images/unchecked.png";
-                _title = Localizer["PermissionDenied"];
-                break;
-            case null:
-                _src = "images/null.png";
-                _title = string.Empty;
-                break;
+            switch (_value)
+            {
+                case true:
+                    _src = "images/checked.png";
+                    _title = Localizer["PermissionGranted"];
+                    break;
+                case false:
+                    _src = "images/unchecked.png";
+                    _title = Localizer["PermissionDenied"];
+                    break;
+                case null:
+                    _src = "images/null.png";
+                    _title = string.Empty;
+                    break;
+            }
+        }
+        else
+        {
+            _src = "images/disabled.png";
+            _title = Localizer["PermissionDisabled"];
         }
 
         StateHasChanged();

Oqtane.Client/Modules/ModuleBase.cs

@@ -1,23 +1,23 @@
-using Microsoft.AspNetCore.Components;
-using Oqtane.Shared;
-using Oqtane.Models;
-using System.Threading.Tasks;
-using Oqtane.Services;
 using System;
-using Oqtane.Enums;
-using Oqtane.UI;
 using System.Collections.Generic;
-using Microsoft.JSInterop;
-using System.Linq;
 using System.Dynamic;
-using System.Reflection;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
+using Oqtane.Enums;
+using Oqtane.Models;
+using Oqtane.Services;
+using Oqtane.Shared;
+using Oqtane.UI;
 
 namespace Oqtane.Modules
 {
     public abstract class ModuleBase : ComponentBase, IModuleControl
     {
         private Logger _logger;
-        private string _urlparametersstate;
+        private string _urlparametersstate = string.Empty;
         private Dictionary<string, string> _urlparameters;
         private bool _scriptsloaded = false;
 
@@ -62,7 +62,7 @@ namespace Oqtane.Modules
         public Dictionary<string, string> UrlParameters {
             get
             {
-                if (_urlparametersstate == null || _urlparametersstate != PageState.UrlParameters)
+                if (string.IsNullOrEmpty(_urlparametersstate) || _urlparametersstate != PageState.UrlParameters)
                 {
                     _urlparametersstate = PageState.UrlParameters;
                     _urlparameters = GetUrlParameters(UrlParametersTemplate);
@@ -79,18 +79,21 @@ namespace Oqtane.Modules
             {
                 List<Resource> resources = null;
                 var type = GetType();
-                if (type.BaseType == typeof(ModuleBase))
+                if (type.IsSubclassOf(typeof(ModuleBase)))
                 {
-                    if (PageState.Page.Resources != null)
+                    if (type.IsSubclassOf(typeof(ModuleControlBase)))
                     {
-                        resources = PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Level == ResourceLevel.Module && item.Namespace == type.Namespace).ToList();
+                        if (Resources != null)
+                        {
+                            resources = Resources.Where(item => item.ResourceType == ResourceType.Script).ToList();
+                        }
                     }
-                }
-                else // modulecontrolbase
-                {
-                    if (Resources != null)
+                    else // ModuleBase
                     {
-                        resources = Resources.Where(item => item.ResourceType == ResourceType.Script).ToList();
+                        if (PageState.Page.Resources != null)
+                        {
+                            resources = PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Level == ResourceLevel.Module && item.Namespace == type.Namespace).ToList();
+                        }
                     }
                 }
                 if (resources != null && resources.Any())
@@ -421,70 +424,121 @@ namespace Oqtane.Modules
 
         public string ReplaceTokens(string content, object obj)
         {
-            var tokens = new List<string>();
-            var pos = content.IndexOf("[");
-            if (pos != -1)
-            {
-                if (content.IndexOf("]", pos) != -1)
-                {
-                    var token = content.Substring(pos, content.IndexOf("]", pos) - pos + 1);
-                    if (token.Contains(":"))
-                    {
-                        tokens.Add(token.Substring(1, token.Length - 2));
-                    }
-                }
-                pos = content.IndexOf("[", pos + 1);
-            }
-            if (tokens.Count != 0)
-            {
-                foreach (string token in tokens)
-                {
-                    var segments = token.Split(":");
-                    if (segments.Length >= 2 && segments.Length <= 3)
-                    {
-                        var objectName = string.Join(":", segments, 0, segments.Length - 1);
-                        var propertyName = segments[segments.Length - 1];
-                        var propertyValue = "";
+            // Using StringBuilder avoids the performance penalty of repeated string allocations
+            // that occur with string.Replace or string concatenation inside loops.
+            var sb = new StringBuilder();
+            var cache = new Dictionary<string, string>(); // Cache to store resolved tokens
+            int index = 0;
 
-                        switch (objectName)
+            // Loop through content to find and replace all tokens
+            while (index < content.Length)
+            {
+                int start = content.IndexOf('[', index); // Find start of token
+                if (start == -1)
+                {
+                    sb.Append(content, index, content.Length - index); // Append remaining content
+                    break;
+                }
+
+                int end = content.IndexOf(']', start); // Find end of token
+                if (end == -1)
+                {
+                    sb.Append(content, index, content.Length - index); // Append unmatched content
+                    break;
+                }
+
+                sb.Append(content, index, start - index); // Append content before token
+
+                string token = content.Substring(start + 1, end - start - 1); // Extract token without brackets
+                string[] parts = token.Split('|', 2); // Separate default fallback if present
+                string key = parts[0];
+                string fallback = parts.Length == 2 ? parts[1] : null;
+
+                if (!cache.TryGetValue(token, out string replacement)) // Check cache first
+                {
+                    replacement = "[" + token + "]"; // Default replacement is original token
+                    string[] segments = key.Split(':');
+
+                    if (segments.Length >= 2)
+                    {
+                        object current = GetTarget(segments[0], obj); // Start from root object
+                        for (int i = 1; i < segments.Length && current != null; i++)
                         {
-                            case "ModuleState":
-                                propertyValue = ModuleState.GetType().GetProperty(propertyName)?.GetValue(ModuleState, null).ToString();
-                                break;
-                            case "PageState":
-                                propertyValue = PageState.GetType().GetProperty(propertyName)?.GetValue(PageState, null).ToString();
-                                break;
-                            case "PageState:Alias":
-                                propertyValue = PageState.Alias.GetType().GetProperty(propertyName)?.GetValue(PageState.Alias, null).ToString();
-                                break;
-                            case "PageState:Site":
-                                propertyValue = PageState.Site.GetType().GetProperty(propertyName)?.GetValue(PageState.Site, null).ToString();
-                                break;
-                            case "PageState:Page":
-                                propertyValue = PageState.Page.GetType().GetProperty(propertyName)?.GetValue(PageState.Page, null).ToString();
-                                break;
-                            case "PageState:User":
-                                propertyValue = PageState.User?.GetType().GetProperty(propertyName)?.GetValue(PageState.User, null).ToString();
-                                break;
-                            case "PageState:Route":
-                                propertyValue = PageState.Route.GetType().GetProperty(propertyName)?.GetValue(PageState.Route, null).ToString();
-                                break;
-                            default:
-                                if (obj != null && obj.GetType().Name == objectName)
-                                {
-                                    propertyValue = obj.GetType().GetProperty(propertyName)?.GetValue(obj, null).ToString();
-                                }
-                                break;
-                        }
-                        if (propertyValue != null)
-                        {
-                            content = content.Replace("[" + token + "]", propertyValue);
+                            var type = current.GetType();
+                            var prop = type.GetProperty(segments[i]);
+                            current = prop?.GetValue(current);
                         }
 
+                        if (current != null)
+                        {
+                            replacement = current.ToString();
+                        }
+                        else if (fallback != null)
+                        {
+                            replacement = fallback; // Use fallback if available
+                        }
                     }
+                    cache[token] = replacement; // Store in cache
                 }
+
+                sb.Append(replacement); // Append replacement value
+                index = end + 1; // Move index past token
             }
-            return content;
+
+            return sb.ToString();
+        }
+
+        // Resolve the object instance for a given object name
+        // Easy to extend with additional object types
+        private object GetTarget(string name, object obj)
+        {
+            return name switch
+            {
+                "ModuleState" => ModuleState,
+                "PageState" => PageState,
+                _ => (obj != null && obj.GetType().Name == name) ? obj : null // Fallback to obj
+            };
+        }
+
+        // date conversion methods
+        public DateTime? UtcToLocal(DateTime? datetime)
+        {
+            // Early return if input is null
+            if (datetime == null)
+                return null;
+
+            string timezoneId = null;
+
+            if (PageState.User != null && !string.IsNullOrEmpty(PageState.User.TimeZoneId))
+            {
+                timezoneId = PageState.User.TimeZoneId;
+            }
+            else if (!string.IsNullOrEmpty(PageState.Site.TimeZoneId))
+            {
+                timezoneId = PageState.Site.TimeZoneId;
+            }
+
+            return Utilities.UtcAsLocalDateTime(datetime, timezoneId);
+        }
+
+        public DateTime? LocalToUtc(DateTime? datetime)
+        {
+            // Early return if input is null
+            if (datetime == null)
+                return null;
+
+            string timezoneId = null;
+
+            if (PageState.User != null && !string.IsNullOrEmpty(PageState.User.TimeZoneId))
+            {
+                timezoneId = PageState.User.TimeZoneId;
+            }
+            else if (!string.IsNullOrEmpty(PageState.Site.TimeZoneId))
+            {
+                timezoneId = PageState.Site.TimeZoneId;
+            }
+
+            return Utilities.LocalDateAndTimeAsUtc(datetime, timezoneId);
         }
 
         // logging methods

Oqtane.Client/Oqtane.Client.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <Configurations>Debug;Release</Configurations>
-    <Version>6.1.2</Version>
+    <Version>6.1.4</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -12,7 +12,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.4</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
@@ -22,10 +22,10 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.7" />
   </ItemGroup>
 
   <ItemGroup>

Oqtane.Client/Resources/Modules/Admin/Files/Edit.resx

@@ -135,9 +135,6 @@
   <data name="Error.Folder.Save" xml:space="preserve">
     <value>Error Saving Folder</value>
   </data>
-  <data name="Message.Folder.Files.InvalidDelete" xml:space="preserve">
-    <value>Folder Has Files And Cannot Be Deleted</value>
-  </data>
   <data name="Message.Folder.Subfolders.InvalidDelete" xml:space="preserve">
     <value>Folder Has Subfolders And Cannot Be Deleted</value>
   </data>

Oqtane.Client/Resources/Modules/Admin/Login/Index.resx

@@ -121,10 +121,10 @@
     <value>Forgot Password</value>
   </data>
   <data name="Success.Account.Verified" xml:space="preserve">
-    <value>User Account Verified Successfully. You Can Now Login With Your Username And Password Below.</value>
+    <value>User Account Email Address Verified Successfully. You Can Now Login With Your Username And Password.</value>
   </data>
   <data name="Message.Account.NotVerified" xml:space="preserve">
-    <value>User Account Could Not Be Verified. Please Contact Your Administrator For Further Instructions.</value>
+    <value>User Account Email Address Could Not Be Verified. Please Contact Your Administrator For Further Instructions.</value>
   </data>
   <data name="Success.Account.Linked" xml:space="preserve">
     <value>User Account Linked Successfully. You Can Now Login With Your External Login Below.</value>
@@ -133,7 +133,7 @@
     <value>External Login Could Not Be Linked. Please Contact Your Administrator For Further Instructions.</value>
   </data>
   <data name="Error.Login.Fail" xml:space="preserve">
-    <value>Login Failed. Please Remember That Passwords Are Case Sensitive. If You Have Attempted To Sign In Multiple Times Unsuccessfully, Your Account Will Be Locked Out For A Period Of Time. Note That User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email If You Are A New User.</value>
+    <value>Login Failed. Please Remember That Passwords Are Case Sensitive. If You Have Attempted To Sign In Multiple Times Unsuccessfully, Your Account Will Be Locked Out For A Period Of Time. Note That New User Accounts Often Require Email Address Verification So You May Wish To Check Your Email For A Notification Containing Further Instructions.</value>
   </data>
   <data name="Message.Required.UserInfo" xml:space="preserve">
     <value>Please Provide All Required Fields</value>

Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx

@@ -160,12 +160,12 @@
     <value>Enabled?</value>
   </data>
   <data name="Synchronize" xml:space="preserve">
-    <value>Synchronize</value>
+    <value>Check For Updates</value>
   </data>
   <data name="Success.Module.Synchronize" xml:space="preserve">
-    <value>Modules Have Been Successfully Synchronized With The Marketplace</value>
+    <value>Module Information Has Been Retrieved From The Marketplace</value>
   </data>
   <data name="Error.Module.Synchronize" xml:space="preserve">
-    <value>Error Synchronizing Modules With The Marketplace</value>
+    <value>Error Retrieving Module Information From The Marketplace</value>
   </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Modules/Export.resx

@@ -121,7 +121,7 @@
     <value>Export</value>
   </data>
   <data name="Content.HelpText" xml:space="preserve">
-    <value>The Exported Module Content</value>
+    <value>Select the Export option and you will be able to view the module content</value>
   </data>
   <data name="Content.Text" xml:space="preserve">
     <value>Content: </value>
@@ -135,4 +135,25 @@
   <data name="Export Content" xml:space="preserve">
     <value>Export Content</value>
   </data>
+  <data name="Content.Heading" xml:space="preserve">
+    <value>Content</value>
+  </data>
+  <data name="File.Heading" xml:space="preserve">
+    <value>File</value>
+  </data>
+  <data name="Folder.Text" xml:space="preserve">
+    <value>Folder:</value>
+  </data>
+  <data name="Folder.HelpText" xml:space="preserve">
+    <value>Select a folder where you wish to save the exported content</value>
+  </data>
+  <data name="Message.Content.Export" xml:space="preserve">
+    <value>Please Select A Folder And Provide A Filename Before Choosing Export</value>
+  </data>
+  <data name="Filename.Text" xml:space="preserve">
+    <value>Filename:</value>
+  </data>
+  <data name="Filename.HelpText" xml:space="preserve">
+    <value>Specify a name for the file (without an extension)</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx

@@ -189,4 +189,19 @@
   <data name="ModuleSettings.Title" xml:space="preserve">
     <value>Module Settings</value>
   </data>
+  <data name="Header.Text" xml:space="preserve">
+    <value>Header:</value>
+  </data>
+  <data name="Header.HelpText" xml:space="preserve">
+    <value>Optionally provide content to be injected above the module instance</value>
+  </data>
+  <data name="Footer.Text" xml:space="preserve">
+    <value>Footer:</value>
+  </data>
+  <data name="Footer.HelpText" xml:space="preserve">
+    <value>Optionally provide content to be injected below the module instance</value>
+  </data>
+  <data name="ModuleContent.Heading" xml:space="preserve">
+    <value>Content</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx

@@ -303,4 +303,10 @@
   <data name="PersonalizedUrlPath.HelpText" xml:space="preserve">
     <value>Provide a url path for your personalized page. Please note that spaces and punctuation will be replaced by a dash.</value>
   </data>
+  <data name="UpdateModulePermissions.Text" xml:space="preserve">
+    <value>Update Module Permissions?</value>
+  </data>
+  <data name="UpdateModulePermissions.HelpText" xml:space="preserve">
+    <value>Specify if changes made to page permissions should be propagated to the modules on this page</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Register/Index.resx

@@ -180,4 +180,10 @@
   <data name="Login" xml:space="preserve">
     <value>Already have account? Login now.</value>
   </data>
+  <data name="TimeZone.Text" xml:space="preserve">
+    <value>Time Zone:</value>
+  </data>
+  <data name="TimeZone.HelpText" xml:space="preserve">
+    <value>Your time zone</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Site/Index.resx

@@ -192,7 +192,7 @@
   <data name="Port.HelpText" xml:space="preserve">
     <value>Enter the port number for the SMTP server. Please note this field is required if you provide a host name.</value>
   </data>
-  <data name="UseSsl.HelpText" xml:space="preserve">
+  <data name="SmtpSSL.HelpText" xml:space="preserve">
     <value>Specify if SSL is required for your SMTP server</value>
   </data>
   <data name="SmtpUsername.HelpText" xml:space="preserve">
@@ -202,7 +202,7 @@
     <value>Enter the password for your SMTP account</value>
   </data>
   <data name="SmtpSender.HelpText" xml:space="preserve">
-    <value>Enter the email which emails will be sent from. Please note that this email address may need to be authorized with the SMTP server.</value>
+    <value>Enter the email address which emails will be sent from. Please note that this email address usually needs to be authorized with the SMTP server.</value>
   </data>
   <data name="EnablePWA.HelpText" xml:space="preserve">
     <value>Select whether you would like this site to be available as a Progressive Web Application (PWA)</value>
@@ -240,8 +240,8 @@
   <data name="Port.Text" xml:space="preserve">
     <value>Port: </value>
   </data>
-  <data name="UseSsl.Text" xml:space="preserve">
-    <value>SSL Enabled: </value>
+  <data name="SmtpSSL.Text" xml:space="preserve">
+    <value>SSL Required: </value>
   </data>
   <data name="SmtpUsername.Text" xml:space="preserve">
     <value>Username: </value>
@@ -372,10 +372,10 @@
   <data name="PageContent.Heading" xml:space="preserve">
     <value>Page Content</value>
   </data>
-  <data name="SMTPEnabled.HelpText" xml:space="preserve">
+  <data name="SmtpEnabled.HelpText" xml:space="preserve">
     <value>Specify if SMTP is enabled for this site</value>
   </data>
-  <data name="SMTPEnabled.Text" xml:space="preserve">
+  <data name="SmtpEnabled.Text" xml:space="preserve">
     <value>Enabled?</value>
   </data>
   <data name="Version.HelpText" xml:space="preserve">
@@ -447,4 +447,46 @@
   <data name="Success.SiteMap.CacheEvicted" xml:space="preserve">
     <value>Site Map Cache Cleared</value>
   </data>
+  <data name="TimeZone.Text" xml:space="preserve">
+    <value>Time Zone:</value>
+  </data>
+  <data name="TimeZone.HelpText" xml:space="preserve">
+    <value>The default time zone for the site</value>
+  </data>
+  <data name="Basic" xml:space="preserve">
+    <value>Basic</value>
+  </data>
+  <data name="OAuth2" xml:space="preserve">
+    <value>OAuth 2.0 (OAuth2)</value>
+  </data>
+  <data name="SmtpAuthentication.Text" xml:space="preserve">
+    <value>Authentication:</value>
+  </data>
+  <data name="SmtpAuthentication.HelpText" xml:space="preserve">
+    <value>Specify the SMTP authentication type</value>
+  </data>
+  <data name="SmtpClientID.Text" xml:space="preserve">
+    <value>Client ID:</value>
+  </data>
+  <data name="SmtpClientID.HelpText" xml:space="preserve">
+    <value>The Client ID for the SMTP provider</value>
+  </data>
+  <data name="SmtpClientSecret.Text" xml:space="preserve">
+    <value>Client Secret:</value>
+  </data>
+  <data name="SmtpClientSecret.HelpText" xml:space="preserve">
+    <value>The Client Secret for the SMTP provider</value>
+  </data>
+  <data name="SmtpScopes.Text" xml:space="preserve">
+    <value>Scopes:</value>
+  </data>
+  <data name="SmtpScopes.HelpText" xml:space="preserve">
+    <value>A list of Scopes for the SMTP provider (separated by commas)</value>
+  </data>
+  <data name="SmtpAuthority.Text" xml:space="preserve">
+    <value>Authority Url:</value>
+  </data>
+  <data name="SmtpAuthority.HelpText" xml:space="preserve">
+    <value>The Authority Url for the SMTP provider</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx

@@ -160,12 +160,12 @@
     <value>Assign</value>
   </data>
   <data name="Synchronize" xml:space="preserve">
-    <value>Synchronize</value>
+    <value>Check For Updates</value>
   </data>
   <data name="Success.Theme.Synchronize" xml:space="preserve">
-    <value>Themes Have Been Successfully Synchronized With The Marketplace</value>
+    <value>Theme Information Has Been Retrieved From The Marketplace</value>
   </data>
   <data name="Error.Theme.Synchronize" xml:space="preserve">
-    <value>Error Synchronizing Themes With The Marketplace</value>
+    <value>Error Retrieving Theme Information From The Marketplace</value>
   </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx

@@ -124,7 +124,7 @@
     <value>Error Downloading Framework Package</value>
   </data>
   <data name="Framework.HelpText" xml:space="preserve">
-    <value>Upload a framework package and select Install to complete the installation</value>
+    <value>Upload A Framework Package (Oqtane.Framework.#.#.#.nupkg) And Then Select Upgrade</value>
   </data>
   <data name="Framework.Text" xml:space="preserve">
     <value>Framework: </value>
@@ -144,9 +144,6 @@
   <data name="Message.Text" xml:space="preserve">
     <value>Framework Is Already Up To Date</value>
   </data>
-  <data name="MessageUpgrade.Text" xml:space="preserve">
-    <value>Upload A Framework Package (Oqtane.Framework.version.nupkg) And Then Select Upgrade</value>
-  </data>
   <data name="Localhost.Text" xml:space="preserve">
     <value>You Cannot Perform A System Update In A Development Environment</value>
   </data>
@@ -157,6 +154,6 @@
     <value>Backup Files?</value>
   </data>
   <data name="Backup.HelpText" xml:space="preserve">
-    <value>Specify if you want to backup files during the upgrade process. Disabling this option will result in a better experience in some environments.</value>
+    <value>Specify if you want to backup files during the upgrade process. Disabling this option will reduce the time required for the upgrade.</value>
   </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/UrlMappings/Add.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -121,10 +121,10 @@
     <value>Redirect To:</value>
   </data>
   <data name="MappedUrl.HelpText" xml:space="preserve">
-    <value>A relative or absolute Url where the user will be redirected</value>
+    <value>A Url where the user will be redirected (absolute or relative). Use '/' for site root path.</value>
   </data>
   <data name="Url.HelpText" xml:space="preserve">
-    <value>An absolute Url identifying a path to a specific page in the site</value>
+    <value>A Url identifying a path to a specific page in the site (absolute or relative)</value>
   </data>
   <data name="Url.Text" xml:space="preserve">
     <value>Url:</value>
@@ -141,4 +141,7 @@
   <data name="Message.SaveUrlMapping" xml:space="preserve">
     <value>The Url must belong to the current site</value>
   </data>
+  <data name="Generate" xml:space="preserve">
+    <value>Generate</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/UrlMappings/Edit.resx

@@ -121,10 +121,10 @@
     <value>Redirect To:</value>
   </data>
   <data name="MappedUrl.HelpText" xml:space="preserve">
-    <value>A relative or absolute Url where the user will be redirected</value>
+    <value>A Url where the user will be redirected (absolute or relative). Use '/' for site root path.</value>
   </data>
   <data name="Url.HelpText" xml:space="preserve">
-    <value>A relative Url identifying a path to a specific page in the site</value>
+    <value>A Url identifying a path to a specific page in the site (absolute or relative)</value>
   </data>
   <data name="Url.Text" xml:space="preserve">
     <value>Url:</value>

Oqtane.Client/Resources/Modules/Admin/UserProfile/Index.resx

@@ -147,9 +147,6 @@
   <data name="Message.User.NoLogIn" xml:space="preserve">
     <value>Current User Is Not Logged In</value>
   </data>
-  <data name="Message.User.NoEmail" xml:space="preserve">
-    <value>You Must Provide An Email Address For Your User Account</value>
-  </data>
   <data name="Error.Profile.Load" xml:space="preserve">
     <value>Error Loading User Profile</value>
   </data>
@@ -246,4 +243,10 @@
   <data name="Logout Everywhere" xml:space="preserve">
     <value>Logout Everywhere</value>
   </data>
+  <data name="TimeZone.Text" xml:space="preserve">
+    <value>Time Zone:</value>
+  </data>
+  <data name="TimeZone.HelpText" xml:space="preserve">
+    <value>Your time zone</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Users/Add.resx

@@ -156,4 +156,16 @@
   <data name="Notify.Text" xml:space="preserve">
     <value>Notify?</value>
   </data>
+  <data name="TimeZone.Text" xml:space="preserve">
+    <value>Time Zone:</value>
+  </data>
+  <data name="TimeZone.HelpText" xml:space="preserve">
+    <value>The user's time zone</value>
+  </data>
+  <data name="Confirmed.Text" xml:space="preserve">
+    <value>Verified?</value>
+  </data>
+  <data name="Confirmed.HelpText" xml:space="preserve">
+    <value>Indicates if the user's email is verified</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Users/Edit.resx

@@ -210,4 +210,16 @@
   <data name="Error.User.Impersonate" xml:space="preserve">
     <value>Unable To Impersonate User</value>
   </data>
+  <data name="TimeZone.Text" xml:space="preserve">
+    <value>Time Zone:</value>
+  </data>
+  <data name="TimeZone.HelpText" xml:space="preserve">
+    <value>The user's time zone</value>
+  </data>
+  <data name="Confirmed.Text" xml:space="preserve">
+    <value>Verified?</value>
+  </data>
+  <data name="Confirmed.HelpText" xml:space="preserve">
+    <value>Indicates if the user's email is verified</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Users/Index.resx

@@ -132,6 +132,18 @@
   <data name="AllowRegistration.Text" xml:space="preserve">
     <value>Allow Registration? </value>
   </data>
+  <data name="RegisterUrl.HelpText" xml:space="preserve">
+    <value>Optionally provide a custom registration url</value>
+  </data>
+  <data name="RegisterUrl.Text" xml:space="preserve">
+    <value>Register Url: </value>
+  </data>
+  <data name="ProfileUrl.HelpText" xml:space="preserve">
+    <value>Optionally provide a custom user profile url</value>
+  </data>
+  <data name="ProfileUrl.Text" xml:space="preserve">
+    <value>Profile Url: </value>
+  </data>
   <data name="Error.SaveSiteSettings" xml:space="preserve">
     <value>Error Saving Settings</value>
   </data>
@@ -208,7 +220,7 @@
     <value>Do you want to allow users to sign in using a username and password that is managed locally on this site? Note that you should only disable this option if you have already sucessfully configured an external login provider, or else you may lock yourself out of the site.</value>
   </data>
   <data name="AllowSiteLogin.Text" xml:space="preserve">
-    <value>Allow Login?</value>
+    <value>Allow Local Login?</value>
   </data>
   <data name="Authority.HelpText" xml:space="preserve">
     <value>The authority url or issuer url associated with the identity provider</value>
@@ -358,7 +370,13 @@
     <value>Do you want users to use two factor authentication? Note that you should use the Disabled option until you have successfully verified that the Notification Job in Scheduled Jobs is enabled and your SMTP options in Site Settings are configured or else you will lock yourself out.</value>
   </data>
   <data name="TwoFactor.Text" xml:space="preserve">
-    <value>Two Factor?</value>
+    <value>Two Factor Authentication?</value>
+  </data>
+  <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="RequireConfirmedEmail.Text" xml:space="preserve">
+    <value>Require Verified Email?</value>
   </data>
   <data name="Disabled" xml:space="preserve">
     <value>Disabled</value>
@@ -490,7 +508,7 @@
     <value>Info</value>
   </data>
   <data name="OAuth2" xml:space="preserve">
-    <value>OAuth 2.0</value>
+    <value>OAuth 2.0 (OAuth2)</value>
   </data>
   <data name="OIDC" xml:space="preserve">
     <value>OpenID Connect (OIDC)</value>

Oqtane.Client/Resources/Modules/Controls/TriStateCheckBox.resx

@@ -123,4 +123,7 @@
   <data name="PermissionDenied" xml:space="preserve">
     <value>Permission Denied</value>
   </data>
+  <data name="PermissionDisabled" xml:space="preserve">
+    <value>Permission Disabled</value>
+  </data>
 </root>

Oqtane.Client/Resources/TimeZoneResources.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Oqtane.Client/Services/FolderService.cs

@@ -42,14 +42,6 @@ namespace Oqtane.Services
             return await PutJsonAsync<Folder>($"{ApiUrl}/{folder.FolderId}", folder);
         }
 
-        public async Task UpdateFolderOrderAsync(int siteId, int folderId, int? parentId)
-        {
-            var parent = parentId == null
-                ? string.Empty
-                : parentId.ToString();
-            await PutAsync($"{ApiUrl}/?siteid={siteId}&folderid={folderId}&parentid={parent}");
-        }
-
         public async Task DeleteFolderAsync(int folderId)
         {
             await DeleteAsync($"{ApiUrl}/{folderId}");

Oqtane.Client/Services/Interfaces/IFolderService.cs

@@ -39,15 +39,6 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task<Folder> UpdateFolderAsync(Folder folder);
 
-        /// <summary>
-        /// Update the internal Folder-Order within the list of Folders.
-        /// </summary>
-        /// <param name="siteId">Reference to the <see cref="Site"/></param>
-        /// <param name="folderId">Reference to a <see cref="Folder"/> for the security check</param>
-        /// <param name="parentId">Reference to the Parent <see cref="Folder"/> or null - this Folders children will be re-sorted.</param>
-        /// <returns></returns>
-        Task UpdateFolderOrderAsync(int siteId, int folderId, int? parentId);
-
         /// <summary>
         /// Delete a <see cref="Folder"/>
         /// </summary>

Oqtane.Client/Services/Interfaces/IModuleService.cs

@@ -56,7 +56,18 @@ namespace Oqtane.Services
         /// Exports a given module
         /// </summary>
         /// <param name="moduleId"></param>
-        /// <returns>module in JSON</returns>
+        /// <param name="pageId"></param>
+        /// <returns>module content in JSON format</returns>
         Task<string> ExportModuleAsync(int moduleId, int pageId);
+
+        /// <summary>
+        /// Exports a given module
+        /// </summary>
+        /// <param name="moduleId"></param>
+        /// <param name="pageId"></param>
+        /// <param name="folderId"></param>
+        /// <param name="filename"></param>
+        /// <returns>file id</returns>
+        Task<int> ExportModuleAsync(int moduleId, int pageId, int folderId, string filename);
     }
 }

Oqtane.Client/Services/Interfaces/ISettingService.cs

@@ -256,7 +256,7 @@ namespace Oqtane.Services
 
         Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue, bool isPrivate);
 
-        Dictionary<string, string> MergeSettings(Dictionary<string, string> settings1, Dictionary<string, string> settings2);
+        Dictionary<string, string> MergeSettings(Dictionary<string, string> baseSettings, Dictionary<string, string> overwriteSettings);
 
 
         [Obsolete("GetSettingAsync(int settingId) is deprecated. Use GetSettingAsync(string entityName, int settingId) instead.", false)]

Oqtane.Client/Services/Interfaces/ITimeZoneService.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using Oqtane.Models;
+
+namespace Oqtane.Services
+{
+    /// <summary>
+    /// Service to retrieve <see cref="TimeZone"/> entries
+    /// </summary>
+    public interface ITimeZoneService
+    {
+        /// <summary>
+        /// Get the list of time zones
+        /// </summary>
+        /// <returns></returns>
+        List<TimeZone> GetTimeZones();
+    }
+}

Oqtane.Client/Services/ModuleService.cs

@@ -47,8 +47,13 @@ namespace Oqtane.Services
         }
 
         public async Task<string> ExportModuleAsync(int moduleId, int pageId)
-{
+        {
             return await GetStringAsync($"{Apiurl}/export?moduleid={moduleId}&pageid={pageId}");
         }
+
+        public async Task<int> ExportModuleAsync(int moduleId, int pageId, int folderId, string filename)
+        {
+            return await PostJsonAsync<string,int>($"{Apiurl}/export?moduleid={moduleId}&pageid={pageId}&folderid={folderId}&filename={filename}", null);
+        }
     }
 }

Oqtane.Client/Services/SettingService.cs

@@ -266,27 +266,25 @@ namespace Oqtane.Services
             return settings;
         }
 
-        public Dictionary<string, string> MergeSettings(Dictionary<string, string> settings1, Dictionary<string, string> settings2)
+        public Dictionary<string, string> MergeSettings(Dictionary<string, string> baseSettings, Dictionary<string, string> overwriteSettings)
         {
-            if (settings1 == null)
+            var settings = baseSettings != null ? new Dictionary<string, string>(baseSettings) : new Dictionary<string, string>();
+            if (overwriteSettings != null)
             {
-                settings1 = new Dictionary<string, string>();
-            }
-            if (settings2 != null)
-            {
-                foreach (var setting in settings2)
+                foreach (var setting in overwriteSettings)
                 {
-                    if (settings1.ContainsKey(setting.Key))
+                    if (settings.ContainsKey(setting.Key))
                     {
-                        settings1[setting.Key] = setting.Value;
+                        settings[setting.Key] = setting.Value;
                     }
                     else
                     {
-                        settings1.Add(setting.Key, setting.Value);
+                        settings.Add(setting.Key, setting.Value);
                     }
                 }
             }
-            return settings1;
+
+            return settings;
         }
 
         [Obsolete("GetSettingAsync(int settingId) is deprecated. Use GetSettingAsync(string entityName, int settingId) instead.", false)]

Oqtane.Client/Services/TimeZoneService.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Localization;
+using NodaTime.TimeZones;
+using NodaTime;
+using Oqtane.Documentation;
+using NodaTime.Extensions;
+
+namespace Oqtane.Services
+{
+    [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
+    public class TimeZoneService : ITimeZoneService
+    {
+        private readonly IStringLocalizer<TimeZoneResources> _TimeZoneLocalizer;
+
+        public TimeZoneService(IStringLocalizer<TimeZoneResources> TimeZoneLocalizer)
+        {
+            _TimeZoneLocalizer = TimeZoneLocalizer;
+        }
+
+        public List<Models.TimeZone> GetTimeZones()
+        {
+            var timezones = new List<Models.TimeZone>();
+
+            foreach (var tz in DateTimeZoneProviders.Tzdb.GetAllZones()
+                // only include timezones which have a country code defined or are US timezones
+                .Where(item => !string.IsNullOrEmpty(TzdbDateTimeZoneSource.Default.ZoneLocations.FirstOrDefault(l => l.ZoneId == item.Id)?.CountryCode) || item.Id.ToLower().Contains("us/"))
+                // order by UTC offset (ie. -11:00 to +14:00)
+                .OrderBy(item => item.GetUtcOffset(Instant.FromDateTimeUtc(DateTime.UtcNow)).Ticks))
+            {
+                // get localized display name
+                var displayname = _TimeZoneLocalizer[tz.Id].Value;
+                if (displayname == tz.Id)
+                {
+                    // use default "friendly" display format
+                    displayname =  displayname.Replace("_", " ").Replace("/", " / ");
+                }
+
+                // time zones can be excluded from the list by providing an empty translation in the localization file
+                if (!string.IsNullOrEmpty(displayname))
+                {
+                    // include offset prefix
+                    var offset = tz.GetUtcOffset(Instant.FromDateTimeUtc(DateTime.UtcNow)).Ticks;
+                    displayname = "(UTC" + (offset >= 0 ? "+" : "-") + new DateTime(Math.Abs(offset)).ToString("HH:mm") + ") " + displayname;
+
+                    timezones.Add(new Models.TimeZone()
+                    {
+                        Id = tz.Id,
+                        DisplayName = displayname
+                    });
+                }
+            }
+
+            return timezones;
+        }
+    }
+}

Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor

@@ -37,7 +37,7 @@
     public override List<Resource> Resources => new List<Resource>()
     {
 		// obtained from https://cdnjs.com/libraries
-        new Stylesheet("https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css", "sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg==", "anonymous"),
+        new Stylesheet(Constants.BootstrapStylesheetUrl, Constants.BootstrapStylesheetIntegrity, "anonymous"),
         new Stylesheet(ThemePath() + "Theme.css"),
         new Script(Constants.BootstrapScriptUrl, Constants.BootstrapScriptIntegrity, "anonymous")
     };

Oqtane.Client/Themes/Controls/Container/ModuleActions.razor

@@ -20,6 +20,7 @@
     protected override void OnParametersSet()
     {
         // trim PageState to mitigate page bloat caused by Blazor serializing/encrypting state when crossing render mode boundaries
+        // only include properties required by the ModuleActionsInteractive component
         _pageState = new PageState
         {
             Alias = PageState.Alias,

Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor

@@ -91,6 +91,7 @@
         }
 
         // trim PageState to mitigate page bloat caused by Blazor serializing/encrypting state when crossing render mode boundaries
+        // only include properties required by the ControlPanelInteractive component
         _pageState = new PageState
         {
             Alias = PageState.Alias,

Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor

@@ -353,7 +353,7 @@
                     module.PageId = PageState.Page.PageId;
                     module.ModuleDefinitionName = _moduleDefinitionName;
                     module.AllPages = false;
-                    module.PermissionList = GenerateDefaultPermissions(module.SiteId);
+                    module.PermissionList = GenerateDefaultPermissions(module.SiteId, module.ModuleDefinitionName);
 
                     module = await ModuleService.AddModuleAsync(module);
                     newModuleId = module.ModuleId;
@@ -365,7 +365,7 @@
                     module.SiteId = PageState.Page.SiteId;
                     module.PageId = PageState.Page.PageId;
                     module.AllPages = false;
-                    module.PermissionList = GenerateDefaultPermissions(module.SiteId);
+                    module.PermissionList = GenerateDefaultPermissions(module.SiteId, module.ModuleDefinitionName);
 
                     module = await ModuleService.AddModuleAsync(module);
                     var moduleContent = await ModuleService.ExportModuleAsync(int.Parse(_moduleId), PageState.Page.PageId);
@@ -430,9 +430,11 @@
         }
     }
 
-    private List<Permission> GenerateDefaultPermissions(int siteId)
+    private List<Permission> GenerateDefaultPermissions(int siteId, string moduleDefinitionName)
     {
         var permissions = new List<Permission>();
+
+        // set module view permissions
         if (_visibility == "view")
         {
             // set module view permissions to page view permissions
@@ -443,8 +445,22 @@
             // set module view permissions to page edit permissions
             permissions = SetPermissions(permissions, siteId, PermissionNames.View, PermissionNames.Edit);
         }
-        // set module edit permissions to page edit permissions
-        permissions = SetPermissions(permissions, siteId, PermissionNames.Edit, PermissionNames.Edit);
+
+        // set remaining module permissions
+        var permissionNames = PermissionNames.Edit;
+        var moduleDefinition = _allModuleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == moduleDefinitionName);
+        if (moduleDefinition != null && !string.IsNullOrEmpty(moduleDefinition.PermissionNames))
+        {
+            permissionNames = moduleDefinition.PermissionNames; // custom module permissions
+        }
+        foreach (var permission in permissionNames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+        {
+            if (permission != PermissionNames.View)
+            {
+                // set module permissions to page edit permissions
+                permissions = SetPermissions(permissions, siteId, permission, PermissionNames.Edit);
+            }
+        }
 
         return permissions;
     }

Oqtane.Client/Themes/Controls/Theme/CookieConsent.razor

@@ -103,6 +103,9 @@
     {
         var cookieConsentSetting = SettingService.GetSetting(PageState.Site.Settings, "CookieConsent", string.Empty);
         _enabled = !string.IsNullOrEmpty(cookieConsentSetting);
+
+        if (!_enabled) return;
+
         _optout = cookieConsentSetting == "optout";
         _actioned = await CookieConsentService.IsActionedAsync();
 
@@ -164,4 +167,4 @@
             StateHasChanged();
         }
     }
-}
+}

Oqtane.Client/Themes/Controls/Theme/UserProfile.razor

@@ -1,6 +1,7 @@
 @namespace Oqtane.Themes.Controls
 @using System.Net
 @inherits ThemeControlBase
+@inject ISettingService SettingService
 @inject IStringLocalizer<UserProfile> Localizer
 @inject NavigationManager NavigationManager
 
@@ -51,20 +52,38 @@
 
         if (!string.IsNullOrEmpty(RegisterUrl))
         {
-            _registerurl = RegisterUrl + "?returnurl=" + (RegisterUrl.Contains("://") ? WebUtility.UrlEncode(PageState.Route.RootUrl) + _returnurl : _returnurl);
+            _registerurl = RegisterUrl;            
+            _registerurl += (!_registerurl.Contains("?") ? "?" : "&") + "returnurl=" + (_registerurl.Contains("://") ? WebUtility.UrlEncode(PageState.Route.RootUrl) + _returnurl : _returnurl);
         }
         else
         {
-            _registerurl = NavigateUrl("register", "returnurl=" + _returnurl);
+            if (!string.IsNullOrEmpty(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:RegisterUrl", "")))
+            {
+                _registerurl = SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:RegisterUrl", "");
+                _registerurl += (!_registerurl.Contains("?") ? "?" : "&") + "returnurl=" + (_registerurl.Contains("://") ? WebUtility.UrlEncode(PageState.Route.RootUrl) + _returnurl : _returnurl);
+            }
+            else
+            {
+                _registerurl = NavigateUrl("register", "returnurl=" + _returnurl);
+            }
         }
 
         if (!string.IsNullOrEmpty(ProfileUrl))
         {
-            _registerurl = ProfileUrl + "?returnurl=" + (ProfileUrl.Contains("://") ? WebUtility.UrlEncode(PageState.Route.RootUrl) + _returnurl : _returnurl);
+            _profileurl = ProfileUrl;
+            _profileurl += (!_profileurl.Contains("?") ? "?" : "&") + "returnurl=" + (_profileurl.Contains("://") ? WebUtility.UrlEncode(PageState.Route.RootUrl) + _returnurl : _returnurl);
         }
         else
         {
-            _registerurl = NavigateUrl("profile", "returnurl=" + _returnurl);
+            if (!string.IsNullOrEmpty(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:ProfileUrl", "")))
+            {
+                _profileurl = SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:ProfileUrl", "");
+                _profileurl += (!_profileurl.Contains("?") ? "?" : "&") + "returnurl=" + (_profileurl.Contains("://") ? WebUtility.UrlEncode(PageState.Route.RootUrl) + _returnurl : _returnurl);
+            }
+            else
+            {
+                _profileurl = NavigateUrl("profile", "returnurl=" + _returnurl);
+            }
         }
     }
 }

Oqtane.Client/Themes/OqtaneTheme/ThemeInfo.cs

@@ -16,8 +16,8 @@ namespace Oqtane.Themes.OqtaneTheme
             ContainerSettingsType = "Oqtane.Themes.OqtaneTheme.ContainerSettings, Oqtane.Client",
             Resources = new List<Resource>()
             {
-		        // obtained from https://cdnjs.com/libraries
-                new Stylesheet("https://cdnjs.cloudflare.com/ajax/libs/bootswatch/5.3.3/cyborg/bootstrap.min.css", "sha512-M+Wrv9LTvQe81gFD2ZE3xxPTN5V2n1iLCXsldIxXvfs6tP+6VihBCwCMBkkjkQUZVmEHBsowb9Vqsq1et1teEg==", "anonymous"),
+		        // obtained from https://cdnjs.com/libraries/bootswatch
+                new Stylesheet("https://cdnjs.cloudflare.com/ajax/libs/bootswatch/5.3.7/cyborg/bootstrap.min.css", "sha512-/LQFzDeXqysGQ/POl5YOEjgVZH1BmqDHvshhnFIChf50bMGQ470qhUrsecD9MRCUwzwqRoshwAbmA2oTW4I6Yg==", "anonymous"),
                 new Stylesheet("~/Theme.css"),
                 new Script(Constants.BootstrapScriptUrl, Constants.BootstrapScriptIntegrity, "anonymous")
             }

Oqtane.Client/Themes/ThemeBase.cs

@@ -43,18 +43,21 @@ namespace Oqtane.Themes
             {
                 List<Resource> resources = null;
                 var type = GetType();
-                if (type.BaseType == typeof(ThemeBase))
+                if (type.IsSubclassOf(typeof(ThemeBase)))
                 {
-                    if (PageState.Page.Resources != null)
+                    if (type.IsSubclassOf(typeof(ThemeControlBase)) || type.IsSubclassOf(typeof(ContainerBase)))
                     {
-                        resources = PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Level == ResourceLevel.Page && item.Namespace == type.Namespace).ToList();
+                        if (Resources != null)
+                        {
+                            resources = Resources.Where(item => item.ResourceType == ResourceType.Script).ToList();
+                        }
                     }
-                }
-                else // themecontrolbase, containerbase
-                {
-                    if (Resources != null)
+                    else // ThemeBase
                     {
-                        resources = Resources.Where(item => item.ResourceType == ResourceType.Script).ToList();
+                        if (PageState.Page.Resources != null)
+                        {
+                            resources = PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Level == ResourceLevel.Page && item.Namespace == type.Namespace).ToList();
+                        }
                     }
                 }
                 if (resources != null && resources.Any())

Oqtane.Client/TimeZoneResources.cs

@@ -0,0 +1,14 @@
+namespace Oqtane
+{
+    /// <summary>
+    /// Dummy class used to collect shared resource strings for this application
+    /// </summary>
+    /// <remarks>
+    /// This class is mostly used with IStringLocalizer and IHtmlLocalizer interfaces.
+    /// The class must reside at the project root.
+    /// </remarks>
+    public class TimeZoneResources
+    {
+
+    }
+}

Oqtane.Client/UI/ContainerBuilder.razor

@@ -6,7 +6,7 @@
 @if (ComponentType != null && _visible)
 {
     <a id="@ModuleState.PageModuleId.ToString()"></a>
-    <CascadingValue Value="@ModuleState">
+    <CascadingValue Value="@ModuleState" IsFixed="true">
 		@if (_useadminborder)
 		{
 			<div class="app-pane-admin-border">
@@ -31,6 +31,9 @@
     [Parameter]
     public Module ModuleState { get; set; }
 
+    [Parameter]
+    public string ContainerType { get; set; }
+
     protected override bool ShouldRender()
     {
         return PageState?.RenderId == ModuleState?.RenderId;
@@ -44,6 +47,10 @@
     protected override void OnParametersSet()
     {
         string container = ModuleState.ContainerType;
+        if (!string.IsNullOrEmpty(ContainerType))
+        {
+            container = ContainerType;
+        }
         if (PageState.ModuleId != -1 && PageState.Route.Action != "" && ModuleState.UseAdminContainer)
         {
             container = (!string.IsNullOrEmpty(PageState.Site.AdminContainerType)) ? PageState.Site.AdminContainerType : Constants.DefaultAdminContainer;

Oqtane.Client/UI/Interop.cs

@@ -224,17 +224,17 @@ namespace Oqtane.UI
 
         public Task UploadFiles(string posturl, string folder, string id, string antiforgerytoken, string jwt)
         {
-            UploadFiles(posturl, folder, id, antiforgerytoken, jwt, 1);
+            UploadFiles(posturl, folder, id, antiforgerytoken, jwt, 1, false);
             return Task.CompletedTask;
         }
 
-        public ValueTask<bool> UploadFiles(string posturl, string folder, string id, string antiforgerytoken, string jwt, int chunksize, CancellationToken cancellationToken = default)
+        public ValueTask<bool> UploadFiles(string posturl, string folder, string id, string antiforgerytoken, string jwt, int chunksize, bool anonymizeuploadfilenames, CancellationToken cancellationToken = default)
         {
             try
             {
                 return _jsRuntime.InvokeAsync<bool>(
                     "Oqtane.Interop.uploadFiles", cancellationToken,
-                    posturl, folder, id, antiforgerytoken, jwt, chunksize);
+                    posturl, folder, id, antiforgerytoken, jwt, chunksize, anonymizeuploadfilenames);
             }
             catch
             {

Oqtane.Client/UI/ModuleInstance.razor

@@ -1,18 +1,27 @@
 @namespace Oqtane.UI
 @inject SiteState SiteState
 
+@if (PageState.ModuleId == -1)
+{
+    @((MarkupString)ModuleState.Header)
+}
 @if (_comment != null)
 {
     @((MarkupString)_comment)
     @if (PageState.RenderMode == RenderModes.Interactive || ModuleState.RenderMode == RenderModes.Static)
     {
-        <RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" />
+        <RenderModeBoundary ModuleState="@ModuleState" PageState="@_pageState" SiteState="@SiteState" />
     }
     else
     {
-        <RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" @rendermode="InteractiveRenderMode.GetInteractiveRenderMode(PageState.Site.Runtime, _prerender)" />
+        <RenderModeBoundary ModuleState="@ModuleState" PageState="@_pageState" SiteState="@SiteState" @rendermode="InteractiveRenderMode.GetInteractiveRenderMode(PageState.Site.Runtime, _prerender)" />
     }
 }
+@if (PageState.ModuleId == -1)
+{
+    @((MarkupString)ModuleState.Footer)
+}
+
 
 @code {
     [CascadingParameter]
@@ -23,6 +32,7 @@
 
     private bool _prerender;
     private string _comment;
+    private PageState _pageState;
 
     protected override void OnParametersSet()
     {
@@ -39,11 +49,12 @@
         }
         _comment += " -->";
 
+        _pageState = PageState.Clone();
         if (PageState.RenderMode == RenderModes.Static && ModuleState.RenderMode == RenderModes.Interactive)
         {
             // trim PageState to mitigate page bloat caused by Blazor serializing/encrypting state when crossing render mode boundaries
-            // please note that this performance optimization results in the PageState.Pages property not being available for use in Interactive components
-            PageState.Site.Pages = new List<Page>();
+            // please note that this performance optimization results in the PageState.Pages property not being available for use in downstream Interactive components
+            _pageState.Site.Pages = new List<Page>();
         }
     }
 

Oqtane.Client/UI/PageState.cs

@@ -37,5 +37,34 @@ namespace Oqtane.UI
         {
             get { return Site?.Languages; }
         }
+
+        public PageState Clone()
+        {
+            return new PageState
+            {
+                Alias = Alias,
+                Site = Site,
+                Page = Page,
+                Modules = Modules,
+                User = User,
+                Uri = Uri,
+                Route = Route,
+                QueryString = QueryString,
+                UrlParameters = UrlParameters,
+                ModuleId = ModuleId,
+                Action = Action,
+                EditMode = EditMode,
+                LastSyncDate = LastSyncDate,
+                RenderMode = RenderMode,
+                Runtime = Runtime,
+                VisitorId = VisitorId,
+                RemoteIPAddress = RemoteIPAddress,
+                ReturnUrl = ReturnUrl,
+                IsInternalNavigation = IsInternalNavigation,
+                RenderId = RenderId,
+                Refresh = Refresh,
+                AllowCookies = AllowCookies
+            };
+        }
     }
 }

Oqtane.Client/UI/Pane.razor

@@ -26,10 +26,13 @@ else
     [Parameter]
     public string Name { get; set; }
 
+    [Parameter]
+    public string ContainerType { get; set; }
+
     RenderFragment DynamicComponent { get; set; }
 
     protected override void OnParametersSet()
-    {
+    {        
         if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList) && PageState.Action == Constants.DefaultAction)
         {
             _useadminborder = true;
@@ -45,12 +48,6 @@ else
         {
             foreach (Module module in PageState.Modules)
             {
-                // set renderid - this allows the framework to determine which components should be rendered when PageState changes
-                if (module.RenderId != PageState.RenderId)
-                {
-                    module.RenderId = PageState.RenderId;
-                }
-
                 var pane = module.Pane;
                 if (module.ModuleId == PageState.ModuleId && PageState.Action != Constants.DefaultAction)
                 {
@@ -101,7 +98,7 @@ else
 
                             if (authorized)
                             {
-                                CreateComponent(builder, module, module.PageModuleId);
+                                CreateComponent(builder, module);
                             }
                         }
                     }
@@ -112,7 +109,7 @@ else
                             // check if user is authorized to view module
                             if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.PermissionList))
                             {
-                                CreateComponent(builder, module, -1);
+                                CreateComponent(builder, module);
                             }
                         }
                     }
@@ -121,14 +118,12 @@ else
         };
     }
 
-    private void CreateComponent(RenderTreeBuilder builder, Module module, int key)
+    private void CreateComponent(RenderTreeBuilder builder, Module module)
     {
         builder.OpenComponent(0, typeof(ContainerBuilder));
         builder.AddAttribute(1, "ModuleState", module);
-        if (key != -1)
-        {
-            builder.SetKey(module.PageModuleId);
-        }
+        builder.AddAttribute(2, "ContainerType", ContainerType);
+        builder.SetKey(module.PageModuleId);
         builder.CloseComponent();
     }
 }

Oqtane.Client/UI/RenderModeBoundary.razor

@@ -4,8 +4,8 @@
 @inject ILogService LoggingService
 @inherits ErrorBoundary
 
-<CascadingValue Value="@PageState">
-    <CascadingValue Value="@ModuleState">
+<CascadingValue Value="@PageState" IsFixed="true">
+    <CascadingValue Value="@ModuleState" IsFixed="true">
         @if (CurrentException is null)
         {
             @if (ModuleType != null)

Oqtane.Client/UI/Routes.razor

@@ -48,12 +48,18 @@
 
     private bool _initialized = false;
     private bool _installed = false;
-    private string _display = "display: none;";
+    private string _display = "";
 
     private PageState _pageState { get; set; }
 
     protected override async Task OnParametersSetAsync()
     {
+        if (PageState != null && PageState.RenderMode == RenderModes.Interactive && PageState.Site.Prerender)
+        {
+            // prevents flash on initial interactive page load when using prerendering
+            _display = "display: none;";
+        }
+
         SiteState.AntiForgeryToken = AntiForgeryToken;
         SiteState.AuthorizationToken = AuthorizationToken;
         SiteState.Platform = Platform;
@@ -61,7 +67,7 @@
 
         if (Runtime == Runtimes.Hybrid)
         {
-             var installation = await InstallationService.IsInstalled();
+            var installation = await InstallationService.IsInstalled();
             _installed = installation.Success;
             if (installation.Alias != null)
             {
@@ -73,8 +79,8 @@
             if (PageState != null)
             {
                 _pageState = PageState;
-                SiteState.Alias = PageState.Alias;
-                SiteState.RemoteIPAddress = (PageState != null) ? PageState.RemoteIPAddress : "";
+                SiteState.Alias = _pageState.Alias;
+                SiteState.RemoteIPAddress = _pageState.RemoteIPAddress;
                 _installed = true;
             }
         }
@@ -85,9 +91,7 @@
     {
         if (firstRender)
         {
-            // prevents flash on initial interactive page load
             _display = "";
-            StateHasChanged();
         }
     }
 

Oqtane.Client/UI/SiteRouter.razor

@@ -71,7 +71,7 @@
     {
         if (PageState == null || PageState.Refresh)
         {
-            await Refresh();
+            await Refresh(false);
         }
     }
 
@@ -79,7 +79,7 @@
     {
         _absoluteUri = args.Location;
         _isInternalNavigation = true;
-        await Refresh();
+        await Refresh(true);
     }
 
     Task IHandleAfterRender.OnAfterRenderAsync()
@@ -93,7 +93,7 @@
     }
 
     [SuppressMessage("ReSharper", "StringIndexOfIsCultureSpecific.1")]
-    private async Task Refresh()
+    private async Task Refresh(bool locationChanged)
     {
         Site site = null;
         Page page = null;
@@ -103,6 +103,7 @@
         var refresh = false;
         var lastsyncdate = DateTime.MinValue;
         var visitorId = -1;
+        var renderid = Guid.Empty;
         _error = "";
 
         Route route = new Route(_absoluteUri, SiteState.Alias.Path);
@@ -288,11 +289,21 @@
                     modules = PageState.Modules;
                 }
 
+                // renderid allows the framework to determine which module components should be rendered on a page
+                if (PageState == null || locationChanged)
+                {
+                    renderid = Guid.NewGuid();
+                }
+                else
+                {
+                    renderid = PageState.RenderId;
+                }
+                
                 // load additional metadata for current page
                 page = ProcessPage(page, site, user, SiteState.Alias, action);
 
                 // load additional metadata for modules
-                (page, modules) = ProcessModules(site, page, modules, moduleid, action, (!string.IsNullOrEmpty(page.DefaultContainerType)) ? page.DefaultContainerType : site.DefaultContainerType, SiteState.Alias);
+                (page, modules) = ProcessModules(site, page, modules, moduleid, action, (!string.IsNullOrEmpty(page.DefaultContainerType)) ? page.DefaultContainerType : site.DefaultContainerType, SiteState.Alias, renderid);
 
                 //cookie consent
                 var _allowCookies = PageState?.AllowCookies;
@@ -324,7 +335,7 @@
 					RemoteIPAddress = SiteState.RemoteIPAddress,
 					ReturnUrl = returnurl,
                     IsInternalNavigation = _isInternalNavigation,
-                    RenderId = Guid.NewGuid(),
+                    RenderId = renderid,
                     Refresh = false,
                     AllowCookies = _allowCookies.GetValueOrDefault(true)
                 };
@@ -343,7 +354,7 @@
                     var urlMapping = await UrlMappingService.GetUrlMappingAsync(site.SiteId, route.PagePath);
                     if (urlMapping != null && !string.IsNullOrEmpty(urlMapping.MappedUrl))
                     {
-                        var url = (urlMapping.MappedUrl.StartsWith("http")) ? urlMapping.MappedUrl : route.SiteUrl + "/" + urlMapping.MappedUrl + route.Query;
+                        var url = (urlMapping.MappedUrl.StartsWith("http")) ? urlMapping.MappedUrl : route.SiteUrl + (!urlMapping.MappedUrl.StartsWith("/") ? "/" : "") + urlMapping.MappedUrl + ((!urlMapping.MappedUrl.Contains("?")) ? route.Query : "");
                         NavigationManager.NavigateTo(url, false);
                         return;
                     }
@@ -447,7 +458,7 @@
         return page;
     }
 
-    private (Page Page, List<Module> Modules) ProcessModules(Site site, Page page, List<Module> modules, int moduleid, string action, string defaultcontainertype, Alias alias)
+    private (Page Page, List<Module> Modules) ProcessModules(Site site, Page page, List<Module> modules, int moduleid, string action, string defaultcontainertype, Alias alias, Guid renderid)
     {
         var paneindex = new Dictionary<string, int>();
 
@@ -592,6 +603,8 @@
             {
                 module.ContainerType = defaultcontainertype;
             }
+
+            module.RenderId = renderid;
         }
 
         foreach (Module module in modules.Where(item => item.PageId == page.PageId))

Oqtane.Client/UI/ThemeBuilder.razor

@@ -20,13 +20,6 @@
             return;
         }
 
-        // force authenticated user to provide email address (email may be missing if using external login)
-        if (PageState.User != null && PageState.User.IsAuthenticated && string.IsNullOrEmpty(PageState.User.Email) && PageState.Route.PagePath != "profile")
-        {
-            NavigationManager.NavigateTo(Utilities.NavigateUrl(PageState.Alias.Path, "profile", "returnurl=" + WebUtility.UrlEncode(PageState.Route.PathAndQuery)));
-            return;
-        }
-
         // set page title
         if (!string.IsNullOrEmpty(PageState.Page.Title))
         {

Oqtane.Database.MySQL/MySQLDatabase.cs

@@ -75,13 +75,9 @@ namespace Oqtane.Database.MySQL
             return dr;
         }
 
-        public override string RewriteName(string name, bool isQuery)
+        public override string DelimitName(string name)
         {
-            if (name.ToLower() == "rows" && isQuery)
-            {
-                name = $"`{name}`"; // escape reserved word in SQL query
-            }
-            return name;
+            return $"`{name}`";
         }
 
         public override DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString)

Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <Version>6.1.2</Version>
+    <Version>6.1.4</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.4</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -33,7 +33,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="MySql.Data" Version="9.2.0" />
+    <PackageReference Include="MySql.Data" Version="9.4.0" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.3.efcore.9.0.0" />
   </ItemGroup>
 

Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <Version>6.1.2</Version>
+    <Version>6.1.4</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.4</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -34,7 +34,7 @@
   
   <ItemGroup>
     <PackageReference Include="EFCore.NamingConventions" Version="9.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.7" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
   </ItemGroup>
 

Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs

@@ -87,9 +87,9 @@ namespace Oqtane.Database.PostgreSQL
             return _rewriter.RewriteName(name);
         }
 
-        public override string RewriteName(string name, bool isQuery)
+        public override string DelimitName(string name)
         {
-            return _rewriter.RewriteName(name);
+            return $"\"{name}\"";
         }
 
         public override string RewriteValue(string value, string type)

Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <Version>6.1.2</Version>
+    <Version>6.1.4</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.4</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -33,7 +33,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.7" />
   </ItemGroup>
 
   <ItemGroup>

Oqtane.Database.SqlServer/SqlServerDatabase.cs

@@ -46,6 +46,11 @@ namespace Oqtane.Database.SqlServer
             }
         }
 
+        public override string DelimitName(string name)
+        {
+            return $"[{name}]";
+        }
+
         public override int ExecuteNonQuery(string connectionString, string query)
         {
             var conn = new SqlConnection(FormatConnectionString(connectionString));

Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <Version>6.1.2</Version>
+    <Version>6.1.4</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.4</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -33,7 +33,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.7" />
   </ItemGroup>
 
   <ItemGroup>

Oqtane.Database.Sqlite/SqliteDatabase.cs

@@ -84,6 +84,11 @@ namespace Oqtane.Database.Sqlite
             return dr;
         }
 
+        public override string DelimitName(string name)
+        {
+            return $"\"{name}\"";
+        }
+
         public override DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString)
         {
             return optionsBuilder.UseSqlite(connectionString)

Oqtane.Maui/Oqtane.Maui.csproj

@@ -6,7 +6,7 @@
     <!-- <TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks> -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
-    <Version>6.1.2</Version>
+    <Version>6.1.4</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -14,7 +14,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.4</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane.Maui</RootNamespace>
@@ -30,7 +30,7 @@
 		<ApplicationId>com.oqtane.maui</ApplicationId>
     
 		<!-- Versions -->
-		<ApplicationDisplayVersion>6.1.2</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>6.1.4</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
     <!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
@@ -67,14 +67,14 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.4" />
-    <PackageReference Include="System.Net.Http.Json" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.50" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.50" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.50" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.7" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.7" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.90" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.90" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.90" />
   </ItemGroup>
 
   <ItemGroup>

Oqtane.Maui/wwwroot/css/app.css

@@ -75,6 +75,10 @@ app {
     color: gray;
 }
 
+.app-moduleactions .dropdown-menu {
+    z-index: 9999;
+}
+
 .app-moduleactions .dropdown-submenu {
     position: relative;
 }
@@ -235,18 +239,19 @@ app {
 .app-form-inline {
     display: inline;
 }
-.app-search{
+
+.app-search {
     display: inline-block;
     position: relative;
 }
-.app-search input + button{
+.app-search input + button {
     background: none;
     border: none;
     position: absolute;
     right: 0;
     top: 0;
 }
-.app-search input + button .oi{
+.app-search input + button .oi {
     top: 0;
 }
 .app-search-noinput {
@@ -270,4 +275,14 @@ app {
 
 .app-logo .navbar-brand {
     padding: 5px 20px 5px 20px;
-}
+}
+
+/* cookie consent */
+.gdpr-consent-bar .btn-show {
+    bottom: -3px;
+    left: 5px;
+}
+.gdpr-consent-bar .btn-hide {
+    top: 0;
+    right: 5px;
+}

Oqtane.Maui/wwwroot/js/interop.js

@@ -311,7 +311,7 @@ Oqtane.Interop = {
         }
         return files;
     },
-    uploadFiles: async function (posturl, folder, id, antiforgerytoken, jwt, chunksize) {
+    uploadFiles: async function (posturl, folder, id, antiforgerytoken, jwt, chunksize, anonymizeuploadfilenames) {
         var success = true;
         var fileinput = document.getElementById('FileInput_' + id);
         var progressinfo = document.getElementById('ProgressInfo_' + id);
@@ -344,16 +344,22 @@ Oqtane.Interop = {
             const totalParts = Math.ceil(file.size / chunkSize);
             let partCount = 0;
 
+            let filename = file.name;
+            if (anonymizeuploadfilenames) {
+                filename = crypto.randomUUID() + '.' + filename.split('.').pop();
+            }
+
             const uploadPart = () => {
                 const start = partCount * chunkSize;
                 const end = Math.min(start + chunkSize, file.size);
                 const chunk = file.slice(start, end);
 
                 return new Promise((resolve, reject) => {
+
                     let formdata = new FormData();
                     formdata.append('__RequestVerificationToken', antiforgerytoken);
                     formdata.append('folder', folder);
-                    formdata.append('formfile', chunk, file.name);
+                    formdata.append('formfile', chunk, filename);
 
                     var credentials = 'same-origin';
                     var headers = new Headers();

Oqtane.Package/Oqtane.Client.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Oqtane.Client</id>
-    <version>6.1.2</version>
+    <version>6.1.4</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.4</releaseNotes>
     <readme>readme.md</readme>
     <icon>icon.png</icon>
     <tags>oqtane</tags>

Oqtane.Package/Oqtane.Framework.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Oqtane.Framework</id>
-    <version>6.1.2</version>
+    <version>6.1.4</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -11,8 +11,8 @@
     <copyright>.NET Foundation</copyright>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
-    <projectUrl>https://github.com/oqtane/oqtane.framework/releases/download/v6.1.2/Oqtane.Framework.6.1.2.Upgrade.zip</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2</releaseNotes>
+    <projectUrl>https://github.com/oqtane/oqtane.framework/releases/download/v6.1.4/Oqtane.Framework.6.1.4.Upgrade.zip</projectUrl>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.4</releaseNotes>
     <readme>readme.md</readme>
     <icon>icon.png</icon>
     <tags>oqtane framework</tags>

Oqtane.Package/Oqtane.Server.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Oqtane.Server</id>
-    <version>6.1.2</version>
+    <version>6.1.4</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.4</releaseNotes>
     <readme>readme.md</readme>
     <icon>icon.png</icon>
     <tags>oqtane</tags>

Oqtane.Package/Oqtane.Shared.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Oqtane.Shared</id>
-    <version>6.1.2</version>
+    <version>6.1.4</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.4</releaseNotes>
     <readme>readme.md</readme>
     <icon>icon.png</icon>
     <tags>oqtane</tags>

Oqtane.Package/Oqtane.Updater.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Oqtane.Updater</id>
-    <version>6.1.2</version>
+    <version>6.1.4</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.2</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.1.4</releaseNotes>
     <readme>readme.md</readme>
     <icon>icon.png</icon>
     <tags>oqtane</tags>

Oqtane.Package/install.ps1

@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.1.2.Install.zip" -Force 
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.1.4.Install.zip" -Force 

Oqtane.Package/release.cmd

@@ -9,6 +9,8 @@ nuget.exe pack Oqtane.Framework.nuspec
 del /F/Q/S "..\Oqtane.Server\bin\Release\net9.0\publish" > NUL
 rmdir /Q/S "..\Oqtane.Server\bin\Release\net9.0\publish"
 dotnet publish ..\Oqtane.Server\Oqtane.Server.csproj /p:Configuration=Release
+del /F/Q/S "..\Oqtane.Server\bin\Release\net9.0\publish\Content" > NUL
+rmdir /Q/S "..\Oqtane.Server\bin\Release\net9.0\publish\Content"
 del /F/Q/S "..\Oqtane.Server\bin\Release\net9.0\publish\wwwroot\Content" > NUL
 rmdir /Q/S "..\Oqtane.Server\bin\Release\net9.0\publish\wwwroot\Content"
 setlocal ENABLEDELAYEDEXPANSION

Oqtane.Package/upgrade.ps1

@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.1.2.Upgrade.zip" -Force 
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.1.4.Upgrade.zip" -Force 

Oqtane.Server/Components/App.razor

@@ -297,7 +297,7 @@
         if (urlMapping != null && !string.IsNullOrEmpty(urlMapping.MappedUrl))
         {
             // redirect to mapped url
-            var url = (urlMapping.MappedUrl.StartsWith("http")) ? urlMapping.MappedUrl : route.SiteUrl + "/" + urlMapping.MappedUrl;
+            var url = (urlMapping.MappedUrl.StartsWith("http")) ? urlMapping.MappedUrl : route.SiteUrl + (!urlMapping.MappedUrl.StartsWith("/") ? "/" : "") + urlMapping.MappedUrl + ((!urlMapping.MappedUrl.Contains("?")) ? route.Query : "");
             NavigationManager.NavigateTo(url, true);
         }
         else // no url mapping exists
@@ -345,6 +345,7 @@
             DateTime expiry = DateTime.MinValue;
             if (visitorCookieValue != null && visitorCookieValue.Contains("|"))
             {
+                // visitor cookies contain the visitor id and an expiry date separated by a pipe symbol
                 var values = visitorCookieValue.Split('|');
                 int.TryParse(values[0], out _visitorId);
                 DateTime.TryParseExact(values[1], "M/d/yyyy hh:mm:ss tt", CultureInfo.InvariantCulture, DateTimeStyles.None, out expiry);

Oqtane.Server/Controllers/FileController.cs

@@ -22,7 +22,6 @@ using Microsoft.AspNetCore.Cors;
 using System.IO.Compression;
 using Oqtane.Services;
 using Microsoft.Extensions.Primitives;
-using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.Net.Http.Headers;
 
 // ReSharper disable StringIndexOfIsCultureSpecific.1
@@ -445,9 +444,14 @@ namespace Oqtane.Controllers
             }
 
             // ensure filename is valid
-            if (!formfile.FileName.IsPathOrFileValid() || !HasValidFileExtension(formfile.FileName))
+            string fileName = formfile.FileName;
+            if (Path.GetExtension(fileName).Contains(':'))
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "File Upload File Name Is Invalid Or Contains Invalid Extension {File}", formfile.FileName);
+                fileName = fileName.Substring(0, fileName.LastIndexOf(':')); // remove invalid suffix from extension
+            }
+            if (!fileName.IsPathOrFileValid() || !HasValidFileExtension(fileName))
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "File Upload File Name Is Invalid Or Contains Invalid Extension {File}", fileName);
                 return StatusCode((int)HttpStatusCode.Forbidden);
             }
 
@@ -459,8 +463,8 @@ namespace Oqtane.Controllers
                 return StatusCode((int)HttpStatusCode.Forbidden);
             }
 
-            // create file name using header values
-            string fileName = formfile.FileName + ".part_" + partCount.ToString("000") + "_" + totalParts.ToString("000");
+            // create file name using header part values
+            fileName += ".part_" + partCount.ToString("000") + "_" + totalParts.ToString("000");
             string folderPath = "";
 
             try
@@ -533,13 +537,13 @@ namespace Oqtane.Controllers
             string parts = Path.GetExtension(filename)?.Replace(token, ""); // returns "001_999"
             int totalparts = int.Parse(parts?.Substring(parts.IndexOf("_") + 1));
 
-            filename = Path.GetFileNameWithoutExtension(filename); // base filename
+            filename = Path.GetFileNameWithoutExtension(filename); // base filename including original file extension
             string[] fileparts = Directory.GetFiles(folder, filename + token + "*"); // list of all file parts
 
             // if all of the file parts exist (note that file parts can arrive out of order)
             if (fileparts.Length == totalparts && CanAccessFiles(fileparts))
             {
-                // merge file parts into temp file (in case another user is trying to get the file)
+                // merge file parts into temp file (in case another user is trying to read the file)
                 bool success = true;
                 using (var stream = new FileStream(Path.Combine(folder, filename + ".tmp"), FileMode.Create))
                 {
@@ -560,25 +564,22 @@ namespace Oqtane.Controllers
                 }
 
                 // clean up file parts
-                foreach (var file in Directory.GetFiles(folder, "*" + token + "*"))
+                foreach (var file in fileparts)
                 {
-                    if (fileparts.Contains(file))
+                    try
                     {
-                        try
-                        {
-                            System.IO.File.Delete(file);
-                        }
-                        catch
-                        {
-                            // unable to delete part - ignore
-                        }
+                        System.IO.File.Delete(file);
+                    }
+                    catch
+                    {
+                        // unable to delete part - ignore
                     }
                 }
 
                 // rename temp file
                 if (success)
                 {
-                    // remove file if it already exists (as well as any thumbnails which may exist)
+                    // remove existing file (as well as any thumbnails)
                     foreach (var file in Directory.GetFiles(folder, Path.GetFileNameWithoutExtension(filename) + ".*"))
                     {
                         if (Path.GetExtension(file) != ".tmp")

Oqtane.Server/Controllers/FolderController.cs

@@ -20,14 +20,16 @@ namespace Oqtane.Controllers
     {
         private readonly IFolderRepository _folders;
         private readonly IUserPermissions _userPermissions;
+        private readonly IFileRepository _files;
         private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
         private readonly Alias _alias;
 
-        public FolderController(IFolderRepository folders, IUserPermissions userPermissions, ISyncManager syncManager, ILogManager logger, ITenantManager tenantManager)
+        public FolderController(IFolderRepository folders, IUserPermissions userPermissions, IFileRepository files, ISyncManager syncManager, ILogManager logger, ITenantManager tenantManager)
         {
             _folders = folders;
             _userPermissions = userPermissions;
+            _files = files;
             _syncManager = syncManager;
             _logger = logger;
             _alias = tenantManager.GetAlias();
@@ -41,7 +43,8 @@ namespace Oqtane.Controllers
             int SiteId;
             if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
-                foreach (Folder folder in _folders.GetFolders(SiteId))
+                var hierarchy = GetFoldersHierarchy(_folders.GetFolders(SiteId).ToList());
+                foreach (Folder folder in hierarchy)
                 {
                     // note that Browse permission is used for this method
                     if (_userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.PermissionList))
@@ -49,7 +52,6 @@ namespace Oqtane.Controllers
                         folders.Add(folder);
                     }
                 }
-                folders = GetFoldersHierarchy(folders);
             }
             else
             {
@@ -244,34 +246,6 @@ namespace Oqtane.Controllers
             return folder;
         }
 
-        // PUT api/<controller>/?siteid=x&folderid=y&parentid=z
-        [HttpPut]
-        [Authorize(Roles = RoleNames.Registered)]
-        public void Put(int siteid, int folderid, int? parentid)
-        {
-            if (siteid == _alias.SiteId && _folders.GetFolder(folderid, false) != null && _userPermissions.IsAuthorized(User, siteid, EntityNames.Folder, folderid, PermissionNames.Edit))
-            {
-                int order = 1;
-                List<Folder> folders = _folders.GetFolders(siteid).ToList();
-                foreach (Folder folder in folders.Where(item => item.ParentId == parentid).OrderBy(item => item.Order))
-                {
-                    if (folder.Order != order)
-                    {
-                        folder.Order = order;
-                        _folders.UpdateFolder(folder);
-                        _syncManager.AddSyncEvent(_alias, EntityNames.Folder, folder.FolderId, SyncEventActions.Update);
-                    }
-                    order += 2;
-                }
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Folder Order Updated {SiteId} {FolderId} {ParentId}", siteid, folderid, parentid);
-            }
-            else
-            {
-                _logger.Log(LogLevel.Error, this, LogFunction.Update, "Unauthorized Folder Put Attempt {SiteId} {FolderId} {ParentId}", siteid, folderid, parentid);
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
-            }
-        }
-
         // DELETE api/<controller>/5
         [HttpDelete("{id}")]
         [Authorize(Roles = RoleNames.Registered)]
@@ -283,12 +257,20 @@ namespace Oqtane.Controllers
                 var folderPath = _folders.GetFolderPath(folder);
                 if (Directory.Exists(folderPath))
                 {
+                    // remove all files from disk (including thumbnails, etc...)
                     foreach (var filePath in Directory.GetFiles(folderPath))
                     {
                         System.IO.File.Delete(filePath);
                     }
                     Directory.Delete(folderPath);
                 }
+
+                // remove files from database
+                foreach (var file in _files.GetFiles(id))
+                {
+                    _files.DeleteFile(file.FileId);
+                }
+
                 _folders.DeleteFolder(id);
                 _syncManager.AddSyncEvent(_alias, EntityNames.Folder, folder.FolderId, SyncEventActions.Delete);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Folder Deleted {FolderId}", id);
@@ -304,7 +286,6 @@ namespace Oqtane.Controllers
         {
             List<Folder> hierarchy = new List<Folder>();
             Action<List<Folder>, Folder> getPath = null;
-            var folders1 = folders;
             getPath = (folderList, folder) =>
             {
                 IEnumerable<Folder> children;
@@ -312,23 +293,23 @@ namespace Oqtane.Controllers
                 if (folder == null)
                 {
                     level = -1;
-                    children = folders1.Where(item => item.ParentId == null);
+                    children = folders.Where(item => item.ParentId == null);
                 }
                 else
                 {
                     level = folder.Level;
-                    children = folders1.Where(item => item.ParentId == folder.FolderId);
+                    children = folders.Where(item => item.ParentId == folder.FolderId);
                 }
 
                 foreach (Folder child in children)
                 {
                     child.Level = level + 1;
-                    child.HasChildren = folders1.Any(item => item.ParentId == child.FolderId);
+                    child.HasChildren = folders.Any(item => item.ParentId == child.FolderId);
                     hierarchy.Add(child);
-                    if (getPath != null) getPath(folderList, child);
+                    getPath(folderList, child);
                 }
             };
-            folders = folders.OrderBy(item => item.Order).ToList();
+            folders = folders.OrderBy(item => item.Name).ToList();
             getPath(folders, null);
 
             // add any non-hierarchical items to the end of the list