From e1cfe776605df96751b661e82dc09b51c635d67f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 06 Oct 2010 10:22:37 -0400
Subject: [PATCH] Fixed PHP warning in webdav code of apache2_plugin.inc.php
---
server/plugins-available/cron_plugin.inc.php | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php
index d923d1b..068dc35 100644
--- a/server/plugins-available/cron_plugin.inc.php
+++ b/server/plugins-available/cron_plugin.inc.php
@@ -97,7 +97,7 @@
$app->log("Parent domain not found",LOGLEVEL_WARN);
return 0;
} elseif($parent_domain["system_user"] == 'root' or $parent_domain["system_group"] == 'root') {
- $app->log("Websites (and Crons) can not be owned by the root user or group.",LOGLEVEL_WARN);
+ $app->log("Websites (and Crons) cannot be owned by the root user or group.",LOGLEVEL_WARN);
return 0;
}
@@ -133,14 +133,15 @@
exec("setquota -T -u $username 604800 604800 -a &> /dev/null");
}
- // make temp direcory writable for the apache user and the website user
- exec("chmod 777 ".escapeshellcmd($parent_domain["document_root"]."/tmp"));
+ // make temp directory writable for the apache and website users
+ chmod(escapeshellcmd($parent_domain["document_root"].'/tmp'), 0777);
/** TODO READ CRON MASTER **/
$this->parent_domain = $parent_domain;
$this->_write_crontab();
+ $this->action = '';
}
@@ -159,7 +160,6 @@
$client_id = intval($client["client_id"]);
unset($client);
- /** TODO remove deleted record **/
$this->parent_domain = $parent_domain;
$this->_write_crontab();
}
@@ -174,7 +174,13 @@
//* try to find customer's mail address
+ /** TODO: add possibility for client to choose mail notification! **/
$cron_content = "MAILTO=''\n\n";
+ $chr_cron_content = "MAILTO=''\n\n";
+ $chr_cron_content .= "SHELL='/usr/sbin/jk_chrootsh'\n\n";
+
+ $cmd_count = 0;
+ $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'");
@@ -193,20 +199,41 @@
}
$command .= "\t";
- if(substr($job['command'], 0, 1) != "/") $command .= $this->parent_domain['document_root'];
+ if(substr($job['command'], 0, 1) != "/") $command .= $this->parent_domain['document_root'].'/';
$command .= $job['command'];
}
- $cron_content .= $command . "\n";
+
+ if($job['type'] == 'chrooted') {
+ $chr_cron_content .= $command . "\n";
+ $chr_cmd_count++;
+ } else {
+ $cron_content .= $command . "\n";
+ $cmd_count++;
+ }
}
}
$cron_file = escapeshellcmd($cron_config["crontab_dir"].'/ispc_'.$this->parent_domain["system_user"]);
- file_put_contents($cron_file, $cron_content);
+ if($cmd_count > 0) {
+ 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->log("Deleted Cron file $cron_file",LOGLEVEL_DEBUG);
+ }
- $app->log("Wrote Cron file $cron_file with content:\n$cron_content",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->log("Wrote Cron file $cron_file with content:\n$chr_cron_content",LOGLEVEL_DEBUG);
+ } else {
+ @unlink($cron_file);
+ $app->log("Deleted Cron file $cron_file",LOGLEVEL_DEBUG);
+ }
+
return 0;
}
} // end class
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1