Merge pull request #1220 from doktornotor/patch-5

6 files changed, 52 insertions, 26 deletions

diff --git a/config/cron/cron.php b/config/cron/cron.php
index 7d55b086..ec15a4cb 100644
--- a/config/cron/cron.php
+++ b/config/cron/cron.php
@@ -76,7 +76,8 @@ include("head.inc");
 	<tr><td>
 		<div>
 		Cron controls the scheduling of commands.<br /><br />
-		For more information see: <a href='http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html'>http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html</a>
+		For more information see: <a href="http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html">FreeBSD Handbook - Configuring cron(8)</a>
+		and <a href="https://www.freebsd.org/cgi/man.cgi?query=crontab&amp;sektion=5">crontab(5) man page</a>.
 		</div>
 	</td></tr>
 	</table>
diff --git a/config/cron/cron.xml b/config/cron/cron.xml
index 181a4506..5e596b6b 100644
--- a/config/cron/cron.xml
+++ b/config/cron/cron.xml
@@ -42,7 +42,7 @@
 	]]>
 	</copyright>
 	<name>cronsettings</name>
-	<version>0.3.3</version>
+	<version>0.3.4</version>
 	<title>Cron Settings</title>
 	<include_file>/usr/local/pkg/cron.inc</include_file>
 	<menu>
