Skip to content

Commit 64c1987

Browse files
dahall_cpdahall_cp
dahall_cp
authored and
dahall_cp
committed
* Version 2.5.12
* Added V1 support to TaskEventWatcher * Refactored V1 task flags and data handlers to use extension methods * Bug fixes to TaskService.Connect, MMCMockup to work with V1, editors to handle V1 editing without V2 errors, TaskListView updating * Added TaskHistoryControl.MaxQueryCount and corresponding MaxHistoryCount to TaskEditDialog and TaskPropertiesControl that allows limiting history items
1 parent 4f63c13 commit 64c1987

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Reporter.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,33 @@ public string[] General()
1818
{
1919
var ret = new List<string>();
2020
ret.Add($"User '{validator.User}' has the following roles:");
21-
ret.Add($" Administrators: {validator.UserIsAdmin}");
22-
ret.Add($" Backup Operators: {validator.UserIsBackupOperator}");
23-
ret.Add($" Server Operators: {validator.UserIsServerOperator}");
21+
ret.Add($"{TorF(validator.UserIsAdmin)} Administrators");
22+
ret.Add($"{TorF(validator.UserIsBackupOperator)} Backup Operators");
23+
ret.Add($"{TorF(validator.UserIsServerOperator)} Server Operators");
2424
return ret.ToArray();
2525
}
2626

2727
public string[] V1()
2828
{
2929
var ret = new List<string>();
30-
ret.Add($"User is a member of at least one of the required groups: {validator.UserIsAdmin || validator.UserIsBackupOperator || validator.UserIsServerOperator}");
31-
ret.Add($"User has access rights to C:\\Windows\\Tasks: {validator.V1TaskPathAccess}");
30+
ret.Add($"{TorF(validator.UserIsAdmin || validator.UserIsBackupOperator || validator.UserIsServerOperator)} User is a member of at least one of the required groups");
31+
ret.Add($"{TorF(validator.V1TaskPathAccess)} User has access rights to C:\\Windows\\Tasks");
3232
ret.Add("");
33-
ret.Add($"Firewall must be enabled and have the following exceptions:");
34-
ret.Add(" Firewall: " + (validator.IsFirewallEnabled ? "Enabled" : "Disabled"));
33+
ret.Add(TorF(validator.IsFirewallEnabled) + " Firewall Enabled");
3534
foreach (string exc in validator.FirewallConfiguration.Keys)
36-
ret.Add($" {exc}: {validator.FirewallConfiguration[exc]}");
35+
ret.Add($"{TorF(validator.FirewallConfiguration[exc])} {exc}");
3736
return ret.ToArray();
3837
}
3938

4039
public string[] V2()
4140
{
4241
var ret = new List<string>();
43-
ret.Add($"Firewall must be enabled and have the following exceptions:");
44-
ret.Add(" Firewall: " + (validator.IsFirewallEnabled ? "Enabled" : "Disabled"));
42+
ret.Add(TorF(validator.IsFirewallEnabled) + " Firewall Enabled");
4543
foreach (string exc in validator.FirewallConfiguration.Keys)
46-
ret.Add($" {exc}: {validator.FirewallConfiguration[exc]}");
44+
ret.Add($"{TorF(validator.FirewallConfiguration[exc])} {exc}");
4745
return ret.ToArray();
4846
}
47+
48+
public static string TorF(bool condition) => condition ? "√" : "X";
4949
}
5050
}

0 commit comments

Comments
 (0)