bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-04 17:43:53 +00:00
Code Issues Releases Wiki Activity

Changed all C# control flow block statements to include space between keyword and open paren

Browse Source
This commit is contained in:
Chad Scharf
2020-03-27 14:36:37 -04:00
parent 943aea9a12
commit 9800b752c0
243 changed files with 2258 additions and 2258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Icons/Models/DomainName.cs
View File

@@ -67,7 +67,7 @@ namespace Bit.Icons.Models
public static bool TryParseBaseDomain(string domainString, out string result)
{
if(Regex.IsMatch(domainString, IpRegex))
if (Regex.IsMatch(domainString, IpRegex))
{
result = domainString;
return true;
@@ -91,7 +91,7 @@ namespace Bit.Icons.Models
MatchingRule = null;
// If the fqdn is empty, we have a problem already
if(domainString.Trim() == string.Empty)
if (domainString.Trim() == string.Empty)
{
throw new ArgumentException("The domain cannot be blank");
}
@@ -100,7 +100,7 @@ namespace Bit.Icons.Models
MatchingRule = FindMatchingTLDRule(domainString);
// At this point, no rules match, we have a problem
if(MatchingRule == null)
if (MatchingRule == null)
{
throw new FormatException("The domain does not have a recognized TLD");
}
@@ -110,7 +110,7 @@ namespace Bit.Icons.Models
var tldIndex = 0;
// First, determine what type of rule we have, and set the TLD accordingly
switch(MatchingRule.Type)
switch (MatchingRule.Type)
{
case TLDRule.RuleType.Normal:
tldIndex = domainString.LastIndexOf("." + MatchingRule.Name);
@@ -140,13 +140,13 @@ namespace Bit.Icons.Models
// If we have 0 parts left, there is just a tld and no domain or subdomain
// If we have 1 part, it's the domain, and there is no subdomain
// If we have 2+ parts, the last part is the domain, the other parts (combined) are the subdomain
if(lstRemainingParts.Count > 0)
if (lstRemainingParts.Count > 0)
{
// Set the domain:
SLD = lstRemainingParts[lstRemainingParts.Count - 1];
// Set the subdomain, if there is one to set:
if(lstRemainingParts.Count > 1)
if (lstRemainingParts.Count > 1)
{
// We strip off the trailing period, too
SubDomain = tempSudomainAndDomain.Substring(0, tempSudomainAndDomain.Length - SLD.Length - 1);
@@ -169,23 +169,23 @@ namespace Bit.Icons.Models
// Our 'matches' collection:
var ruleMatches = new List<TLDRule>();
foreach(string domainPart in lstDomainParts)
foreach (string domainPart in lstDomainParts)
{
// Add on our next domain part:
checkAgainst = string.Format("{0}.{1}", domainPart, checkAgainst);
// If we end in a period, strip it off:
if(checkAgainst.EndsWith("."))
if (checkAgainst.EndsWith("."))
{
checkAgainst = checkAgainst.Substring(0, checkAgainst.Length - 1);
}
var rules = Enum.GetValues(typeof(TLDRule.RuleType)).Cast<TLDRule.RuleType>();
foreach(var rule in rules)
foreach (var rule in rules)
{
// Try to match rule:
TLDRule result;
if(TLDRulesCache.Instance.TLDRuleLists[rule].TryGetValue(checkAgainst, out result))
if (TLDRulesCache.Instance.TLDRuleLists[rule].TryGetValue(checkAgainst, out result))
{
ruleMatches.Add(result);
}
@@ -210,12 +210,12 @@ namespace Bit.Icons.Models
public TLDRule(string RuleInfo)
{
// Parse the rule and set properties accordingly:
if(RuleInfo.StartsWith("*"))
if (RuleInfo.StartsWith("*"))
{
Type = RuleType.Wildcard;
Name = RuleInfo.Substring(2);
}
else if(RuleInfo.StartsWith("!"))
else if (RuleInfo.StartsWith("!"))
{
Type = RuleType.Exception;
Name = RuleInfo.Substring(1);
@@ -229,7 +229,7 @@ namespace Bit.Icons.Models
public int CompareTo(TLDRule other)
{
if(other == null)
if (other == null)
{
return -1;
}
@@ -261,11 +261,11 @@ namespace Bit.Icons.Models
{
get
{
if(_uniqueInstance == null)
if (_uniqueInstance == null)
{
lock(_syncObj)
lock (_syncObj)
{
if(_uniqueInstance == null)
if (_uniqueInstance == null)
{
_uniqueInstance = new TLDRulesCache();
}
@@ -279,7 +279,7 @@ namespace Bit.Icons.Models
public static void Reset()
{
lock(_syncObj)
lock (_syncObj)
{
_uniqueInstance = null;
}
@@ -289,7 +289,7 @@ namespace Bit.Icons.Models
{
var results = new Dictionary<TLDRule.RuleType, IDictionary<string, TLDRule>>();
var rules = Enum.GetValues(typeof(TLDRule.RuleType)).Cast<TLDRule.RuleType>();
foreach(var rule in rules)
foreach (var rule in rules)
{
results[rule] = new Dictionary<string, TLDRule>(StringComparer.CurrentCultureIgnoreCase);
}
@@ -301,7 +301,7 @@ namespace Bit.Icons.Models
// b.) Blank
var rulesStrings = ruleStrings
.Where(ruleString => !ruleString.StartsWith("//") && ruleString.Trim().Length != 0);
foreach(var ruleString in rulesStrings)
foreach (var ruleString in rulesStrings)
{
var result = new TLDRule(ruleString);
results[result.Type][result.Name] = result;
@@ -318,9 +318,9 @@ namespace Bit.Icons.Models
var assembly = typeof(TLDRulesCache).GetTypeInfo().Assembly;
var stream = assembly.GetManifestResourceStream("Bit.Icons.Resources.public_suffix_list.dat");
string line;
using(var reader = new StreamReader(stream))
using (var reader = new StreamReader(stream))
{
while((line = reader.ReadLine()) != null)
while ((line = reader.ReadLine()) != null)
{
yield return line;
}

16
src/Icons/Models/IconResult.cs
View File

@@ -7,30 +7,30 @@ namespace Bit.Icons.Models
public IconResult(string href, string sizes)
{
Path = href;
if(!string.IsNullOrWhiteSpace(sizes))
if (!string.IsNullOrWhiteSpace(sizes))
{
var sizeParts = sizes.Split('x');
if(sizeParts.Length == 2 && int.TryParse(sizeParts[0].Trim(), out var width) &&
if (sizeParts.Length == 2 && int.TryParse(sizeParts[0].Trim(), out var width) &&
int.TryParse(sizeParts[1].Trim(), out var height))
{
DefinedWidth = width;
DefinedHeight = height;
if(width == height)
if (width == height)
{
if(width == 32)
if (width == 32)
{
Priority = 1;
}
else if(width == 64)
else if (width == 64)
{
Priority = 2;
}
else if(width >= 24 && width <= 128)
else if (width >= 24 && width <= 128)
{
Priority = 3;
}
else if(width == 16)
else if (width == 16)
{
Priority = 4;
}
@@ -42,7 +42,7 @@ namespace Bit.Icons.Models
}
}
if(Priority == 0)
if (Priority == 0)
{
Priority = 200;
}