Skip to content

Commit

Permalink
analizators/U2U1003
Browse files Browse the repository at this point in the history
  • Loading branch information
@SuhorukovAnton
SuhorukovAnton committed Jan 10, 2022
1 parent a671732 commit c43f244
Show file tree
Hide file tree
Showing 15 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion common/ASC.Core.Common/Notify/Patterns/NVelocityPatternFormatter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected override void AfterFormat(INoticeMessage message)
base.AfterFormat(message);
}

private static void EventCartridgeReferenceInsertion(object sender, ReferenceInsertionEventArgs e)
private void EventCartridgeReferenceInsertion(object sender, ReferenceInsertionEventArgs e)
{
if (!(e.OriginalValue is string originalString)) return;
var lines = originalString.Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
Expand Down
4 changes: 2 additions & 2 deletions common/ASC.Notify.Textile/JabberStyler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void ApplyFormating(NoticeMessage message)
message.Body = body;
}

private static string EvalLink(Match match)
private string EvalLink(Match match)
{
if (match.Success)
{
Expand All @@ -88,7 +88,7 @@ private static string EvalLink(Match match)
return match.Value;
}

private static string ArgMatchReplace(Match match)
private string ArgMatchReplace(Match match)
{
return match.Result("${arg}");
}
Expand Down
2 changes: 1 addition & 1 deletion common/ASC.Textile/Blocks/CapitalsBlockModifier.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public override string ModifyLine(string line)
return line;
}

static private string CapitalsFormatMatchEvaluator(Match m)
private string CapitalsFormatMatchEvaluator(Match m)
{
return @"<span class=""caps"">" + m.Groups["caps"].Value + @"</span>";
}
Expand Down
2 changes: 1 addition & 1 deletion common/ASC.Textile/Blocks/CodeBlockModifier.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public override string Conclude(string line)
return line;
}

static public string CodeFormatMatchEvaluator(Match m)
public string CodeFormatMatchEvaluator(Match m)
{
var res = m.Groups["before"].Value + "<code";
if (m.Groups["lang"].Length > 0)
Expand Down
2 changes: 1 addition & 1 deletion common/ASC.Textile/Blocks/ImageBlockModifier.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public override string ModifyLine(string line)
return line;
}

static string ImageFormatMatchEvaluator(Match m)
string ImageFormatMatchEvaluator(Match m)
{
var atts = BlockAttributesParser.ParseBlockAttributes(m.Groups["atts"].Value, "img");
if (m.Groups["algn"].Length > 0)
Expand Down
2 changes: 1 addition & 1 deletion products/ASC.CRM/Server/Api/ContactInfosController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ public ContactInfoDto DeleteContactInfo(int contactid, int id)
return wrapper;
}

