Skip to content

Commit d215533

Browse files
committed
Fix Array to string conversion in both jailkit plugins
1 parent 8673319 commit d215533

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

server/plugins-available/cron_jailkit_plugin.inc.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ function insert($event_name, $data) {
119119
// Add selected PHP version to the jailkit chroot
120120
if ($section == 'jailkit_chroot_app_sections') {
121121
if (isset($parent_domain['php_jk_section']) && $parent_domain['php_jk_section'] != '' ) {
122+
if (is_array($this->jailkit_config['jailkit_chroot_app_sections'])) {
123+
$this->jailkit_config['jailkit_chroot_app_sections'] = implode(' ', $this->jailkit_config['jailkit_chroot_app_sections']);
124+
}
122125
$this->jailkit_config['jailkit_chroot_app_sections'] = $this->jailkit_config['jailkit_chroot_app_sections'] . ' ' . $parent_domain['php_jk_section'];
123126
$jk_temp_config = preg_split('/[\s,]+/', $this->jailkit_config['jailkit_chroot_app_sections']);
124127

@@ -201,6 +204,9 @@ function update($event_name, $data) {
201204
// Add selected PHP version to the jailkit chroot
202205
if($section == 'jailkit_chroot_app_sections') {
203206
if(isset($parent_domain['php_jk_section']) && $parent_domain['php_jk_section'] != '' ) {
207+
if(is_array($this->jailkit_config['jailkit_chroot_app_sections'])) {
208+
$this->jailkit_config['jailkit_chroot_app_sections'] = implode(' ', $this->jailkit_config['jailkit_chroot_app_sections']);
209+
}
204210
$this->jailkit_config['jailkit_chroot_app_sections'] = $this->jailkit_config['jailkit_chroot_app_sections'] . ' ' . $parent_domain['php_jk_section'];
205211
$jk_temp_config = preg_split('/[\s,]+/', $this->jailkit_config['jailkit_chroot_app_sections']);
206212

server/plugins-available/shelluser_jailkit_plugin.inc.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ function insert($event_name, $data) {
134134
// Add selected PHP version to the jailkit chroot
135135
if ($section == 'jailkit_chroot_app_sections') {
136136
if (isset($web['php_jk_section']) && $web['php_jk_section'] != '' ) {
137+
if(is_array($this->jailkit_config['jailkit_chroot_app_sections'])) {
138+
$this->jailkit_config['jailkit_chroot_app_sections'] = implode(' ', $this->jailkit_config['jailkit_chroot_app_sections']);
139+
}
140+
137141
$this->jailkit_config['jailkit_chroot_app_sections'] = $this->jailkit_config['jailkit_chroot_app_sections'] . ' ' . $web['php_jk_section'];
138142
$jk_temp_config = preg_split('/[\s,]+/', $this->jailkit_config['jailkit_chroot_app_sections']);
139143

@@ -241,17 +245,23 @@ function update($event_name, $data) {
241245
if (isset($web[$section]) && $web[$section] != '' ) {
242246
$this->jailkit_config[$section] = $web[$section];
243247
}
248+
if (is_array($this->jailkit_config['jailkit_chroot_app_sections'])) {
249+
$this->jailkit_config['jailkit_chroot_app_sections'] = implode(' ', $this->jailkit_config['jailkit_chroot_app_sections']);
250+
}
244251
// Add selected PHP version to the jailkit chroot
245252
if ($section == 'jailkit_chroot_app_sections') {
246253
if (isset($web['php_jk_section']) && $web['php_jk_section'] != '' ) {
254+
if (is_array($this->jailkit_config['jailkit_chroot_app_sections'])) {
255+
$this->jailkit_config['jailkit_chroot_app_sections'] = implode(' ', $this->jailkit_config['jailkit_chroot_app_sections']);
256+
}
257+
247258
$this->jailkit_config['jailkit_chroot_app_sections'] = $this->jailkit_config['jailkit_chroot_app_sections'] . ' ' . $web['php_jk_section'];
248259
$jk_temp_config = preg_split('/[\s,]+/', $this->jailkit_config['jailkit_chroot_app_sections']);
249260

250261
// Merge the arrays and remove duplicates
251262
$this->jailkit_config[$section] = array_unique($jk_temp_config, SORT_REGULAR);
252263
sort($this->jailkit_config[$section], SORT_STRING);
253264
}
254-
255265
}
256266
}
257267

0 commit comments

Comments
 (0)