server/plugins-available/webserver_plugin.inc.php

@@ -89,20 +89,20 @@ class webserver_plugin {
 		//** add default php.ini files to check
 		$check_files[] = array('file' => $web_config['php_ini_path_apache'],
 			'mode' => 'mod',
-			'php_version' => ''); // default;
+			'php_version' => 0); // default;
 
 		$check_files[] = array('file' => $web_config['php_ini_path_cgi'],
 			'mode' => '', // all but 'mod' and 'fast-cgi'
-			'php_version' => ''); // default;
+			'php_version' => 0); // default;
 
 		if($fastcgi_config["fastcgi_phpini_path"] && $fastcgi_config["fastcgi_phpini_path"] != $web_config['php_ini_path_cgi']) {
 			$check_files[] = array('file' => $fastcgi_config["fastcgi_phpini_path"],
 				'mode' => 'fast-cgi',
-				'php_version' => ''); // default;
+				'php_version' => 0); // default;
 		} else {
 			$check_files[] = array('file' => $web_config['php_ini_path_cgi'],
 				'mode' => 'fast-cgi', // all but 'mod'
-				'php_version' => ''); // default;
+				'php_version' => 0); // default;
 		}
 
 
@@ -112,11 +112,11 @@ class webserver_plugin {
 			if($php['php_fastcgi_ini_dir'] && $php['php_fastcgi_ini_dir'] . '/php.ini' != $web_config['php_ini_path_cgi']) {
 				$check_files[] = array('file' => $php['php_fastcgi_ini_dir'] . '/php.ini',
 					'mode' => 'fast-cgi',
-					'php_version' => $php['php_fastcgi_ini_dir']);
+					'php_version' => $php['server_php_id']);
 			} elseif($php['php_fpm_ini_dir'] && $php['php_fpm_ini_dir'] . '/php.ini' != $web_config['php_ini_path_cgi']) {
 				$check_files[] = array('file' => $php['php_fpm_ini_dir'] . '/php.ini',
 					'mode' => 'php-fpm',
-					'php_version' => $php['php_fpm_ini_dir']);
+					'php_version' => $php['server_php_id']);
 			}
 		}
 		unset($php_versions);

server/plugins-available/z_php_fpm_incron_reload_plugin.inc.php

@@ -66,7 +66,7 @@ class z_php_fpm_incron_reload_plugin {
 
 	private function phpVersionUnchanged($data)
 	{
-		return $data['new']['fastcgi_php_version'] === $data['old']['fastcgi_php_version'];
+		return $data['new']['server_php_id'] === $data['old']['server_php_id'];
 	}
 
 	private function setup($data)
@@ -77,7 +77,7 @@ class z_php_fpm_incron_reload_plugin {
 		$this->createIncronConfiguration(
 			$triggerFile,
 			$data['system_user'],
-			$data['fastcgi_php_version']
+			$data['server_php_id']
 		);
 
 		$this->restartIncronService();
@@ -173,12 +173,14 @@ class z_php_fpm_incron_reload_plugin {
 	}
 
 	private function getPhpService($fastcgiPhpVersion) {
-		$phpInfo = explode(':', $fastcgiPhpVersion);
+		global $app;
+
+		$phpInfo = $app->db->queryOneRecord('SELECT * FROM server_php WHERE server_php_id = ?', $fastcgiPhpVersion);
 		if (empty($phpInfo)) {
 			return null;
 		}
 
-		$phpService = $phpInfo[1];
+		$phpService = $phpInfo['php_fpm_init_script'];
 		if (empty($phpService)) {
 			return null;
 		}

server/scripts/create_jailkit_chroot.sh

@@ -21,7 +21,7 @@ CHROOT_APP_SECTIONS=$2
 chown root:root $CHROOT_HOMEDIR
 
 ## Initialize the chroot into the specified directory with the specified applications
-jk_init -f -k -c /etc/jailkit/jk_init.ini -j $CHROOT_HOMEDIR $CHROOT_APP_SECTIONS
+jk_init -f -c /etc/jailkit/jk_init.ini -j $CHROOT_HOMEDIR $CHROOT_APP_SECTIONS
 
 ## Create the temp directory
 if [ ! -d "$CHROOT_HOMEDIR/tmp" ]

server/scripts/create_jailkit_programs.sh

@@ -17,4 +17,4 @@ fi
 CHROOT_HOMEDIR=$1
 CHROOT_APP_PROGRAMS=$2
 
-jk_cp -k $CHROOT_HOMEDIR $CHROOT_APP_PROGRAMS
+jk_cp -j $CHROOT_HOMEDIR $CHROOT_APP_PROGRAMS

server/server.php

@@ -217,5 +217,5 @@ if ($needStartCore) {
 $app->log('Remove Lock: ' . $conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock', LOGLEVEL_DEBUG);
 
 
-die("finished.\n");
+die("finished server.php.\n");
 ?>