Update Jailkit/PHP cron placeholders code

Author: ms217

interface/web/sites/ajax_get_json.php

@@ -250,17 +250,27 @@
 
 if($type == 'getcronplaceholders') {
 
-	$web_docroot_client = '';
+	if(is_array($web_id) && !empty($web_id)) {
 
-	if($web_id > 0) {
+		$web_docroot_client = '';
 
 		$web = $app->db->queryOneRecord("SELECT wd.sys_groupid, wd.domain, wd.document_root, sp.php_cli_binary
 			FROM web_domain wd
 				LEFT JOIN server_php sp ON wd.server_php_id = sp.server_php_id
 			WHERE wd.domain_id = ?", $web_id);
 
-		$php_cli_binary = $web['php_cli_binary'];
-		$domain = $web['domain'];
+		if(empty($web['php_cli_binary'])) {
+			$php_cli_binary = "/usr/bin/php";
+		} else {
+			$php_cli_binary = $web['php_cli_binary'];
+		}
+
+		if(empty($web['domain'])) {
+			$domain = $app->tform->wordbook["domain_not_selected_placeholder_txt"];
+		} else {
+			$domain = $web['domain'];
+		}
+
 
 		$domain_owner = $app->db->queryOneRecord("SELECT limit_cron_type FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $web["sys_groupid"]);
 
@@ -279,20 +289,18 @@
 		if($cron_type != 'chrooted') {
 			$web_docroot_client = $web['document_root'];
 		}
-	}
 
-	$web_docroot_client .= '/web';
+		$web_docroot_client .= '/web';
 
-	if(empty($web['php_cli_binary'])) {
-		$php_cli_binary = "/usr/bin/php";
+		$json = json_encode(array(
+			'php_cli_binary' => $php_cli_binary,
+			'docroot_client' => $web_docroot_client,
+			//'cron_type' => $cron_type,
+			'domain' => $domain
+		));
 	}
 
-	$json = json_encode(array(
-		'php_cli_binary' => $php_cli_binary,
-		'docroot_client' => $web_docroot_client,
-		//'cron_type' => $cron_type,
-		'domain' => $domain
-	));
+
 }
 
 header('Content-type: application/json');

interface/web/sites/cron_edit.php

@@ -83,21 +83,23 @@ function onShowEnd() {
 				LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id
 			WHERE `domain_id` = ?", $this->dataRecord["parent_domain_id"]);
 
-		$php_cli_binary = $parent_domain['php_cli_binary'];
-		$domain = $parent_domain['domain'];
-
-		if($this->dataRecord['type'] != 'chrooted') {
-			$web_docroot_client = $parent_domain['document_root'];
-		} else {
-			$web_docroot_client = '';
-		}
 
 		if(empty($parent_domain['php_cli_binary'])) {
 			$php_cli_binary = "/usr/bin/php";
+		} else {
+			$php_cli_binary = $parent_domain['php_cli_binary'];
 		}
 
 		if(empty($parent_domain['domain'])) {
 			$domain = $app->tform->wordbook["domain_not_selected_placeholder_txt"];
+		} else {
+			$domain = $parent_domain['domain'];
+		}
+
+		if($this->dataRecord['type'] != 'chrooted') {
+			$web_docroot_client = $parent_domain['document_root'];
+		} else {
+			$web_docroot_client = '';
 		}
 
 		// web folder is hardcoded to /web:

server/lib/classes/cron.d/600-jailkit_maintenance.inc.php

@@ -68,7 +68,7 @@ public function onRunJob() {
 		$sql = "SELECT domain_id, domain, document_root, system_user, system_group, php_fpm_chroot, jailkit_chroot_app_sections, jailkit_chroot_app_programs, delete_unused_jailkit, last_jailkit_hash, `php_cli_binary`
 					FROM web_domain
 						LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id
-					WHERE type = 'vhost' AND (last_jailkit_update IS NULL OR last_jailkit_update < (NOW() - INTERVAL 24 HOUR)) AND web_domain.server_id = ? and domain_id=57
+					WHERE type = 'vhost' AND (last_jailkit_update IS NULL OR last_jailkit_update < (NOW() - INTERVAL 24 HOUR)) AND web_domain.server_id = ?
 					ORDER by last_jailkit_update
 					LIMIT ?";
 		$records = $app->db->queryAllRecords($sql, $conf['server_id'], $num_jails_to_update);
@@ -80,7 +80,15 @@ public function onRunJob() {
 			}
 
 			$options = $global_options;
-			$options['php_cli_binary'] = $rec['php_cli_binary'];
+
+			$options['domain'] = $rec['domain'];
+
+			if(empty($rec['php_cli_binary'])) {
+				$options['php_cli_binary'] = "/usr/bin/php";
+			} else {
+				$options['php_cli_binary'] = $rec['php_cli_binary'];
+			}
+
 
 			//$app->log('Beginning jailkit maintenance for domain '.$rec['domain'].' at '.$rec['document_root'], LOGLEVEL_DEBUG);
 			print 'Beginning jailkit maintenance for domain '.$rec['domain'].' at '.$rec['document_root']."\n";

server/lib/classes/system.inc.php

@@ -2831,10 +2831,8 @@ public function update_jailkit_chroot($home_dir, $sections = array(), $programs
 
 		if (!empty($options['php_cli_binary'])) {
 			if(!file_exists($home_dir . '/' . $options['php_cli_binary'])) {
-				$app->log("The PHP cli binary " . $options['php_cli_binary'] . " is not available in the jail of the web " . $this->web['domain']  . " / SSH/SFTP user: " . $this->username  . ". Check your Jailkit setup!", LOGLEVEL_DEBUG);
-				$tpl->setVar('use_php_path', false);
-				$tpl->setVar('use_php_alias', false);
-				if(is_link($home_dir . '/etc/alternatives/php'))
+				$app->log("update_jailkit_chroot: The PHP cli binary " . $options['php_cli_binary'] . " is not available in the jail of the web " . $options['domain'], LOGLEVEL_DEBUG);
+				if(is_link($home_dir . '/etc/alternatives/php') || is_file($home_dir . '/etc/alternatives/php'))
 				{
 					unlink($home_dir . '/etc/alternatives/php');
 				}

server/plugins-available/shelluser_base_plugin.inc.php

@@ -34,6 +34,8 @@ class shelluser_base_plugin {
 	var $class_name = 'shelluser_base_plugin';
 	var $min_uid = 499;
 	var $data = array();
+	var $web = array();
+
 
 	//* This function is called during ispconfig installation to determine
 	//  if a symlink shall be created for this plugin.