Skip to content

Commit

Permalink
analizators/U2U1113
Browse files Browse the repository at this point in the history
  • Loading branch information
SuhorukovAnton committed Jan 17, 2022
1 parent 0ee1a35 commit cec441c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ protected virtual void OnProgressChanged(ProgressChangedEventArgs eventArgs)

foreach (var p in parsed)
{
if (string.IsNullOrEmpty(p.Trim())) continue;
if (string.IsNullOrWhiteSpace(p)) continue;
var keyValue = p.Split('=');
result.Add(keyValue[0].ToLowerInvariant(), keyValue[1]);
}
Expand Down
4 changes: 2 additions & 2 deletions common/services/ASC.ApiSystem/Classes/CommonMethods.cs
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public bool SendCongratulations(string requestUriScheme, Tenant tenant, bool ski

public bool GetTenant(IModel model, out Tenant tenant)
{
if (CoreBaseSettings.Standalone && model != null && !string.IsNullOrEmpty((model.PortalName ?? "").Trim()))
if (CoreBaseSettings.Standalone && model != null && !string.IsNullOrWhiteSpace((model.PortalName ?? "")))
{
tenant = TenantManager.GetTenant((model.PortalName ?? "").Trim());
return true;
Expand All @@ -216,7 +216,7 @@ public bool GetTenant(IModel model, out Tenant tenant)
return true;
}

if (model != null && !string.IsNullOrEmpty((model.PortalName ?? "").Trim()))
if (model != null && !string.IsNullOrWhiteSpace((model.PortalName ?? "")))
{
tenant = HostedSolution.GetTenant((model.PortalName ?? "").Trim());
return true;
Expand Down
4 changes: 2 additions & 2 deletions common/services/ASC.ApiSystem/Controllers/PortalController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -477,13 +477,13 @@ public IActionResult GetPortals([FromQuery] TenantModel model)
var tenants = new List<Tenant>();
var empty = true;

if (!string.IsNullOrEmpty((model.Email ?? "").Trim()))
if (!string.IsNullOrWhiteSpace((model.Email ?? "")))
{
empty = false;
tenants.AddRange(HostedSolution.FindTenants((model.Email ?? "").Trim()));
}

if (!string.IsNullOrEmpty((model.PortalName ?? "").Trim()))
if (!string.IsNullOrWhiteSpace((model.PortalName ?? "")))
{
empty = false;
var tenant = HostedSolution.GetTenant((model.PortalName ?? "").Trim());
Expand Down

0 comments on commit cec441c

Please sign in to comment.