Merge pull request #2318 from oqtane/master

Merge pull request #2317 from oqtane/dev

Oqtane.Client/Extensions/OqtaneLocalizationExtensions.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Microsoft.Extensions.Localization
 {
     public static class OqtaneLocalizationExtensions
@@ -18,5 +20,42 @@ namespace Microsoft.Extensions.Localization
             }
             return localizedValue;
         }
+
+        /// <summary>
+        /// Creates an IStringLocalizer based on a type name. This extension method is useful in scenarios where the default IStringLocalizer is unable to locate the resources.
+        /// </summary>
+        /// <param name="localizerFactory"></param>
+        /// <param name="fullTypeName">the full type name ie. GetType().FullName</param>
+        /// <returns></returns>
+        public static IStringLocalizer Create(this IStringLocalizerFactory localizerFactory, string fullTypeName)
+        {
+            var typename = fullTypeName;
+
+            // handle generic types
+            var type = Type.GetType(fullTypeName);
+            if (type.IsGenericType)
+            {
+                typename = type.GetGenericTypeDefinition().FullName;
+                typename = typename.Substring(0, typename.IndexOf("`")); // remove generic type info
+            }
+
+            // format typename
+            if (typename.Contains(","))
+            {
+                typename = typename.Substring(0, typename.IndexOf(",")); // remove assembly info
+            }
+
+            // remove rootnamespace
+            var rootnamespace = "";
+            var attributes = type.Assembly.GetCustomAttributes(typeof(RootNamespaceAttribute), false);
+            if (attributes.Length > 0)
+            {
+                rootnamespace = ((RootNamespaceAttribute)attributes[0]).RootNamespace;
+            }
+            typename = typename.Replace(rootnamespace + ".", "");
+
+            // create IStringLocalizer using factory
+            return localizerFactory.Create(typename, type.Assembly.GetName().Name);
+        }    
     }
 }

Oqtane.Client/Installer/Controls/SqlServerConfig.razor

@@ -4,7 +4,7 @@
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <div class="row mb-1 align-items-center">
-    <Label Class="col-sm-3" For="server" HelpText="Enter the database server" ResourceKey="Server">Server:</Label>
+	<Label Class="col-sm-3" For="server" HelpText="Enter the database server name. This might include a port number as well if you are using a cloud service (ie. servername.database.windows.net,1433) " ResourceKey="Server">Server:</Label>
     <div class="col-sm-9">
         <input id="server" type="text" class="form-control" @bind="@_server" />
     </div>
@@ -51,7 +51,7 @@
 @if (_encryption == "true")
 {
 	<div class="row mb-1 align-items-center">
-		<Label Class="col-sm-3" For="trustservercertificate" HelpText="Specify the type of certificate you are using for encryption" ResourceKey="TrustServerCertificate">Certificate:</Label>
+		<Label Class="col-sm-3" For="trustservercertificate" HelpText="Specify the type of certificate you are using for encryption. Verifiable is equivalent to False. Self Signed is equivalent to True." ResourceKey="TrustServerCertificate">Certificate:</Label>
 		<div class="col-sm-9">
 			<select id="encryption" class="form-select custom-select" @bind="@_trustservercertificate">
 				<option value="true">@Localizer["Self Signed"]</option>

Oqtane.Client/Installer/Installer.razor

@@ -26,28 +26,41 @@
                     <div class="col-sm-9">
                         @if (_databases != null)
                         {
-							<select id="databasetype" class="form-select custom-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))">
+							<div class="input-group">
+								<select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))" required>
 									@foreach (var database in _databases)
-                                {
-                                    if (database.IsDefault)
-                                    {
-                                        <option value="@database.Name" selected>@Localizer[@database.Name]</option>
-                                    }
-                                    else
 									{
 										<option value="@database.Name">@Localizer[@database.Name]</option>
-                                    }
 									}
 								</select>
+								@if (!_showConnectionString)
+								{
+									<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionString"]</button>
+								}
+								else
+								{
+									<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionParameters"]</button>
+								}
+							</div>
                         }
                     </div>
                 </div>
-                @{
+				@if (!_showConnectionString)
+				{
 					if (_databaseConfigType != null)
 					{
-                        @DatabaseConfigComponent;
+						@DatabaseConfigComponent
 					}
 				}
+				else
+				{
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="connectionstring" HelpText="Enter a complete connection string including all parameters and delimiters" ResourceKey="ConnectionString">String:</Label>
+						<div class="col-sm-9">
+							<textarea id="connectionstring" class="form-control" @bind="@_connectionString" rows="3"></textarea>
+						</div>
+					</div>
+				}
 			</div>
         </div>
         <div class="col text-center">
@@ -63,8 +76,8 @@
                     <Label Class="col-sm-3" For="password" HelpText="Provide a password for the primary user account" ResourceKey="Password">Password:</Label>
                     <div class="col-sm-9">
 						<div class="input-group">
-							<input id="password" type="@_passwordtype" class="form-control" @bind="@_hostPassword" autocomplete="new-password" />
+							<input id="password" type="@_passwordType" class="form-control" @bind="@_hostPassword" autocomplete="new-password" />
-							<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+							<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglePassword</button>
 						</div>
                     </div>
                 </div>
@@ -72,8 +85,8 @@
                     <Label Class="col-sm-3" For="confirm" HelpText="Please confirm the password entered above by entering it again" ResourceKey="Confirm">Confirm:</Label>
                     <div class="col-sm-9">
 						<div class="input-group">
-							<input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirmPassword" autocomplete="new-password" />
+							<input id="confirm" type="@_confirmPasswordType" class="form-control" @bind="@_confirmPassword" autocomplete="new-password" />
-							<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+							<button type="button" class="btn btn-secondary" @onclick="@ToggleConfirmPassword">@_toggleConfirmPassword</button>
 						</div>
                     </div>
                 </div>
@@ -107,11 +120,15 @@
 	private Type _databaseConfigType;
 	private object _databaseConfig;
 	private RenderFragment DatabaseConfigComponent { get; set; }
+	private bool _showConnectionString = false;
+	private string _connectionString = string.Empty;
 
 	private string _hostUsername = string.Empty;
 	private string _hostPassword = string.Empty;
-	private string _passwordtype = "password";
+	private string _passwordType = "password";
-	private string _togglepassword = string.Empty;
+	private string _confirmPasswordType = "password";
+	private string _togglePassword = string.Empty;
+	private string _toggleConfirmPassword = string.Empty;
 	private string _confirmPassword = string.Empty;
 	private string _hostEmail = string.Empty;
 	private bool _register = true;
@@ -120,7 +137,9 @@
 
 	protected override async Task OnInitializedAsync()
 	{
-		_togglepassword = SharedLocalizer["ShowPassword"];
+		_togglePassword = SharedLocalizer["ShowPassword"];
+		_toggleConfirmPassword = SharedLocalizer["ShowPassword"];
+
 		_databases = await DatabaseService.GetDatabasesAsync();
 		if (_databases.Exists(item => item.IsDefault))
 		{
@@ -138,7 +157,7 @@
 		try
 		{
 			_databaseName = (string)eventArgs.Value;
-
+			_showConnectionString = false;
 			LoadDatabaseConfigComponent();
 		}
 		catch
@@ -175,10 +194,17 @@
 	private async Task Install()
 	{
 		var connectionString = String.Empty;
+		if (_showConnectionString)
+		{
+			connectionString = _connectionString;
+		}
+		else
+		{
 			if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
 			{
 				connectionString = databaseConfigControl.GetConnectionString();
 			}
+		}
 
 		if (connectionString != "" && !string.IsNullOrEmpty(_hostUsername) && !string.IsNullOrEmpty(_hostPassword) && _hostPassword == _confirmPassword && !string.IsNullOrEmpty(_hostEmail) && _hostEmail.Contains("@"))
 		{
@@ -230,15 +256,39 @@
 
 	private void TogglePassword()
 	{
-		if (_passwordtype == "password")
+		if (_passwordType == "password")
 		{
-			_passwordtype = "text";
+			_passwordType = "text";
-			_togglepassword = SharedLocalizer["HidePassword"];
+			_togglePassword = SharedLocalizer["HidePassword"];
 		}
 		else
 		{
-			_passwordtype = "password";
+			_passwordType = "password";
-			_togglepassword = SharedLocalizer["ShowPassword"];
+			_togglePassword = SharedLocalizer["ShowPassword"];
 		}
 	}
+
+	private void ToggleConfirmPassword()
+	{
+		if (_confirmPasswordType == "password")
+		{
+			_confirmPasswordType = "text";
+			_toggleConfirmPassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_confirmPasswordType = "password";
+			_toggleConfirmPassword = SharedLocalizer["ShowPassword"];
+		}
+	}
+
+	private void ToggleConnectionString()
+	{
+		if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			_connectionString = databaseConfigControl.GetConnectionString();
+		}
+		_showConnectionString = !_showConnectionString;
+	}
+
 }

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

@@ -11,8 +11,7 @@
         Module module = await ModuleService.GetModuleAsync(ModuleState.ModuleId);
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
-            string message = string.Format(Localizer["Error.Module.Load"], module.ModuleDefinitionName);
+			AddModuleMessage(string.Format(Localizer["Error.Module.Load"], module.ModuleDefinitionName), MessageType.Error);
-            AddModuleMessage(message, MessageType.Error);
         }
 
         await logger.LogCritical("Error Loading Module {Module}", module);

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

@@ -56,6 +56,10 @@ else
 	protected override async Task OnParametersSetAsync()
 	{
 		_jobs = await JobService.GetJobsAsync();
+		if (_jobs.Count == 0)
+		{
+			AddModuleMessage(string.Format(Localizer["Message.NoJobs"], NavigateUrl("admin/system")), MessageType.Warning);
+		}
 	}
 
 	private string DisplayStatus(bool isEnabled, bool isExecuting)

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

@@ -20,6 +20,7 @@ else
             @if (_availableCultures.Count() == 0)
             {
                 <ModuleMessage Type="MessageType.Info" Message="@_message"></ModuleMessage>
+				<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
             }
             else
             {
@@ -31,7 +32,7 @@ else
                                 <select id="_code" class="form-select" @bind="@_code" required>
                                     @foreach (var culture in _availableCultures)
                                     {
-                                        <option value="@culture.Name">@culture.DisplayName</option>
+                                        <option value="@culture.Name">@(culture.DisplayName + " (" + culture.Name + ")")</option>
                                     }
                                 </select>
                             </div>
@@ -47,11 +48,11 @@ else
                         </div>
                     </div>
                     <button type="button" class="btn btn-success" @onclick="SaveLanguage">@SharedLocalizer["Save"]</button>
+					<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
                 </form>
             }
-            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
         </TabPanel>
-        <TabPanel Name="Download" ResourceKey="Download" Security="SecurityAccessLevel.Host">
+		<TabPanel Name="Translations" Heading="Translations" ResourceKey="Download" Security="SecurityAccessLevel.Host">
             <div class="row justify-content-center mb-3">
                 <div class="col-sm-6">
                     <div class="input-group">
@@ -78,6 +79,7 @@ else
                                 <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp;
                                 @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;
                                 @SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
+                                @((MarkupString)(!string.IsNullOrEmpty(context.PackageUrl) ? "&nbsp;&nbsp;|&nbsp;&nbsp;" + SharedLocalizer["Search.Source"] + ": <strong>" + new Uri(context.PackageUrl).Host + "</strong>" : ""))
                                 @((MarkupString)(context.TrialPeriod > 0 ? "&nbsp;&nbsp;|&nbsp;&nbsp;<strong>" + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "</strong>" : ""))
                             </td>
                             <td style="width: 1px; vertical-align: middle;">
@@ -113,7 +115,7 @@ else
         <TabPanel Name="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host">
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" HelpText="Upload one or more translations. Once they are uploaded click Install to complete the installation." ResourceKey="LanguageUpload">Language: </Label>
+                    <Label Class="col-sm-3" HelpText="Upload one or more translations. Once they are uploaded click Install to complete the installation." ResourceKey="LanguageUpload">Translation: </Label>
                     <div class="col-sm-9">
                         <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
                     </div>
@@ -183,8 +185,7 @@ else
 		var languagesCodes = languages.Select(l => l.Code).ToList();
 
 		_supportedCultures = await LocalizationService.GetCulturesAsync();
-        _availableCultures = _supportedCultures
+		_availableCultures = _supportedCultures.Where(c => !c.Name.Equals(Constants.DefaultCulture) && !languagesCodes.Contains(c.Name));
-            .Where(c => !c.Name.Equals(Constants.DefaultCulture) && !languagesCodes.Contains(c.Name));
 		await LoadTranslations();
 
         if (_supportedCultures.Count() == 1)

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

@@ -19,6 +19,7 @@ else
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>
             <th>@Localizer["Code"]</th>
+			<th>@Localizer["Translation"]</th>
             <th>@Localizer["Default"]</th>
 			<th style="width: 1px;">&nbsp;</th>
         </Header>
@@ -26,6 +27,7 @@ else
             <td><ActionDialog Header="Delete Language" Message="@string.Format(Localizer["Confirm.Language.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteLanguage(context))" Disabled="@((context.IsDefault && _languages.Count > 2) || context.Code == Constants.DefaultCulture)" ResourceKey="DeleteLanguage" /></td>
             <td>@context.Name</td>
             <td>@context.Code</td>
+			<td>@context.Version</td>
 			<td><TriStateCheckBox Value="@(context.IsDefault)" Disabled="true"></TriStateCheckBox></td>
 			<td>
                 @if (UpgradeAvailable(context.Code))
@@ -50,9 +52,6 @@ else
         var cultures = await LocalizationService.GetCulturesAsync();
         var culture = cultures.First(c => c.Name.Equals(Constants.DefaultCulture));
 
-        // Adds English as default language
-        _languages.Insert(0, new Language { Name = culture.DisplayName, Code = culture.Name, IsDefault = !_languages.Any(l => l.IsDefault) });
-
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
             _packages = await PackageService.GetPackagesAsync("translation");
@@ -81,7 +80,7 @@ else
         var upgradeavailable = false;
         if (_packages != null)
         {
-            var package = _packages.Where(item => item.PackageId == (Constants.PackageId + ".Client." + code)).FirstOrDefault();
+			var package = _packages.Where(item => item.PackageId == ("Oqtane.Client." + code)).FirstOrDefault();
             if (package != null)
             {
                 upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) == 0);

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

@@ -1,5 +1,6 @@
 @namespace Oqtane.Modules.Admin.Logs
 @inherits ModuleBase
+@inject NavigationManager NavigationManager
 @inject ILogService LogService
 @inject ISettingService SettingService
 @inject IStringLocalizer<Index> Localizer
@@ -104,6 +105,10 @@ else
 	{
 		try
 		{
+			if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int id))
+			{
+				NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, ModuleState.ModuleId, "Detail", $"id={id}"));
+			}
 			if (PageState.QueryString.ContainsKey("level"))
 			{
 				_level = PageState.QueryString["level"];

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

@@ -85,7 +85,7 @@ else
 	private List<Template> _templates;
 	private string _template = "-";
 	private string[] _versions;
-	private string _reference = Constants.Version;
+	private string _reference = "local";
 	private string _minversion = "2.0.0";
 	private string _location = string.Empty;
 

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

@@ -35,6 +35,7 @@
                             <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp;
                             @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;
                             @SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
+                            @((MarkupString)(!string.IsNullOrEmpty(context.PackageUrl) ? "&nbsp;&nbsp;|&nbsp;&nbsp;" + SharedLocalizer["Search.Source"] + ": <strong>" + new Uri(context.PackageUrl).Host + "</strong>" : ""))
                             @((MarkupString)(context.TrialPeriod > 0 ? "&nbsp;&nbsp;|&nbsp;&nbsp;<strong>" + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "</strong>" : ""))
                         </td>
                         <td style="width: 1px; vertical-align: middle;">
@@ -90,9 +91,9 @@
                     <div class="modal-body">
                         <p style="height: 200px; overflow-y: scroll;">
                             <h3>@_productname</h3>
-                            @if (!string.IsNullOrEmpty(_license))
+                            @if (!string.IsNullOrEmpty(_packagelicense))
                             {
-                                @((MarkupString)_license)
+								@((MarkupString)_packagelicense)
                             }
                             else
                             {
@@ -118,9 +119,9 @@
 	private string _price = "free";
 	private string _search = "";
 	private string _productname = "";
-    private string _license = "";
 	private string _packageid = "";
-    private string _version = "";
+	private string _packagelicense = "";
+	private string _packageversion = "";
 
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -197,7 +198,7 @@
 	private void HideModal()
 	{
 		_productname = "";
-        _license = "";
+		_packagelicense = "";
 		StateHasChanged();
 	}
 
@@ -209,12 +210,12 @@
 			if (package != null)
 			{
 				_productname = package.Name;
+				_packageid = package.PackageId;
 				if (!string.IsNullOrEmpty(package.License))
 				{
-                    _license = package.License.Replace("\n", "<br />");
+					_packagelicense = package.License.Replace("\n", "<br />");
 				}
-                _packageid = package.PackageId;
+				_packageversion = package.Version;
-                _version = package.Version;
 			}
 			StateHasChanged();
 		}
@@ -229,16 +230,16 @@
 	{
 		try
 		{
-            await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder);
+			await PackageService.DownloadPackageAsync(_packageid, _packageversion, Constants.PackagesFolder);
-            await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version);
+			await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _packageversion);
 			AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success);
 			_productname = "";
