Merged revisions 1699-1700,1705 from trunk.

tbrehm

2010-05-26 7f2bb38064a377e2278ed29c4d162f20a5bb8c3d

 server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -85,14 +85,14 @@
            $this->app = $app;
            $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
            
            $command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
            exec($command);
				
            $this->_update_website_security_level();
				
            $this->_add_jailkit_user();
         
            $this->_setup_jailkit_chroot();
				
            $this->_add_jailkit_user();
				
            $command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
            exec($command);
            
            $this->_update_website_security_level();
         }
@@ -160,7 +160,7 @@
         //exec('rm -rf '.$data['old']['dir'].$jailkit_chroot_userhome);
         
         if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) {
            $command = 'userdel -f -r';
            $command = 'userdel -f';
            $command .= ' '.escapeshellcmd($data['old']['username']);
            exec($command);
            $app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);