Permalink
Browse files

Merge pull request #499 from roycewilliams/master

minor grammar; normalize periods in config descriptions
  • Loading branch information...
s3inlc committed Nov 6, 2018
2 parents cd2951c + d750f94 commit 23af76bf27723e7d3af10a7d589a704c2f41fe85
Showing with 23 additions and 23 deletions.
  1. +19 −19 src/inc/defines/config.php
  2. +1 −1 src/templates/health/index.template.html
  3. +3 −3 src/templates/static/about.template.html
View
@@ -250,43 +250,43 @@ public static function getConfigType($config) {
public static function getConfigDescription($config) {
switch ($config) {
case DConfig::BENCHMARK_TIME:
return "Time in seconds an agent should benchmark a task";
return "Time in seconds an agent should benchmark a task.";
case DConfig::CHUNK_DURATION:
return "Time in seconds a client should be working on a single chunk";
return "Time in seconds a client should be working on a single chunk.";
case DConfig::CHUNK_TIMEOUT:
return "Time in seconds the server will consider an issued chunk as inactive or timed out and will reallocate to another client.";
case DConfig::AGENT_TIMEOUT:
return "Time in seconds the server will consider a client inactive or timed out.";
case DConfig::HASHES_PAGE_SIZE:
return "Number of hashes shown on each page of the hashes view.";
case DConfig::FIELD_SEPARATOR:
return "The separator character used to separate hash and plain (or salt)";
return "The separator character used to separate hash and plain (or salt).";
case DConfig::HASHLIST_ALIAS:
return "The string used as hashlist alias when creating a task";
return "The string used as hashlist alias when creating a task.";
case DConfig::STATUS_TIMER:
return "Interval in seconds clients should report back to the server. (cracks, status, and progress)";
return "Interval in seconds clients should report back to the server. (cracks, status, and progress).";
case DConfig::BLACKLIST_CHARS:
return "Characters that are not allowed to be used in attack command inputs";
return "Characters that are not allowed to be used in attack command inputs.";
case DConfig::NUMBER_LOGENTRIES:
return "Number of log entries that should be saved. When this number is exceeded by 120%, the oldest will be overwritten";
return "Number of log entries that should be saved. When this number is exceeded by 120%, the oldest will be overwritten.";
case DConfig::TIME_FORMAT:
return "Set the time format. Use syntax for PHPs date() method";
return "Set the time format. Use syntax for PHPs date() method.";
case DConfig::BASE_URL:
return "Base url for the webpage (this does not include hostname and is normally determined automatically on the installation)";
return "Base url for the webpage (this does not include hostname and is normally determined automatically on the installation).";
case DConfig::DISP_TOLERANCE:
return "Allowable deviation in the final chunk of a task in percent.<br>(avoids issuing small chunks when the remaining part of a task is slightly bigger than the normal chunk size)";
return "Allowable deviation in the final chunk of a task in percent.<br>(avoids issuing small chunks when the remaining part of a task is slightly bigger than the normal chunk size).";
case DConfig::BATCH_SIZE:
return "Batch size of SQL query when hashlist is sent to the agent";
return "Batch size of SQL query when hashlist is sent to the agent.";
case DConfig::YUBIKEY_ID:
return "Yubikey Client Id";
return "Yubikey Client ID.";
case DConfig::YUBIKEY_KEY:
return "Yubikey Secret Key";
return "Yubikey Secret Key.";
case DConfig::YUBIKEY_URL:
return "Yubikey API Url";
return "Yubikey API URL.";
case DConfig::BASE_HOST:
return "Base hostname/port/protocol to use. Only fill this in to override the auto-determined value.";
case DConfig::DONATE_OFF:
return "Hide donation information";
return "Hide donation information.";
case DConfig::PLAINTEXT_MAX_LENGTH:
return "Max length of a plaintext. (WARNING: This change may take a long time depending on DB size!)";
case DConfig::HASH_MAX_LENGTH:
@@ -344,13 +344,13 @@ public static function getConfigDescription($config) {
case DConfig::TELEGRAM_PROXY_TYPE:
return "Proxy type to use for telegram notifications.";
case DConfig::DISABLE_TRIMMING:
return "Disable trimming of chunks and redo whole chunks";
return "Disable trimming of chunks and redo whole chunks.";
case DConfig::PRIORITY_0_START:
return "Also automatically assign tasks with priority 0";
return "Also automatically assign tasks with priority 0.";
case DConfig::SERVER_LOG_LEVEL:
return "Server level to be logged on the server to file";
return "Server level to be logged on the server to file.";
case DConfig::MAX_SESSION_LENGTH:
return "Max session length users can configure (in hours)";
return "Max session length users can configure (in hours).";
}
return $config;
}
@@ -3,7 +3,7 @@
<h2>Health Checks</h2>
{%TEMPLATE->struct/messages%}
<div class="alert alert-info">
Health checks can be used to check if all agents in the setup work properly. Note that a health check won't be finished until all agents which are registered reported back their results.
Health checks can be used to check if all agents are working properly. Note that a health check won't be finished until all registered agents report back their results.
</div>
<div class="card">
<div class="table-responsive">
@@ -4,7 +4,7 @@ <h2>About [[$APP_NAME]]</h2>
<div class='alert alert-info'>
[[$APP_NAME]] version <code>[[version]]</code> running on <code>[[host]]</code>.<br>
{{IF [[gitcommit]] != "not versioned"}}
[[$APP_NAME]] is running versioned, updates can be retreived with <code>git pull</code>. Latest commit:
[[$APP_NAME]] is running versioned. Updates can be retrieved with <code>git pull</code>. Latest commit:
<code>[[gitcommit]]</code>.
{{ENDIF}}
</div>
@@ -27,12 +27,12 @@ <h2>About [[$APP_NAME]]</h2>
<li>User permission levels</li>
<li>Various notification types</li>
<li>Small and/or CPU-only tasks</li>
<li>Group assignment for agents and users for fine-grained access-control</li>
<li>Group assignment for agents and users for fine-grained access control</li>
<li>Compatible with crackers supporting certain flags</li>
</ul>
</div>
<div class='alert alert-neutral'>
Thanks to following people for helping in various way to make [[$APP_NAME]] work:<br>
Thanks to the following people for helping in various ways to make [[$APP_NAME]] work:<br>
winxp5421<br>
blazer<br>
CynoSure Prime<br>

0 comments on commit 23af76b

Please sign in to comment.