Fixed: FS#3564 - shell users accounts are not removed.

Till Brehm

2014-08-14 c653844975fb13bf7aaf2cc0dc96c8c70906394e

Fixed: FS#3564 - shell users accounts are not removed.

 server/plugins-available/shelluser_base_plugin.inc.php

@@ -231,7 +231,7 @@
            if($userid > $this->min_uid) {
                // We delete only non jailkit users, jailkit users will be deleted by the jailkit plugin.
                if ($data['old']['chroot'] != "jailkit") {
                    $command = 'userdel -f';
                    $command = 'killall -u '.escapeshellcmd($data['old']['username']).' ; userdel -f';
                    $command .= ' '.escapeshellcmd($data['old']['username']).' &> /dev/null';
                    exec($command);
                    $app->log("Deleted shelluser: ".$data['old']['username'], LOGLEVEL_DEBUG);

 server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -226,7 +226,7 @@
            $app->system->web_folder_protection($web['document_root'], false);

            if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) {
                $command = 'userdel -f';
                $command = 'killall -u '.escapeshellcmd($data['old']['username']).' ; userdel -f';
                $command .= ' '.escapeshellcmd($data['old']['username']).' &> /dev/null';
                exec($command);
                $app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome, LOGLEVEL_DEBUG);