-            _license = "";
+			_packagelicense = "";
 			StateHasChanged();
 		}
 		catch (Exception ex)
 		{
-            await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _version);
+			await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _packageversion);
 			AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
 		}
 	}
@@ -252,7 +253,7 @@
 		}
 		catch (Exception ex)
 		{
-            await logger.LogError(ex, "Error Installing Module");
+			await logger.LogError(ex, "Error Installing Modules");
 		}
 	}
 }

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

@@ -1,6 +1,7 @@
 @namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
 @inject IModuleDefinitionService ModuleDefinitionService
+@inject IPackageService PackageService
 @inject NavigationManager NavigationManager
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
@@ -42,6 +43,12 @@
                     <div class="col-sm-9">
                         <input id="version" class="form-control" @bind="@_version" disabled />
                     </div>
+                </div>
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="packagename" HelpText="The unique name of the package from which this module was installed" ResourceKey="PackageName">Package Name: </Label>
+					<div class="col-sm-9">
+						<input id="packagename" class="form-control" @bind="@_packagename" disabled />
+					</div>
 				</div>
 				<div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="owner" HelpText="The owner or creator of the module" ResourceKey="Owner">Owner: </Label>
@@ -75,6 +82,12 @@
                 </div>
             </div>
 		</Section>
+		<br />
+		<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@SharedLocalizer["Save"]</button>
+		<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+		<br />
+		<br />
+		<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
     </TabPanel>
     <TabPanel Name="Permissions" ResourceKey="Permissions">
         <div class="container">
@@ -82,23 +95,99 @@
                 <PermissionGrid EntityName="@EntityNames.ModuleDefinition" PermissionNames="@PermissionNames.Utilize" Permissions="@_permissions" @ref="_permissionGrid" />
             </div>
         </div>
+		<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@SharedLocalizer["Save"]</button>
+		<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    </TabPanel>
+	<TabPanel Name="Translations" ResourceKey="Translations">
+		@if (_packages != null)
+		{
+			if (_packages.Count > 0)
+			{
+				<Pager Items="@_packages">
+					<Row>
+						<td>
+							<h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;by:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
+							@(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
+							<strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp;
+							@SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;
+							@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
+							@((MarkupString)(!string.IsNullOrEmpty(context.PackageUrl) ? "&nbsp;&nbsp;|&nbsp;&nbsp;" + SharedLocalizer["Search.Source"] + ": <strong>" + new Uri(context.PackageUrl).Host + "</strong>" : ""))
+							@((MarkupString)(context.TrialPeriod > 0 ? "&nbsp;&nbsp;|&nbsp;&nbsp;<strong>" + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "</strong>" : ""))
+						</td>
+						<td style="width: 1px; vertical-align: middle;">
+							@if (context.Price != null && !string.IsNullOrEmpty(context.PackageUrl))
+							{
+								<button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+							}
+						</td>
+						<td style="width: 1px; vertical-align: middle;">
+							@if (context.Price != null && !string.IsNullOrEmpty(context.PaymentUrl))
+							{
+								<a class="btn btn-primary" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@context.Price.Value.ToString("$#,##0.00")</a>
+							}
+							else
+							{
+								<button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+							}
+						</td>
+					</Row>
+				</Pager>
+				<button type="button" class="btn btn-success" @onclick="InstallTranslations">@SharedLocalizer["Install"]</button>
+			}
+			else
+			{
+				<br />
+				<div class="mx-auto text-center">
+					@Localizer["Search.NoResults"]
+				</div>
+			}
+		}
 	</TabPanel>
 </TabStrip>
-<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@SharedLocalizer["Save"]</button>
+
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+@if (_productname != "")
-<br />
+{
-<br />
+	<div class="app-actiondialog">
-<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+		<div class="modal" tabindex="-1" role="dialog">
+			<div class="modal-dialog">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h5 class="modal-title">@SharedLocalizer["Review License Terms"]</h5>
+						<button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
+					</div>
+					<div class="modal-body">
+						<p style="height: 200px; overflow-y: scroll;">
+							<h3>@_productname</h3>
+							@if (!string.IsNullOrEmpty(_packagelicense))
+							{
+								@((MarkupString)_packagelicense)
+							}
+							else
+							{
+								@SharedLocalizer["License Not Specified"]
+							}
+						</p>
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-success" @onclick="DownloadTranslation">@SharedLocalizer["Accept"]</button>
+						<button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+}
 
 @code {
     private ElementReference form;
     private bool validated = false;
     private int _moduleDefinitionId;
     private string _name;
-    private string _version;
+	private string _description = "";
 	private string _categories;
     private string _moduledefinitionname = "";
-    private string _description = "";
+	private string _version;
+	private string _packagename = "";
 	private string _owner = "";
     private string _url = "";
     private string _contact = "";
@@ -114,6 +203,12 @@
     private PermissionGrid _permissionGrid;
 #pragma warning restore 649
 
+	private List<Package> _packages;
+	private string _productname = "";
+	private string _packageid = "";
+	private string _packagelicense = "";
+	private string _packageversion = "";
+
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
@@ -125,10 +220,11 @@
             if (moduleDefinition != null)
             {
                 _name = moduleDefinition.Name;
-                _version = moduleDefinition.Version;
+				_description = moduleDefinition.Description;
                 _categories = moduleDefinition.Categories;
                 _moduledefinitionname = moduleDefinition.ModuleDefinitionName;
-                _description = moduleDefinition.Description;
+				_version = moduleDefinition.Version;
+				_packagename = moduleDefinition.PackageName;
 				_owner = moduleDefinition.Owner;
                 _url = moduleDefinition.Url;
                 _contact = moduleDefinition.Contact;
@@ -139,6 +235,8 @@
                 _createdon = moduleDefinition.CreatedOn;
                 _modifiedby = moduleDefinition.ModifiedBy;
                 _modifiedon = moduleDefinition.ModifiedOn;
+
+				_packages = await PackageService.GetPackagesAsync("translation", "", "", moduleDefinition.PackageName);
 			}
         }
         catch (Exception ex)
@@ -185,4 +283,66 @@
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
+
+	private void HideModal()
+	{
+		_productname = "";
+		_packagelicense = "";
+		StateHasChanged();
+	}
+	
+	private async Task GetPackage(string packageid, string version)
+	{
+		try
+		{
+			var package = await PackageService.GetPackageAsync(packageid, version);
+			if (package != null)
+			{
+				_productname = package.Name;
+				_packageid = package.PackageId;
+				if (!string.IsNullOrEmpty(package.License))
+				{
+					_packagelicense = package.License.Replace("\n", "<br />");
+				}
+				_packageversion = package.Version;
+			}
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version);
+			AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
+		}
+	}
+
+	private async Task DownloadTranslation()
+	{
+		try
+		{
+			await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder);
+			await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version);
+			AddModuleMessage(Localizer["Success.Translation.Download"], MessageType.Success);
+			_productname = "";
+			_packagelicense = "";
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _version);
+			AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
+		}
+	}
+
+	private async Task InstallTranslations()
+	{
+		try
+		{
+			await PackageService.InstallPackagesAsync();
+			AddModuleMessage(string.Format(Localizer["Success.Translation.Install"], NavigateUrl("admin/system")), MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Installing Translations");
+		}
+	}
 }

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

@@ -12,11 +12,32 @@
 }
 else
 {
+	<div class="container">
+		<div class="row mb-3 align-items-center">
+			<div class="col-sm-6">
 				<ActionLink Action="Add" Text="Install Module" ResourceKey="InstallModule" />
 				@((MarkupString)"&nbsp;")
 				<ActionLink Action="Create" Text="Create Module" ResourceKey="CreateModule" Class="btn btn-secondary" />
+			</div>
+			<div class="col-sm-6">
+				<select class="form-select" @onchange="(e => CategoryChanged(e))">
+					@foreach (var category in _categories)
+					{
+						if (category == _category)
+						{
+							<option value="@category" selected>@category @Localizer["Modules"]</option>
+						}
+						else
+						{
+							<option value="@category">@category @Localizer["Modules"]</option>
+						}
+					}
+				</select>
+			</div>
+		</div>
+	</div>
 			
-    <Pager Items="@_moduleDefinitions">
+	<Pager Items="@_moduleDefinitions.Where(item => item.Categories.Contains(_category))">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
@@ -65,6 +86,8 @@ else
 @code {
 	private List<ModuleDefinition> _moduleDefinitions;
 	private List<Package> _packages;
+	private List<string> _categories = new List<string>();
+	private string _category = "Common";
 
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -74,6 +97,7 @@ else
 		{
 			_moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
 			_packages = await PackageService.GetPackagesAsync("module");
+			_categories = _moduleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
 		}
 		catch (Exception ex)
 		{
@@ -149,4 +173,10 @@ else
 			AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
 		}
 	}
+
+	private void CategoryChanged(ChangeEventArgs e)
+	{
+		_category = (string)e.Value;
+		StateHasChanged();
+	}
 }

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

@@ -124,13 +124,16 @@
 		_containerType = ModuleState.ContainerType;
 		_allPages = ModuleState.AllPages.ToString();
 		_permissions = ModuleState.Permissions;
-        _permissionNames = ModuleState.ModuleDefinition.PermissionNames;
 		_pageId = ModuleState.PageId.ToString();
 		createdby = ModuleState.CreatedBy;
 		createdon = ModuleState.CreatedOn;
 		modifiedby = ModuleState.ModifiedBy;
 		modifiedon = ModuleState.ModifiedOn;
 
+		if (ModuleState.ModuleDefinition != null)
+		{
+			_permissionNames = ModuleState.ModuleDefinition?.PermissionNames;
+
 			if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType))
 			{
 				// module settings type explicitly declared in IModule interface
@@ -156,6 +159,11 @@
 					builder.CloseComponent();
 				};
 			}
+		}
+		else
+		{
+			AddModuleMessage(string.Format(Localizer["Error.Module.Load"], ModuleState.ModuleDefinitionName), MessageType.Error);
+		}
 
 		var theme = _themes.FirstOrDefault(item => item.Containers.Any(themecontrol => themecontrol.TypeName.Equals(_containerType)));
 		if (theme != null && !string.IsNullOrEmpty(theme.ContainerSettingsType))
@@ -198,6 +206,7 @@
 
 				var module = ModuleState;
 				module.AllPages = bool.Parse(_allPages);
+				module.PageModuleId = ModuleState.PageModuleId;
 				module.Permissions = _permissionGrid.GetPermissions();
 				await ModuleService.UpdateModuleAsync(module);
 

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

@@ -59,7 +59,7 @@ else
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
             _roles = await RoleService.GetRolesAsync(PageState.Site.SiteId, true);
-            _roles = _roles.Where(item => item.Name != RoleNames.Everyone).ToList();
+			_roles.RemoveAll(item => item.Name == RoleNames.Everyone || item.Name == RoleNames.Unauthenticated);
         }
         else
         {

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

@@ -172,20 +172,50 @@
 			<Section Name="Aliases" Heading="Aliases" ResourceKey="Aliases">
 	            <div class="container">
 						<div class="row mb-1 align-items-center">
-						<Label Class="col-sm-3" For="alias" HelpText="The aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). If a site has multiple aliases they should be separated by commas." ResourceKey="Aliases">Aliases: </Label>
+							<Label Class="col-sm-3" For="aliases" HelpText="The list of aliases for this site" ResourceKey="Aliases">Aliases: </Label>
 							<div class="col-sm-9">
-							<textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea>
+								<button type="button" class="btn btn-primary" @onclick="AddAlias">@SharedLocalizer["Add"]</button>
-						</div>
+								<Pager Items="@_aliases">
-					</div>
+									<Header>
-					<div class="row mb-1 align-items-center">
+										<th style="width: 1px;">&nbsp;</th>
-						<Label Class="col-sm-3" For="defaultalias" HelpText="The default alias for the site. Requests for non-default aliases will be redirected to the default alias." ResourceKey="DefaultAlias">Default Alias: </Label>
+										<th style="width: 1px;">&nbsp;</th>
-						<div class="col-sm-9">
+										<th>@Localizer["AliasName"]</th>
-                            <select id="defaultalias" class="form-select" @bind="@_defaultalias" required>
+										<th>@Localizer["AliasDefault"]</th>
-								@foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray())
+									</Header>
+									<Row>
+										@if (context.AliasId != _aliasid)
 										{
-									<option value="@name">@name</option>
+											<td>
+												@if (_aliasid == -1)
+												{
+													<button type="button" class="btn btn-primary" @onclick="@(() => EditAlias(context))">@SharedLocalizer["Edit"]</button>
 												}
+											</td>
+											<td>
+												@if (_aliasid == -1)
+												{
+													<ActionDialog Action="Delete" OnClick="@(async () => await DeleteAlias(context))" ResourceKey="DeleteModule" Class="btn btn-danger" Header="Delete Alias" Message="@string.Format(Localizer["Confirm.Alias.Delete", context.Name])" />
+												}
+											</td>
+											<td>@context.Name</td>
+											<td>@context.IsDefault</td>
+										}
+										else
+										{
+											<td><button type="button" class="btn btn-success" @onclick="@(async () => await SaveAlias())">@SharedLocalizer["Save"]</button></td>
+											<td><button type="button" class="btn btn-secondary" @onclick="@(async () => await CancelAlias())">@SharedLocalizer["Cancel"]</button></td>
+											<td>
+												<input id="aliasname" class="form-control" @bind="@_aliasname" />
+											</td>
+											<td>
+												<select id="defaultaias" class="form-select" @bind="@_defaultalias" required>
+													<option value="True">@SharedLocalizer["Yes"]</option>
+													<option value="False">@SharedLocalizer["No"]</option>
 												</select>
+											</td>
+										}
+									</Row>
+								</Pager>
 							</div>
 						</div>
 				</div>
