IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Coomon: static private fields renamed as per microsoft convention

Browse Source
This commit is contained in:
Maksim Chegulov 2022-02-04 12:46:24 +03:00
parent 4097f72e94
commit 9f561702df
5 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/ASC.Common/Logging/SelfCleaningAppender.cs
View File

@ -27,15 +27,14 @@ namespace ASC.Common.Logging;
public class SelfCleaningAppender : RollingFileAppender
{
private static DateTime _lastCleanDate;
private static int? _cleanPeriod;
private static DateTime s_lastCleanDate;
private static int? s_cleanPeriod;
protected override void Append(LoggingEvent loggingEvent)
{
if (DateTime.UtcNow.Date > _lastCleanDate.Date)
if (DateTime.UtcNow.Date > s_lastCleanDate.Date)
{
_lastCleanDate = DateTime.UtcNow.Date;
s_lastCleanDate = DateTime.UtcNow.Date;
Clean();
}
@ -44,9 +43,9 @@ public class SelfCleaningAppender : RollingFileAppender
protected override void Append(LoggingEvent[] loggingEvents)
{
if (DateTime.UtcNow.Date > _lastCleanDate.Date)
if (DateTime.UtcNow.Date > s_lastCleanDate.Date)
{
_lastCleanDate = DateTime.UtcNow.Date;
s_lastCleanDate = DateTime.UtcNow.Date;
Clean();
}
@ -55,8 +54,8 @@ public class SelfCleaningAppender : RollingFileAppender
private static int GetCleanPeriod()
{
if (_cleanPeriod != null)
return _cleanPeriod.Value;
if (s_cleanPeriod != null)
return s_cleanPeriod.Value;
const string key = "CleanPeriod";
@ -67,7 +66,7 @@ public class SelfCleaningAppender : RollingFileAppender
if (repo != null && repo.Properties.GetKeys().Contains(key))
int.TryParse(repo.Properties[key].ToString(), out value);
_cleanPeriod = value;
s_cleanPeriod = value;
return value;
}

19
common/ASC.Common/Logging/SelfCleaningTarget.cs
View File

@ -30,15 +30,14 @@ namespace ASC.Common.Logging;
[Target("SelfCleaning")]
public class SelfCleaningTarget : FileTarget
{
private static DateTime _lastCleanDate;
private static int? _cleanPeriod;
private static DateTime s_lastCleanDate;
private static int? s_cleanPeriod;
protected override void Write(IList<AsyncLogEventInfo> logEvents)
{
if (DateTime.UtcNow.Date > _lastCleanDate.Date)
if (DateTime.UtcNow.Date > s_lastCleanDate.Date)
{
_lastCleanDate = DateTime.UtcNow.Date;
s_lastCleanDate = DateTime.UtcNow.Date;
Clean();
}
@ -57,9 +56,9 @@ public class SelfCleaningTarget : FileTarget
protected override void Write(LogEventInfo logEvent)
{
if (DateTime.UtcNow.Date > _lastCleanDate.Date)
if (DateTime.UtcNow.Date > s_lastCleanDate.Date)
{
_lastCleanDate = DateTime.UtcNow.Date;
s_lastCleanDate = DateTime.UtcNow.Date;
Clean();
}
@ -68,8 +67,8 @@ public class SelfCleaningTarget : FileTarget
private static int GetCleanPeriod()
{
if (_cleanPeriod != null)
return _cleanPeriod.Value;
if (s_cleanPeriod != null)
return s_cleanPeriod.Value;
var value = 30;
@ -83,7 +82,7 @@ public class SelfCleaningTarget : FileTarget
int.TryParse(variable.Text, out value);
}
_cleanPeriod = value;
s_cleanPeriod = value;
return value;
}

4
common/ASC.Common/Security/Authorizing/AzObjectIdHelper.cs
View File

@ -28,12 +28,12 @@ namespace ASC.Common.Security.Authorizing;
public static class AzObjectIdHelper
{
private static readonly string separator = "|";
private static readonly string s_separator = "|";
public static string GetFullObjectId(ISecurityObjectId objectId)
{
if (objectId == null) return null;
return $"{objectId.ObjectType.FullName}{separator}{objectId.SecurityId}";
return $"{objectId.ObjectType.FullName}{s_separator}{objectId.SecurityId}";
}
}

17
common/ASC.Common/Utils/HtmlUtil.cs
View File

@ -27,36 +27,35 @@ namespace ASC.Common.Utils;
public static class HtmlUtil
{
private static readonly Regex _tagReplacer
private static readonly Regex s_tagReplacer
= new Regex("<[^>]*>", RegexOptions.Multiline | RegexOptions.Compiled);
private static readonly Regex _commentsReplacer
private static readonly Regex s_commentsReplacer
= new Regex("<!--(?s).*?-->", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
private static readonly Regex _xssReplacer
private static readonly Regex s_xssReplacer
= new Regex(@"<\s*(style|script)[^>]*>(.*?)<\s*/\s*(style|script)>", RegexOptions.IgnoreCase
| RegexOptions.CultureInvariant | RegexOptions.Compiled | RegexOptions.Singleline);
private static readonly Regex _worder =
private static readonly Regex s_worder =
new Regex(@"\S+", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
public static string GetText(string html, int maxLength = 0, string endBlockTemplate = "...")
{
var unformatedText = string.Empty;
if (!string.IsNullOrEmpty(html))
{
html = _xssReplacer.Replace(html, string.Empty); //Clean malicious tags. <script> <style>
html = s_xssReplacer.Replace(html, string.Empty); //Clean malicious tags. <script> <style>
if (string.IsNullOrEmpty(html)) return html;
unformatedText = _tagReplacer.Replace(html, string.Empty);
unformatedText = s_tagReplacer.Replace(html, string.Empty);
if (!string.IsNullOrEmpty(unformatedText))
{
// kill comments
unformatedText = _commentsReplacer.Replace(unformatedText, string.Empty);
unformatedText = s_commentsReplacer.Replace(unformatedText, string.Empty);
unformatedText = unformatedText.Trim();
if (!string.IsNullOrEmpty(unformatedText))
@ -97,7 +96,7 @@ public static class HtmlUtil
{
if (string.IsNullOrEmpty(searchText) || string.IsNullOrEmpty(htmlText)) return htmlText;
var regexpstr = _worder.Matches(searchText).Cast<Match>().Select(m => m.Value).Distinct().Aggregate((r, n) => r + "|" + n);
var regexpstr = s_worder.Matches(searchText).Cast<Match>().Select(m => m.Value).Distinct().Aggregate((r, n) => r + "|" + n);
var wordsFinder = new Regex(Regex.Escape(regexpstr), RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Multiline);
return wordsFinder.Replace(htmlText, m => string.Format("<span class='searchTextHighlight{1}'>{0}</span>", m.Value, withoutLink ? " bold" : string.Empty));

28
common/ASC.Common/Web/MimeMapping.cs
View File

@ -27,8 +27,8 @@ namespace ASC.Common.Web;
public static class MimeMapping
{
private static readonly Hashtable _extensionToMimeMappingTable = new Hashtable(200, StringComparer.CurrentCultureIgnoreCase);
private static readonly IDictionary<string, IList<string>> _mimeSynonyms = new Dictionary<string, IList<string>>();
private static readonly Hashtable s_extensionToMimeMappingTable = new Hashtable(200, StringComparer.CurrentCultureIgnoreCase);
private static readonly IDictionary<string, IList<string>> s_mimeSynonyms = new Dictionary<string, IList<string>>();
static MimeMapping()
{
@ -810,12 +810,12 @@ public static class MimeMapping
{
if (string.IsNullOrEmpty(mimeMapping)) return null;
foreach (DictionaryEntry entry in _extensionToMimeMappingTable)
foreach (DictionaryEntry entry in s_extensionToMimeMappingTable)
{
var mime = (string)entry.Value;
if (mime == mimeMapping.ToLowerInvariant()) return (string)entry.Key;
if (!_mimeSynonyms.ContainsKey(mime)) continue;
if (_mimeSynonyms[mime].Contains(mimeMapping.ToLowerInvariant())) return (string)entry.Key;
if (!s_mimeSynonyms.ContainsKey(mime)) continue;
if (s_mimeSynonyms[mime].Contains(mimeMapping.ToLowerInvariant())) return (string)entry.Key;
}
return null;
@ -827,27 +827,27 @@ public static class MimeMapping
var startIndex = fileName.LastIndexOf('.');
if (0 <= startIndex && fileName.LastIndexOf('\\') < startIndex)
str = (string)_extensionToMimeMappingTable[fileName.Substring(startIndex)];
str = (string)s_extensionToMimeMappingTable[fileName.Substring(startIndex)];
if (str == null) str = (string)_extensionToMimeMappingTable[".*"];
if (str == null) str = (string)s_extensionToMimeMappingTable[".*"];
return str;
}
private static void AddMimeMapping(string extension, string MimeType)
{
if (_extensionToMimeMappingTable.ContainsKey(extension))
AddMimeSynonym((string)_extensionToMimeMappingTable[extension], MimeType);
if (s_extensionToMimeMappingTable.ContainsKey(extension))
AddMimeSynonym((string)s_extensionToMimeMappingTable[extension], MimeType);
else _extensionToMimeMappingTable.Add(extension, MimeType);
else s_extensionToMimeMappingTable.Add(extension, MimeType);
}
private static void AddMimeSynonym(string mime, string synonym)
{
if (!_mimeSynonyms.ContainsKey(mime))
_mimeSynonyms[mime] = new List<string>();
if (!s_mimeSynonyms.ContainsKey(mime))
s_mimeSynonyms[mime] = new List<string>();
if (!_mimeSynonyms[mime].Contains(synonym))
_mimeSynonyms[mime].Add(synonym);
if (!s_mimeSynonyms[mime].Contains(synonym))
s_mimeSynonyms[mime].Add(synonym);
}
}