Skip to content

Commit eec2982

Browse files
committed
Revert changes
1 parent fc96c64 commit eec2982

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

server/plugins-available/shelluser_jailkit_plugin.inc.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ function _setup_jailkit_chroot()
329329
$options = array('allow_hardlink');
330330
}
331331

332-
//$web = $app->db->queryOneRecord("SELECT domain, last_jailkit_hash FROM web_domain WHERE domain_id = ?", $this->data['new']["parent_domain_id"]);
333-
$web = $app->db->queryOneRecord("SELECT * FROM web_domain LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id WHERE `domain_id` = ?", $data["new"]["parent_domain_id"]);
332+
$web = $app->db->queryOneRecord("SELECT domain, last_jailkit_hash FROM web_domain WHERE domain_id = ?", $this->data['new']["parent_domain_id"]);
333+
//$web = $app->db->queryOneRecord("SELECT * FROM web_domain LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id WHERE `domain_id` = ?", $data["new"]["parent_domain_id"]);
334334

335335
$last_updated = preg_split('/[\s,]+/', $this->jailkit_config['jailkit_chroot_app_sections']
336336
.' '.$this->jailkit_config['jailkit_chroot_app_programs']
@@ -357,14 +357,13 @@ function _setup_jailkit_chroot()
357357
$tpl->setVar('jailkit_chroot', true);
358358
$tpl->setVar('domain', $web['domain']);
359359
$tpl->setVar('home_dir', $this->_get_home_dir(""));
360-
$tpl->setVar('php_cli_binary', dirname($web['php_cli_binary']));
361360

362361
$bashrc = $this->data['new']['dir'].'/etc/bash.bashrc';
363362
if(@is_file($bashrc) || @is_link($bashrc)) unlink($bashrc);
364363

365364
$app->system->file_put_contents($bashrc, $tpl->grab());
366365

367-
//file_put_contents($bashrc, $tpl->grab());
366+
368367
unset($tpl);
369368

370369
$app->log("Added bashrc script: ".$bashrc, LOGLEVEL_DEBUG);

0 commit comments

Comments
 (0)