Skip to content

Commit ab61404

Browse files
committed
Fixed: FS#1090 - Error in cron.
1 parent 94c3ec8 commit ab61404

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

server/cron_daily.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,14 @@ function setConfigVar( $filename, $varName, $varValue ) {
181181

182182
$sql = "SELECT domain_id, domain, document_root, system_user FROM web_domain WHERE server_id = ".$conf["server_id"];
183183
$records = $app->db->queryAllRecords($sql);
184+
$app->uses('system');
184185
if(is_array($records)) {
185186
foreach($records as $rec){
186187
$tmp_path = realpath(escapeshellcmd($rec["document_root"].'/tmp'));
187-
if($tmp_path != '' && strlen($tmp_path) > 10 && is_dir($tmp_path)){
188+
if($tmp_path != '' && strlen($tmp_path) > 10 && is_dir($tmp_path) && $app->system->is_user($rec['system_user'])){
188189
exec("cd ".$tmp_path."; find -ctime +1 -user ".escapeshellcmd($rec['system_user'])." | grep -v -w .no_delete | xargs rm &> /dev/null");
189-
exec("cd ".$tmp_path."; find -ctime +1 -user www-data | grep -v -w .no_delete | xargs rm &> /dev/null");
190-
exec("cd ".$tmp_path."; find -ctime +1 -user wwwrun | grep -v -w .no_delete | xargs rm &> /dev/null");
190+
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");
191+
if($app->system->is_user('wwwrun')) exec("cd ".$tmp_path."; find -ctime +1 -user wwwrun | grep -v -w .no_delete | xargs rm &> /dev/null");
191192
}
192193
}
193194
}

0 commit comments

Comments
 (0)