From 303bdf3be23cf40fb0f18f1706deda73ac988c6d Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Thu, 5 Mar 2020 19:22:13 +0300 Subject: [PATCH] Remove this keyword --- .../Modules/Controls/ModuleMessage.razor | 2 +- Oqtane.Client/Modules/HtmlText/Edit.razor | 2 +- .../HtmlText/Services/HtmlTextService.cs | 6 +++--- Oqtane.Client/Modules/ModuleBase.cs | 8 ++++---- .../IdentityAuthenticationStateProvider.cs | 6 +++--- Oqtane.Client/Services/AliasService.cs | 6 +++--- Oqtane.Client/Services/FileService.cs | 8 ++++---- Oqtane.Client/Services/FolderService.cs | 6 +++--- Oqtane.Client/Services/InstallationService.cs | 6 +++--- Oqtane.Client/Services/JobLogService.cs | 6 +++--- Oqtane.Client/Services/JobService.cs | 6 +++--- Oqtane.Client/Services/LogService.cs | 6 +++--- .../Services/ModuleDefinitionService.cs | 6 +++--- Oqtane.Client/Services/ModuleService.cs | 6 +++--- Oqtane.Client/Services/NotificationService.cs | 6 +++--- Oqtane.Client/Services/PackageService.cs | 6 +++--- Oqtane.Client/Services/PageModuleService.cs | 6 +++--- Oqtane.Client/Services/PageService.cs | 6 +++--- Oqtane.Client/Services/ProfileService.cs | 6 +++--- Oqtane.Client/Services/RoleService.cs | 6 +++--- Oqtane.Client/Services/SettingService.cs | 6 +++--- Oqtane.Client/Services/SiteService.cs | 6 +++--- Oqtane.Client/Services/TenantService.cs | 6 +++--- Oqtane.Client/Services/ThemeService.cs | 6 +++--- Oqtane.Client/Services/UserRoleService.cs | 6 +++--- Oqtane.Client/Services/UserService.cs | 6 +++--- Oqtane.Client/Shared/Interop.cs | 2 +- Oqtane.Client/Shared/SiteRouter.razor | 2 +- Oqtane.Client/Themes/ContainerBase.cs | 2 +- .../Themes/Controls/ControlPanel.razor | 6 +++--- Oqtane.Client/Themes/LayoutBase.cs | 2 +- Oqtane.Client/Themes/ThemeBase.cs | 2 +- Oqtane.Server/Controllers/AliasController.cs | 4 ++-- Oqtane.Server/Controllers/FileController.cs | 12 ++++++------ Oqtane.Server/Controllers/FolderController.cs | 6 +++--- .../Controllers/InstallationController.cs | 4 ++-- Oqtane.Server/Controllers/JobController.cs | 6 +++--- Oqtane.Server/Controllers/JobLogController.cs | 4 ++-- Oqtane.Server/Controllers/LogController.cs | 4 ++-- Oqtane.Server/Controllers/ModuleController.cs | 10 +++++----- .../Controllers/ModuleDefinitionController.cs | 10 +++++----- .../Controllers/NotificationController.cs | 6 +++--- Oqtane.Server/Controllers/PackageController.cs | 2 +- Oqtane.Server/Controllers/PageController.cs | 10 +++++----- .../Controllers/PageModuleController.cs | 8 ++++---- Oqtane.Server/Controllers/ProfileController.cs | 4 ++-- Oqtane.Server/Controllers/RoleController.cs | 4 ++-- Oqtane.Server/Controllers/SettingController.cs | 8 ++++---- Oqtane.Server/Controllers/SiteController.cs | 8 ++++---- Oqtane.Server/Controllers/TenantController.cs | 4 ++-- Oqtane.Server/Controllers/ThemeController.cs | 8 ++++---- Oqtane.Server/Controllers/UserController.cs | 18 +++++++++--------- .../Controllers/UserRoleController.cs | 4 ++-- .../Infrastructure/InstallationManager.cs | 4 ++-- .../Infrastructure/Jobs/HostedServiceBase.cs | 6 +++--- Oqtane.Server/Infrastructure/LogManager.cs | 10 +++++----- .../HtmlText/Controllers/HtmlTextController.cs | 2 +- .../HtmlText/Manager/HtmlTextManager.cs | 2 +- Oqtane.Server/Pages/Login.cshtml.cs | 4 ++-- .../Repository/Context/DBContextBase.cs | 2 +- .../Repository/Context/MasterDBContext.cs | 2 +- Oqtane.Server/Repository/FileRepository.cs | 2 +- Oqtane.Server/Repository/FolderRepository.cs | 2 +- .../Repository/ModuleDefinitionRepository.cs | 2 +- Oqtane.Server/Repository/ModuleRepository.cs | 6 +++--- .../Repository/PageModuleRepository.cs | 2 +- Oqtane.Server/Repository/PageRepository.cs | 4 ++-- .../Repository/PermissionRepository.cs | 2 +- Oqtane.Server/Repository/SiteRepository.cs | 18 +++++++++--------- Oqtane.Server/Security/PermissionHandler.cs | 6 +++--- .../Security/PermissionRequirement.cs | 4 ++-- Oqtane.Server/Security/UserPermissions.cs | 4 ++-- 72 files changed, 198 insertions(+), 198 deletions(-) diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor index bdc96ba9..6c1a75f0 100644 --- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor +++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor @@ -28,7 +28,7 @@ public void SetModuleMessage(string message, MessageType type) { - this.message = message; + message = message; classname = GetMessageType(type); StateHasChanged(); } diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor index d396da3c..48f6daf7 100644 --- a/Oqtane.Client/Modules/HtmlText/Edit.razor +++ b/Oqtane.Client/Modules/HtmlText/Edit.razor @@ -130,7 +130,7 @@ else { if (RichTextEditorMode) { - content = await this.RichTextEditorHtml.GetHTML(); + content = await RichTextEditorHtml.GetHTML(); } content = content.Replace(((PageState.Alias.Path == "") ? "/~" : PageState.Alias.Path) + Constants.ContentUrl, Constants.ContentUrl); diff --git a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs index b6336015..713d0f5b 100644 --- a/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs +++ b/Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Modules.HtmlText.Services public HtmlTextService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this.sitestate = sitestate; - this.NavigationManager = NavigationManager; + http = http; + sitestate = sitestate; + NavigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs index 4e60257a..234026a5 100644 --- a/Oqtane.Client/Modules/ModuleBase.cs +++ b/Oqtane.Client/Modules/ModuleBase.cs @@ -14,7 +14,7 @@ namespace Oqtane.Modules public ModuleBase() { - this.logger = new Logger(this); + logger = new Logger(this); } [Inject] @@ -43,7 +43,7 @@ namespace Oqtane.Modules public string ModulePath() { - return "Modules/" + this.GetType().Namespace + "/"; + return "Modules/" + GetType().Namespace + "/"; } // url methods @@ -135,7 +135,7 @@ namespace Oqtane.Modules { UserId = PageState.User.UserId; } - string category = this.GetType().AssemblyQualifiedName; + string category = GetType().AssemblyQualifiedName; string feature = Utilities.GetTypeNameLastSegment(category, 1); LogFunction logfunction; if (string.IsNullOrEmpty(function)) @@ -170,7 +170,7 @@ namespace Oqtane.Modules public Logger(ModuleBase modulebase) { - this.modulebase = modulebase; + modulebase = modulebase; } public async Task LogTrace(string message, params object[] args) diff --git a/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs b/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs index 2db32002..4f2c52d6 100644 --- a/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs +++ b/Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs @@ -19,9 +19,9 @@ namespace Oqtane.Providers public IdentityAuthenticationStateProvider(NavigationManager NavigationManager, SiteState sitestate, IServiceProvider provider) { - this._navigationManager = NavigationManager; - this._siteState = sitestate; - this._serviceProvider = provider; + _navigationManager = NavigationManager; + _siteState = sitestate; + _serviceProvider = provider; } public override async Task GetAuthenticationStateAsync() diff --git a/Oqtane.Client/Services/AliasService.cs b/Oqtane.Client/Services/AliasService.cs index af150507..c4c685e5 100644 --- a/Oqtane.Client/Services/AliasService.cs +++ b/Oqtane.Client/Services/AliasService.cs @@ -18,9 +18,9 @@ namespace Oqtane.Services public AliasService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/FileService.cs b/Oqtane.Client/Services/FileService.cs index 553b9cca..cc66d536 100644 --- a/Oqtane.Client/Services/FileService.cs +++ b/Oqtane.Client/Services/FileService.cs @@ -19,10 +19,10 @@ namespace Oqtane.Services public FileService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager, IJSRuntime jsRuntime) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; - this._jsRuntime = jsRuntime; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; + _jsRuntime = jsRuntime; } private string apiurl diff --git a/Oqtane.Client/Services/FolderService.cs b/Oqtane.Client/Services/FolderService.cs index 17481aa6..85bc7765 100644 --- a/Oqtane.Client/Services/FolderService.cs +++ b/Oqtane.Client/Services/FolderService.cs @@ -17,9 +17,9 @@ namespace Oqtane.Services public FolderService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/InstallationService.cs b/Oqtane.Client/Services/InstallationService.cs index ab37df1e..8e454ab1 100644 --- a/Oqtane.Client/Services/InstallationService.cs +++ b/Oqtane.Client/Services/InstallationService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public InstallationService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/JobLogService.cs b/Oqtane.Client/Services/JobLogService.cs index 55815fab..e866e641 100644 --- a/Oqtane.Client/Services/JobLogService.cs +++ b/Oqtane.Client/Services/JobLogService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public JobLogService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this.http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/JobService.cs b/Oqtane.Client/Services/JobService.cs index 169c57db..828203e1 100644 --- a/Oqtane.Client/Services/JobService.cs +++ b/Oqtane.Client/Services/JobService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public JobService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/LogService.cs b/Oqtane.Client/Services/LogService.cs index bd921230..b8f1b5b0 100644 --- a/Oqtane.Client/Services/LogService.cs +++ b/Oqtane.Client/Services/LogService.cs @@ -17,9 +17,9 @@ namespace Oqtane.Services public LogService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/ModuleDefinitionService.cs b/Oqtane.Client/Services/ModuleDefinitionService.cs index 8126f1be..368b4cf5 100644 --- a/Oqtane.Client/Services/ModuleDefinitionService.cs +++ b/Oqtane.Client/Services/ModuleDefinitionService.cs @@ -18,9 +18,9 @@ namespace Oqtane.Services public ModuleDefinitionService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/ModuleService.cs b/Oqtane.Client/Services/ModuleService.cs index 2207fc7a..d6c4be40 100644 --- a/Oqtane.Client/Services/ModuleService.cs +++ b/Oqtane.Client/Services/ModuleService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public ModuleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/NotificationService.cs b/Oqtane.Client/Services/NotificationService.cs index c21d6ca4..c286a277 100644 --- a/Oqtane.Client/Services/NotificationService.cs +++ b/Oqtane.Client/Services/NotificationService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public NotificationService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/PackageService.cs b/Oqtane.Client/Services/PackageService.cs index b3f42051..e0431556 100644 --- a/Oqtane.Client/Services/PackageService.cs +++ b/Oqtane.Client/Services/PackageService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public PackageService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/PageModuleService.cs b/Oqtane.Client/Services/PageModuleService.cs index 5d6bbbc8..d3c813b0 100644 --- a/Oqtane.Client/Services/PageModuleService.cs +++ b/Oqtane.Client/Services/PageModuleService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public PageModuleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/PageService.cs b/Oqtane.Client/Services/PageService.cs index fe2b1486..07829178 100644 --- a/Oqtane.Client/Services/PageService.cs +++ b/Oqtane.Client/Services/PageService.cs @@ -17,9 +17,9 @@ namespace Oqtane.Services public PageService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/ProfileService.cs b/Oqtane.Client/Services/ProfileService.cs index 67f07111..227b37c1 100644 --- a/Oqtane.Client/Services/ProfileService.cs +++ b/Oqtane.Client/Services/ProfileService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public ProfileService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/RoleService.cs b/Oqtane.Client/Services/RoleService.cs index f25e68fa..da5b5642 100644 --- a/Oqtane.Client/Services/RoleService.cs +++ b/Oqtane.Client/Services/RoleService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public RoleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/SettingService.cs b/Oqtane.Client/Services/SettingService.cs index 48026fce..a8ba70c2 100644 --- a/Oqtane.Client/Services/SettingService.cs +++ b/Oqtane.Client/Services/SettingService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public SettingService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/SiteService.cs b/Oqtane.Client/Services/SiteService.cs index 9c95b358..de62f802 100644 --- a/Oqtane.Client/Services/SiteService.cs +++ b/Oqtane.Client/Services/SiteService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public SiteService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/TenantService.cs b/Oqtane.Client/Services/TenantService.cs index bee9b1eb..3ef6761f 100644 --- a/Oqtane.Client/Services/TenantService.cs +++ b/Oqtane.Client/Services/TenantService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public TenantService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/ThemeService.cs b/Oqtane.Client/Services/ThemeService.cs index 7594d28f..270b880f 100644 --- a/Oqtane.Client/Services/ThemeService.cs +++ b/Oqtane.Client/Services/ThemeService.cs @@ -18,9 +18,9 @@ namespace Oqtane.Services public ThemeService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/UserRoleService.cs b/Oqtane.Client/Services/UserRoleService.cs index fbe53cd8..c6d95550 100644 --- a/Oqtane.Client/Services/UserRoleService.cs +++ b/Oqtane.Client/Services/UserRoleService.cs @@ -16,9 +16,9 @@ namespace Oqtane.Services public UserRoleService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Services/UserService.cs b/Oqtane.Client/Services/UserService.cs index 002e1536..8636b90b 100644 --- a/Oqtane.Client/Services/UserService.cs +++ b/Oqtane.Client/Services/UserService.cs @@ -14,9 +14,9 @@ namespace Oqtane.Services public UserService(HttpClient http, SiteState sitestate, NavigationManager NavigationManager) { - this._http = http; - this._siteState = sitestate; - this._navigationManager = NavigationManager; + _http = http; + _siteState = sitestate; + _navigationManager = NavigationManager; } private string apiurl diff --git a/Oqtane.Client/Shared/Interop.cs b/Oqtane.Client/Shared/Interop.cs index 6f34d128..82bf37a6 100644 --- a/Oqtane.Client/Shared/Interop.cs +++ b/Oqtane.Client/Shared/Interop.cs @@ -11,7 +11,7 @@ namespace Oqtane.Shared public Interop(IJSRuntime jsRuntime) { - this._jsRuntime = jsRuntime; + _jsRuntime = jsRuntime; } public Task SetCookie(string name, string value, int days) diff --git a/Oqtane.Client/Shared/SiteRouter.razor b/Oqtane.Client/Shared/SiteRouter.razor index f6f84616..d6b99d02 100644 --- a/Oqtane.Client/Shared/SiteRouter.razor +++ b/Oqtane.Client/Shared/SiteRouter.razor @@ -59,7 +59,7 @@ } else { - System.Diagnostics.Debug.WriteLine(this.GetType().FullName + ": Error: API call to " + _absoluteUri + " is not mapped to a Controller"); + System.Diagnostics.Debug.WriteLine(GetType().FullName + ": Error: API call to " + _absoluteUri + " is not mapped to a Controller"); } } } diff --git a/Oqtane.Client/Themes/ContainerBase.cs b/Oqtane.Client/Themes/ContainerBase.cs index 867722f7..2e55f969 100644 --- a/Oqtane.Client/Themes/ContainerBase.cs +++ b/Oqtane.Client/Themes/ContainerBase.cs @@ -22,7 +22,7 @@ namespace Oqtane.Themes public string ThemePath() { - return "Themes/" + this.GetType().Namespace + "/"; + return "Themes/" + GetType().Namespace + "/"; } public string NavigateUrl() diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor index ef7f1a60..2680fa3b 100644 --- a/Oqtane.Client/Themes/Controls/ControlPanel.razor +++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor @@ -459,19 +459,19 @@ { page.IsDeleted = true; await PageService.UpdatePageAsync(page); - await logger.Log(page.PageId, null, PageState.User.UserId, this.GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, null, "Page Deleted {Page}", page); + await logger.Log(page.PageId, null, PageState.User.UserId, GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, null, "Page Deleted {Page}", page); NavigationManager.NavigateTo(NavigateUrl("", Reload.Site)); } else // personalized page { await PageService.DeletePageAsync(page.PageId); - await logger.Log(page.PageId, null, PageState.User.UserId, this.GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, null, "Page Deleted {Page}", page); + await logger.Log(page.PageId, null, PageState.User.UserId, GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, null, "Page Deleted {Page}", page); NavigationManager.NavigateTo(NavigateUrl(Reload.Page)); } } catch (Exception ex) { - await logger.Log(page.PageId, null, PageState.User.UserId, this.GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, ex, "Page Deleted {Page} {Error}", page, ex.Message); + await logger.Log(page.PageId, null, PageState.User.UserId, GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, ex, "Page Deleted {Page} {Error}", page, ex.Message); } } } diff --git a/Oqtane.Client/Themes/LayoutBase.cs b/Oqtane.Client/Themes/LayoutBase.cs index 546937ab..27bac9a6 100644 --- a/Oqtane.Client/Themes/LayoutBase.cs +++ b/Oqtane.Client/Themes/LayoutBase.cs @@ -11,7 +11,7 @@ namespace Oqtane.Themes public string LayoutPath() { - return "Themes/" + this.GetType().Namespace + "/"; + return "Themes/" + GetType().Namespace + "/"; } } diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs index 631ef9ea..f0d05016 100644 --- a/Oqtane.Client/Themes/ThemeBase.cs +++ b/Oqtane.Client/Themes/ThemeBase.cs @@ -16,7 +16,7 @@ namespace Oqtane.Themes public string ThemePath() { - return "Themes/" + this.GetType().Namespace + "/"; + return "Themes/" + GetType().Namespace + "/"; } public async Task IncludeCSS(string Url) diff --git a/Oqtane.Server/Controllers/AliasController.cs b/Oqtane.Server/Controllers/AliasController.cs index 1a969e65..1727b15f 100644 --- a/Oqtane.Server/Controllers/AliasController.cs +++ b/Oqtane.Server/Controllers/AliasController.cs @@ -19,8 +19,8 @@ namespace Oqtane.Controllers public AliasController(IAliasRepository Aliases, ILogManager logger) { - this._aliases = Aliases; - this._logger = logger; + _aliases = Aliases; + _logger = logger; } // GET: api/ diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs index 78529d00..cd6408fe 100644 --- a/Oqtane.Server/Controllers/FileController.cs +++ b/Oqtane.Server/Controllers/FileController.cs @@ -29,12 +29,12 @@ namespace Oqtane.Controllers public FileController(IWebHostEnvironment environment, IFileRepository Files, IFolderRepository Folders, IUserPermissions UserPermissions, ITenantResolver Tenants, ILogManager logger) { - this._environment = environment; - this._files = Files; - this._folders = Folders; - this._userPermissions = UserPermissions; - this._tenants = Tenants; - this._logger = logger; + _environment = environment; + _files = Files; + _folders = Folders; + _userPermissions = UserPermissions; + _tenants = Tenants; + _logger = logger; } // GET: api/?folder=x diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs index 029a3984..a99b0fcd 100644 --- a/Oqtane.Server/Controllers/FolderController.cs +++ b/Oqtane.Server/Controllers/FolderController.cs @@ -19,9 +19,9 @@ namespace Oqtane.Controllers public FolderController(IFolderRepository Folders, IUserPermissions UserPermissions, ILogManager logger) { - this._folders = Folders; - this._userPermissions = UserPermissions; - this._logger = logger; + _folders = Folders; + _userPermissions = UserPermissions; + _logger = logger; } // GET: api/?siteid=x diff --git a/Oqtane.Server/Controllers/InstallationController.cs b/Oqtane.Server/Controllers/InstallationController.cs index dedb2044..05e66775 100644 --- a/Oqtane.Server/Controllers/InstallationController.cs +++ b/Oqtane.Server/Controllers/InstallationController.cs @@ -24,8 +24,8 @@ namespace Oqtane.Controllers public InstallationController(IConfigurationRoot Config, IInstallationManager InstallationManager) { - this._config = Config; - this._installationManager = InstallationManager; + _config = Config; + _installationManager = InstallationManager; } // POST api/ diff --git a/Oqtane.Server/Controllers/JobController.cs b/Oqtane.Server/Controllers/JobController.cs index 29d18d12..1d3088d6 100644 --- a/Oqtane.Server/Controllers/JobController.cs +++ b/Oqtane.Server/Controllers/JobController.cs @@ -20,9 +20,9 @@ namespace Oqtane.Controllers public JobController(IJobRepository Jobs, ILogManager logger, IServiceProvider ServiceProvider) { - this._jobs = Jobs; - this._logger = logger; - this._serviceProvider = ServiceProvider; + _jobs = Jobs; + _logger = logger; + _serviceProvider = ServiceProvider; } // GET: api/ diff --git a/Oqtane.Server/Controllers/JobLogController.cs b/Oqtane.Server/Controllers/JobLogController.cs index 330acfc8..03c8db95 100644 --- a/Oqtane.Server/Controllers/JobLogController.cs +++ b/Oqtane.Server/Controllers/JobLogController.cs @@ -16,8 +16,8 @@ namespace Oqtane.Controllers public JobLogController(IJobLogRepository JobLogs, ILogManager logger) { - this._jobLogs = JobLogs; - this._logger = logger; + _jobLogs = JobLogs; + _logger = logger; } // GET: api/ diff --git a/Oqtane.Server/Controllers/LogController.cs b/Oqtane.Server/Controllers/LogController.cs index 97280357..ca98b0ad 100644 --- a/Oqtane.Server/Controllers/LogController.cs +++ b/Oqtane.Server/Controllers/LogController.cs @@ -17,8 +17,8 @@ namespace Oqtane.Controllers public LogController(ILogManager Logger, ILogRepository Logs) { - this._ogger = Logger; - this._logs = Logs; + _ogger = Logger; + _logs = Logs; } // GET: api/?siteid=x&level=y&function=z&rows=50 diff --git a/Oqtane.Server/Controllers/ModuleController.cs b/Oqtane.Server/Controllers/ModuleController.cs index 796211ac..9679f835 100644 --- a/Oqtane.Server/Controllers/ModuleController.cs +++ b/Oqtane.Server/Controllers/ModuleController.cs @@ -22,11 +22,11 @@ namespace Oqtane.Controllers public ModuleController(IModuleRepository Modules, IPageModuleRepository PageModules, IModuleDefinitionRepository ModuleDefinitions, IUserPermissions UserPermissions, ILogManager logger) { - this._modules = Modules; - this._pageModules = PageModules; - this._moduleDefinitions = ModuleDefinitions; - this._userPermissions = UserPermissions; - this._logger = logger; + _modules = Modules; + _pageModules = PageModules; + _moduleDefinitions = ModuleDefinitions; + _userPermissions = UserPermissions; + _logger = logger; } // GET: api/?siteid=x diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs index 81e88b3c..212a2773 100644 --- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs +++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs @@ -24,11 +24,11 @@ namespace Oqtane.Controllers public ModuleDefinitionController(IModuleDefinitionRepository ModuleDefinitions, IUserPermissions UserPermissions, IInstallationManager InstallationManager, IWebHostEnvironment environment, ILogManager logger) { - this._moduleDefinitions = ModuleDefinitions; - this._userPermissions = UserPermissions; - this._installationManager = InstallationManager; - this._environment = environment; - this._logger = logger; + _moduleDefinitions = ModuleDefinitions; + _userPermissions = UserPermissions; + _installationManager = InstallationManager; + _environment = environment; + _logger = logger; } // GET: api/?siteid=x diff --git a/Oqtane.Server/Controllers/NotificationController.cs b/Oqtane.Server/Controllers/NotificationController.cs index 592de0e7..78879821 100644 --- a/Oqtane.Server/Controllers/NotificationController.cs +++ b/Oqtane.Server/Controllers/NotificationController.cs @@ -19,9 +19,9 @@ namespace Oqtane.Controllers public NotificationController(INotificationRepository Notifications, IUserPermissions UserPermissions, ILogManager logger) { - this._notifications = Notifications; - this._userPermissions = UserPermissions; - this._logger = logger; + _notifications = Notifications; + _userPermissions = UserPermissions; + _logger = logger; } // GET: api/?siteid=x&type=y&userid=z diff --git a/Oqtane.Server/Controllers/PackageController.cs b/Oqtane.Server/Controllers/PackageController.cs index 69f0b590..5b69d426 100644 --- a/Oqtane.Server/Controllers/PackageController.cs +++ b/Oqtane.Server/Controllers/PackageController.cs @@ -21,7 +21,7 @@ namespace Oqtane.Controllers public PackageController(IWebHostEnvironment environment) { - this._environment = environment; + _environment = environment; } // GET: api/?tag=x diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs index 5bdc2b50..249b309b 100644 --- a/Oqtane.Server/Controllers/PageController.cs +++ b/Oqtane.Server/Controllers/PageController.cs @@ -21,11 +21,11 @@ namespace Oqtane.Controllers public PageController(IPageRepository Pages, IModuleRepository Modules, IPageModuleRepository PageModules, IUserPermissions UserPermissions, ILogManager logger) { - this._pages = Pages; - this._modules = Modules; - this._pageModules = PageModules; - this._userPermissions = UserPermissions; - this._logger = logger; + _pages = Pages; + _modules = Modules; + _pageModules = PageModules; + _userPermissions = UserPermissions; + _logger = logger; } // GET: api/?siteid=x diff --git a/Oqtane.Server/Controllers/PageModuleController.cs b/Oqtane.Server/Controllers/PageModuleController.cs index fb1d568b..5b6f9e7d 100644 --- a/Oqtane.Server/Controllers/PageModuleController.cs +++ b/Oqtane.Server/Controllers/PageModuleController.cs @@ -20,10 +20,10 @@ namespace Oqtane.Controllers public PageModuleController(IPageModuleRepository PageModules, IModuleRepository Modules, IUserPermissions UserPermissions, ILogManager logger) { - this._pageModules = PageModules; - this._modules = Modules; - this._userPermissions = UserPermissions; - this._logger = logger; + _pageModules = PageModules; + _modules = Modules; + _userPermissions = UserPermissions; + _logger = logger; } // GET api//5 diff --git a/Oqtane.Server/Controllers/ProfileController.cs b/Oqtane.Server/Controllers/ProfileController.cs index 4636cdb0..6fda81cc 100644 --- a/Oqtane.Server/Controllers/ProfileController.cs +++ b/Oqtane.Server/Controllers/ProfileController.cs @@ -16,8 +16,8 @@ namespace Oqtane.Controllers public ProfileController(IProfileRepository Profiles, ILogManager logger) { - this._profiles = Profiles; - this._logger = logger; + _profiles = Profiles; + _logger = logger; } // GET: api/?siteid=x diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs index 21d7be48..74c7f87e 100644 --- a/Oqtane.Server/Controllers/RoleController.cs +++ b/Oqtane.Server/Controllers/RoleController.cs @@ -16,8 +16,8 @@ namespace Oqtane.Controllers public RoleController(IRoleRepository Roles, ILogManager logger) { - this._roles = Roles; - this._logger = logger; + _roles = Roles; + _logger = logger; } // GET: api/?siteid=x diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs index 7b3c16ee..69996b05 100644 --- a/Oqtane.Server/Controllers/SettingController.cs +++ b/Oqtane.Server/Controllers/SettingController.cs @@ -20,10 +20,10 @@ namespace Oqtane.Controllers public SettingController(ISettingRepository Settings, IPageModuleRepository PageModules, IUserPermissions UserPermissions, ILogManager logger) { - this._settings = Settings; - this._pageModules = PageModules; - this._userPermissions = UserPermissions; - this._logger = logger; + _settings = Settings; + _pageModules = PageModules; + _userPermissions = UserPermissions; + _logger = logger; } // GET: api/ diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs index 4cbe52f0..1642e1e1 100644 --- a/Oqtane.Server/Controllers/SiteController.cs +++ b/Oqtane.Server/Controllers/SiteController.cs @@ -21,10 +21,10 @@ namespace Oqtane.Controllers public SiteController(ISiteRepository Sites, ITenantResolver Tenants, IWebHostEnvironment environment, ILogManager logger) { - this._sites = Sites; - this._tenants = Tenants; - this._environment = environment; - this._logger = logger; + _sites = Sites; + _tenants = Tenants; + _environment = environment; + _logger = logger; } // GET: api/ diff --git a/Oqtane.Server/Controllers/TenantController.cs b/Oqtane.Server/Controllers/TenantController.cs index c04af901..437260cb 100644 --- a/Oqtane.Server/Controllers/TenantController.cs +++ b/Oqtane.Server/Controllers/TenantController.cs @@ -16,8 +16,8 @@ namespace Oqtane.Controllers public TenantController(ITenantRepository Tenants, ILogManager logger) { - this._tenants = Tenants; - this._logger = logger; + _tenants = Tenants; + _logger = logger; } // GET: api/ diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs index e9908af8..4ced2132 100644 --- a/Oqtane.Server/Controllers/ThemeController.cs +++ b/Oqtane.Server/Controllers/ThemeController.cs @@ -22,10 +22,10 @@ namespace Oqtane.Controllers public ThemeController(IThemeRepository Themes, IInstallationManager InstallationManager, IWebHostEnvironment environment, ILogManager logger) { - this._themes = Themes; - this._installationManager = InstallationManager; - this._environment = environment; - this._logger = logger; + _themes = Themes; + _installationManager = InstallationManager; + _environment = environment; + _logger = logger; } // GET: api/ diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs index 6569ebfd..a3becc52 100644 --- a/Oqtane.Server/Controllers/UserController.cs +++ b/Oqtane.Server/Controllers/UserController.cs @@ -31,15 +31,15 @@ namespace Oqtane.Controllers public UserController(IUserRepository Users, IRoleRepository Roles, IUserRoleRepository UserRoles, UserManager IdentityUserManager, SignInManager IdentitySignInManager, ITenantResolver Tenants, INotificationRepository Notifications, IFolderRepository Folders, ILogManager logger) { - this._users = Users; - this._roles = Roles; - this._userRoles = UserRoles; - this._identityUserManager = IdentityUserManager; - this._identitySignInManager = IdentitySignInManager; - this._tenants = Tenants; - this._folders = Folders; - this._notifications = Notifications; - this._logger = logger; + _users = Users; + _roles = Roles; + _userRoles = UserRoles; + _identityUserManager = IdentityUserManager; + _identitySignInManager = IdentitySignInManager; + _tenants = Tenants; + _folders = Folders; + _notifications = Notifications; + _logger = logger; } // GET api//5?siteid=x diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs index 559d5419..216cb93e 100644 --- a/Oqtane.Server/Controllers/UserRoleController.cs +++ b/Oqtane.Server/Controllers/UserRoleController.cs @@ -16,8 +16,8 @@ namespace Oqtane.Controllers public UserRoleController(IUserRoleRepository UserRoles, ILogManager logger) { - this._userRoles = UserRoles; - this._logger = logger; + _userRoles = UserRoles; + _logger = logger; } // GET: api/?userid=x diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index 305ad72f..a7d34f16 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -17,8 +17,8 @@ namespace Oqtane.Infrastructure public InstallationManager(IHostApplicationLifetime HostApplicationLifetime, IWebHostEnvironment environment) { - this._hostApplicationLifetime = HostApplicationLifetime; - this._environment = environment; + _hostApplicationLifetime = HostApplicationLifetime; + _environment = environment; } public void InstallPackages(string Folders, bool Restart) diff --git a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs index 670a2dbd..40853084 100644 --- a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs +++ b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs @@ -19,7 +19,7 @@ namespace Oqtane.Infrastructure public HostedServiceBase(IServiceScopeFactory ServiceScopeFactory) { - this._serviceScopeFactory = ServiceScopeFactory; + _serviceScopeFactory = ServiceScopeFactory; } // abstract method must be overridden @@ -34,7 +34,7 @@ namespace Oqtane.Infrastructure using (var scope = _serviceScopeFactory.CreateScope()) { // get name of job - string JobType = Utilities.GetFullTypeName(this.GetType().AssemblyQualifiedName); + string JobType = Utilities.GetFullTypeName(GetType().AssemblyQualifiedName); // load jobs and find current job IJobRepository Jobs = scope.ServiceProvider.GetRequiredService(); @@ -146,7 +146,7 @@ namespace Oqtane.Infrastructure // set IsExecuting to false in case this job was forcefully terminated previously using (var scope = _serviceScopeFactory.CreateScope()) { - string JobType = Utilities.GetFullTypeName(this.GetType().AssemblyQualifiedName); + string JobType = Utilities.GetFullTypeName(GetType().AssemblyQualifiedName); IJobRepository Jobs = scope.ServiceProvider.GetRequiredService(); Job Job = Jobs.GetJobs().Where(item => item.JobType == JobType).FirstOrDefault(); if (Job != null) diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs index 8cfd8002..67eb28eb 100644 --- a/Oqtane.Server/Infrastructure/LogManager.cs +++ b/Oqtane.Server/Infrastructure/LogManager.cs @@ -20,11 +20,11 @@ namespace Oqtane.Infrastructure public LogManager(ILogRepository Logs, ITenantResolver TenantResolver, IConfigurationRoot Config, IUserPermissions UserPermissions, IHttpContextAccessor Accessor) { - this._logs = Logs; - this._tenantResolver = TenantResolver; - this._config = Config; - this._userPermissions = UserPermissions; - this._accessor = Accessor; + _logs = Logs; + _tenantResolver = TenantResolver; + _config = Config; + _userPermissions = UserPermissions; + _accessor = Accessor; } public void Log(LogLevel Level, object Class, LogFunction Function, string Message, params object[] Args) diff --git a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs index 9c5420c7..ac0ab3af 100644 --- a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs +++ b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs @@ -19,7 +19,7 @@ namespace Oqtane.Modules.HtmlText.Controllers public HtmlTextController(IHtmlTextRepository HtmlText, ILogManager logger, IHttpContextAccessor HttpContextAccessor) { _htmlText = HtmlText; - this._logger = logger; + _logger = logger; if (HttpContextAccessor.HttpContext.Request.Query.ContainsKey("entityid")) { _entityId = int.Parse(HttpContextAccessor.HttpContext.Request.Query["entityid"]); diff --git a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs index d1bdcd3f..0d87934d 100644 --- a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs +++ b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs @@ -11,7 +11,7 @@ namespace Oqtane.Modules.HtmlText.Manager public HtmlTextManager(IHtmlTextRepository htmltexts) { - this._htmlTexts = htmltexts; + _htmlTexts = htmltexts; } public string ExportModule(Module Module) diff --git a/Oqtane.Server/Pages/Login.cshtml.cs b/Oqtane.Server/Pages/Login.cshtml.cs index adf86ee4..179cbe09 100644 --- a/Oqtane.Server/Pages/Login.cshtml.cs +++ b/Oqtane.Server/Pages/Login.cshtml.cs @@ -15,8 +15,8 @@ namespace Oqtane.Pages public LoginModel(UserManager IdentityUserManager, SignInManager IdentitySignInManager) { - this.IdentityUserManager = IdentityUserManager; - this.IdentitySignInManager = IdentitySignInManager; + IdentityUserManager = IdentityUserManager; + IdentitySignInManager = IdentitySignInManager; } public async Task OnPostAsync(string username, string password, bool remember, string returnurl) diff --git a/Oqtane.Server/Repository/Context/DBContextBase.cs b/Oqtane.Server/Repository/Context/DBContextBase.cs index a5cf922a..9395a75d 100644 --- a/Oqtane.Server/Repository/Context/DBContextBase.cs +++ b/Oqtane.Server/Repository/Context/DBContextBase.cs @@ -16,7 +16,7 @@ namespace Oqtane.Repository public DBContextBase(ITenantResolver TenantResolver, IHttpContextAccessor accessor) { _tenant = TenantResolver.GetTenant(); - this._accessor = accessor; + _accessor = accessor; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) diff --git a/Oqtane.Server/Repository/Context/MasterDBContext.cs b/Oqtane.Server/Repository/Context/MasterDBContext.cs index 669dd035..9ba8939f 100644 --- a/Oqtane.Server/Repository/Context/MasterDBContext.cs +++ b/Oqtane.Server/Repository/Context/MasterDBContext.cs @@ -12,7 +12,7 @@ namespace Oqtane.Repository public MasterDBContext(DbContextOptions options, IHttpContextAccessor accessor) : base(options) { - this._accessor = accessor; + _accessor = accessor; } public virtual DbSet Alias { get; set; } diff --git a/Oqtane.Server/Repository/FileRepository.cs b/Oqtane.Server/Repository/FileRepository.cs index 67d2ffa3..673aa110 100644 --- a/Oqtane.Server/Repository/FileRepository.cs +++ b/Oqtane.Server/Repository/FileRepository.cs @@ -13,7 +13,7 @@ namespace Oqtane.Repository public FileRepository(TenantDBContext context, IPermissionRepository Permissions) { _db = context; - this._permissions = Permissions; + _permissions = Permissions; } public IEnumerable GetFiles(int FolderId) diff --git a/Oqtane.Server/Repository/FolderRepository.cs b/Oqtane.Server/Repository/FolderRepository.cs index 60ba28f0..900f044b 100644 --- a/Oqtane.Server/Repository/FolderRepository.cs +++ b/Oqtane.Server/Repository/FolderRepository.cs @@ -13,7 +13,7 @@ namespace Oqtane.Repository public FolderRepository(TenantDBContext context, IPermissionRepository Permissions) { _db = context; - this._permissions = Permissions; + _permissions = Permissions; } public IEnumerable GetFolders(int SiteId) diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs index f819e89c..ed7c5ebe 100644 --- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs +++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs @@ -20,7 +20,7 @@ namespace Oqtane.Repository { _db = context; _cache = cache; - this._permissions = Permissions; + _permissions = Permissions; } public IEnumerable GetModuleDefinitions(int SiteId) diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs index 9a59e9fd..31f51f9f 100644 --- a/Oqtane.Server/Repository/ModuleRepository.cs +++ b/Oqtane.Server/Repository/ModuleRepository.cs @@ -20,9 +20,9 @@ namespace Oqtane.Repository public ModuleRepository(TenantDBContext context, IPermissionRepository Permissions, IModuleDefinitionRepository ModuleDefinitions, IServiceProvider ServiceProvider) { _db = context; - this._permissions = Permissions; - this._moduleDefinitions = ModuleDefinitions; - this._serviceProvider = ServiceProvider; + _permissions = Permissions; + _moduleDefinitions = ModuleDefinitions; + _serviceProvider = ServiceProvider; } public IEnumerable GetModules(int SiteId) diff --git a/Oqtane.Server/Repository/PageModuleRepository.cs b/Oqtane.Server/Repository/PageModuleRepository.cs index 833a1923..0696dfcc 100644 --- a/Oqtane.Server/Repository/PageModuleRepository.cs +++ b/Oqtane.Server/Repository/PageModuleRepository.cs @@ -13,7 +13,7 @@ namespace Oqtane.Repository public PageModuleRepository(TenantDBContext context, IPermissionRepository Permissions) { _db = context; - this._permissions = Permissions; + _permissions = Permissions; } public IEnumerable GetPageModules(int SiteId) diff --git a/Oqtane.Server/Repository/PageRepository.cs b/Oqtane.Server/Repository/PageRepository.cs index 03676f39..29161d8f 100644 --- a/Oqtane.Server/Repository/PageRepository.cs +++ b/Oqtane.Server/Repository/PageRepository.cs @@ -14,8 +14,8 @@ namespace Oqtane.Repository public PageRepository(TenantDBContext context, IPermissionRepository Permissions, IPageModuleRepository PageModules) { _db = context; - this._permissions = Permissions; - this._pageModules = PageModules; + _permissions = Permissions; + _pageModules = PageModules; } public IEnumerable GetPages(int SiteId) diff --git a/Oqtane.Server/Repository/PermissionRepository.cs b/Oqtane.Server/Repository/PermissionRepository.cs index ad92f03a..161703a0 100644 --- a/Oqtane.Server/Repository/PermissionRepository.cs +++ b/Oqtane.Server/Repository/PermissionRepository.cs @@ -17,7 +17,7 @@ namespace Oqtane.Repository public PermissionRepository(TenantDBContext context, IRoleRepository Roles) { _db = context; - this._roles = Roles; + _roles = Roles; } public IEnumerable GetPermissions(int SiteId, string EntityName) diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index 3605cc7c..69f26491 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -27,15 +27,15 @@ namespace Oqtane.Repository public SiteRepository(TenantDBContext context, IRoleRepository RoleRepository, IProfileRepository ProfileRepository, IFolderRepository FolderRepository, IFileRepository FileRepository, IPageRepository PageRepository, IModuleRepository ModuleRepository, IPageModuleRepository PageModuleRepository, IModuleDefinitionRepository ModuleDefinitionRepository, IServiceProvider ServiceProvider) { _db = context; - this._roleRepository = RoleRepository; - this._profileRepository = ProfileRepository; - this._folderRepository = FolderRepository; - this._fileRepository = FileRepository; - this._pageRepository = PageRepository; - this._moduleRepository = ModuleRepository; - this._pageModuleRepository = PageModuleRepository; - this._moduleDefinitionRepository = ModuleDefinitionRepository; - this._serviceProvider = ServiceProvider; + _roleRepository = RoleRepository; + _profileRepository = ProfileRepository; + _folderRepository = FolderRepository; + _fileRepository = FileRepository; + _pageRepository = PageRepository; + _moduleRepository = ModuleRepository; + _pageModuleRepository = PageModuleRepository; + _moduleDefinitionRepository = ModuleDefinitionRepository; + _serviceProvider = ServiceProvider; // define the default site template _siteTemplate = new List(); diff --git a/Oqtane.Server/Security/PermissionHandler.cs b/Oqtane.Server/Security/PermissionHandler.cs index bf08f7b1..6a3249ef 100644 --- a/Oqtane.Server/Security/PermissionHandler.cs +++ b/Oqtane.Server/Security/PermissionHandler.cs @@ -14,9 +14,9 @@ namespace Oqtane.Security public PermissionHandler(IHttpContextAccessor HttpContextAccessor, IUserPermissions UserPermissions, ILogManager logger) { - this._httpContextAccessor = HttpContextAccessor; - this._userPermissions = UserPermissions; - this._logger = logger; + _httpContextAccessor = HttpContextAccessor; + _userPermissions = UserPermissions; + _logger = logger; } protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement) diff --git a/Oqtane.Server/Security/PermissionRequirement.cs b/Oqtane.Server/Security/PermissionRequirement.cs index 7404d5bd..a8b23280 100644 --- a/Oqtane.Server/Security/PermissionRequirement.cs +++ b/Oqtane.Server/Security/PermissionRequirement.cs @@ -10,8 +10,8 @@ namespace Oqtane.Security public PermissionRequirement(string EntityName, string PermissionName) { - this.EntityName = EntityName; - this.PermissionName = PermissionName; + EntityName = EntityName; + PermissionName = PermissionName; } } } diff --git a/Oqtane.Server/Security/UserPermissions.cs b/Oqtane.Server/Security/UserPermissions.cs index b31a897d..b1bca9a6 100644 --- a/Oqtane.Server/Security/UserPermissions.cs +++ b/Oqtane.Server/Security/UserPermissions.cs @@ -13,8 +13,8 @@ namespace Oqtane.Security public UserPermissions(IPermissionRepository Permissions, IHttpContextAccessor Accessor) { - this._permissions = Permissions; - this._accessor = Accessor; + _permissions = Permissions; + _accessor = Accessor; } public bool IsAuthorized(ClaimsPrincipal User, string EntityName, int EntityId, string PermissionName)