use separate escapeshellarg()-calls as it leads to 'group user' as being recognized as the group only

d00p · d00p · commit 55c7b2aedf21 · 2015-01-05T18:16:51.000+01:00
Signed-off-by: Michael Kaufmann (d00p) &lt;d00p@froxlor.org&gt;
diff --git a/scripts/jobs/cron_tasks.php b/scripts/jobs/cron_tasks.php
@@ -98,7 +98,7 @@
 				&& !in_array(Settings::Get('system.httpuser'), $groupinfo['members'])
 			) {
 				// webserver has no access, add it
-				safe_exec('usermod -aG ' . escapeshellarg(Settings::Get('phpfpm.vhost_httpgroup')." ".Settings::Get('system.httpuser')));
+				safe_exec('usermod -a -G ' . escapeshellarg(Settings::Get('phpfpm.vhost_httpgroup'))." ".escapeshellarg(Settings::Get('system.httpuser')));
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@`
`98`	`98`	`&& !in_array(Settings::Get('system.httpuser'), $groupinfo['members'])`
`99`	`99`	`) {`
`100`	`100`	`// webserver has no access, add it`
`101`		`- safe_exec('usermod -aG ' . escapeshellarg(Settings::Get('phpfpm.vhost_httpgroup')." ".Settings::Get('system.httpuser')));`
	`101`	`+ safe_exec('usermod -a -G ' . escapeshellarg(Settings::Get('phpfpm.vhost_httpgroup'))." ".escapeshellarg(Settings::Get('system.httpuser')));`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`