Skip to content

Commit 35957eb

Browse files
author
Marius Burkard
committed
- fixed syntax and logical errors
1 parent 05161ae commit 35957eb

File tree

4 files changed

+42
-29
lines changed

4 files changed

+42
-29
lines changed

‎server/lib/app.inc.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ function __construct() {
6969

7070
}
7171

72+
public function __get($prop) {
73+
if(property_exists($this, $prop)) return $this->{$prop};
74+
75+
$this->uses($prop);
76+
if(property_exists($this, $prop)) return $this->{$prop};
77+
else return null;
78+
}
79+
7280
function setCaller($caller) {
7381
$this->_calling_script = $caller;
7482
}

‎server/lib/classes/letsencrypt.inc.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function __construct(){
4444
}
4545

4646
public function get_acme_script() {
47-
$acme = excplode("\n", shell_exec('which /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh'));
47+
$acme = explode("\n", shell_exec('which /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh'));
4848
$acme = reset($acme);
4949
if(is_executable($acme)) {
5050
return $acme;
@@ -233,7 +233,10 @@ public function get_letsencrypt_certificate_paths($domains = array()) {
233233
}
234234

235235
private function get_ssl_domain($data) {
236+
global $app;
237+
236238
$domain = $data['new']['ssl_domain'];
239+
237240
if(!$domain) $domain = $data['new']['domain'];
238241

239242
if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y') {
@@ -249,8 +252,6 @@ private function get_ssl_domain($data) {
249252
}
250253

251254
public function get_website_certificate_paths($data) {
252-
global $app;
253-
254255
$ssl_dir = $data['new']['document_root'].'/ssl';
255256
$domain = $this->get_ssl_domain($data);
256257

@@ -472,4 +473,3 @@ public function request_certificates($data, $server_type = 'apache') {
472473
}
473474
}
474475

475-
?>

‎server/lib/classes/plugin_webserver_base.inc.php‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,38 +33,44 @@ class plugin_webserver_base {
3333
public function registerEvents($server_type = 'apache') {
3434
global $app;
3535

36-
$app->plugins->registerEvent('web_domain_insert', $this->plugin_name, 'ssl');
37-
$app->plugins->registerEvent('web_domain_update', $this->plugin_name, 'ssl');
38-
$app->plugins->registerEvent('web_domain_delete', $this->plugin_name, 'ssl');
36+
if($server_type === 'apache') {
37+
$plugin_name = 'apache2_plugin';
38+
} else {
39+
$plugin_name = 'nginx_plugin';
40+
}
41+
42+
$app->plugins->registerEvent('web_domain_insert', $plugin_name, 'ssl');
43+
$app->plugins->registerEvent('web_domain_update', $plugin_name, 'ssl');
44+
$app->plugins->registerEvent('web_domain_delete', $plugin_name, 'ssl');
3945

40-
$app->plugins->registerEvent('web_domain_insert', $this->plugin_name, 'insert');
41-
$app->plugins->registerEvent('web_domain_update', $this->plugin_name, 'update');
42-
$app->plugins->registerEvent('web_domain_delete', $this->plugin_name, 'delete');
46+
$app->plugins->registerEvent('web_domain_insert', $plugin_name, 'insert');
47+
$app->plugins->registerEvent('web_domain_update', $plugin_name, 'update');
48+
$app->plugins->registerEvent('web_domain_delete', $plugin_name, 'delete');
4349

44-
$app->plugins->registerEvent('server_ip_insert', $this->plugin_name, 'server_ip');
45-
$app->plugins->registerEvent('server_ip_update', $this->plugin_name, 'server_ip');
46-
$app->plugins->registerEvent('server_ip_delete', $this->plugin_name, 'server_ip');
50+
$app->plugins->registerEvent('server_ip_insert', $plugin_name, 'server_ip');
51+
$app->plugins->registerEvent('server_ip_update', $plugin_name, 'server_ip');
52+
$app->plugins->registerEvent('server_ip_delete', $plugin_name, 'server_ip');
4753

48-
$app->plugins->registerEvent('server_insert', $this->plugin_name, 'server_ip');
49-
$app->plugins->registerEvent('server_update', $this->plugin_name, 'server_ip');
54+
$app->plugins->registerEvent('server_insert', $plugin_name, 'server_ip');
55+
$app->plugins->registerEvent('server_update', $plugin_name, 'server_ip');
5056

51-
$app->plugins->registerEvent('client_delete', $this->plugin_name, 'client_delete');
57+
$app->plugins->registerEvent('client_delete', $plugin_name, 'client_delete');
5258

53-
$app->plugins->registerEvent('web_folder_user_insert', $this->plugin_name, 'web_folder_user');
54-
$app->plugins->registerEvent('web_folder_user_update', $this->plugin_name, 'web_folder_user');
55-
$app->plugins->registerEvent('web_folder_user_delete', $this->plugin_name, 'web_folder_user');
59+
$app->plugins->registerEvent('web_folder_user_insert', $plugin_name, 'web_folder_user');
60+
$app->plugins->registerEvent('web_folder_user_update', $plugin_name, 'web_folder_user');
61+
$app->plugins->registerEvent('web_folder_user_delete', $plugin_name, 'web_folder_user');
5662

57-
$app->plugins->registerEvent('web_folder_update', $this->plugin_name, 'web_folder_update');
58-
$app->plugins->registerEvent('web_folder_delete', $this->plugin_name, 'web_folder_delete');
63+
$app->plugins->registerEvent('web_folder_update', $plugin_name, 'web_folder_update');
64+
$app->plugins->registerEvent('web_folder_delete', $plugin_name, 'web_folder_delete');
5965

60-
$app->plugins->registerEvent('ftp_user_delete', $this->plugin_name, 'ftp_user_delete');
66+
$app->plugins->registerEvent('ftp_user_delete', $plugin_name, 'ftp_user_delete');
6167

62-
$app->plugins->registerAction('php_ini_changed', $this->plugin_name, 'php_ini_changed');
68+
$app->plugins->registerAction('php_ini_changed', $plugin_name, 'php_ini_changed');
6369

6470
if($server_type === 'apache') {
65-
$app->plugins->registerEvent('webdav_user_insert', $this->plugin_name, 'webdav');
66-
$app->plugins->registerEvent('webdav_user_update', $this->plugin_name, 'webdav');
67-
$app->plugins->registerEvent('webdav_user_delete', $this->plugin_name, 'webdav');
71+
$app->plugins->registerEvent('webdav_user_insert', $plugin_name, 'webdav');
72+
$app->plugins->registerEvent('webdav_user_update', $plugin_name, 'webdav');
73+
$app->plugins->registerEvent('webdav_user_delete', $plugin_name, 'webdav');
6874
}
6975
}
7076

@@ -1354,8 +1360,7 @@ public function eventUpdate($event_name, $data, $server_type = 'apache') {
13541360
$app->system->file_put_contents($vhost_file, $this->nginx_merge_locations($tpl->grab()));
13551361
}
13561362
$app->log('Writing the vhost file: '.$vhost_file, LOGLEVEL_DEBUG);
1357-
unset($tpl);
1358-
1363+
13591364
if($server_type === 'apache') {
13601365
/*
13611366
* maybe we have some webdav - user. If so, add them...

‎server/plugins-available/apache2_plugin.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ function update($event_name, $data) {
9898

9999
if($this->action != 'insert') $this->action = 'update';
100100

101-
$app->plugins_webserver_base->eventUpdate($event_name, $data, 'apache');
101+
$app->plugin_webserver_base->eventUpdate($event_name, $data, 'apache');
102102

103103
//* Unset action to clean it for next processed vhost.
104104
$this->action = '';

0 commit comments

Comments
 (0)