Fixed a php warning and removed -f switch from userdel command in jailkit p...

tbrehm

2010-05-03 d4db604730b0a843ff526506abeadc0ae72d03b0

Fixed a php warning and removed -f switch from userdel command in jailkit plugin.

 interface/web/monitor/show_sys_state.php

@@ -153,10 +153,12 @@
            $html .= $data['html_server'];
            /* get all VE's of this server */
            $veInfo = $data['ve_info'];
            foreach ($veInfo as $info) {
                for ($i = 0; $i < sizeof($serverData); $i++) {
                    if ($serverData[$i]['server_name'] == $info['hostname']) {
                        $html = str_replace('##VE_INFO##', $serverData[$i]['html_ve'] . '##VE_INFO##', $html);
            if(is_array($veInfo)) {
                foreach ($veInfo as $info) {
                    for ($i = 0; $i < sizeof($serverData); $i++) {
                        if ($serverData[$i]['server_name'] == $info['hostname']) {
                            $html = str_replace('##VE_INFO##', $serverData[$i]['html_ve'] . '##VE_INFO##', $html);
                        }
                    }
                }
            }

 server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -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';
                $command = 'userdel';
                $command .= ' '.escapeshellcmd($data['old']['username']);
                exec($command);
                $app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);