@@ -253,8 +283,9 @@
 	private List<ThemeControl> _containers = new List<ThemeControl>();
 	private string _name = string.Empty;
 	private List<Alias> _aliases;
-	private string _defaultalias = string.Empty;
+	private int _aliasid = -1;
-	private string _urls = string.Empty;
+	private string _aliasname;
+	private string _defaultalias;
 	private string _runtime = "";
 	private string _prerender = "";
 	private int _logofileid = -1;
@@ -304,10 +335,7 @@
 				_prerender = site.RenderMode.Replace(_runtime, "");
 				_isdeleted = site.IsDeleted.ToString();
 
-				if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-				{
 				await GetAliases();
-				}
 
 				if (site.LogoFileId != null)
 				{
@@ -408,24 +436,6 @@
 			try
 			{
 				if (_name != string.Empty && _themetype != "-" && _containertype != "-")
-				{
-					var unique = true;
-					if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-					{
-						_urls = Regex.Replace(_urls, @"\r\n?|\n", ","); // convert line breaks to commas
-						var aliases = await AliasService.GetAliasesAsync();
-						foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray())
-						{
-							var alias = aliases.Where(item => item.Name == name).FirstOrDefault();
-							if (alias != null && unique)
-							{
-								unique = (alias.TenantId == PageState.Site.TenantId && alias.SiteId == PageState.Site.SiteId);
-							}
-						}
-						if (unique && string.IsNullOrEmpty(_defaultalias)) unique = false;
-					}
-
-					if (unique)
 				{
 					var site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
 					if (site != null)
@@ -502,43 +512,6 @@
 						settings = SettingService.SetSetting(settings, "NotificationRetention", _retention, true);
 						await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
 
-							if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-							{
-								var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
-									.Select(sValue => sValue.Trim()).ToArray();
-								foreach (Alias alias in _aliases)
-								{
-									if (!names.Contains(alias.Name.Trim()))
-									{
-										await AliasService.DeleteAliasAsync(alias.AliasId);
-									}
-								}
-
-								foreach (string name in names)
-								{
-									var alias = _aliases.Find(item => item.Name.Trim() == name);
-									if (alias == null)
-									{
-										alias = new Alias();
-										alias.Name = name;
-										alias.TenantId = site.TenantId;
-										alias.SiteId = site.SiteId;
-										alias.IsDefault = (name == _defaultalias);
-										await AliasService.AddAliasAsync(alias);
-									}
-									else
-									{
-										if (alias.Name != name || alias.IsDefault != (alias.Name.Trim() == _defaultalias))
-										{
-											alias.Name = name;
-											alias.IsDefault = (name == _defaultalias);
-											await AliasService.UpdateAliasAsync(alias);
-										}
-									}
-								}
-								await GetAliases();
-							}
-
 						await logger.LogInformation("Site Settings Saved {Site}", site);
 
 						if (refresh || reload)
@@ -552,11 +525,6 @@
 						}
 					}
 				}
-					else // deuplicate alias or default alias not specified
-					{
-						AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning);
-					}
-				}
 				else
 				{
 					AddModuleMessage(Localizer["Message.Required.SiteName"], MessageType.Warning);
@@ -578,19 +546,19 @@
 	{
 		try
 		{
-			var sites = await SiteService.GetSitesAsync();
+			var aliases = await AliasService.GetAliasesAsync();
-			if (sites.Count > 1)
+			if (aliases.Any(item => item.SiteId != PageState.Site.SiteId || item.TenantId != PageState.Site.TenantId))
 			{
 				await SiteService.DeleteSiteAsync(PageState.Site.SiteId);
 				await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId);
 
-				var aliases = await AliasService.GetAliasesAsync();
+				foreach (Alias alias in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
-				foreach (Alias a in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
 				{
-					await AliasService.DeleteAliasAsync(a.AliasId);
+					await AliasService.DeleteAliasAsync(alias.AliasId);
 				}
 
-				NavigationManager.NavigateTo(NavigateUrl("admin/sites"));
+				var redirect = aliases.First(item => item.SiteId != PageState.Site.SiteId || item.TenantId != PageState.Site.TenantId);
+				NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + redirect.Name, true);
 			}
 			else
 			{
@@ -637,20 +605,6 @@
 		}
 	}
 
-	private async Task GetAliases()
-	{
-		_urls = string.Empty;
-		_defaultalias = string.Empty;
-		_aliases = await AliasService.GetAliasesAsync();
-		_aliases = _aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId).OrderBy(item => item.AliasId).ToList();
-		foreach (Alias alias in _aliases)
-		{
-			_urls += (_urls == string.Empty) ? alias.Name.Trim() : ", " + alias.Name.Trim();
-			if (alias.IsDefault && string.IsNullOrEmpty(_defaultalias)) _defaultalias = alias.Name.Trim();
-		}
-		if (string.IsNullOrEmpty(_defaultalias)) _defaultalias = _aliases.First().Name.Trim();
-	}
-
 	private void ToggleSMTPPassword()
 	{
 		if (_smtppasswordtype == "password")
@@ -664,4 +618,84 @@
 			_togglesmtppassword = SharedLocalizer["ShowPassword"];
 		}
 	}
+
+	private async Task GetAliases()
+	{
+		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+		{
+			_aliases = await AliasService.GetAliasesAsync();
+			_aliases = _aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId).OrderBy(item => item.AliasId).ToList();
+		}
+	}
+
+	private void AddAlias()
+	{
+		_aliases.Add(new Alias { AliasId = 0, Name = "", IsDefault = false });
+		_aliasid = 0;
+		_aliasname = "";
+		_defaultalias = "False";
+		StateHasChanged();
+	}
+
+	private void EditAlias(Alias alias)
+	{
+		_aliasid = alias.AliasId;
+		_aliasname = alias.Name;
+		_defaultalias = alias.IsDefault.ToString();
+		StateHasChanged();
+	}
+
+	private async Task DeleteAlias(Alias alias)
+	{
+		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+		{
+			await AliasService.DeleteAliasAsync(alias.AliasId);
+			await GetAliases();
+			StateHasChanged();
+		}
+	}
+
+	private async Task SaveAlias()
+	{
+		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+		{
+			if (!string.IsNullOrEmpty(_aliasname))
+			{
+				var aliases = await AliasService.GetAliasesAsync();
+				var alias = aliases.Where(item => item.Name == _aliasname).FirstOrDefault();
+				bool unique = (alias == null || alias.AliasId == _aliasid);
+				if (unique)
+				{
+					if (_aliasid == 0)
+					{
+						alias = new Alias { SiteId = PageState.Site.SiteId, TenantId = PageState.Site.TenantId, Name = _aliasname, IsDefault = bool.Parse(_defaultalias) };
+						await AliasService.AddAliasAsync(alias);
+					}
+					else
+					{
+						alias = _aliases.Single(item => item.AliasId == _aliasid);
+						alias.Name = _aliasname;
+						alias.IsDefault = bool.Parse(_defaultalias);
+						await AliasService.UpdateAliasAsync(alias);
+					}
+				}
+				else // duplicate alias
+				{
+					AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning);
+				}
+			}
+			await GetAliases();
+			_aliasid = -1;
+			_aliasname = "";
+			StateHasChanged();
+		}
+	}
+
+	private async Task CancelAlias()
+	{
+		await GetAliases();
+		_aliasid = -1;
+		_aliasname = "";
+		StateHasChanged();
+	}
 }

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

@@ -29,7 +29,7 @@ else
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="alias" HelpText="Enter the aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). If a site has multiple aliases they can be separated by commas." ResourceKey="Aliases">Aliases: </Label>
+                <Label Class="col-sm-3" For="alias" HelpText="Enter the aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder)." ResourceKey="Aliases">Aliases: </Label>
                 <div class="col-sm-9">
                     <textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea>
                 </div>
@@ -128,24 +128,42 @@ else
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="databaseType" HelpText="Select the database type for the tenant" ResourceKey="DatabaseType">Database Type: </Label>
                     <div class="col-sm-9">
+                        @if (_databases != null)
+						{
+							<div class="input-group">
 								<select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))" required>
 									@foreach (var database in _databases)
 									{
-                                if (database.IsDefault)
+										<option value="@database.Name">@Localizer[@database.Name]</option>
+									}
+								</select>
+								@if (!_showConnectionString)
 								{
-                                    <option value="@database.Name" selected>@Localizer[@database.Name]</option>
+									<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionString"]</button>
 								}
 								else
 								{
-                                    <option value="@database.Name">@Localizer[@database.Name]</option>
+									<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionParameters"]</button>
 								}
+							</div>
 						}
-                        </select>
 					</div>
                 </div>
+				@if (!_showConnectionString)
+				{
 					if (_databaseConfigType != null)
 					{
-                    @DatabaseConfigComponent;
+						@DatabaseConfigComponent
+					}
+				}
+				else
+				{
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="connectionstring" HelpText="Enter a complete connection string including all parameters and delimiters" ResourceKey="ConnectionString">String:</Label>
+						<div class="col-sm-9">
+							<textarea id="connectionstring" class="form-control" @bind="@_connectionString" rows="3"></textarea>
+						</div>
+					</div>
 				}
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="hostUsername" HelpText="Enter the username of an existing host user" ResourceKey="HostUsername">Host Username:</Label>
@@ -172,11 +190,12 @@ else
 	private List<Database> _databases;
 	private ElementReference form;
 	private bool validated = false;
-	private string _databaseName = "LocalDB";
+	private string _databaseName;
 	private Type _databaseConfigType;
 	private object _databaseConfig;
 	private RenderFragment DatabaseConfigComponent { get; set; }
-
+	private bool _showConnectionString = false;
+	private string _connectionString = string.Empty;
 
 	private List<Theme> _themeList;
 	private List<ThemeControl> _themes = new List<ThemeControl>();
@@ -208,7 +227,16 @@ else
 		_themeList = await ThemeService.GetThemesAsync();
 		_themes = ThemeService.GetThemeControls(_themeList);
 		_siteTemplates = await SiteTemplateService.GetSiteTemplatesAsync();
+
 		_databases = await DatabaseService.GetDatabasesAsync();
+		if (_databases.Exists(item => item.IsDefault))
+		{
+			_databaseName = _databases.Find(item => item.IsDefault).Name;
+		}
+		else
+		{
+			_databaseName = "LocalDB";
+		}
 		LoadDatabaseConfigComponent();
 	}
 
@@ -217,7 +245,7 @@ else
 		try
 		{
 			_databaseName = (string)eventArgs.Value;
-
+			_showConnectionString = false;
 			LoadDatabaseConfigComponent();
 		}
 		catch
@@ -311,12 +339,19 @@ else
 							user = await UserService.LoginUserAsync(user);
                             if (user.IsAuthenticated)
                             {
+								var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
 								var connectionString = String.Empty;
+								if (_showConnectionString)
+								{
+									connectionString = _connectionString;
+								}
+								else
+								{
 									if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
 									{
 										connectionString = databaseConfigControl.GetConnectionString();
 									}
-                                var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+								}
 
                                 if (connectionString != "")
                                 {
@@ -397,4 +432,13 @@ else
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
+
+	private void ToggleConnectionString()
+	{
+		if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			_connectionString = databaseConfigControl.GetConnectionString();
+		}
+		_showConnectionString = !_showConnectionString;
+	}
 }

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

@@ -37,6 +37,12 @@
                 <div class="col-sm-9">
                     <input id="ipaddress" class="form-control" @bind="@_ipaddress" readonly />
                 </div>
+            </div>
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="environment" HelpText="Environment name" ResourceKey="Environment">Environment: </Label>
+				<div class="col-sm-9">
+					<input id="environment" class="form-control" @bind="@_environment" readonly />
+				</div>
 			</div>
 			<div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="contentrootpath" HelpText="Root Path" ResourceKey="ContentRootPath">Root Path: </Label>
@@ -142,6 +148,7 @@
         <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
     </TabPanel>
 </TabStrip>
