From aa78fde6a92f66b84d626e114d8b54a5fb6ece0c Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Wed, 14 Nov 2012 07:19:43 -0500 Subject: [PATCH] - Added function for IPv6 prefixes in multiserver mirror setups to nginx plugin. --- server/plugins-available/cron_plugin.inc.php | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php index 3ec4717..4ccbcb2 100644 --- a/server/plugins-available/cron_plugin.inc.php +++ b/server/plugins-available/cron_plugin.inc.php @@ -142,7 +142,7 @@ } // make temp directory writable for the apache and website users - chmod(escapeshellcmd($parent_domain["document_root"].'/tmp'), 0777); + $app->system->chmod(escapeshellcmd($parent_domain["document_root"].'/tmp'), 0777); /** TODO READ CRON MASTER **/ @@ -198,7 +198,7 @@ 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 = str_replace(" ", "", $job['run_min']) . "\t" . str_replace(" ", "", $job['run_hour']) . "\t" . str_replace(" ", "", $job['run_mday']) . "\t" . str_replace(" ", "", $job['run_month']) . "\t" . str_replace(" ", "", $job['run_wday']); } $command .= "\t{$this->parent_domain['system_user']}"; //* running as user if($job['type'] == 'url') { @@ -217,10 +217,10 @@ } if($job['type'] == 'chrooted') { - $chr_cron_content .= $command . "\t#{$job['domain']}\n"; + $chr_cron_content .= $command . " #{$job['domain']}\n"; $chr_cmd_count++; } else { - $cron_content .= $command . "\t#{$job['domain']}\n"; + $cron_content .= $command . " #{$job['domain']}\n"; $cmd_count++; } } @@ -234,19 +234,19 @@ } if($cmd_count > 0) { - file_put_contents($cron_file, $cron_content); + $app->system->file_put_contents($cron_file, $cron_content); $app->log("Wrote Cron file $cron_file with content:\n$cron_content",LOGLEVEL_DEBUG); } else { - @unlink($cron_file); + $app->system->unlink($cron_file); $app->log("Deleted Cron file $cron_file",LOGLEVEL_DEBUG); } $cron_file = escapeshellcmd($cron_config["crontab_dir"].'/ispc_chrooted_'.$this->parent_domain["system_user"]); if($chr_cmd_count > 0) { - file_put_contents($cron_file, $chr_cron_content); + $app->system->file_put_contents($cron_file, $chr_cron_content); $app->log("Wrote Cron file $cron_file with content:\n$chr_cron_content",LOGLEVEL_DEBUG); } else { - @unlink($cron_file); + $app->system->unlink($cron_file); $app->log("Deleted Cron file $cron_file",LOGLEVEL_DEBUG); } -- Gitblit v1.9.1