From 79a9fe8994783c6f01f9fd245bb1ebae8aaf3833 Mon Sep 17 00:00:00 2001 From: Sebastian Leupold Date: Tue, 3 Mar 2020 11:13:04 +0100 Subject: [PATCH 1/2] Fix #3604 (missing tokens) --- .../SqlDataProvider/09.05.01.SqlDataProvider | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.05.01.SqlDataProvider diff --git a/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.05.01.SqlDataProvider b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.05.01.SqlDataProvider new file mode 100644 index 00000000000..739582f7640 --- /dev/null +++ b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.05.01.SqlDataProvider @@ -0,0 +1,64 @@ +/************************************************************/ +/***** SqlDataProvider *****/ +/***** *****/ +/***** *****/ +/***** Note: To manually execute this script you must *****/ +/***** perform a search and replace operation *****/ +/***** for {databaseOwner} and {objectQualifier} *****/ +/***** *****/ +/************************************************************/ + + +IF EXISTS (SELECT * FROM sys.Procedures WHERE object_id = OBJECT_ID(N'{databaseOwner}[{objectQualifier}CoreMessaging_GetNextMessagesForDigestDispatch]')) + DROP PROCEDURE {databaseOwner}[{objectQualifier}CoreMessaging_GetNextMessagesForDigestDispatch]; +GO + +IF EXISTS (SELECT * FROM sys.Procedures WHERE object_id = OBJECT_ID(N'[dbo].[CoreMessaging_GetNextMessagesForDigestDispatch]')) + DROP PROCEDURE [dbo].[CoreMessaging_GetNextMessagesForDigestDispatch]; +GO + +CREATE PROCEDURE {databaseOwner}[{objectQualifier}CoreMessaging_GetNextMessagesForDigestDispatch] + @Frequency INT, + @SchedulerInstance UNIQUEIDENTIFIER, + @BatchSize INT +AS +BEGIN + UPDATE R + SET [EmailSchedulerInstance] = @SchedulerInstance, + [LastModifiedOnDate] = GetDate() + FROM {databaseOwner}[{objectQualifier}CoreMessaging_MessageRecipients] R + JOIN (SELECT TOP (@BatchSize) + UserID + FROM {databaseOwner}[{objectQualifier}vw_MessagesForDispatch] + WHERE [EmailSchedulerInstance] IS NULL + AND [EmailFrequency] = @Frequency + GROUP BY UserID + ORDER BY UserID) D ON R.UserID = R.UserID + + SELECT M.[PortalID], + M.[NotificationTypeID], + M.[To], + M.[From], + M.[Subject], + M.[Body], + M.[SenderUserID], + M.[ExpirationDate], + M.[Context], + R.[RecipientID], + R.[MessageID], + R.[UserID] + FROM {databaseOwner}[{objectQualifier}CoreMessaging_MessageRecipients] R + JOIN {databaseOwner}[{objectQualifier}CoreMessaging_Messages] M ON R.MessageID = M.MessageID + WHERE [EmailSent] = 0 -- Filter these 4 columms to use proper index + AND [Read] = 0 + AND [Archived] = 0 + AND [EmailSchedulerInstance] = @SchedulerInstance + ORDER BY --[PortalID], + [UserID], + [RecipientID] DESC +END; -- Procedure +GO + +/************************************************************/ +/***** SqlDataProvider *****/ +/************************************************************/ From 8e0386268f346c53e66275a1eb8aa35eee4fa09b Mon Sep 17 00:00:00 2001 From: Sebastian Leupold Date: Wed, 27 May 2020 14:17:52 +0200 Subject: [PATCH 2/2] Improve wording fixes #3785 --- .../App_LocalResources/Security.resx | 63 +------------------ .../App_LocalResources/SiteSettings.resx | 61 +----------------- 2 files changed, 3 insertions(+), 121 deletions(-) diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx index 40b7ea1fd5b..70df1e352a4 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx @@ -1,64 +1,5 @@  - @@ -679,7 +620,7 @@ Maximum upload size must be between 12 and {0} - Enter the file extensions (separated by commas) that can be uploaded to the site by site administrators. + Enter the extensions (separated by commas) for files that can be uploaded to the site by site administrators. Allowable File Extensions: @@ -1157,7 +1098,7 @@ Force user logout in other browsers after the user's password has been changed. - Default list of file extensions end users are allowed to upload. Admin users can override this but they can never allow more file types than those set in the master list above. Note this list will be filtered by the list above when saving. + Default extension list for files that end users are allowed to upload. Admin users can override this, but they can never allow more file types than those set in the master list above. Note this list will be filtered by the list above when saving. Default End User Extension Whitelist diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx index 15b29476787..63064d5d72a 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx @@ -1,64 +1,5 @@  - @@ -1444,7 +1385,7 @@ Only Images - A comma separated list of file extensions that end users are allowed to upload to the site. Note this can be through uploading a profile picture, content to the journal or from a file upload module. The extensions you enter are checked against a global permitted list and may be restricted as a result. + A comma separated extension list for files that end users are allowed to upload to the site. Note this can be through uploading a profile picture, content to the journal or from a file upload module. The extensions you enter are checked against a global permitted list and may be restricted as a result. Allowed File Extensions