From ab6140422e939d6771d87ee49b2190e6b145c858 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 03 Mar 2010 05:47:12 -0500
Subject: [PATCH] Fixed: FS#1090 - Error in cron.
---
server/cron_daily.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 20974e4..f1313ed 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -181,13 +181,14 @@
$sql = "SELECT domain_id, domain, document_root, system_user FROM web_domain WHERE server_id = ".$conf["server_id"];
$records = $app->db->queryAllRecords($sql);
+$app->uses('system');
if(is_array($records)) {
foreach($records as $rec){
$tmp_path = realpath(escapeshellcmd($rec["document_root"].'/tmp'));
- if($tmp_path != '' && strlen($tmp_path) > 10 && is_dir($tmp_path)){
+ if($tmp_path != '' && strlen($tmp_path) > 10 && is_dir($tmp_path) && $app->system->is_user($rec['system_user'])){
exec("cd ".$tmp_path."; find -ctime +1 -user ".escapeshellcmd($rec['system_user'])." | grep -v -w .no_delete | xargs rm &> /dev/null");
- exec("cd ".$tmp_path."; find -ctime +1 -user www-data | grep -v -w .no_delete | xargs rm &> /dev/null");
- exec("cd ".$tmp_path."; find -ctime +1 -user wwwrun | grep -v -w .no_delete | xargs rm &> /dev/null");
+ if($app->system->is_user('www-data')) exec("cd ".$tmp_path."; find -ctime +1 -user www-data | grep -v -w .no_delete | xargs rm &> /dev/null");
+ if($app->system->is_user('wwwrun')) exec("cd ".$tmp_path."; find -ctime +1 -user wwwrun | grep -v -w .no_delete | xargs rm &> /dev/null");
}
}
}
--
Gitblit v1.9.1