Merge branch 'stable-3.1' into 'stable-3.1'

Fix xfs_quota

Fix xfs_quota:
 - Replace "-g" with "-u" because username is is used
 - Set the path for the timer command

See merge request !458

server/plugins-available/apache2_plugin.inc.php

@@ -890,10 +890,10 @@ class apache2_plugin {
           $primitive_root = $df_output[1];
 
 		  if($file_system == 'xfs') {
-			exec("xfs_quota -x -c 'limit -g bsoft=$mb_soft" . 'm'. " bhard=$mb_hard" . 'm'. " $username' $primitive_root");
+			exec("xfs_quota -x -c 'limit -u 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'");
+            exec("xfs_quota -x -c 'timer -bir -i 604800' $primitive_root");
 
             unset($project_uid, $username_position, $xfs_projects);
             unset($primitive_root, $df_output, $mb_hard, $mb_soft);

server/plugins-available/cron_plugin.inc.php

@@ -145,10 +145,10 @@ class cron_plugin {
               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");
+              exec("xfs_quota -x -c 'limit -u 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'");
+              exec("xfs_quota -x -c 'timer -bir -i 604800' $primitive_root");
 
               unset($project_uid, $username_position, $xfs_projects);
               unset($primitive_root, $df_output, $mb_hard, $mb_soft);

server/plugins-available/nginx_plugin.inc.php

@@ -748,10 +748,10 @@ class nginx_plugin {
           $primitive_root = $df_output[1];
 
           if($file_system == 'xfs') {
-			exec("xfs_quota -x -c 'limit -g bsoft=$mb_soft" . 'm'. " bhard=$mb_hard" . 'm'. " $username' $primitive_root");
+			exec("xfs_quota -x -c 'limit -u 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'");
+            exec("xfs_quota -x -c 'timer -bir -i 604800' $primitive_root");
 
             unset($project_uid, $username_position, $xfs_projects);
             unset($primitive_root, $df_output, $mb_hard, $mb_soft);