diff --git a/config/cron/cron_edit.php b/config/cron/cron_edit.php
index b89c28e0..58389284 100644
--- a/config/cron/cron_edit.php
+++ b/config/cron/cron_edit.php
@@ -128,45 +128,57 @@ function show_advanced_config() {
 	<form action="cron_edit.php" method="post" name="iform" id="iform">
 		<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="form">
 		<tr>
-			<td width="25%" valign="top" class="vncellreq">minute</td>
-			<td width="75%" class="vtable">
-				<input name="minute" type="text" class="formfld" id="minute" size="40" value="<?=htmlspecialchars($pconfig['minute']);?>" />
+			<td width="10%" valign="top" class="vncellreq">Minute</td>
+			<td width="90%" class="vtable">
+				<input name="minute" type="text" class="formfld" id="minute" size="40" value="<?=htmlspecialchars($pconfig['minute']);?>" /><br/>
+				The minute(s) at which the command will be executed.<br/>
+				(0-59, ranges, or divided, *=all)
 			</td>
 		</tr>
 		<tr>
-			<td width="25%" valign="top" class="vncellreq">hour</td>
-			<td width="75%" class="vtable">
-				<input name="hour" type="text" class="formfld" id="hour" size="40" value="<?=htmlspecialchars($pconfig['hour']);?>" />
+			<td width="10%" valign="top" class="vncellreq">Hour</td>
+			<td width="90%" class="vtable">
+				<input name="hour" type="text" class="formfld" id="hour" size="40" value="<?=htmlspecialchars($pconfig['hour']);?>" /><br/>
+				The day(s) of the month on which the command will be executed.<br/>
+				(1-31, ranges, or divided, *=all)
 			</td>
 		</tr>
 		<tr>
-			<td width="25%" valign="top" class="vncellreq">mday</td>
-			<td width="75%" class="vtable">
-				<input name="mday" type="text" class="formfld" id="mday" size="40" value="<?=htmlspecialchars($pconfig['mday']);?>" />
+			<td width="10%" valign="top" class="vncellreq">Day of the Month</td>
+			<td width="90%" class="vtable">
+				<input name="mday" type="text" class="formfld" id="mday" size="40" value="<?=htmlspecialchars($pconfig['mday']);?>" /><br/>
+				The day(s) of the month on which the command will be executed.<br/>
+				(1-31, ranges, or divided, *=all)
 			</td>
 		</tr>
 		<tr>
-			<td width="25%" valign="top" class="vncellreq">month</td>
-			<td width="75%" class="vtable">
-				<input name="month" type="text" class="formfld" id="month" size="40" value="<?=htmlspecialchars($pconfig['month']);?>" />
+			<td width="10%" valign="top" class="vncellreq">Month of the Year</td>
+			<td width="90%" class="vtable">
+				<input name="month" type="text" class="formfld" id="month" size="40" value="<?=htmlspecialchars($pconfig['month']);?>" /><br/>
+				The month(s) of the year during which the command will be executed.<br/>
+				(1-12, ranges, or divided, *=all)
 			</td>
 		</tr>
 		<tr>
-			<td width="25%" valign="top" class="vncellreq">wday</td>
-			<td width="75%" class="vtable">
-				<input name="wday" type="text" class="formfld" id="wday" size="40" value="<?=htmlspecialchars($pconfig['wday']);?>" />
+			<td width="10%" valign="top" class="vncellreq">Day of the Week</td>
+			<td width="90%" class="vtable">
+				<input name="wday" type="text" class="formfld" id="wday" size="40" value="<?=htmlspecialchars($pconfig['wday']);?>" /><br/>
+				The day(s) of the week on which the command will be executed.<br/>
+				(0-7, 7=Sun or use names, ranges, or divided, *=all)
 			</td>
 		</tr>
 		<tr>
-			<td width="25%" valign="top" class="vncellreq">who</td>
-			<td width="75%" class="vtable">
-				<input name="who" type="text" class="formfld" id="who" size="40" value="<?=htmlspecialchars($pconfig['who']);?>" />
+			<td width="10%" valign="top" class="vncellreq">User</td>
+			<td width="90%" class="vtable">
+				<input name="who" type="text" class="formfld" id="who" size="40" value="<?=htmlspecialchars($pconfig['who']);?>" /><br/>
+				The user executing the command (typically "root")
 			</td>
 		</tr>
 		<tr>
-			<td width="25%" valign="top" class="vncellreq">command</td>
-			<td width="75%" class="vtable">
-				<textarea rows="3" cols="68" name="command" id="command"><?=htmlspecialchars($pconfig['command']);?></textarea>
+			<td width="10%" valign="top" class="vncellreq">Command</td>
+			<td width="90%" class="vtable">
+				<textarea rows="3" cols="68" name="command" id="command"><?=htmlspecialchars($pconfig['command']);?></textarea><br/>
+				The <strong>full path</strong> to the command, plus parameters.
 			</td>
 		</tr>
 		<tr>
@@ -178,6 +190,18 @@ function show_advanced_config() {
 				<?php endif; ?>
 			</td>
 		</tr>
+		<tr class="listtopic">
+			<td colspan="2">Help</td>
+		</tr>
+		<tr>
+			<td colspan="2">
+				'Using "*" for a time entry means "all" or "every", and is the same as a range from first to last.
+				<br/>Ranges may also be used, for example "1-5" in the "Day of Week" field means Monday through Friday.
+				<br/>Time entries may be divided and will be executed when they divide evenly, for example "*/15" in the Minute field means "Every 15 minutes".
+				<br/><br/>For more information see: <a href="http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html">FreeBSD Handbook - Configuring cron(8)</a>
+				and <a href="https://www.freebsd.org/cgi/man.cgi?query=crontab&amp;sektion=5">crontab(5) man page</a>.
+			</td>
+		</tr>
 		</table>
 	</form>
 	<br />
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index b25e68c9..8b37c0dd 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -371,10 +371,11 @@
 		<descr>The cron utility is used to manage commands on a schedule.</descr>
 		<category>System</category>
 		<config_file>https://packages.pfsense.org/packages/config/cron/cron.xml</config_file>
-		<version>0.3.3</version>
+		<version>0.3.4</version>
 		<status>RC</status>
 		<required_version>2.2</required_version>
 		<configurationfile>cron.xml</configurationfile>
+		<maximum_version>2.2.999</maximum_version>
 	</package>
 	<package>
 		<name>vHosts</name>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 743ade9c..8e6f22f2 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -423,7 +423,7 @@
 		<pkginfolink></pkginfolink>
 		<config_file>https://packages.pfsense.org/packages/config/cron/cron.xml</config_file>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<version>0.3.3</version>
+		<version>0.3.4</version>
 		<status>RC</status>
 		<required_version>2.1</required_version>
 		<configurationfile>cron.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 851ee03e..a395c133 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -423,7 +423,7 @@
 		<pkginfolink></pkginfolink>
 		<config_file>https://packages.pfsense.org/packages/config/cron/cron.xml</config_file>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
-		<version>0.3.3</version>
+		<version>0.3.4</version>
 		<status>RC</status>
 		<required_version>2.1</required_version>
 		<configurationfile>cron.xml</configurationfile>