From 9cf2c25a64a23a1be36f9cd0af8aac150b659f14 Mon Sep 17 00:00:00 2001
From: latham <latham@ispconfig3>
Date: Fri, 28 Oct 2011 11:33:06 -0400
Subject: [PATCH] start adding SPF by adding enum in table
---
server/plugins-available/cron_plugin.inc.php | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php
index 388ca65..d1e31d1 100644
--- a/server/plugins-available/cron_plugin.inc.php
+++ b/server/plugins-available/cron_plugin.inc.php
@@ -191,11 +191,15 @@
$chr_cmd_count = 0;
//* read all active cron jobs from database and write them to file
- $cron_jobs = $app->db->queryAllRecords("SELECT `run_min`, `run_hour`, `run_mday`, `run_month`, `run_wday`, `command`, `type` FROM `cron` WHERE `parent_domain_id` = ".intval($this->parent_domain["domain_id"]) . " AND `active` = 'y'");
+ $cron_jobs = $app->db->queryAllRecords("SELECT c.`run_min`, c.`run_hour`, c.`run_mday`, c.`run_month`, c.`run_wday`, c.`command`, c.`type`, `web_domain`.`domain` as `domain` FROM `cron` as c INNER JOIN `web_domain` ON `web_domain`.`domain_id` = c.`parent_domain_id` WHERE c.`parent_domain_id` = ".intval($this->parent_domain["domain_id"]) . " AND c.`active` = 'y'");
if($cron_jobs && count($cron_jobs) > 0) {
foreach($cron_jobs as $job) {
- $command = "{$job['run_min']}\t{$job['run_hour']}\t{$job['run_mday']}\t{$job['run_month']}\t{$job['run_wday']}";
- $command .= "\t{$this->parent_domain['system_user']}"; //* running as user
+ if($job['run_month'] == '@reboot') {
+ $command = "@reboot";
+ } else {
+ $command = "{$job['run_min']}\t{$job['run_hour']}\t{$job['run_mday']}\t{$job['run_month']}\t{$job['run_wday']}";
+ }
+ $command .= "\t{$this->parent_domain['system_user']}"; //* running as user
if($job['type'] == 'url') {
$command .= "\t{$cron_config['wget']} -q -O /dev/null " . escapeshellarg($job['command']) . " >/dev/null 2>&1";
} else {
@@ -212,10 +216,10 @@
}
if($job['type'] == 'chrooted') {
- $chr_cron_content .= $command . "\n";
+ $chr_cron_content .= $command . "\t#{$job['domain']}\n";
$chr_cmd_count++;
} else {
- $cron_content .= $command . "\n";
+ $cron_content .= $command . "\t#{$job['domain']}\n";
$cmd_count++;
}
}
--
Gitblit v1.9.1