From b9a3ef486ebcde18a5ade37865ff8f397185d24f Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 24 Jul 2016 05:30:59 -0400
Subject: [PATCH] Fixed #3979 Mailbox users unable to save autoresponders
---
server/plugins-available/cron_plugin.inc.php | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php
index 7d3c138..1a13a57 100644
--- a/server/plugins-available/cron_plugin.inc.php
+++ b/server/plugins-available/cron_plugin.inc.php
@@ -123,18 +123,37 @@
exec("useradd -d ".escapeshellcmd($parent_domain["document_root"])." -g $groupname $username -s /bin/false");
$app->log("Adding the user: $username", LOGLEVEL_DEBUG);
}
+
+ // Set the quota for the user
+ if($username != '' && $app->system->is_user($username)) {
+ if($parent_domain['hd_quota'] > 0) {
+ $blocks_soft = $parent_domain['hd_quota'] * 1024;
+ $mb_soft = $parent_domain['hd_quota'];
+ $blocks_hard = $blocks_soft + 1024;
+ $mb_hard = $mb_soft + 1;
+ } else {
+ $mb_soft = $mb_hard = $blocks_soft = $blocks_hard = 0;
+ }
- // Set the quota for the user
- if($username != '' && $app->system->is_user($username)) {
- if($parent_domain["hd_quota"] > 0){
- $blocks_soft = $parent_domain["hd_quota"] * 1024;
- $blocks_hard = $blocks_soft + 1024;
- } else {
- $blocks_soft = $blocks_hard = 0;
- }
- exec("setquota -u $username $blocks_soft $blocks_hard 0 0 -a &> /dev/null");
- exec("setquota -T -u $username 604800 604800 -a &> /dev/null");
- }
+ // get the primitive folder for document_root and the filesystem, will need it later.
+ $df_output=explode(" ", exec("df -T " . escapeshellarg($parent_domain["document_root"]) . "|awk 'END{print \$2,\$NF}'"));
+ $file_system = $df_output[0];
+ $primitive_root = $df_output[1];
+
+ if ( in_array($file_system , array('ext2','ext3','ext4'),true) ) {
+ exec('setquota -u '. $username . ' ' . $blocks_soft . ' ' . $blocks_hard . ' 0 0 -a &> /dev/null');
+ exec('setquota -T -u '.$username.' 604800 604800 -a &> /dev/null');
+ } elseif ($file_system == 'xfs') {
+
+ exec("xfs_quota -x -c 'limit -g bsoft=$mb_soft" . 'm'. " bhard=$mb_hard" . 'm'. " $username' $primitive_root");
+
+ // xfs only supports timers globally, not per user.
+ exec("xfs_quota -x -c 'timer -bir -i 604800'");
+
+ unset($project_uid, $username_position, $xfs_projects);
+ unset($primitive_root, $df_output, $mb_hard, $mb_soft);
+ }
+ }
//TODO : change this when distribution information has been integrated into server record
//* Gentoo requires a user to be part of the crontab group.
@@ -218,7 +237,7 @@
$command .= "\t{$this->parent_domain['system_user']}"; //* running as user
if($job['type'] == 'url') {
- $command .= "\t{$cron_config['wget']} -q -t 1 -T 7200 -O " . $log_wget_target . " " . escapeshellarg($job['command']) . " " . $log_target;
+ $command .= "\t{$cron_config['wget']} --user-agent='Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:47.0) Gecko/20100101 Firefox/47.0' -q -t 1 -T 7200 -O " . $log_wget_target . " " . escapeshellarg($job['command']) . " " . $log_target;
} else {
$web_root = '';
if($job['type'] == 'chrooted') {
--
Gitblit v1.9.1