+<br /><br />
 
 @code {
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
@@ -151,6 +158,7 @@
 	private string _osversion = string.Empty;
 	private string _machinename = string.Empty;
 	private string _ipaddress = string.Empty;
+	private string _environment = string.Empty;
 	private string _contentrootpath = string.Empty;
 	private string _webrootpath = string.Empty;
 	private string _servertime = string.Empty;
@@ -175,6 +183,7 @@
 			_osversion = systeminfo["OSVersion"].ToString();
 			_machinename = systeminfo["MachineName"].ToString();
 			_ipaddress = systeminfo["IPAddress"].ToString();
+			_environment = systeminfo["Environment"].ToString();
 			_contentrootpath = systeminfo["ContentRootPath"].ToString();
 			_webrootpath = systeminfo["WebRootPath"].ToString();
 			_servertime = systeminfo["ServerTime"].ToString() + " UTC";

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

@@ -35,6 +35,7 @@
                             <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp;
                             @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;
                             @SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
+                            @((MarkupString)(!string.IsNullOrEmpty(context.PackageUrl) ? "&nbsp;&nbsp;|&nbsp;&nbsp;" + SharedLocalizer["Search.Source"] + ": <strong>" + new Uri(context.PackageUrl).Host + "</strong>" : ""))
                             @((MarkupString)(context.TrialPeriod > 0 ? "&nbsp;&nbsp;|&nbsp;&nbsp;<strong>" + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "</strong>" : ""))
                         </td>
                         <td style="width: 1px; vertical-align: middle;">

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

@@ -24,6 +24,12 @@
         <div class="col-sm-9">
             <input id="version" class="form-control" @bind="@_version" disabled />
         </div>
+    </div>
+	<div class="row mb-1 align-items-center">
+		<Label Class="col-sm-3" For="packagename" HelpText="The unique name of the package from which this module was installed" ResourceKey="PackageName">Package Name: </Label>
+		<div class="col-sm-9">
+			<input id="packagename" class="form-control" @bind="@_packagename" disabled />
+		</div>
 	</div>
 	<div class="row mb-1 align-items-center">
         <Label Class="col-sm-3" For="owner" HelpText="The owner or creator of the theme" ResourceKey="Owner">Owner: </Label>
@@ -56,6 +62,7 @@
 	private string _themeName = "";
 	private string _name;
 	private string _version;
+	private string _packagename;
 	private string _owner = "";
 	private string _url = "";
 	private string _contact = "";
@@ -74,6 +81,7 @@
 			{
 				_name = theme.Name;
 				_version = theme.Version;
+				_packagename = theme.PackageName;
 				_owner = theme.Owner;
                 _url = theme.Url;
                 _contact = theme.Contact;

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

@@ -88,15 +88,17 @@ else
             userid = Int32.Parse(PageState.QueryString["id"]);
             User user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
             name = user.DisplayName;
+
             if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
             {
                 roles = await RoleService.GetRolesAsync(PageState.Site.SiteId, true);
-                roles = roles.Where(item => item.Name != RoleNames.Everyone).ToList();
+				roles.RemoveAll(item => item.Name == RoleNames.Everyone || item.Name == RoleNames.Unauthenticated);
             }
             else
             {
                 roles = await RoleService.GetRolesAsync(PageState.Site.SiteId);
             }
+
             await GetUserRoles();
         }
         catch (Exception ex)

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -310,6 +310,17 @@
 		var interop = new Interop(JSRuntime);
 		var upload = await interop.GetFiles(_fileinputid);
 		if (upload.Length > 0)
+		{
+			string restricted = "";
+			foreach (var file in upload)
+			{
+				var extension = (file.LastIndexOf(".") != -1) ? file.Substring(file.LastIndexOf(".") + 1) : "";
+				if (!Constants.UploadableFiles.Split(',').Contains(extension.ToLower()))
+				{
+					restricted += (restricted == "" ? "" : ",") + extension;
+				}
+			}
+			if (restricted == "")
 			{
 				try
 				{
@@ -360,6 +371,12 @@
 				}
 			}
 			else
+			{
+				_message = string.Format(Localizer["Message.File.Restricted"], restricted);
+				_messagetype = MessageType.Warning;
+			}
+		}
+        else
         {
             _message = Localizer["Message.File.NotSelected"];
             _messagetype = MessageType.Warning;

Oqtane.Client/Modules/Controls/LocalizableComponent.cs

@@ -1,13 +1,13 @@
 using System;
 using Microsoft.AspNetCore.Components;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
-using Oqtane.Shared;
 
 namespace Oqtane.Modules.Controls
 {
     public class LocalizableComponent : ModuleControlBase
     {
+        [Inject] public IStringLocalizerFactory LocalizerFactory { get; set; }
+
         private IStringLocalizer _localizer;
 
         [Parameter]
@@ -30,48 +30,32 @@ namespace Oqtane.Modules.Controls
             var key = $"{ResourceKey}.{propertyName}";
             var value = Localize(key);
 
-            if (value == key)
+            if (value == key || value == String.Empty)
             {
-                // Returns default property value (English version) instead of ResourceKey.PropertyName
+                // return default property value if key does not exist in resource file or value is empty
-                return propertyValue;
-            }
-            else
-            {
-                if (value == String.Empty)
-                {
-                    // Returns default property value (English version)
                 return propertyValue;
             }
             else
             {
+                // return localized value
                 return value;
             }
         }
-        }
 
         protected override void OnParametersSet()
         {
             IsLocalizable = false;
 
-            if (string.IsNullOrEmpty(ResourceType))
+            if (String.IsNullOrEmpty(ResourceType))
             {
                 ResourceType = ModuleState?.ModuleType;
             }
 
-            if (!String.IsNullOrEmpty(ResourceKey) && !string.IsNullOrEmpty(ResourceType))
+            if (!String.IsNullOrEmpty(ResourceKey) && !String.IsNullOrEmpty(ResourceType))
             {
-                var moduleType = Type.GetType(ResourceType);
+                _localizer = LocalizerFactory.Create(ResourceType);
-                if (moduleType != null)
-                {
-                    using (var scope = ServiceActivator.GetScope())
-                    {
-                        var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>();
-                        _localizer = localizerFactory.Create(moduleType);
-
                 IsLocalizable = true;
             }
         }
     }
-        }
-    }
 }

Oqtane.Client/Modules/Controls/Pager.razor

@@ -1,5 +1,6 @@
 @namespace Oqtane.Modules.Controls
 @inherits ModuleControlBase
+@inject IStringLocalizerFactory LocalizerFactory
 @typeparam TableItem
 
 @if (ItemList != null)
@@ -48,7 +49,7 @@
                 <a class="page-link" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a>
             </li>
             <li class="page-item disabled">
-                <a class="page-link" style="white-space: nowrap;">Page @_page of @_pages</a>
+                <a class="page-link" style="white-space: nowrap;">@Localizer["PageOfPages", _page, _pages]</a>
             </li>
         </ul>
     }
@@ -156,13 +157,14 @@
                 <a class="page-link" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a>
             </li>
             <li class="page-item disabled">
-               <a class="page-link" style="white-space: nowrap;">Page @_page of @_pages</a>
+               <a class="page-link" style="white-space: nowrap;">@Localizer["PageOfPages", _page, _pages]</a>
             </li>
         </ul>
     }
 }
 
 @code {
+	private IStringLocalizer Localizer;
 	private int _pages = 0;
 	private int _page = 1;
 	private int _maxItems = 10;
@@ -215,6 +217,11 @@
 
 	private IEnumerable<TableItem> ItemList { get; set; }
 
+	protected override void OnInitialized()
+	{
+		Localizer = LocalizerFactory.Create(GetType().FullName);
+	}
+
 	protected override void OnParametersSet()
 	{
         if (string.IsNullOrEmpty(Format))

Oqtane.Client/Modules/Controls/PermissionGrid.razor

@@ -127,11 +127,10 @@
 			_permissionnames = PermissionNames;
 		}
 
-		_roles = await RoleService.GetRolesAsync(ModuleState.SiteId);
+		_roles = await RoleService.GetRolesAsync(ModuleState.SiteId, true);
-		_roles.Insert(0, new Role { Name = RoleNames.Everyone });
+		if (!UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 		{
-			_roles.Add(new Role { Name = RoleNames.Host });
+			_roles.RemoveAll(item => item.Name == RoleNames.Host);
 		}
 
 		_permissions = new List<PermissionString>();
@@ -254,6 +253,7 @@
 			permission = _permissions[i];
 			List<string> ids = permission.Permissions.Split(';', StringSplitOptions.RemoveEmptyEntries).ToList();
 			ids.Remove("!" + RoleNames.Everyone); // remove deny all users
+			ids.Remove("!" + RoleNames.Unauthenticated); // remove deny unauthenticated
 			ids.Remove("!" + RoleNames.Registered); // remove deny registered users
 			if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 			{

Oqtane.Client/Modules/Controls/RichTextEditor.razor

@@ -150,10 +150,6 @@
 			// preserve a copy of the rich text content (Quill sanitizes content so we need to retrieve it from the editor)
 			_originalrichhtml = await interop.GetHtml(_editorElement);
 		}
-		else
-		{
-			await interop.LoadEditorContent(_editorElement, _richhtml);	
-		}
 	}
 
 	public void CloseFileManager()

Oqtane.Client/Oqtane.Client.csproj

@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <RazorLangVersion>3.0</RazorLangVersion>
     <Configurations>Debug;Release</Configurations>
-    <Version>3.1.2</Version>
+    <Version>3.1.4</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -13,7 +13,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/v3.1.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>

Oqtane.Client/Program.cs

@@ -114,6 +114,7 @@ namespace Oqtane.Client
 
         private static void RegisterModuleServices(Assembly assembly, IServiceCollection services)
         {
+            // dynamically register module scoped services
             var implementationTypes = assembly.GetInterfaces<IService>();
             foreach (var implementationType in implementationTypes)
             {

Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx

@@ -121,7 +121,7 @@
     <value>Server:</value>
   </data>
   <data name="Server.HelpText" xml:space="preserve">
-    <value>Enter the database server</value>
+    <value>Enter the database server name. This might include a port number as well if you are using a cloud service (ie. servername.database.windows.net,1433) </value>
   </data>
   <data name="Database.Text" xml:space="preserve">
     <value>Database:</value>
@@ -133,7 +133,7 @@
     <value>Integrated Security:</value>
   </data>
   <data name="IntegratedSecurity.HelpText" xml:space="preserve">
-    <value>Select if you want integrated security or not</value>
+    <value>Select if you are using integrated security</value>
   </data>
   <data name="Uid.Text" xml:space="preserve">
     <value>User Id:</value>
@@ -163,7 +163,7 @@
     <value>Self Signed</value>
   </data>
   <data name="TrustServerCertificate.HelpText" xml:space="preserve">
-    <value>Specify the type of certificate you are using for encryption</value>
+    <value>Specify the type of certificate you are using for encryption. Verifiable is equivalent to False. Self Signed is equivalent to True.</value>
   </data>
   <data name="TrustServerCertificate.Text" xml:space="preserve">
     <value>Trust Server Certificate:</value>

Oqtane.Client/Resources/Installer/Installer.resx

@@ -168,4 +168,16 @@
   <data name="Username.Text" xml:space="preserve">
     <value>Username:</value>
   </data>
+  <data name="ConnectionString.HelpText" xml:space="preserve">
+    <value>Enter a complete connection string including all parameters and delimiters</value>
+  </data>
+  <data name="ConnectionString.Text" xml:space="preserve">
+    <value>String:</value>
+  </data>
+  <data name="EnterConnectionParameters" xml:space="preserve">
+    <value>Enter Connection Parameters</value>
+  </data>
+  <data name="EnterConnectionString" xml:space="preserve">
+    <value>Enter Connection String</value>
+  </data>
 </root>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -118,6 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Error.Module.Load" xml:space="preserve">
-    <value>A Problem Was Encountered Loading Module {0}</value>
+    <value>A Problem Was Encountered Loading Module {0}. The Module Is Either Invalid Or Does Not Exist.</value>
   </data>
 </root>

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

@@ -192,4 +192,7 @@
   <data name="Once" xml:space="preserve">
     <value>Execute Once</value>
   </data>
+  <data name="Message.NoJobs" xml:space="preserve">
+    <value>Please Note That After An Initial Installation You Must &amp;lt;a href={0}&amp;gt;Restart&amp;lt;/a&amp;gt; The Application In Order To Activate The Default Scheduled Jobs.</value>
+  </data>
 </root>

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

@@ -154,13 +154,13 @@
     <value>No Translations Match The Criteria Provided Or Package Service Is Disabled</value>
   </data>
   <data name="Download.Heading" xml:space="preserve">
-    <value>Download</value>
+    <value>Translations</value>
   </data>
   <data name="LanguageUpload.HelpText" xml:space="preserve">
-    <value>Upload one or more translations. Once they are uploaded click Install to complete the installation.</value>
+    <value>Upload one or more translation packages. Once they are uploaded click Install to complete the installation.</value>
   </data>
   <data name="LanguageUpload.Text" xml:space="preserve">
-    <value>Upload Language</value>
+    <value>Translation</value>
   </data>
   <data name="Manage.Heading" xml:space="preserve">
     <value>Manage</value>

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

@@ -144,4 +144,7 @@
   <data name="DeleteLanguage.Text" xml:space="preserve">
     <value>Delete</value>
   </data>
+  <data name="Translation" xml:space="preserve">
+    <value>Translation</value>
+  </data>
 </root>

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

@@ -195,4 +195,25 @@
   <data name="Information.Text" xml:space="preserve">
     <value>Information</value>
   </data>
+  <data name="PackageName.HelpText" xml:space="preserve">
+    <value>The unique name of the package from which this module was installed</value>
+  </data>
+  <data name="PackageName.Text" xml:space="preserve">
+    <value>Package Name:</value>
+  </data>
+  <data name="Error.Translation.Download" xml:space="preserve">
+    <value>Error Downloading Translation</value>
+  </data>
+  <data name="Search.NoResults" xml:space="preserve">
+    <value>No Translations Exist For This Module Or Package Service Is Disabled</value>
+  </data>
+  <data name="Success.Translation.Download" xml:space="preserve">
+    <value>Translation Downloaded Successfully. Click Install To Complete Installation.</value>
+  </data>
+  <data name="Success.Translation.Install" xml:space="preserve">
+    <value>Translation Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+  </data>
+  <data name="Translations.Heading" xml:space="preserve">
+    <value>Translations</value>
+  </data>
 </root>

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

@@ -150,4 +150,7 @@
   <data name="EditModule.Text" xml:space="preserve">
     <value>Edit</value>
   </data>
+  <data name="Modules" xml:space="preserve">
+    <value>Modules</value>
+  </data>
 </root>

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

@@ -147,4 +147,7 @@
   <data name="Message.Required.Title" xml:space="preserve">
     <value>You Must Provide A Title For The Module</value>
   </data>
+  <data name="Error.Module.Load" xml:space="preserve">
+    <value>A Problem Was Encountered Loading Module {0}. The Module Is Either Invalid Or Does Not Exist.</value>
+  </data>
 </root>

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

@@ -142,7 +142,7 @@
     <value>Site Settings Saved</value>
   </data>
   <data name="Message.Aliases.Taken" xml:space="preserve">
-    <value>The Default Alias Has Not Been Specified Or An Alias Was Specified That Has Already Been Used For Another Site</value>
+    <value>An Alias Was Specified That Has Already Been Used For Another Site</value>
   </data>
   <data name="Message.Required.SiteName" xml:space="preserve">
     <value>You Must Provide A Site Name, Alias, And Default Theme/Container</value>
@@ -166,7 +166,7 @@
     <value>Enter the tenant for the site</value>
   </data>
   <data name="Aliases.HelpText" xml:space="preserve">
-    <value>The aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). If a site has multiple aliases they should be separated by commas.</value>
+    <value>The aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder).</value>
   </data>
   <data name="IsDeleted.HelpText" xml:space="preserve">
     <value>Is this site deleted?</value>
@@ -324,4 +324,13 @@
   <data name="Aliases.Heading" xml:space="preserve">
     <value>Aliases</value>
   </data>
+  <data name="AliasName" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="AliasDefault" xml:space="preserve">
+    <value>Default?</value>
+  </data>
+  <data name="Confirm.Alias.Delete" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete {0}?</value>
+  </data>
 </root>

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

@@ -270,4 +270,16 @@
   <data name="Runtime.Text" xml:space="preserve">
     <value>Runtime: </value>
   </data>
+  <data name="ConnectionString.HelpText" xml:space="preserve">
+    <value>Enter a complete connection string including all parameters and delimiters</value>
+  </data>
+  <data name="ConnectionString.Text" xml:space="preserve">
+    <value>String:</value>
+  </data>
+  <data name="EnterConnectionParameters" xml:space="preserve">
+    <value>Enter Connection Parameters</value>
+  </data>
+  <data name="EnterConnectionString" xml:space="preserve">
+    <value>Enter Connection String</value>
+  </data>
 </root>

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

@@ -270,4 +270,10 @@
   <data name="WorkingSet.Text" xml:space="preserve">
     <value>Memory Allocation:</value>
   </data>
+  <data name="Environment.HelpText" xml:space="preserve">
+    <value>Environment Name</value>
+  </data>
+  <data name="Environment.Text" xml:space="preserve">
+    <value>Environment:</value>
+  </data>
 </root>

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

@@ -162,4 +162,10 @@
   <data name="License.HelpText" xml:space="preserve">
     <value>The license of the theme</value>
   </data>
+  <data name="PackageName.HelpText" xml:space="preserve">
+    <value>The unique name of the package from which this module was installed</value>
+  </data>
+  <data name="PackageName.Text" xml:space="preserve">
+    <value>Package Name:</value>
+  </data>
 </root>

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

@@ -219,4 +219,10 @@
   <data name="DeleteAllNotifications.Text" xml:space="preserve">
     <value>Delete ALL Notifications</value>
   </data>
+  <data name="Notifications.Heading" xml:space="preserve">
+    <value>Notifications</value>
+  </data>
+  <data name="Profile.Heading" xml:space="preserve">
+    <value>Profile</value>
+  </data>
 </root>

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

@@ -141,4 +141,7 @@
   <data name="Success.File.Upload" xml:space="preserve">
     <value>File Upload Succeeded</value>
   </data>
+  <data name="Message.File.Restricted" xml:space="preserve">
+    <value>Files With Extension Of {0} Are Restricted From Upload. Please Contact Your Administrator For More Information.</value>
+  </data>
 </root>

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

@@ -0,0 +1,123 @@
+<?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>
+  <data name="PageOfPages" xml:space="preserve">
+    <value>Page {0} of {1}</value>
+  </data>
+</root>

Oqtane.Client/Resources/SharedResources.resx

@@ -327,4 +327,13 @@
   <data name="ShowPassword" xml:space="preserve">
     <value>Show</value>
   </data>
+  <data name="PageOfPages" xml:space="preserve">
+    <value>Page {0} of {1}</value>
+  </data>
+  <data name="Url Mappings" xml:space="preserve">
+    <value>Url Mappings</value>
+  </data>
+  <data name="Visitor Management" xml:space="preserve">
+    <value>Visitor Management</value>
+  </data>
 </root>

Oqtane.Client/Resources/Themes/OqtaneTheme/ThemeSettings.resx

@@ -138,6 +138,12 @@
   <data name="Register.Text" xml:space="preserve">
     <value>Show Register?</value>
   </data>
+  <data name="Scope.HelpText" xml:space="preserve">
+    <value>Specify if the settings are applicable to this page or the entire site.</value>
+  </data>
+  <data name="Scope.Text" xml:space="preserve">
+    <value>Setting Scope:</value>
+  </data>
   <data name="Site" xml:space="preserve">
     <value>Site</value>
   </data>

Oqtane.Client/Services/FileService.cs

@@ -47,7 +47,7 @@ namespace Oqtane.Services
             var path = WebUtility.UrlEncode(folderPath);
 
             List<File> files = await GetJsonAsync<List<File>>($"{Apiurl}/{siteId}/{path}");
-            return files.OrderBy(item => item.Name).ToList();
+            return files?.OrderBy(item => item.Name).ToList();
         }
 
         public async Task<File> GetFileAsync(int fileId)

