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

Author: tbrehm

interface/web/monitor/show_sys_state.php

@@ -153,10 +153,12 @@ function _getSysState() {
 			$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 @@ function delete($event_name,$data) {
 			//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);