Filip's hourly at most option

WiWaG · Sep 26, 2007 · 3d2487a · 3d2487a
1 parent 38660e7
commit 3d2487a
Show file tree

Hide file tree

Showing 35 changed files with 42 additions and 5 deletions.
diff --git a/cron/CHANGELOG b/cron/CHANGELOG
@@ -19,3 +19,5 @@ Changed the default schedule for new jobs to hourly.
 When a user's home directory is changed in the Users and Groups module, any Cron jobs that use the old path are updated to the new.
 ---- Changes since 1.350 ----
 Added a button on the Edit Job page for cloning an existing job.
+---- Changes since 1.360 ----
+Added a Module Config option to limit Cron jobs to hourly at most, thanks to Filip Hajny.
diff --git a/cron/config-aix b/cron/config-aix
@@ -17,3 +17,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-cobalt-linux b/cron/config-cobalt-linux
@@ -20,3 +20,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-coherent-linux b/cron/config-coherent-linux
@@ -20,3 +20,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-corel-linux b/cron/config-corel-linux
@@ -20,3 +20,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-debian-linux b/cron/config-debian-linux
@@ -18,3 +18,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-debian-linux-2.1-* b/cron/config-debian-linux-2.1-*
@@ -21,3 +21,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-freebsd b/cron/config-freebsd
@@ -18,3 +18,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-generic-linux b/cron/config-generic-linux
@@ -20,3 +20,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-gentoo-linux b/cron/config-gentoo-linux
@@ -20,3 +20,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-hpux b/cron/config-hpux
@@ -17,3 +17,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-irix b/cron/config-irix
@@ -19,3 +19,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-macos b/cron/config-macos
@@ -18,3 +18,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-mandrake-linux b/cron/config-mandrake-linux
@@ -20,3 +20,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-msc-linux b/cron/config-msc-linux
@@ -20,3 +20,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-netbsd b/cron/config-netbsd
@@ -18,3 +18,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-open-linux b/cron/config-open-linux
@@ -21,3 +21,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-openbsd b/cron/config-openbsd
@@ -18,3 +18,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-openmamba-linux b/cron/config-openmamba-linux
@@ -20,3 +20,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-openserver b/cron/config-openserver
@@ -17,3 +17,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-osf1 b/cron/config-osf1
@@ -19,3 +19,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-redhat-linux b/cron/config-redhat-linux
@@ -20,3 +20,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-slackware-linux b/cron/config-slackware-linux
@@ -17,3 +17,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-sol-linux b/cron/config-sol-linux
@@ -20,3 +20,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-solaris b/cron/config-solaris
@@ -17,3 +17,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-suse-linux b/cron/config-suse-linux
@@ -19,3 +19,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-suse-linux-7.0-8.0 b/cron/config-suse-linux-7.0-8.0
@@ -19,3 +19,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-suse-linux-8.2-* b/cron/config-suse-linux-8.2-*
@@ -19,3 +19,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-trustix-linux b/cron/config-trustix-linux
@@ -20,3 +20,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-turbo-linux b/cron/config-turbo-linux
@@ -20,3 +20,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-united-linux b/cron/config-united-linux
@@ -19,3 +19,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-unixware b/cron/config-unixware
@@ -17,3 +17,4 @@ match_mode=0
 match_user=1
 kill_subs=0
 show_comment=0
+hourly_only=0
diff --git a/cron/config-windows b/cron/config-windows
@@ -9,3 +9,4 @@ match_user=1
 kill_subs=0
 single_file=c:/cronw/crontab.txt
 show_comment=0
+hourly_only=0
diff --git a/cron/config.info b/cron/config.info
@@ -6,6 +6,7 @@ show_run=Display running status of jobs?,1,2-Yes&#44; and allow starting and sto
 match_mode=Find job processes by,1,1-Command only,0-Command and arguments
 match_user=Match usernames when finding job processes?,1,1-Yes,0-No
 kill_subs=Kill sub-processes when terminating jobs?,1,1-Yes,0-No
+hourly_only=Only allow jobs to be at most hourly?,1,0-No,1-Yes
 line2=System configuration,11
 cron_dir=Crontab Directory,0
 cron_get_command=Command to read a user's cron job,0

diff --git a/cron/cron-lib.pl b/cron/cron-lib.pl
@@ -688,17 +688,19 @@ sub show_times_input
 
 	# Output selection list
 	print "<td valign=top>\n";
-	printf "<input type=radio name=all_$arr value=1 %s> $text{'edit_all'}<br>\n",
+        printf "<input type=radio name=all_$arr value=1 %s %s> $text{'edit_all'}<br>\n",
+                $arr eq "mins" && $config{'hourly_only'} ? "disabled" : "",
 		$job->{$arr} eq "*" ? "checked" : "";
 	printf "<input type=radio name=all_$arr value=0 %s> $text{'edit_selected'}<br>\n",
 		$job->{$arr} ne "*" ? "checked" : "";
 	print "<table> <tr>\n";
-	for($j=0; $j<@$arr; $j+=12) {
-		$jj = $j+11;
+        for($j=0; $j<@$arr; $j+=($arr eq "mins" && $config{'hourly_only'} ? 60 : 12)) {
+                $jj = $j+($arr eq "mins" && $config{'hourly_only'} ? 59 : 11);
 		if ($jj >= @$arr) { $jj = @$arr - 1; }
 		@sec = @$arr[$j .. $jj];
-		printf "<td valign=top><select multiple size=%d name=$arr>\n",
-			@sec > 12 ? 12 : scalar(@sec);
+                printf "<td valign=top><select %s size=%d name=$arr>\n",
+                        $arr eq "mins" && $config{'hourly_only'} ? "" : "multiple",
+                        @sec > 12 ? ($arr eq "mins" && $config{'hourly_only'} ? 1 : 12) : scalar(@sec);
 		foreach $v (@sec) {
 			if ($v =~ /^(.*)=(.*)$/) { $disp = $1; $code = $2; }
 			else { $disp = $code = $v; }