- Fixed FS#2666 - Deletion of SSH users generates warning in cron log. - Fi...

ftimme

2013-02-12 4ccdf7b9c1783e2b80000af92ba73c1bcf7cac01

 server/plugins-available/apache2_plugin.inc.php

@@ -462,7 +462,7 @@
                exec('chown --recursive --from='.escapeshellcmd($data['old']['system_user']).':'.escapeshellcmd($data['old']['system_group']).' '.escapeshellcmd($data['new']['system_user']).':'.escapeshellcmd($data['new']['system_group']).' '.$new_dir);

                //* Change the home directory and group of the website user
                $command = 'usermod';
                $command = 'killall -u '.escapeshellcmd($data['new']['system_user']).' && usermod';
                $command .= ' --home '.escapeshellcmd($data['new']['document_root']);
                $command .= ' --gid '.escapeshellcmd($data['new']['system_group']);
                $command .= ' '.escapeshellcmd($data['new']['system_user']);
@@ -699,7 +699,7 @@
            }
            
            if($web_config['add_web_users_to_sshusers_group'] == 'y') {
               $command = 'usermod';
               $command = 'killall -u '.escapeshellcmd($data['new']['system_user']).' && usermod';
               $command .= ' --groups sshusers';
               $command .= ' '.escapeshellcmd($data['new']['system_user']);
               $this->_exec($command);
@@ -1748,8 +1748,8 @@
            
            if($data['old']['type'] == 'vhost') {
                //delete the web user
                $command = 'userdel';
                $command .= ' '.$data['old']['system_user'];
                $command = 'killall -u '.escapeshellcmd($data['old']['system_user']).' && userdel';
                $command .= ' '.escapeshellcmd($data['old']['system_user']);
                exec($command);
                if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command);