Oqtane.Client/Services/Interfaces/ILanguageService.cs

@@ -17,6 +17,14 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task<List<Language>> GetLanguagesAsync(int siteId);
 
+        /// <summary>
+        /// Returns a list of all available languages for the given <see cref="Site" /> and package
+        /// </summary>
+        /// <param name="siteId"></param>
+        /// <param name="packageName"></param>
+        /// <returns></returns>
+        Task<List<Language>> GetLanguagesAsync(int siteId, string packageName);
+
         /// <summary>
         /// Returns the given language
         /// </summary>

Oqtane.Client/Services/LanguageService.cs

@@ -17,18 +17,27 @@ namespace Oqtane.Services
 
         public async Task<List<Language>> GetLanguagesAsync(int siteId)
         {
-            var languages = await GetJsonAsync<List<Language>>($"{Apiurl}?siteid={siteId}");
+            return await GetLanguagesAsync(siteId, "");
+        }
 
-            return languages?.OrderBy(l => l.Name).ToList() ?? Enumerable.Empty<Language>().ToList();
+        public async Task<List<Language>> GetLanguagesAsync(int siteId, string packageName)
+        {
+            return await GetJsonAsync<List<Language>>($"{Apiurl}?siteid={siteId}&packagename={packageName}");
         }
 
         public async Task<Language> GetLanguageAsync(int languageId)
-            => await GetJsonAsync<Language>($"{Apiurl}/{languageId}");
+        {
+            return await GetJsonAsync<Language>($"{Apiurl}/{languageId}");
+        }
 
         public async Task<Language> AddLanguageAsync(Language language)
-            => await PostJsonAsync<Language>(Apiurl, language);
+        {
+            return await PostJsonAsync<Language>(Apiurl, language);
+        }
 
         public async Task DeleteLanguageAsync(int languageId)
-            => await DeleteAsync($"{Apiurl}/{languageId}");
+        {
+            await DeleteAsync($"{Apiurl}/{languageId}");
+        }
     }
 }

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

@@ -17,7 +17,7 @@
     <LanguageSwitcher />
 }
 
-@if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions) || (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered)))
+@if (_showEditMode || (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered)))
 {
     if (PageState.EditMode)
     {
@@ -218,6 +218,7 @@
 }
 
 @code{
+	private bool _showEditMode = false;
 	private bool _deleteConfirmation = false;
 	private List<string> _categories = new List<string>();
 	private List<ModuleDefinition> _allModuleDefinitions;
@@ -285,8 +286,10 @@
 
 	protected override async Task OnParametersSetAsync()
 	{
+		_showEditMode = false;
 		if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
 		{
+			_showEditMode = true;
 			_pages?.Clear();
 
 			foreach (Page p in PageState.Pages)
@@ -305,6 +308,17 @@
 			_moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList();
 			_categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
 		}
+		else
+		{
+			foreach (var module in PageState.Modules.Where(item => item.PageId == PageState.Page.PageId))
+			{
+				if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, module.Permissions))
+				{
+					_showEditMode = true;
+					break;
+				}
+			}			
+		}
 	}
 
 	private void CategoryChanged(ChangeEventArgs e)
