From 4661ee96d0d8316f10a1fd72e6123b7aa1196965 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Wed, 2 Feb 2022 19:54:23 +0300 Subject: [PATCH 1/2] Packages updated --- common/ASC.Api.Core/ASC.Api.Core.csproj | 14 +++++++------- common/ASC.Common/ASC.Common.csproj | 12 ++++++------ common/ASC.Core.Common/ASC.Core.Common.csproj | 12 ++++++------ .../ASC.Data.Backup.Core.csproj | 6 +++--- .../ASC.Data.Storage/ASC.Data.Storage.csproj | 18 +++++++++--------- .../ASC.FederatedLogin.csproj | 2 +- common/ASC.IPSecurity/ASC.IPSecurity.csproj | 2 +- .../ASC.MessagingSystem.csproj | 2 +- common/ASC.VoipService/ASC.VoipService.csproj | 2 +- .../ASC.Webhooks.Core/ASC.Webhooks.Core.csproj | 2 +- .../ASC.ElasticSearch/ASC.ElasticSearch.csproj | 2 +- products/ASC.Files/Core/ASC.Files.Core.csproj | 6 +++--- web/ASC.Web.Core/ASC.Web.Core.csproj | 4 ++-- .../ASC.Web.HealthChecks.UI.csproj | 4 ++-- 14 files changed, 44 insertions(+), 44 deletions(-) diff --git a/common/ASC.Api.Core/ASC.Api.Core.csproj b/common/ASC.Api.Core/ASC.Api.Core.csproj index d1cc1e21a5..da346a0610 100644 --- a/common/ASC.Api.Core/ASC.Api.Core.csproj +++ b/common/ASC.Api.Core/ASC.Api.Core.csproj @@ -11,14 +11,14 @@ - - - - - - + + + + + + - + diff --git a/common/ASC.Common/ASC.Common.csproj b/common/ASC.Common/ASC.Common.csproj index 6038ef792c..5d98ae1363 100644 --- a/common/ASC.Common/ASC.Common.csproj +++ b/common/ASC.Common/ASC.Common.csproj @@ -30,16 +30,16 @@ - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + @@ -53,7 +53,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive --> - + diff --git a/common/ASC.Core.Common/ASC.Core.Common.csproj b/common/ASC.Core.Common/ASC.Core.Common.csproj index f6a18017c4..b17305d29c 100644 --- a/common/ASC.Core.Common/ASC.Core.Common.csproj +++ b/common/ASC.Core.Common/ASC.Core.Common.csproj @@ -49,15 +49,15 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj b/common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj index d497d21597..5e0701b2cf 100644 --- a/common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj +++ b/common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj @@ -13,14 +13,14 @@ - + true - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/common/ASC.Data.Storage/ASC.Data.Storage.csproj b/common/ASC.Data.Storage/ASC.Data.Storage.csproj index 80827e1fca..77ed298653 100644 --- a/common/ASC.Data.Storage/ASC.Data.Storage.csproj +++ b/common/ASC.Data.Storage/ASC.Data.Storage.csproj @@ -30,15 +30,15 @@ - - - - - - - - - + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/common/ASC.FederatedLogin/ASC.FederatedLogin.csproj b/common/ASC.FederatedLogin/ASC.FederatedLogin.csproj index 71605e7ea1..9d55334c68 100644 --- a/common/ASC.FederatedLogin/ASC.FederatedLogin.csproj +++ b/common/ASC.FederatedLogin/ASC.FederatedLogin.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/common/ASC.IPSecurity/ASC.IPSecurity.csproj b/common/ASC.IPSecurity/ASC.IPSecurity.csproj index 9a2e9296e6..4af550a685 100644 --- a/common/ASC.IPSecurity/ASC.IPSecurity.csproj +++ b/common/ASC.IPSecurity/ASC.IPSecurity.csproj @@ -14,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/common/ASC.MessagingSystem/ASC.MessagingSystem.csproj b/common/ASC.MessagingSystem/ASC.MessagingSystem.csproj index 0f8062e382..4209ed64a4 100644 --- a/common/ASC.MessagingSystem/ASC.MessagingSystem.csproj +++ b/common/ASC.MessagingSystem/ASC.MessagingSystem.csproj @@ -14,7 +14,7 @@ - + diff --git a/common/ASC.VoipService/ASC.VoipService.csproj b/common/ASC.VoipService/ASC.VoipService.csproj index 43a83627c9..6ae1aad4a2 100644 --- a/common/ASC.VoipService/ASC.VoipService.csproj +++ b/common/ASC.VoipService/ASC.VoipService.csproj @@ -22,7 +22,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/common/ASC.Webhooks.Core/ASC.Webhooks.Core.csproj b/common/ASC.Webhooks.Core/ASC.Webhooks.Core.csproj index b96022a035..fae7e9e936 100644 --- a/common/ASC.Webhooks.Core/ASC.Webhooks.Core.csproj +++ b/common/ASC.Webhooks.Core/ASC.Webhooks.Core.csproj @@ -19,7 +19,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/common/services/ASC.ElasticSearch/ASC.ElasticSearch.csproj b/common/services/ASC.ElasticSearch/ASC.ElasticSearch.csproj index 60ab191dcd..7705a34077 100644 --- a/common/services/ASC.ElasticSearch/ASC.ElasticSearch.csproj +++ b/common/services/ASC.ElasticSearch/ASC.ElasticSearch.csproj @@ -28,7 +28,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/products/ASC.Files/Core/ASC.Files.Core.csproj b/products/ASC.Files/Core/ASC.Files.Core.csproj index 3addf4d1e0..4e3bd72208 100644 --- a/products/ASC.Files/Core/ASC.Files.Core.csproj +++ b/products/ASC.Files/Core/ASC.Files.Core.csproj @@ -22,14 +22,14 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/web/ASC.Web.Core/ASC.Web.Core.csproj b/web/ASC.Web.Core/ASC.Web.Core.csproj index b17ec7ac5e..33a7b4790e 100644 --- a/web/ASC.Web.Core/ASC.Web.Core.csproj +++ b/web/ASC.Web.Core/ASC.Web.Core.csproj @@ -211,8 +211,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj b/web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj index e5f91c16e5..6e87bf0b9b 100644 --- a/web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj +++ b/web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj @@ -6,8 +6,8 @@ - - + + From eed733b83cee28ba34b66299bc9869088c211cd0 Mon Sep 17 00:00:00 2001 From: Alexey Bannov Date: Fri, 4 Feb 2022 20:59:58 +0300 Subject: [PATCH 2/2] fixed user photo thumbnail generator --- common/ASC.Core.Common/Data/DbSettingsManager.cs | 7 ++++++- web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs | 10 +++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/common/ASC.Core.Common/Data/DbSettingsManager.cs b/common/ASC.Core.Common/Data/DbSettingsManager.cs index d83a3c85d7..f17b2f1027 100644 --- a/common/ASC.Core.Common/Data/DbSettingsManager.cs +++ b/common/ASC.Core.Common/Data/DbSettingsManager.cs @@ -326,7 +326,12 @@ namespace ASC.Core.Data private T Deserialize(string data) { - return JsonSerializer.Deserialize(data); + var options = new JsonSerializerOptions + { + PropertyNameCaseInsensitive = true + }; + + return JsonSerializer.Deserialize(data, options); } private string Serialize(T settings) diff --git a/web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs b/web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs index d58dbc6f7d..fe1279878c 100644 --- a/web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs +++ b/web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs @@ -78,16 +78,20 @@ namespace ASC.Web.Core.Users var x = thumbnailSettings.Point.X > 0 ? thumbnailSettings.Point.X : 0; var y = thumbnailSettings.Point.Y > 0 ? thumbnailSettings.Point.Y : 0; + var width = x + thumbnailSettings.Size.Width > mainImg.Width ? mainImg.Width : thumbnailSettings.Size.Width; + var height = y + thumbnailSettings.Size.Height > mainImg.Height ? mainImg.Height : thumbnailSettings.Size.Height; + var rect = new Rectangle(x, y, - thumbnailSettings.Size.Width, - thumbnailSettings.Size.Height); + width, + height); Image destRound = mainImg.Clone(x => x.Crop(rect).Resize(new ResizeOptions { Size = size, Mode = ResizeMode.Stretch - })); + })); + return destRound; } }