Skip to content

Commit 095dd62

Browse files
committed
Removed unused from jailkit maintenance code
1 parent 90c36c2 commit 095dd62

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

install/sql/ispconfig3.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1463,7 +1463,7 @@ CREATE TABLE `server_php` (
14631463
`php_fpm_pool_dir` varchar(255) DEFAULT NULL,
14641464
`php_fpm_socket_dir` varchar(255) DEFAULT NULL,
14651465
`php_cli_binary` varchar(255) DEFAULT NULL,
1466-
`php_jk_section` varchar(255) DEFAULT NULL,
1466+
`php_jk_section` varchar(255) DEFAULT NULL,
14671467
`active` enum('n','y') NOT NULL DEFAULT 'y',
14681468
`sortprio` int(20) NOT NULL DEFAULT 100,
14691469
PRIMARY KEY (`server_php_id`)

interface/web/sites/ajax_get_json.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,11 @@
291291
$web_docroot_client .= '/web';
292292

293293
$json = json_encode(array(
294-
'php_cli_binary' => $php_cli_binary,
295-
'docroot_client' => $web_docroot_client,
294+
'php_cli_binary' => $php_cli_binary,
295+
'docroot_client' => $web_docroot_client,
296296
'cron_type' => $cron_type,
297-
'domain' => $domain
298-
));
297+
'domain' => $domain
298+
));
299299
}
300300
}
301301

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ class cronjob_jailkit_maintenance extends cronjob {
3737
public function onRunJob() {
3838
global $app, $conf;
3939

40-
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
41-
4240
$jailkit_config = $app->getconf->get_server_config($conf['server_id'], 'jailkit');
4341
if(isset($this->jailkit_config) && isset($this->jailkit_config['jailkit_hardlinks'])) {
4442
if($this->jailkit_config['jailkit_hardlinks'] == 'yes') {

server/plugins-available/cron_jailkit_plugin.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ function update($event_name, $data) {
165165
//* get data from web
166166
$parent_domain = $app->db->queryOneRecord("SELECT web_domain.*, server_php.php_jk_section
167167
FROM web_domain
168-
LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id
168+
LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id
169169
WHERE web_domain.domain_id = ?", $data["new"]["parent_domain_id"]);
170170

171171
if(!$parent_domain["domain_id"]) {

0 commit comments

Comments
 (0)