@@ -419,7 +433,7 @@
 
     private async Task ToggleEditMode(bool EditMode)
     {
-        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
+        if (_showEditMode)
         {
             if (EditMode)
             {
@@ -445,7 +459,6 @@
 
     private void Navigate(string location)
     {
-        //HideControlPanel();
         Module module;
         switch (location)
         {

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

@@ -24,13 +24,9 @@
 @code{
     private IEnumerable<Culture> _supportedCultures;
 
-    protected override async Task OnParametersSetAsync()
+    protected override void OnParametersSet()
     {
-        var languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId);
+		var languages = PageState.Languages;
-        var defaultCulture = CultureInfo.GetCultureInfo(Constants.DefaultCulture);
-
-        languages.Add(new Language { Code = defaultCulture.Name, Name = defaultCulture.DisplayName });
-        
         _supportedCultures = languages.Select(l => new Culture { Name = l.Code, DisplayName = l.Name });
     }
 

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

@@ -9,15 +9,19 @@
             if (childPage.PageId == PageState.Page.PageId)
             {
                 <a class="nav-link active px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                    <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                         <span class="@childPage.Icon" aria-hidden="true" />
                         @childPage.Name <span class="visually-hidden-focusable">(current)</span>
+                    </span>
                 </a>
             }
             else
             {
                 <a class="nav-link px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                    <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                         <span class="@childPage.Icon" aria-hidden="true" />
                         @childPage.Name
+                    </span>
                 </a>
             }
         }
@@ -34,8 +38,10 @@ else
                 {
                     <li class="nav-item">
                         <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                            <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                                 <span class="@childPage.Icon" aria-hidden="true" />
                                 @childPage.Name <span class="visually-hidden-focusable">(current)</span>
+                            </span>
                         </a>
                     </li>
                 }
@@ -43,8 +49,10 @@ else
                 {
                     <li class="nav-item">
                         <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                            <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                                 <span class="@childPage.Icon" aria-hidden="true" />
                                 @childPage.Name
+                            </span>
                         </a>
                     </li>
                 }

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

@@ -9,8 +9,10 @@
         {
             <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                 <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                    <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                         <span class="@childPage.Icon" aria-hidden="true" />
                         @childPage.Name <span class="visually-hidden-focusable">(current)</span>
+                    </span>
                 </a>
             </li>
         }
@@ -18,8 +20,10 @@
         {
             <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                 <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                    <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                         <span class="@childPage.Icon" aria-hidden="true" />
                         @childPage.Name
+                    </span>
                 </a>
             </li>
         }
@@ -38,8 +42,10 @@ else
             {
                 <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                     <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                        <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                             <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name <span class="visually-hidden-focusable">(current)</span>
+                        </span>
                     </a>
                 </li>
             }
@@ -47,8 +53,10 @@ else
             {
                 <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                     <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                        <span class="w-100" data-bs-toggle="collapse" data-bs-target=".navbar-collapse.show">
                             <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name
+                        </span>
                     </a>
                 </li>
             }

Oqtane.Client/UI/PageState.cs

@@ -8,6 +8,7 @@ namespace Oqtane.UI
     {
         public Alias Alias { get; set; }
         public Site Site { get; set; }
+        public List<Language> Languages { get; set; }
         public List<Page> Pages { get; set; }
         public Page Page { get; set; }
         public User User { get; set; }

Oqtane.Client/UI/SiteRouter.razor

@@ -6,6 +6,7 @@
 @inject INavigationInterception NavigationInterception
 @inject ISyncService SyncService
 @inject ISiteService SiteService
+@inject ILanguageService LanguageService
 @inject IPageService PageService
 @inject IUserService UserService
 @inject IModuleService ModuleService
@@ -70,6 +71,7 @@
 	private async Task Refresh()
 	{
 		Site site;
+		List<Language> languages;
 		List<Page> pages;
 		Page page;
 		User user = null;
@@ -173,11 +175,13 @@
 
 			if (PageState == null || refresh == UI.Refresh.Site)
 			{
+				languages = await LanguageService.GetLanguagesAsync(site.SiteId);
 				pages = await PageService.GetPagesAsync(site.SiteId);
 				pages = pages.Where(item => !item.IsDeleted).ToList();
 			}
 			else
 			{
+				languages = PageState.Languages; 
 				pages = PageState.Pages;
 			}
 
@@ -230,6 +234,7 @@
                     {
                         Alias = SiteState.Alias,
                         Site = site,
+						Languages = languages,
                         Pages = pages,
                         Page = page,
                         User = user,

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.1.2</Version>
+    <Version>3.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/v3.1.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.MySQL</id>
-        <version>3.1.2</version>
+        <version>3.1.4</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane MySQL Provider</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/v3.1.2</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.1.2</Version>
+    <Version>3.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/v3.1.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.PostgreSQL</id>
-        <version>3.1.2</version>
+        <version>3.1.4</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane PostgreSQL Provider</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/v3.1.2</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.1.2</Version>
+    <Version>3.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/v3.1.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.SqlServer</id>
-        <version>3.1.2</version>
+        <version>3.1.4</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane SQL Server Provider</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/v3.1.2</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.1.2</Version>
+    <Version>3.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/v3.1.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.Sqlite</id>
-        <version>3.1.2</version>
+        <version>3.1.4</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane SQLite Provider</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/v3.1.2</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

Oqtane.Package/Oqtane.Client.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Client</id>
-    <version>3.1.2</version>
+    <version>3.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/v3.1.2</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>

Oqtane.Package/Oqtane.Framework.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Framework</id>
-    <version>3.1.2</version>
+    <version>3.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/v3.1.2/Oqtane.Framework.3.1.2.Upgrade.zip</projectUrl>
+    <projectUrl>https://github.com/oqtane/oqtane.framework/releases/download/v3.1.4/Oqtane.Framework.3.1.2.Upgrade.zip</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.2</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane framework</tags>
   </metadata>

Oqtane.Package/Oqtane.Server.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Server</id>
-    <version>3.1.2</version>
+    <version>3.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/v3.1.2</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>

Oqtane.Package/Oqtane.Shared.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Shared</id>
-    <version>3.1.2</version>
+    <version>3.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/v3.1.2</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>

Oqtane.Package/Oqtane.Updater.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Updater</id>
-    <version>3.1.2</version>
+    <version>3.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/v3.1.2</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>

Oqtane.Package/install.ps1

@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net6.0\publish\*" -DestinationPath "Oqtane.Framework.3.1.2.Install.zip" -Force 
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net6.0\publish\*" -DestinationPath "Oqtane.Framework.3.1.4.Install.zip" -Force 

Oqtane.Package/upgrade.ps1

@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net6.0\publish\*" -DestinationPath "Oqtane.Framework.3.1.2.Upgrade.zip" -Force 
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net6.0\publish\*" -DestinationPath "Oqtane.Framework.3.1.4.Upgrade.zip" -Force 

Oqtane.Server/Controllers/AliasController.cs

@@ -16,12 +16,14 @@ namespace Oqtane.Controllers
     public class AliasController : Controller
     {
         private readonly IAliasRepository _aliases;
+        private readonly ITenantRepository _tenants;
         private readonly ILogManager _logger;
         private readonly Alias _alias;
 
-        public AliasController(IAliasRepository aliases, ILogManager logger, ITenantManager tenantManager)
+        public AliasController(IAliasRepository aliases, ITenantRepository tenants, ILogManager logger, ITenantManager tenantManager)
         {
             _aliases = aliases;
+            _tenants = tenants;
             _logger = logger;
             _alias = tenantManager.GetAlias();
         }
@@ -95,6 +97,13 @@ namespace Oqtane.Controllers
             {
                 _aliases.DeleteAlias(id);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Alias Deleted {AliasId}", id);
+
+                var aliases = _aliases.GetAliases();
+                if (!aliases.Any(item => item.TenantId == alias.TenantId))
+                {
+                    _tenants.DeleteTenant(alias.TenantId);
+                    _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Tenant Deleted {TenantId}", alias.TenantId);
+                }
             }
             else
             {

Oqtane.Server/Controllers/FileController.cs

@@ -255,7 +255,7 @@ namespace Oqtane.Controllers
                 }
                 catch (Exception ex)
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Create, "File Could Not Be Downloaded From Url {Url} {Error}", url, ex.Message);
+                    _logger.Log(LogLevel.Error, this, LogFunction.Create, ex, "File Could Not Be Downloaded From Url {Url} {Error}", url, ex.Message);
                 }
             }
             else
@@ -276,9 +276,17 @@ namespace Oqtane.Controllers
                 return;
             }
 
-            if (!formfile.FileName.IsPathOrFileValid())
+            // ensure filename is valid
+            string token = ".part_";
+            if (!formfile.FileName.IsPathOrFileValid() || !formfile.FileName.Contains(token))
+            {
+                return;
+            }
+
+            // check for allowable file extensions (ignore token)
+            var extension = Path.GetExtension(formfile.FileName.Substring(0, formfile.FileName.IndexOf(token))).Replace(".", "");
+            if (!Constants.UploadableFiles.Split(',').Contains(extension.ToLower()))
             {
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Conflict;
                 return;
             }
 
@@ -331,9 +339,9 @@ namespace Oqtane.Controllers
         {
             string merged = "";
 
-            // parse the filename which is in the format of filename.ext.part_x_y
+            // parse the filename which is in the format of filename.ext.part_001_999
             string token = ".part_";
-            string parts = Path.GetExtension(filename)?.Replace(token, ""); // returns "x_y"
+            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
@@ -370,13 +378,6 @@ namespace Oqtane.Controllers
                         System.IO.File.Delete(filepart);
                     }
 
-                    // check for allowable file extensions
-                    if (!Constants.UploadableFiles.Split(',').Contains(Path.GetExtension(filename)?.ToLower().Replace(".", "")))
-                    {
-                        System.IO.File.Delete(Path.Combine(folder, filename + ".tmp"));
-                    }
-                    else
-                    {
                     // remove file if it already exists
                     if (System.IO.File.Exists(Path.Combine(folder, filename)))
                     {
@@ -386,7 +387,6 @@ namespace Oqtane.Controllers
                     // rename file now that the entire process is completed
                     System.IO.File.Move(Path.Combine(folder, filename + ".tmp"), Path.Combine(folder, filename));
                     _logger.Log(LogLevel.Information, this, LogFunction.Create, "File Uploaded {File}", Path.Combine(folder, filename));
-                    }
 
                     merged = filename;
                 }
@@ -394,8 +394,7 @@ namespace Oqtane.Controllers
 
             // clean up file parts which are more than 2 hours old ( which can happen if a prior file upload failed )
             var cleanupFiles = Directory.EnumerateFiles(folder, "*" + token + "*")
-                .Where(f => Path.GetExtension(f).StartsWith(token));
+                .Where(f => Path.GetExtension(f).StartsWith(token) && !Path.GetFileName(f).StartsWith(filename));
-
             foreach (var file in cleanupFiles)
             {
                 var createdDate = System.IO.File.GetCreationTime(file).ToUniversalTime();
@@ -603,7 +602,7 @@ namespace Oqtane.Controllers
             }
             catch (Exception ex)
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Error Creating Image For File {FilePath} {Width} {Height} {Mode} {Rotate} {Error}", filepath, width, height, mode, rotate, ex.Message);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, ex, "Error Creating Image For File {FilePath} {Width} {Height} {Mode} {Rotate} {Error}", filepath, width, height, mode, rotate, ex.Message);
                 imagepath = "";
             }
 

Oqtane.Server/Controllers/LanguageController.cs

@@ -1,5 +1,7 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Net;
+using System.Reflection;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Oqtane.Enums;
@@ -7,6 +9,10 @@ using Oqtane.Infrastructure;
 using Oqtane.Models;
 using Oqtane.Repository;
 using Oqtane.Shared;
+using System.Linq;
+using System.Diagnostics;
+using System.Globalization;
+using System;
 
 namespace Oqtane.Controllers
 {
@@ -14,23 +20,40 @@ namespace Oqtane.Controllers
     public class LanguageController : Controller
     {
         private readonly ILanguageRepository _languages;
+        private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
         private readonly Alias _alias;
 
-        public LanguageController(ILanguageRepository language, ILogManager logger, ITenantManager tenantManager)
+        public LanguageController(ILanguageRepository language, ISyncManager syncManager, ILogManager logger, ITenantManager tenantManager)
         {
             _languages = language;
+            _syncManager = syncManager;
             _logger = logger;
             _alias = tenantManager.GetAlias();
         }
 
         [HttpGet]
-        public IEnumerable<Language> Get(string siteid)
+        public IEnumerable<Language> Get(string siteid, string packagename)
         {
             int SiteId;
             if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
-                return _languages.GetLanguages(SiteId);
+                if (string.IsNullOrEmpty(packagename))
+                {
+                    packagename = "Oqtane";
+                }
+                var languages = _languages.GetLanguages(SiteId).ToList();
+                foreach (var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), $"{packagename}.*{Constants.SatelliteAssemblyExtension}", SearchOption.AllDirectories))
+                {
+                    var code = Path.GetFileName(Path.GetDirectoryName(file));
+                    if (languages.Any(item => item.Code == code))
+                    {
+                        languages.Single(item => item.Code == code).Version = FileVersionInfo.GetVersionInfo(file).FileVersion;
+                    }
+                }
+                var defaultCulture = CultureInfo.GetCultureInfo(Constants.DefaultCulture);
+                languages.Add(new Language { Code = defaultCulture.Name, Name = defaultCulture.DisplayName, Version = Constants.Version, IsDefault = !languages.Any(l => l.IsDefault) });
+                return languages.OrderBy(item => item.Name);
             }
             else
             {
@@ -63,6 +86,7 @@ namespace Oqtane.Controllers
             if (ModelState.IsValid && language.SiteId == _alias.SiteId)
             {
                 language = _languages.AddLanguage(language);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
                 _logger.Log(LogLevel.Information, this, LogFunction.Create, "Language Added {Language}", language);
             }
             else
@@ -82,6 +106,7 @@ namespace Oqtane.Controllers
             if (language != null && language.SiteId == _alias.SiteId)
             {
                 _languages.DeleteLanguage(id);
+                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Language Deleted {LanguageId}", id);
             }
             else
@@ -89,7 +114,6 @@ namespace Oqtane.Controllers
                 _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Language Delete Attempt {LanguageId}", id);
                 HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
-
         }
     }
 }

Oqtane.Server/Controllers/LocalizationController.cs

@@ -22,11 +22,15 @@ namespace Oqtane.Controllers
         // GET: api/localization
         [HttpGet()]
         public IEnumerable<Culture> Get()
-            => _localizationManager.GetSupportedCultures().Select(c => new Culture {
+        {
+            var cultures = _localizationManager.GetSupportedCultures().Select(c => new Culture
+               {
                    Name = CultureInfo.GetCultureInfo(c).Name,
                    DisplayName = CultureInfo.GetCultureInfo(c).DisplayName,
                    IsDefault = _localizationManager.GetDefaultCulture()
                     .Equals(CultureInfo.GetCultureInfo(c).Name, StringComparison.OrdinalIgnoreCase)
                });
+            return cultures.OrderBy(item => item.DisplayName);
+        }
     }
 }

Oqtane.Server/Controllers/ModuleController.cs

@@ -63,6 +63,8 @@ namespace Oqtane.Controllers
                         module.CreatedOn = pagemodule.Module.CreatedOn;
                         module.ModifiedBy = pagemodule.Module.ModifiedBy;
                         module.ModifiedOn = pagemodule.Module.ModifiedOn;
+                        module.DeletedBy = pagemodule.DeletedBy;
+                        module.DeletedOn = pagemodule.DeletedOn;
                         module.IsDeleted = pagemodule.IsDeleted;
 
                         module.PageModuleId = pagemodule.PageModuleId;
@@ -139,24 +141,41 @@ namespace Oqtane.Controllers
         [Authorize(Roles = RoleNames.Registered)]
         public Module Put(int id, [FromBody] Module module)
         {
-            if (ModelState.IsValid && module.SiteId == _alias.SiteId && _modules.GetModule(module.ModuleId, false) != null && _userPermissions.IsAuthorized(User, EntityNames.Module, module.ModuleId, PermissionNames.Edit))
+            var _module = _modules.GetModule(module.ModuleId, false);
+
+            if (ModelState.IsValid && module.SiteId == _alias.SiteId && _module != null && _userPermissions.IsAuthorized(User, EntityNames.Module, module.ModuleId, PermissionNames.Edit))
             {
                 module = _modules.UpdateModule(module);
+
+                if (_module.AllPages != module.AllPages)
+                {
+                    var pageModules = _pageModules.GetPageModules(module.SiteId).ToList();
                     if (module.AllPages)
                     {
-                    var pageModule = _pageModules.GetPageModules(module.SiteId).FirstOrDefault(item => item.ModuleId == module.ModuleId);
+                        var pageModule = _pageModules.GetPageModule(module.PageModuleId);
-                    _logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Updated {Module}", module);
-
                         var pages = _pages.GetPages(module.SiteId).ToList();
                         foreach (Page page in pages)
                         {
-                        if (page.PageId != pageModule.PageId && !page.Path.StartsWith("admin/"))
+                            if (!pageModules.Exists(item => item.ModuleId == module.ModuleId && item.PageId == page.PageId) && !page.Path.StartsWith("admin/"))
                             {
                                 _pageModules.AddPageModule(new PageModule { PageId = page.PageId, ModuleId = pageModule.ModuleId, Title = pageModule.Title, Pane = pageModule.Pane, Order = pageModule.Order, ContainerType = pageModule.ContainerType });
                             }
                         }
                     }
+                    else
+                    {
+                        foreach (var pageModule in pageModules)
+                        {
+                            if (pageModule.ModuleId == module.ModuleId && pageModule.PageModuleId != module.PageModuleId)
+                            {
+                                _pageModules.DeletePageModule(pageModule.PageModuleId);
+                            }
+                        }
+                    }
+                }
+
                 _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
+                _logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Updated {Module}", module);
             }
             else
             {

Oqtane.Server/Controllers/ModuleDefinitionController.cs

@@ -307,9 +307,9 @@ namespace Oqtane.Controllers
                     if (moduleDefinition.Version == "local")
                     {
                         text = text.Replace("[FrameworkVersion]", Constants.Version);
-                        text = text.Replace("[ClientReference]", "<Reference Include=\"Oqtane.Client\"><HintPath>..\\..\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net6.0\\Oqtane.Client.dll</HintPath></Reference>");
+                        text = text.Replace("[ClientReference]", $"<Reference Include=\"Oqtane.Client\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net6.0\\Oqtane.Client.dll</HintPath></Reference>");
-                        text = text.Replace("[ServerReference]", "<Reference Include=\"Oqtane.Server\"><HintPath>..\\..\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net6.0\\Oqtane.Server.dll</HintPath></Reference>");
+                        text = text.Replace("[ServerReference]", $"<Reference Include=\"Oqtane.Server\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net6.0\\Oqtane.Server.dll</HintPath></Reference>");
-                        text = text.Replace("[SharedReference]", "<Reference Include=\"Oqtane.Shared\"><HintPath>..\\..\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net6.0\\Oqtane.Shared.dll</HintPath></Reference>");
+                        text = text.Replace("[SharedReference]", $"<Reference Include=\"Oqtane.Shared\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net6.0\\Oqtane.Shared.dll</HintPath></Reference>");
                     }
                     else
                     {

Oqtane.Server/Controllers/SqlController.cs

@@ -53,7 +53,7 @@ namespace Oqtane.Controllers
             catch (Exception ex)
             {
                 results.Add(new Dictionary<string, string>() { { "Error", ex.Message } });
-                _logger.Log(LogLevel.Error, this, LogFunction.Other, "Sql Query {Query} Executed on Tenant {TenantId} Resulted In An Error {Error}", sqlquery.Query, sqlquery.TenantId, ex.Message);
+                _logger.Log(LogLevel.Error, this, LogFunction.Other, ex, "Sql Query {Query} Executed on Tenant {TenantId} Resulted In An Error {Error}", sqlquery.Query, sqlquery.TenantId, ex.Message);
             }
             sqlquery.Results = results;
             return sqlquery;

Oqtane.Server/Controllers/SystemController.cs

@@ -38,6 +38,7 @@ namespace Oqtane.Controllers
                     systeminfo.Add("TickCount", Environment.TickCount64.ToString());
                     systeminfo.Add("ContentRootPath", _environment.ContentRootPath);
                     systeminfo.Add("WebRootPath", _environment.WebRootPath);
+                    systeminfo.Add("Environment", _environment.EnvironmentName);
                     systeminfo.Add("ServerTime", DateTime.UtcNow.ToString());
                     var feature = HttpContext.Features.Get<IHttpConnectionFeature>();
                     systeminfo.Add("IPAddress", feature?.LocalIpAddress?.ToString());

Oqtane.Server/Controllers/ThemeController.cs

@@ -188,8 +188,8 @@ namespace Oqtane.Controllers
                     if (theme.Version == "local")
                     {
                         text = text.Replace("[FrameworkVersion]", Constants.Version);
-                        text = text.Replace("[ClientReference]", "<Reference Include=\"Oqtane.Client\"><HintPath>..\\..\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net6.0\\Oqtane.Client.dll</HintPath></Reference>");
+                        text = text.Replace("[ClientReference]", $"<Reference Include=\"Oqtane.Client\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net6.0\\Oqtane.Client.dll</HintPath></Reference>");
-                        text = text.Replace("[SharedReference]", "<Reference Include=\"Oqtane.Shared\"><HintPath>..\\..\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net6.0\\Oqtane.Shared.dll</HintPath></Reference>");
+                        text = text.Replace("[SharedReference]", $"<Reference Include=\"Oqtane.Shared\"><HintPath>..\\..\\{rootFolder}\\Oqtane.Server\\bin\\Debug\\net6.0\\Oqtane.Shared.dll</HintPath></Reference>");
                     }
                     else
                     {

Oqtane.Server/Controllers/UserRoleController.cs

@@ -39,23 +39,22 @@ namespace Oqtane.Controllers
         public IEnumerable<UserRole> Get(string siteid, string userid = null, string rolename = null)
         {
             int SiteId;
-            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId && (userid != null || rolename != null))
-            {
-                int UserId = (int.TryParse(userid, out UserId)) ? UserId : -1;
-                if (User.IsInRole(RoleNames.Admin) || ((userid == null || _userPermissions.GetUser().UserId == UserId) && (rolename == null || (User.IsInRole(rolename) && rolename != RoleNames.Registered))))
             {
                 var userroles = _userRoles.GetUserRoles(SiteId).ToList();
                 if (userid != null)
                 {
+                    int UserId = int.TryParse(userid, out UserId) ? UserId : -1;
                     userroles = userroles.Where(item => item.UserId == UserId).ToList();
                 }
                 if (rolename != null)
                 {
                     userroles = userroles.Where(item => item.Role.Name == rolename).ToList();
                 }
+                var user = _userPermissions.GetUser();
                 for (int i = 0; i < userroles.Count(); i++)
                 {
-                        userroles[i] = Filter(userroles[i]);
+                    userroles[i] = Filter(userroles[i], user.UserId);
                 }
                 return userroles.OrderBy(u => u.User.DisplayName);
             }
@@ -66,13 +65,6 @@ namespace Oqtane.Controllers
                 return null;
             }
         }
-            else
-            {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized UserRole Get Attempt For Site {SiteId} User {UserId} Role {RoleName}", siteid, userid, rolename);
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
-                return null;
-            }
-        }
         
         // GET api/<controller>/5
         [HttpGet("{id}")]
@@ -82,16 +74,7 @@ namespace Oqtane.Controllers
             var userrole = _userRoles.GetUserRole(id);
             if (userrole != null && SiteValid(userrole.Role.SiteId))
             {
-                if (User.IsInRole(RoleNames.Admin) || User.Identity.Name?.ToLower() != userrole.User.Username.ToLower() || User.IsInRole(userrole.Role.Name))
+                return Filter(userrole, _userPermissions.GetUser().UserId);
-                {
-                    return Filter(userrole);
-                }
-                else
-                {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized User Role Get Attempt {UserRoleId}", id);
-                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
-                    return null;
-                }
             }
             else
             {
@@ -101,7 +84,7 @@ namespace Oqtane.Controllers
             }
         }
 
-        private UserRole Filter(UserRole userrole)
+        private UserRole Filter(UserRole userrole, int userid)
         {
             if (userrole != null)
             {
@@ -110,7 +93,7 @@ namespace Oqtane.Controllers
                 userrole.User.TwoFactorCode = "";
                 userrole.User.TwoFactorExpiry = null;
 
-                if (!User.IsInRole(RoleNames.Admin) && User.Identity.Name?.ToLower() != userrole.User.Username.ToLower())
+                if (!User.IsInRole(RoleNames.Admin) && userid != userrole.User.UserId)
                 {
                     userrole.User.Email = "";
                     userrole.User.PhotoFileId = null;

Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Reflection;
+using System.Reflection.Metadata;
 using System.Runtime.Loader;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication.OAuth;
@@ -17,6 +18,7 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Models;
 using Oqtane.Infrastructure;
+using Oqtane.Models;
 using Oqtane.Modules;
 using Oqtane.Repository;
 using Oqtane.Security;
@@ -248,7 +250,7 @@ namespace Microsoft.Extensions.DependencyInjection
             var assemblies = AppDomain.CurrentDomain.GetOqtaneAssemblies();
             foreach (var assembly in assemblies)
             {
-                // dynamically register module services, contexts, and repository classes
+                // dynamically register module scoped services (ie. client service classes)
                 var implementationTypes = assembly.GetInterfaces<IService>();
                 foreach (var implementationType in implementationTypes)
                 {
@@ -259,6 +261,17 @@ namespace Microsoft.Extensions.DependencyInjection
                     }
                 }
 
+                // dynamically register module transient services (ie. server DBContext, repository classes)
+                implementationTypes = assembly.GetInterfaces<ITransientService>();
+                foreach (var implementationType in implementationTypes)
+                {
+                    if (implementationType.AssemblyQualifiedName != null)
+                    {
+                        var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}"));
+                        services.AddTransient(serviceType ?? implementationType, implementationType);
+                    }
+                }
+
                 // dynamically register hosted services
                 var serviceTypes = assembly.GetTypes(hostedServiceType);
                 foreach (var serviceType in serviceTypes)
@@ -315,52 +328,26 @@ namespace Microsoft.Extensions.DependencyInjection
 
         private static void LoadSatelliteAssemblies(string[] supportedCultures)
         {
-            var assemblies = AppDomain.CurrentDomain.GetAssemblies();
-            var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
-            if (assemblyPath == null)
-            {
-                return;
-            }
-
             AssemblyLoadContext.Default.Resolving += ResolveDependencies;
 
-            foreach (var culture in supportedCultures)
+            foreach (var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), $"*{Constants.SatelliteAssemblyExtension}", SearchOption.AllDirectories))
             {
-                if (culture == Constants.DefaultCulture)
+                var code = Path.GetFileName(Path.GetDirectoryName(file));
+                if (supportedCultures.Contains(code))
                 {
-                    continue;
-                }
-
-                var assembliesFolder = new DirectoryInfo(Path.Combine(assemblyPath, culture));
-                if (assembliesFolder.Exists)
-                {
-                    foreach (var assemblyFile in assembliesFolder.EnumerateFiles($"*{Constants.SatelliteAssemblyExtension}"))
-                    {
-                        AssemblyName assemblyName;
                     try
                     {
-                            assemblyName = AssemblyName.GetAssemblyName(assemblyFile.FullName);
+                        Assembly assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(System.IO.File.ReadAllBytes(file)));
-                        }
+                        Debug.WriteLine($"Oqtane Info: Loaded Satellite Assembly {file}");
-                        catch
-                        {
-                            Debug.WriteLine($"Oqtane Error: Cannot Get Satellite Assembly Name For {assemblyFile.Name}");
-                            continue;
-                        }
-
-                        try
-                        {
-                            Assembly assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(System.IO.File.ReadAllBytes(assemblyFile.FullName)));
-                            Debug.WriteLine($"Oqtane Info: Loaded Assembly {assemblyName}");
                     }
                     catch (Exception ex)
                     {
-                            Debug.WriteLine($"Oqtane Error: Unable To Load Assembly {assemblyName} - {ex}");
+                        Debug.WriteLine($"Oqtane Error: Unable To Load Satellite Assembly {file} - {ex}");
-                        }
                     }
                 }
                 else
                 {
-                    Debug.WriteLine($"Oqtane Error: The Satellite Assembly Folder For {culture} Does Not Exist");
+                    Debug.WriteLine($"Oqtane Error: Culture Not Supported For Satellite Assembly {file}");
                 }
             }
         }

Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs

