Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-31 dbf57dddf7ef07a0168ad0c1d64de0735a9c5804

 server/plugins-available/shelluser_base_plugin.inc.php

@@ -136,6 +136,10 @@
            exec($command);
            $app->log("Executed command: ".$command, LOGLEVEL_DEBUG);
            $app->log("Added shelluser: ".$data['new']['username'], LOGLEVEL_DEBUG);
				
            $app->system->chown(escapeshellcmd($data['new']['dir']),escapeshellcmd($data['new']['username']));
            $app->system->chgrp(escapeshellcmd($data['new']['dir']),escapeshellcmd($data['new']['pgroup']));
				

            // call the ssh-rsa update function
            $app->uses("getconf");