Fixed #6633 Code Error - Jailkit Update on every cron change

tbrehm · tbrehm · commit 4e95e6063a50 · 2024-02-09T06:47:29.000+01:00
diff --git a/server/plugins-available/cron_jailkit_plugin.inc.php b/server/plugins-available/cron_jailkit_plugin.inc.php
@@ -229,7 +229,7 @@ function delete($event_name, $data) {
 
 	function _setup_jailkit_chroot()
 	{
-		global $app;
+		global $app, $conf;
 
 		if (isset($this->jailkit_config) && isset($this->jailkit_config['jailkit_hardlinks'])) {
 			if ($this->jailkit_config['jailkit_hardlinks'] == 'yes') {
@@ -293,7 +293,7 @@ function _setup_jailkit_chroot()
 			$programs = $this->jailkit_config['jailkit_chroot_app_programs'] . ' '
 				  . $this->jailkit_config['jailkit_chroot_cron_programs'];
 
-			if ($update_hash == $parent_domain['last_jailkit_hash']) {
+			if ($update_hash == $this->parent_domain['last_jailkit_hash']) {
 				return;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ function delete($event_name, $data) {`
`229`	`229`
`230`	`230`	`function _setup_jailkit_chroot()`
`231`	`231`	`{`
`232`		`- global $app;`
	`232`	`+ global $app, $conf;`
`233`	`233`
`234`	`234`	`if (isset($this->jailkit_config) && isset($this->jailkit_config['jailkit_hardlinks'])) {`
`235`	`235`	`if ($this->jailkit_config['jailkit_hardlinks'] == 'yes') {`
`@@ -293,7 +293,7 @@ function _setup_jailkit_chroot()`
`293`	`293`	`$programs = $this->jailkit_config['jailkit_chroot_app_programs'] . ' '`
`294`	`294`	`. $this->jailkit_config['jailkit_chroot_cron_programs'];`
`295`	`295`
`296`		`- if ($update_hash == $parent_domain['last_jailkit_hash']) {`
	`296`	`+ if ($update_hash == $this->parent_domain['last_jailkit_hash']) {`
`297`	`297`	`return;`
`298`	`298`	`}`
`299`	`299`