@@ -187,7 +187,7 @@ namespace Oqtane.Extensions
                 catch (Exception ex)
                 {
                     var _logger = context.HttpContext.RequestServices.GetRequiredService<ILogManager>();
-                    _logger.Log(LogLevel.Error, "ExternalLogin", Enums.LogFunction.Security, "An Error Occurred Accessing The User Info Endpoint - {Error}", ex.Message);
+                    _logger.Log(LogLevel.Error, "ExternalLogin", Enums.LogFunction.Security, ex, "An Error Occurred Accessing The User Info Endpoint - {Error}", ex.Message);
                 }
             }
 

Oqtane.Server/Infrastructure/InstallationManager.cs

@@ -48,15 +48,19 @@ namespace Oqtane.Infrastructure
             }
 
             // move packages to secure /Packages folder
-            foreach (var folder in "Modules,Themes,Packages".Split(","))
+            foreach (var folderName in "Modules,Themes,Packages".Split(","))
             {
-                foreach(var file in Directory.GetFiles(Path.Combine(webRootPath, folder), "*.nupkg*"))
+                string folder = Path.Combine(webRootPath, folderName);
+                if (Directory.Exists(folder))
+                {
+                    foreach (var file in Directory.GetFiles(folder, "*.nupkg*"))
                     {
                         var destinationFile = Path.Combine(sourceFolder, Path.GetFileName(file));
                         if (File.Exists(destinationFile))
                         {
                             File.Delete(destinationFile);
                         }
+
                         if (destinationFile.ToLower().EndsWith(".nupkg.bak"))
                         {
                             // leave a copy in the current folder as it is distributed with the core framework
@@ -69,6 +73,11 @@ namespace Oqtane.Infrastructure
                         }
                     }
                 }
+                else
+                {
+                    Directory.CreateDirectory(folder);
+                }
+            }
 
             // iterate through Nuget packages in source folder
             foreach (string packagename in Directory.GetFiles(sourceFolder, "*.nupkg"))

Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs

@@ -120,6 +120,10 @@ namespace Oqtane.Infrastructure
                             mailMessage.Body += "Subject: " + notification.Subject + "\n\n";
                             mailMessage.Body += notification.Body;
 
+                            // set encoding
+                            mailMessage.SubjectEncoding = System.Text.Encoding.UTF8;
+                            mailMessage.BodyEncoding = System.Text.Encoding.UTF8;
+
                             // send mail
                             try
                             {

Oqtane.Server/Infrastructure/LocalizationManager.cs

@@ -1,8 +1,5 @@
-using System;
+using System.Globalization;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Reflection;
 using Microsoft.Extensions.Options;
 using Oqtane.Shared;
 
@@ -11,7 +8,6 @@ namespace Oqtane.Infrastructure
     public class LocalizationManager : ILocalizationManager
     {
         private static readonly string DefaultCulture = Constants.DefaultCulture;
-        private static readonly string[] DefaultSupportedCultures = new[] { DefaultCulture };
 
         private readonly LocalizationOptions _localizationOptions;
 
@@ -21,19 +17,20 @@ namespace Oqtane.Infrastructure
         }
 
         public string GetDefaultCulture()
-            => String.IsNullOrEmpty(_localizationOptions.DefaultCulture)
+        {
-                ? DefaultCulture
+            if (string.IsNullOrEmpty(_localizationOptions.DefaultCulture))
-                : _localizationOptions.DefaultCulture;
+            {
+                return DefaultCulture;
+            }
+            else
+            {
+                return _localizationOptions.DefaultCulture;
+            }
+        }
 
         public string[] GetSupportedCultures()
         { 
-            var cultures = new List<string>(DefaultSupportedCultures);
+            return CultureInfo.GetCultures(CultureTypes.AllCultures).Select(item => item.Name).OrderBy(c => c).ToArray();
-            foreach(var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Oqtane.Client.resources.dll", SearchOption.AllDirectories))
-            {
-                cultures.Add(Path.GetFileName(Path.GetDirectoryName(file)));
-            }
-
-            return cultures.OrderBy(c => c).ToArray();
         }
     }
 }

Oqtane.Server/Infrastructure/LogManager.cs

@@ -203,12 +203,15 @@ namespace Oqtane.Infrastructure
             }
             if (Enum.Parse<LogLevel>(log.Level) >= notifylevel)
             {
+                var alias = _tenantManager.GetAlias();
                 foreach (var userrole in _userRoles.GetUserRoles(log.SiteId.Value))
                 {
                     if (userrole.Role.Name == RoleNames.Host)
                     {
-                        var url = _accessor.HttpContext.Request.Scheme + "://" + _tenantManager.GetAlias().Name + "/admin/log";
+                        var subject = $"{alias.Name} Site {log.Level} Notification";
-                        var notification = new Notification(log.SiteId.Value, userrole.User, "Site " + log.Level + " Notification", "Please visit " + url + " for more information");
+                        var url = $"{_accessor.HttpContext.Request.Scheme}://{alias.Name}/admin/log?id={log.LogId}";
+                        string body = $"Log Message: {log.Message}\n\nPlease visit {url} for more information";
+                        var notification = new Notification(log.SiteId.Value, userrole.User, subject, body);
                         _notifications.AddNotification(notification);
                     }
                 }

Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs

@@ -62,7 +62,7 @@ namespace Oqtane.SiteTemplates
                         "<p><a href=\"https://dotnet.microsoft.com/apps/aspnet/web-apps/blazor\" target=\"_new\">Blazor</a> is an open source and cross-platform web UI framework for building single-page apps using .NET and C# instead of JavaScript. Blazor WebAssembly relies on Wasm, an open web standard that does not require plugins or code transpilation in order to run natively in a web browser. Blazor Server uses SignalR to host your application on a web server and provide a responsive and robust development experience. Blazor applications work in all modern web browsers, including mobile browsers.</p>" +
                         "<p>Blazor is a feature of <a href=\"https://dotnet.microsoft.com/apps/aspnet\" target=\"_new\">.NET Core</a>, the popular cross platform web development framework from Microsoft that extends the <a href=\"https://dotnet.microsoft.com/learn/dotnet/what-is-dotnet\" target=\"_new\" >.NET developer platform</a> with tools and libraries for building web apps.</p>"
                     },
-                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "MIT License", Pane = "Content",
+                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "MIT License", Pane = PaneNames.Admin,
                         ModulePermissions = new List<Permission> {
                             new Permission(PermissionNames.View, RoleNames.Everyone, true),
                             new Permission(PermissionNames.View, RoleNames.Admin, true),

Oqtane.Server/Infrastructure/UpgradeManager.cs

@@ -1,7 +1,5 @@
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
 using Oqtane.Extensions;
 using Oqtane.Models;
 using Oqtane.Repository;
@@ -50,6 +48,12 @@ namespace Oqtane.Infrastructure
                     case "3.0.1":
                         Upgrade_3_0_1(tenant, scope);
                         break;
+                    case "3.1.3":
+                        Upgrade_3_1_3(tenant, scope);
+                        break;
+                    case "3.1.4":
+                        Upgrade_3_1_4(tenant, scope);
+                        break;
                 }
             }
         }
@@ -182,5 +186,57 @@ namespace Oqtane.Infrastructure
                 sites.CreatePages(site, pageTemplates);
             }
         }
+
+        private void Upgrade_3_1_3(Tenant tenant, IServiceScope scope)
+        {
+            var roles = scope.ServiceProvider.GetRequiredService<IRoleRepository>();
+            if (!roles.GetRoles(-1, true).ToList().Where(item => item.Name == RoleNames.Unauthenticated).Any())
+            {
+                roles.AddRole(new Role { SiteId = null, Name = RoleNames.Unauthenticated, Description = RoleNames.Unauthenticated, IsAutoAssigned = false, IsSystem = true });
+            }
+        }
+
+        private void Upgrade_3_1_4(Tenant tenant, IServiceScope scope)
+        {
+            var pageTemplates = new List<PageTemplate>();
+
+            pageTemplates.Add(new PageTemplate
+            {
+                Name = "Not Found",
+                Parent = "",
+                Path = "404",
+                Icon = Icons.X,
+                IsNavigation = false,
+                IsPersonalizable = false,
+                PagePermissions = new List<Permission>
+                {
+                    new Permission(PermissionNames.View, RoleNames.Everyone, true),
+                    new Permission(PermissionNames.View, RoleNames.Admin, true),
+                    new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                }.EncodePermissions(),
+                PageTemplateModules = new List<PageTemplateModule>
+                {
+                    new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Not Found", Pane = PaneNames.Admin,
+                        ModulePermissions = new List<Permission> {
+                            new Permission(PermissionNames.View, RoleNames.Everyone, true),
+                            new Permission(PermissionNames.View, RoleNames.Admin, true),
+                            new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+                        }.EncodePermissions(),
+                        Content = "<p>The page you requested does not exist.</p>"
+                    }
+                }
+            });
+
+            var pages = scope.ServiceProvider.GetRequiredService<IPageRepository>();
+
+            var sites = scope.ServiceProvider.GetRequiredService<ISiteRepository>();
+            foreach (Site site in sites.GetSites().ToList())
+            {
+                if (!pages.GetPages(site.SiteId).ToList().Where(item => item.Path == "404").Any())
+                {
+                    sites.CreatePages(site, pageTemplates);
+                }
+            }
+        }
     }
 }

