- don't use loginname for chowning when not in fcgid-mode (pureftp-quota-calculation), fixes #407
This commit is contained in:
@@ -383,6 +383,18 @@ while($row = $db->fetch_array($result))
|
|||||||
{
|
{
|
||||||
$result_quota = $db->query("SELECT homedir FROM `" . TABLE_FTP_USERS . "` WHERE customerid = '" . $row['customerid'] . "'");
|
$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))
|
while($row_quota = $db->fetch_array($result_quota))
|
||||||
{
|
{
|
||||||
$quotafile = "" . $row_quota['homedir'] . ".ftpquota";
|
$quotafile = "" . $row_quota['homedir'] . ".ftpquota";
|
||||||
@@ -390,7 +402,7 @@ while($row = $db->fetch_array($result))
|
|||||||
$stringdata = "0 " . $current_diskspace['all']*1024 . "";
|
$stringdata = "0 " . $current_diskspace['all']*1024 . "";
|
||||||
fwrite($fh, $stringdata);
|
fwrite($fh, $stringdata);
|
||||||
fclose($fh);
|
fclose($fh);
|
||||||
safe_exec('chown ' . $row['loginname'] . ':' . $row['loginname'] . ' ' . escapeshellarg($quotafile) . '');
|
safe_exec('chown ' . $user . ':' . $group . ' ' . escapeshellarg($quotafile) . '');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user