From ca44db25a010441c83a9a6d502b3e082b8643897 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 17 Sep 2010 17:54:22 +0000 Subject: [PATCH] - don't use loginname for chowning when not in fcgid-mode (pureftp-quota-calculation), fixes #407 --- scripts/jobs/cron_traffic.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/scripts/jobs/cron_traffic.php b/scripts/jobs/cron_traffic.php index 2f4e952e..4fd3ca27 100644 --- a/scripts/jobs/cron_traffic.php +++ b/scripts/jobs/cron_traffic.php @@ -382,6 +382,18 @@ while($row = $db->fetch_array($result)) if($settings['system']['ftpserver'] == "pureftpd") { $result_quota = $db->query("SELECT homedir FROM `" . TABLE_FTP_USERS . "` WHERE customerid = '" . $row['customerid'] . "'"); + + // get correct user + if($settings['system']['mod_fcgid'] == 1) + { + $user = $row['loginname']; + $group = $row['loginname']; + } + else + { + $user = $row['guid']; + $group = $row['guid']; + } while($row_quota = $db->fetch_array($result_quota)) { @@ -390,7 +402,7 @@ while($row = $db->fetch_array($result)) $stringdata = "0 " . $current_diskspace['all']*1024 . ""; fwrite($fh, $stringdata); fclose($fh); - safe_exec('chown ' . $row['loginname'] . ':' . $row['loginname'] . ' ' . escapeshellarg($quotafile) . ''); + safe_exec('chown ' . $user . ':' . $group . ' ' . escapeshellarg($quotafile) . ''); } } }