Oqtane.Server/Migrations/EntityBuilders/BaseEntityBuilder.cs

@@ -18,6 +18,7 @@ namespace Oqtane.Migrations.EntityBuilders
             _migrationBuilder = migrationBuilder;
             ActiveDatabase = database;
             ForeignKeys = new List<ForeignKey<TEntityBuilder>>();
+            Schema = null;
         }
 
         protected IDatabase ActiveDatabase { get; }
@@ -30,6 +31,8 @@ namespace Oqtane.Migrations.EntityBuilders
 
         protected List<ForeignKey<TEntityBuilder>> ForeignKeys { get; }
 
+        protected string Schema { get; init; }
+
         private string RewriteName(string name)
         {
             return ActiveDatabase.RewriteName(name);
@@ -319,7 +322,7 @@ namespace Oqtane.Migrations.EntityBuilders
         /// </summary>
         public void Create()
         {
-            _migrationBuilder.CreateTable(RewriteName(EntityTableName), BuildTable, null, AddKeys);
+            _migrationBuilder.CreateTable(RewriteName(EntityTableName), BuildTable, Schema, AddKeys);
         }
 
         /// <summary>

Oqtane.Server/Modules/HtmlText/Repository/HtmlTextContext.cs

@@ -11,7 +11,7 @@ using Oqtane.Repository.Databases.Interfaces;
 namespace Oqtane.Modules.HtmlText.Repository
 {
     [PrivateApi("Mark HtmlText classes as private, since it's not very useful in the public docs")]
-    public class HtmlTextContext : DBContextBase, IService, IMultiDatabase
+    public class HtmlTextContext : DBContextBase, ITransientService, IMultiDatabase
     {
         public HtmlTextContext(ITenantManager tenantManager, IHttpContextAccessor httpContextAccessor) : base(tenantManager, httpContextAccessor) { }
 

Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs

@@ -1,13 +1,11 @@
-using Microsoft.EntityFrameworkCore;
 using System.Linq;
-using Oqtane.Modules.HtmlText.Models;
 using Oqtane.Documentation;
 using System.Collections.Generic;
 
 namespace Oqtane.Modules.HtmlText.Repository
 {
     [PrivateApi("Mark HtmlText classes as private, since it's not very useful in the public docs")]
-    public class HtmlTextRepository : IHtmlTextRepository, IService
+    public class HtmlTextRepository : IHtmlTextRepository, ITransientService
     {
         private readonly HtmlTextContext _db;
 

Oqtane.Server/Oqtane.Server.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
-    <Version>3.1.2</Version>
+    <Version>3.1.4</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -11,7 +11,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/v3.1.2</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.4</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>

Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs

@@ -1,11 +1,12 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Security.Policy;
 using Oqtane.Models;
 
 // ReSharper disable once CheckNamespace
 namespace Oqtane.Repository
 {
     public interface IPermissionRepository
-    {
+{
         IEnumerable<Permission> GetPermissions(int siteId, string entityName);
         IEnumerable<Permission> GetPermissions(string entityName, int entityId);
         IEnumerable<Permission> GetPermissions(string entityName, int entityId, string permissionName);

Oqtane.Server/Repository/LanguageRepository.cs

@@ -13,13 +13,16 @@ namespace Oqtane.Repository
             _db = context;
         }
             
-        public IEnumerable<Language> GetLanguages(int siteId) => _db.Language.Where(l => l.SiteId == siteId);
+        public IEnumerable<Language> GetLanguages(int siteId)
+        {
+            return _db.Language.Where(l => l.SiteId == siteId);
+        }
 
         public Language AddLanguage(Language language)
         {
             if (language.IsDefault)
             {
-                // Ensure all other languages are not set to current
+                // Ensure all other languages are not set to default
                 _db.Language
                     .Where(l => l.SiteId == language.SiteId)
                     .ToList()
@@ -32,7 +35,10 @@ namespace Oqtane.Repository
             return language;
         }
 
-        public Language GetLanguage(int languageId) => _db.Language.Find(languageId);
+        public Language GetLanguage(int languageId)
+        {
+            return _db.Language.Find(languageId);
+        }
 
         public void DeleteLanguage(int languageId)
         {

Oqtane.Server/Repository/PageModuleRepository.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Extensions;
 using Oqtane.Models;
+using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
@@ -24,7 +25,7 @@ namespace Oqtane.Repository
                 .Where(item => item.Module.SiteId == siteId);
             if (pagemodules.Any())
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList();
+                IEnumerable<Permission> permissions = _permissions.GetPermissions(siteId, EntityNames.Module).ToList();
                 foreach (PageModule pagemodule in pagemodules)
                 {
                     pagemodule.Module.Permissions = permissions.Where(item => item.EntityId == pagemodule.ModuleId).EncodePermissions();
@@ -44,7 +45,8 @@ namespace Oqtane.Repository
             }
             if (pagemodules.Any())
             {
-                IEnumerable<Permission> permissions = _permissions.GetPermissions(pagemodules.FirstOrDefault().Module.SiteId, "Module").ToList();
+                var siteId = pagemodules.FirstOrDefault().Module.SiteId;
+                IEnumerable<Permission> permissions = _permissions.GetPermissions(siteId, EntityNames.Module).ToList();
                 foreach (PageModule pagemodule in pagemodules)
                 {
                     pagemodule.Module.Permissions = permissions.Where(item => item.EntityId == pagemodule.ModuleId).EncodePermissions();
@@ -87,7 +89,7 @@ namespace Oqtane.Repository
             }
             if (pagemodule != null)
             {
-                pagemodule.Module.Permissions = _permissions.GetPermissionString("Module", pagemodule.ModuleId);
+                pagemodule.Module.Permissions = _permissions.GetPermissionString(EntityNames.Module, pagemodule.ModuleId);
             }
             return pagemodule;
         }
@@ -98,7 +100,7 @@ namespace Oqtane.Repository
                 .SingleOrDefault(item => item.PageId == pageId && item.ModuleId == moduleId);
             if (pagemodule != null)
             {
-                pagemodule.Module.Permissions = _permissions.GetPermissionString("Module", pagemodule.ModuleId);
+                pagemodule.Module.Permissions = _permissions.GetPermissionString(EntityNames.Module, pagemodule.ModuleId);
             }
             return pagemodule;
         }

Oqtane.Server/Repository/PermissionRepository.cs

@@ -1,11 +1,14 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.Json;
+using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Extensions;
 using Oqtane.Models;
+using Microsoft.Extensions.Caching.Memory;
+using Oqtane.Infrastructure;
 
 namespace Oqtane.Repository
 {
@@ -13,33 +16,49 @@ namespace Oqtane.Repository
     {
         private TenantDBContext _db;
         private readonly IRoleRepository _roles;
+        private readonly IMemoryCache _cache;
+        private readonly SiteState _siteState;
 
-        public PermissionRepository(TenantDBContext context, IRoleRepository roles)
+        public PermissionRepository(TenantDBContext context, IRoleRepository roles, IMemoryCache cache, SiteState siteState)
         {
             _db = context;
             _roles = roles;
+            _cache = cache;
+            _siteState = siteState;
          }
 
         public IEnumerable<Permission> GetPermissions(int siteId, string entityName)
         {
-            return _db.Permission.Where(item => item.SiteId == siteId)
+            var alias = _siteState?.Alias;
+            if (alias != null && alias.SiteId != -1)
+            {
+                return _cache.GetOrCreate($"permissions:{alias.SiteKey}:{entityName}", entry =>
+                {
+                    entry.SlidingExpiration = TimeSpan.FromMinutes(30);
+                    return _db.Permission.Where(item => item.SiteId == alias.SiteId)
                         .Where(item => item.EntityName == entityName)
-                .Include(item => item.Role); // eager load roles
+                        .Include(item => item.Role).ToList(); // eager load roles
+                });
+            }
+            else
+            {
+                return _db.Permission.Where(item => item.SiteId == siteId || siteId == -1)
+                    .Where(item => item.EntityName == entityName)
+                    .Include(item => item.Role).ToList(); // eager load roles
+            }
         }
 
         public IEnumerable<Permission> GetPermissions(string entityName, int entityId)
         {
-            return _db.Permission.Where(item => item.EntityName == entityName)
+            var permissions = GetPermissions(-1, entityName);
-                .Where(item => item.EntityId == entityId)
+            return permissions.Where(item => item.EntityId == entityId);
-                .Include(item => item.Role); // eager load roles
         }
 
         public IEnumerable<Permission> GetPermissions(string entityName, int entityId, string permissionName)
         {
-            return _db.Permission.Where(item => item.EntityName == entityName)
+            var permissions = GetPermissions(-1, entityName);
-                .Where(item => item.EntityId == entityId)
+            return permissions.Where(item => item.EntityId == entityId)
-                .Where(item => item.PermissionName == permissionName)
+                .Where(item => item.PermissionName == permissionName);
-                .Include(item => item.Role); // eager load roles
         }
 
         public string GetPermissionString(int siteId, string entityName)
@@ -62,6 +81,7 @@ namespace Oqtane.Repository
         {
             _db.Permission.Add(permission);
             _db.SaveChanges();
+            ClearCache(permission.EntityName);
             return permission;
         }
 
@@ -69,6 +89,7 @@ namespace Oqtane.Repository
         {
             _db.Entry(permission).State = EntityState.Modified;
             _db.SaveChanges();
+            ClearCache(permission.EntityName);
             return permission;
         }
 
@@ -90,6 +111,7 @@ namespace Oqtane.Repository
                 _db.Permission.Add(permission);
             }
             _db.SaveChanges();
+            ClearCache(entityName);
         }
 
         public Permission GetPermission(int permissionId)
@@ -102,6 +124,7 @@ namespace Oqtane.Repository
             Permission permission = _db.Permission.Find(permissionId);
             _db.Permission.Remove(permission);
             _db.SaveChanges();
+            ClearCache(permission.EntityName);
         }
 
         public void DeletePermissions(int siteId, string entityName, int entityId)
@@ -115,6 +138,16 @@ namespace Oqtane.Repository
                 _db.Permission.Remove(permission);
             }
             _db.SaveChanges();
+            ClearCache(entityName);
+        }
+
+        private void ClearCache(string entityName)
+        {
+            var alias = _siteState?.Alias;
+            if (alias != null && alias.SiteId != -1)
+            {
+                _cache.Remove($"permissions:{alias.SiteKey}:{entityName}");
+            }
         }
 
         // permissions are stored in the format "{permissionname:!rolename1;![userid1];rolename2;rolename3;[userid2];[userid3]}" where "!" designates Deny permissions

Oqtane.Server/Repository/SiteRepository.cs

@@ -94,16 +94,18 @@ namespace Oqtane.Repository
             List<Role> roles = _roleRepository.GetRoles(site.SiteId, true).ToList();
             if (!roles.Where(item => item.Name == RoleNames.Everyone).Any())
             {
-                _roleRepository.AddRole(new Role {SiteId = null, Name = RoleNames.Everyone, Description = "All Users", IsAutoAssigned = false, IsSystem = true});
+                _roleRepository.AddRole(new Role {SiteId = null, Name = RoleNames.Everyone, Description = RoleNames.Everyone, IsAutoAssigned = false, IsSystem = true});
+            }
+            if (!roles.Where(item => item.Name == RoleNames.Unauthenticated).Any())
+            {
+                _roleRepository.AddRole(new Role { SiteId = null, Name = RoleNames.Unauthenticated, Description = RoleNames.Unauthenticated, IsAutoAssigned = false, IsSystem = true });
             }
-
             if (!roles.Where(item => item.Name == RoleNames.Host).Any())
             {
-                _roleRepository.AddRole(new Role {SiteId = null, Name = RoleNames.Host, Description = "Application Administrators", IsAutoAssigned = false, IsSystem = true});
+                _roleRepository.AddRole(new Role {SiteId = null, Name = RoleNames.Host, Description = RoleNames.Host, IsAutoAssigned = false, IsSystem = true});
             }
-
+            _roleRepository.AddRole(new Role {SiteId = site.SiteId, Name = RoleNames.Registered, Description = RoleNames.Registered, IsAutoAssigned = true, IsSystem = true});
-            _roleRepository.AddRole(new Role {SiteId = site.SiteId, Name = RoleNames.Registered, Description = "Registered Users", IsAutoAssigned = true, IsSystem = true});
+            _roleRepository.AddRole(new Role {SiteId = site.SiteId, Name = RoleNames.Admin, Description = RoleNames.Admin, IsAutoAssigned = false, IsSystem = true});
-            _roleRepository.AddRole(new Role {SiteId = site.SiteId, Name = RoleNames.Admin, Description = "Site Administrators", IsAutoAssigned = false, IsSystem = true});
 
             _profileRepository.AddProfile(new Profile
                 {SiteId = site.SiteId, Name = "FirstName", Title = "First Name", Description = "Your First Or Given Name", Category = "Name", ViewOrder = 1, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false, Options = ""});

Oqtane.Server/Startup.cs

@@ -31,7 +31,8 @@ namespace Oqtane
         {
             var builder = new ConfigurationBuilder()
                 .SetBasePath(env.ContentRootPath)
-                .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true);
+                .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", true, true);
             Configuration = builder.Build();
 
             _supportedCultures = localizationManager.GetSupportedCultures();

Oqtane.Server/wwwroot/Modules/Templates/External/Server/Repository/[Module]Context.cs

@@ -7,7 +7,7 @@ using Oqtane.Repository.Databases.Interfaces;
 
 namespace [Owner].[Module].Repository
 {
-    public class [Module]Context : DBContextBase, IService, IMultiDatabase
+    public class [Module]Context : DBContextBase, ITransientService, IMultiDatabase
     {
         public virtual DbSet<Models.[Module]> [Module] { get; set; }
 

Oqtane.Server/wwwroot/Modules/Templates/External/Server/Repository/[Module]Repository.cs

@@ -6,7 +6,7 @@ using [Owner].[Module].Models;
 
 namespace [Owner].[Module].Repository
 {
-    public class [Module]Repository : I[Module]Repository, IService
+    public class [Module]Repository : I[Module]Repository, ITransientService
     {
         private readonly [Module]Context _db;
 

Oqtane.Server/wwwroot/Modules/Templates/External/template.json

@@ -1,5 +1,5 @@
 {
   "Title": "Default Module Template",
   "Type": "External",
-  "Version": "3.0.0"
+  "Version": "3.1.4"
 }