private static ContactInfo FromContactInfoDto(ContactInfoDto contactInfoDto)
private ContactInfo FromContactInfoDto(ContactInfoDto contactInfoDto)
{
return new ContactInfo
{
Expand Down
2 changes: 1 addition & 1 deletion products/ASC.CRM/Server/Core/Dao/TagDao.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ public void AddTagToEntity(EntityType entityType, int entityID, int[] tagIDs)
tx.Commit();
}

private static string CorrectTag(string tag)
private string CorrectTag(string tag)
{
return tag == null
? null
Expand Down
2 changes: 1 addition & 1 deletion products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ protected string GetAvailableTitle(string requestTitle, string parentFolderId, F
return requestTitle;
}

private static string MatchEvaluator(Match match)
private string MatchEvaluator(Match match)
{
var index = Convert.ToInt32(match.Groups[2].Value);
var staticText = match.Value.Substring(string.Format(" ({0})", index).Length);
Expand Down
2 changes: 1 addition & 1 deletion products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ protected string GetAvailableTitle(string requestTitle, string parentFolderPath,
return requestTitle;
}

private static string MatchEvaluator(Match match)
private string MatchEvaluator(Match match)
{
var index = Convert.ToInt32(match.Groups[2].Value);
var staticText = match.Value.Substring(string.Format(" ({0})", index).Length);
Expand Down
2 changes: 1 addition & 1 deletion products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ protected string GetAvailableTitle(string requestTitle, string parentFolderId, F
return requestTitle;
}

private static string MatchEvaluator(Match match)
private string MatchEvaluator(Match match)
{
var index = Convert.ToInt32(match.Groups[2].Value);
var staticText = match.Value.Substring(string.Format(" ({0})", index).Length);
Expand Down
2 changes: 1 addition & 1 deletion products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ protected string GetAvailableTitle(string requestTitle, Folder parentFolderID, F
return requestTitle;
}

private static string MatchEvaluator(Match match)
private string MatchEvaluator(Match match)
{
var index = Convert.ToInt32(match.Groups[2].Value);
var staticText = match.Value.Substring(string.Format(" ({0})", index).Length);
Expand Down
2 changes: 1 addition & 1 deletion products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ protected override IEnumerable<string> GetChildren(string folderId)
return subFolders.Concat(files);
}

private static string MatchEvaluator(Match match)
private string MatchEvaluator(Match match)
{
var index = Convert.ToInt32(match.Groups[2].Value);
var staticText = match.Value.Substring(string.Format(" ({0})", index).Length);
Expand Down
4 changes: 2 additions & 2 deletions web/ASC.Web.Core/Notify/NotifyConfiguration.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public void Configure()
}
}

private static void NotifyClientRegisterCallback(Context context, INotifyClient client)
private void NotifyClientRegisterCallback(Context context, INotifyClient client)
{
#region url correction

Expand Down Expand Up @@ -250,7 +250,7 @@ private static void NotifyClientRegisterCallback(Context context, INotifyClient
#endregion
}

private static void BeforeTransferRequest(NotifyEngine sender, NotifyRequest request, IServiceScope scope)
private void BeforeTransferRequest(NotifyEngine sender, NotifyRequest request, IServiceScope scope)
{
var aid = Guid.Empty;
var aname = string.Empty;
Expand Down
28 changes: 14 additions & 14 deletions web/ASC.Web.Core/Notify/StudioNotifyService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public void UserPasswordChange(UserInfo userInfo)
var hash = Authentication.GetUserPasswordStamp(userInfo.ID).ToString("s");
var confirmationUrl = CommonLinkUtility.GetConfirmationUrl(userInfo.Email, ConfirmType.PasswordChange, hash, userInfo.ID);

static string greenButtonText() => WebstudioNotifyPatternResource.ButtonChangePassword;
string greenButtonText() => WebstudioNotifyPatternResource.ButtonChangePassword;

var action = CoreBaseSettings.Personal
? (CoreBaseSettings.CustomMode ? Actions.PersonalCustomModePasswordChange : Actions.PersonalPasswordChange)
Expand All @@ -202,7 +202,7 @@ public void SendEmailChangeInstructions(UserInfo user, string email)
{
var confirmationUrl = CommonLinkUtility.GetConfirmationUrl(email, ConfirmType.EmailChange, AuthContext.CurrentAccount.ID);

static string greenButtonText() => WebstudioNotifyPatternResource.ButtonChangeEmail;
string greenButtonText() => WebstudioNotifyPatternResource.ButtonChangeEmail;

var action = CoreBaseSettings.Personal
? (CoreBaseSettings.CustomMode ? Actions.PersonalCustomModeEmailChangeV115 : Actions.PersonalEmailChangeV115)
Expand All @@ -220,7 +220,7 @@ public void SendEmailActivationInstructions(UserInfo user, string email)
{
var confirmationUrl = CommonLinkUtility.GetConfirmationUrl(email, ConfirmType.EmailActivation, null, user.ID);

static string greenButtonText() => WebstudioNotifyPatternResource.ButtonActivateEmail;
string greenButtonText() => WebstudioNotifyPatternResource.ButtonActivateEmail;

client.SendNoticeToAsync(
Actions.ActivateEmail,
Expand Down Expand Up @@ -290,7 +290,7 @@ public void SendMsgMobilePhoneChange(UserInfo userInfo)
{
var confirmationUrl = CommonLinkUtility.GetConfirmationUrl(userInfo.Email.ToLower(), ConfirmType.PhoneActivation);

static string greenButtonText() => WebstudioNotifyPatternResource.ButtonChangePhone;
string greenButtonText() => WebstudioNotifyPatternResource.ButtonChangePhone;

client.SendNoticeToAsync(
Actions.PhoneChange,
Expand All @@ -303,7 +303,7 @@ public void SendMsgTfaReset(UserInfo userInfo)
{
var confirmationUrl = CommonLinkUtility.GetConfirmationUrl(userInfo.Email.ToLower(), ConfirmType.TfaActivation);

static string greenButtonText() => WebstudioNotifyPatternResource.ButtonChangeTfa;
string greenButtonText() => WebstudioNotifyPatternResource.ButtonChangeTfa;

client.SendNoticeToAsync(
Actions.TfaChange,
Expand All @@ -326,7 +326,7 @@ public void SendJoinMsg(string email, EmployeeType emplType)
var inviteUrl = CommonLinkUtility.GetConfirmationUrl(email, ConfirmType.EmpInvite, (int)emplType)
+ string.Format("&emplType={0}", (int)emplType);

static string greenButtonText() => WebstudioNotifyPatternResource.ButtonJoin;
string greenButtonText() => WebstudioNotifyPatternResource.ButtonJoin;

client.SendNoticeToAsync(
Actions.JoinUsers,
Expand Down Expand Up @@ -454,7 +454,7 @@ public void UserInfoActivation(UserInfo newUserInfo)

var confirmationUrl = GenerateActivationConfirmUrl(newUserInfo);

static string greenButtonText() => WebstudioNotifyPatternResource.ButtonAccept;
string greenButtonText() => WebstudioNotifyPatternResource.ButtonAccept;

client.SendNoticeToAsync(
notifyAction,
Expand Down Expand Up @@ -492,7 +492,7 @@ public void GuestInfoActivation(UserInfo newUserInfo)

var confirmationUrl = GenerateActivationConfirmUrl(newUserInfo);

static string greenButtonText() => WebstudioNotifyPatternResource.ButtonAccept;
string greenButtonText() => WebstudioNotifyPatternResource.ButtonAccept;

client.SendNoticeToAsync(
notifyAction,
Expand Down Expand Up @@ -657,7 +657,7 @@ public void SendMsgPortalDeactivation(Tenant t, string deactivateUrl, string act
{
var u = UserManager.GetUsers(t.OwnerId);

static string greenButtonText() => WebstudioNotifyPatternResource.ButtonDeactivatePortal;
string greenButtonText() => WebstudioNotifyPatternResource.ButtonDeactivatePortal;

client.SendNoticeToAsync(
Actions.PortalDeactivate,
Expand All @@ -672,7 +672,7 @@ public void SendMsgPortalDeletion(Tenant t, string url, bool showAutoRenewText)
{
var u = UserManager.GetUsers(t.OwnerId);

static string greenButtonText() => WebstudioNotifyPatternResource.ButtonDeletePortal;
string greenButtonText() => WebstudioNotifyPatternResource.ButtonDeletePortal;

client.SendNoticeToAsync(
Actions.PortalDelete,
Expand All @@ -685,7 +685,7 @@ public void SendMsgPortalDeletion(Tenant t, string url, bool showAutoRenewText)

public void SendMsgPortalDeletionSuccess(UserInfo owner, string url)
{
static string greenButtonText() => WebstudioNotifyPatternResource.ButtonLeaveFeedback;
string greenButtonText() => WebstudioNotifyPatternResource.ButtonLeaveFeedback;

client.SendNoticeToAsync(
Actions.PortalDeleteSuccessV115,
Expand All @@ -701,7 +701,7 @@ public void SendMsgDnsChange(Tenant t, string confirmDnsUpdateUrl, string portal
{
var u = UserManager.GetUsers(t.OwnerId);

static string greenButtonText() => WebstudioNotifyPatternResource.ButtonConfirmPortalAddressChange;
string greenButtonText() => WebstudioNotifyPatternResource.ButtonConfirmPortalAddressChange;

client.SendNoticeToAsync(
Actions.DnsChange,
Expand All @@ -716,7 +716,7 @@ public void SendMsgDnsChange(Tenant t, string confirmDnsUpdateUrl, string portal

public void SendMsgConfirmChangeOwner(UserInfo owner, UserInfo newOwner, string confirmOwnerUpdateUrl)
{
static string greenButtonText() => WebstudioNotifyPatternResource.ButtonConfirmPortalOwnerUpdate;
string greenButtonText() => WebstudioNotifyPatternResource.ButtonConfirmPortalOwnerUpdate;

client.SendNoticeToAsync(
Actions.ConfirmOwnerChange,
Expand Down Expand Up @@ -754,7 +754,7 @@ public void SendCongratulations(UserInfo u)
var confirmationUrl = CommonLinkUtility.GetConfirmationUrl(u.Email, ConfirmType.EmailActivation);
confirmationUrl += "&first=true";

static string greenButtonText() => WebstudioNotifyPatternResource.ButtonConfirm;
string greenButtonText() => WebstudioNotifyPatternResource.ButtonConfirm;

client.SendNoticeToAsync(
notifyAction,
Expand Down
28 changes: 14 additions & 14 deletions web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public void SendSaasLetters(string senderName, DateTime scheduleDate)

Func<string> greenButtonText = () => string.Empty;

static string blueButtonText() => WebstudioNotifyPatternResource.ButtonRequestCallButton;
string blueButtonText() => WebstudioNotifyPatternResource.ButtonRequestCallButton;
var greenButtonUrl = string.Empty;

Func<string> tableItemText1 = () => string.Empty;
Expand Down Expand Up @@ -156,17 +156,17 @@ public void SendSaasLetters(string senderName, DateTime scheduleDate)

Func<string> tableItemLearnMoreText1 = () => string.Empty;

static string tableItemLearnMoreText2() => string.Empty;
string tableItemLearnMoreText2() => string.Empty;

static string tableItemLearnMoreText3() => string.Empty;
string tableItemLearnMoreText3() => string.Empty;

static string tableItemLearnMoreText4() => string.Empty;
string tableItemLearnMoreText4() => string.Empty;

static string tableItemLearnMoreText5() => string.Empty;
string tableItemLearnMoreText5() => string.Empty;

static string tableItemLearnMoreText6() => string.Empty;
string tableItemLearnMoreText6() => string.Empty;

static string tableItemLearnMoreText7() => string.Empty;
string tableItemLearnMoreText7() => string.Empty;

var tableItemLearnMoreUrl1 = string.Empty;
var tableItemLearnMoreUrl2 = string.Empty;
Expand Down Expand Up @@ -518,7 +518,7 @@ public void SendEnterpriseLetters(string senderName, DateTime scheduleDate)

Func<string> greenButtonText = () => string.Empty;

static string blueButtonText() => WebstudioNotifyPatternResource.ButtonRequestCallButton;
string blueButtonText() => WebstudioNotifyPatternResource.ButtonRequestCallButton;
var greenButtonUrl = string.Empty;

Func<string> tableItemText1 = () => string.Empty;
Expand Down Expand Up @@ -555,17 +555,17 @@ public void SendEnterpriseLetters(string senderName, DateTime scheduleDate)

Func<string> tableItemLearnMoreText1 = () => string.Empty;

static string tableItemLearnMoreText2() => string.Empty;
string tableItemLearnMoreText2() => string.Empty;

static string tableItemLearnMoreText3() => string.Empty;
string tableItemLearnMoreText3() => string.Empty;

static string tableItemLearnMoreText4() => string.Empty;
string tableItemLearnMoreText4() => string.Empty;

static string tableItemLearnMoreText5() => string.Empty;
string tableItemLearnMoreText5() => string.Empty;

static string tableItemLearnMoreText6() => string.Empty;
string tableItemLearnMoreText6() => string.Empty;

static string tableItemLearnMoreText7() => string.Empty;
string tableItemLearnMoreText7() => string.Empty;

var tableItemLearnMoreUrl1 = string.Empty;
var tableItemLearnMoreUrl2 = string.Empty;
Expand Down

0 comments on commit c43f244

Please sign in to comment.