Skip to content

Commit 755575a

Browse files
florian030florian030
committed
Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop
2 parents 18e78b2 + a7a114c commit 755575a

15 files changed

+55
-44
lines changed

‎install/install.php‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,7 @@
545545
}
546546

547547
//** Configure ISPConfig :-)
548+
$issue_asked = false;
548549
$issue_tried = false;
549550
$install_ispconfig_interface_default = ($conf['mysql']['master_slave_setup'] == 'y')?'n':'y';
550551
if($install_mode == 'standard' || strtolower($inst->simple_query('Install ISPConfig Web Interface', array('y', 'n'), $install_ispconfig_interface_default,'install_ispconfig_web_interface')) == 'y') {
@@ -574,19 +575,22 @@
574575
$inst->make_ispconfig_ssl_cert();
575576
$issue_tried = true;
576577
}
578+
$issue_asked = true;
577579
$inst->install_ispconfig_interface = true;
578580

579581
} else {
580582
$inst->install_ispconfig_interface = false;
581583
}
582584

583585
// Create SSL certs for non-webserver(s)?
584-
if(!file_exists('/usr/local/ispconfig/interface/ssl/ispserver.crt')) {
585-
if(!$issue_tried && strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y','create_ssl_server_certs')) == 'y') {
586-
$inst->make_ispconfig_ssl_cert();
587-
}
588-
} else {
589-
swriteln('Certificate exists. Not creating a new one.');
586+
if(!$issue_asked) {
587+
if(!file_exists('/usr/local/ispconfig/interface/ssl/ispserver.crt')) {
588+
if(!$issue_tried && strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y','create_ssl_server_certs')) == 'y') {
589+
$inst->make_ispconfig_ssl_cert();
590+
}
591+
} else {
592+
swriteln('Certificate exists. Not creating a new one.');
593+
}
590594
}
591595

592596
if($conf['services']['web'] == true) {

‎install/tpl/debian_postfix.conf.master‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ nested_header_checks = regexp:{config_dir}/nested_header_checks
4141
body_checks = regexp:{config_dir}/body_checks
4242
owner_request_special = no
4343
smtp_tls_security_level = may
44-
smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3, !TLSv1, !TLSv1.1
45-
smtpd_tls_protocols = !SSLv2,!SSLv3, !TLSv1, !TLSv1.1
46-
smtp_tls_protocols = !SSLv2,!SSLv3, !TLSv1, !TLSv1.1
44+
smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3
45+
smtpd_tls_protocols = !SSLv2,!SSLv3
46+
smtp_tls_protocols = !SSLv2,!SSLv3
4747
smtpd_tls_exclude_ciphers = RC4, aNULL
4848
smtp_tls_exclude_ciphers = RC4, aNULL
4949
smtpd_tls_mandatory_ciphers = medium

‎install/tpl/fedora_postfix.conf.master‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ nested_header_checks = regexp:{config_dir}/nested_header_checks
3737
body_checks = regexp:{config_dir}/body_checks
3838
inet_interfaces = all
3939
smtp_tls_security_level = may
40-
smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3, !TLSv1, !TLSv1.1
41-
smtpd_tls_protocols = !SSLv2,!SSLv3, !TLSv1, !TLSv1.1
42-
smtp_tls_protocols = !SSLv2,!SSLv3, !TLSv1, !TLSv1.1
40+
smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3
41+
smtpd_tls_protocols = !SSLv2,!SSLv3
42+
smtp_tls_protocols = !SSLv2,!SSLv3
4343
smtpd_tls_exclude_ciphers = RC4, aNULL
4444
smtp_tls_exclude_ciphers = RC4, aNULL
4545
smtpd_tls_mandatory_ciphers = medium

‎install/tpl/gentoo_postfix.conf.master‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ nested_header_checks = regexp:{config_dir}/nested_header_checks
3636
body_checks = regexp:{config_dir}/body_checks
3737
inet_interfaces = all
3838
smtp_tls_security_level = may
39-
smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3, !TLSv1, !TLSv1.1
40-
smtpd_tls_protocols = !SSLv2,!SSLv3, !TLSv1, !TLSv1.1
41-
smtp_tls_protocols = !SSLv2,!SSLv3, !TLSv1, !TLSv1.1
39+
smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3
40+
smtpd_tls_protocols = !SSLv2,!SSLv3
41+
smtp_tls_protocols = !SSLv2,!SSLv3
4242
smtpd_tls_exclude_ciphers = RC4, aNULL
4343
smtp_tls_exclude_ciphers = RC4, aNULL
4444
smtpd_tls_mandatory_ciphers = medium

‎install/tpl/mysql-virtual_email2email.cf.master‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
44
hosts = {mysql_server_ip}
5-
query = SELECT cc AS email FROM mail_user WHERE email = '%s' AND cc != '' AND (forward_in_lda = 'n' OR disabledeliver = 'y') AND postfix = 'y' AND server_id = {server_id}
5+
query = SELECT email FROM mail_user WHERE email = '%s' AND forward_in_lda = 'n' AND disabledeliver = 'n' AND postfix = 'y' AND server_id = {server_id}
6+
UNION
7+
SELECT cc AS email FROM mail_user WHERE email = '%s' AND cc != '' AND (forward_in_lda = 'n' OR disabledeliver = 'y') AND postfix = 'y' AND server_id = {server_id}

‎install/tpl/opensuse_postfix.conf.master‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ nested_header_checks = regexp:{config_dir}/nested_header_checks
3939
body_checks = regexp:{config_dir}/body_checks
4040
inet_interfaces = all
4141
smtp_tls_security_level = may
42-
smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3, !TLSv1, !TLSv1.1
43-
smtpd_tls_protocols = !SSLv2,!SSLv3, !TLSv1, !TLSv1.1
44-
smtp_tls_protocols = !SSLv2,!SSLv3, !TLSv1, !TLSv1.1
42+
smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3
43+
smtpd_tls_protocols = !SSLv2,!SSLv3
44+
smtp_tls_protocols = !SSLv2,!SSLv3
4545
smtpd_tls_exclude_ciphers = RC4, aNULL
4646
smtp_tls_exclude_ciphers = RC4, aNULL
4747
smtpd_tls_mandatory_ciphers = medium

‎install/update.php‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,7 @@
519519
//** Configure ISPConfig
520520
swriteln('Updating ISPConfig');
521521

522+
$issue_asked = false;
522523
$issue_tried = false;
523524
// create acme vhost
524525
if($conf['nginx']['installed'] == true) {
@@ -544,15 +545,18 @@
544545
$inst->make_ispconfig_ssl_cert();
545546
$issue_tried = true;
546547
}
548+
$issue_asked = true;
547549
}
548550

549551
// Create SSL certs for non-webserver(s)?
550-
if(!file_exists('/usr/local/ispconfig/interface/ssl/ispserver.crt')) {
551-
if(!$issue_tried && strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y','create_ssl_server_certs')) == 'y') {
552-
$inst->make_ispconfig_ssl_cert();
553-
}
554-
} else {
555-
swriteln('Certificate exists. Not creating a new one.');
552+
if(!$issue_asked) {
553+
if(!file_exists('/usr/local/ispconfig/interface/ssl/ispserver.crt')) {
554+
if(!$issue_tried && strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y','create_ssl_server_certs')) == 'y') {
555+
$inst->make_ispconfig_ssl_cert();
556+
}
557+
} else {
558+
swriteln('Certificate exists. Not creating a new one.');
559+
}
556560
}
557561

558562
$inst->install_ispconfig();

‎interface/web/admin/directive_snippets_del.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@
4949

5050
class page_action extends tform_actions {
5151
function onBeforeDelete() {
52-
global $app, $conf;
52+
global $app;
5353

5454
if($this->dataRecord['type'] === 'php') {
5555
$rlike = $this->dataRecord['directive_snippets_id'].'|,'.$this->dataRecord['directive_snippets_id'].'|'.$this->dataRecord['directive_snippets_id'].',';
56-
$affected_snippets = $app->db->queryAllRecords('SELECT directive_snippets_id FROM directive_snippets WHERE required_php_snippets REGEXP ? AND type = ?', $rlike, 'apache');
56+
$affected_snippets = $app->db->queryAllRecords('SELECT directive_snippets_id FROM directive_snippets WHERE required_php_snippets REGEXP ?', $rlike);
5757
if(is_array($affected_snippets) && !empty($affected_snippets)) {
5858
foreach($affected_snippets as $snippet) {
5959
$sql_in[] = $snippet['directive_snippets_id'];
6060
}
61-
$affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE server_id = ? AND directive_snippets_id IN ?', $conf['server_id'], $sql_in);
61+
$affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE directive_snippets_id IN ?', $sql_in);
6262
}
6363
} elseif($this->dataRecord['type'] === 'apache' || $this->dataRecord['type'] === 'nginx') {
64-
$affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE server_id = ? AND directive_snippets_id = ?', $conf['server_id'], $this->dataRecord['directive_snippets_id']);
64+
$affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE directive_snippets_id = ?', $this->dataRecord['directive_snippets_id']);
6565
}
6666

6767
if(!empty($affected_sites)) {

‎interface/web/admin/directive_snippets_edit.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@
5050
class page_action extends tform_actions {
5151

5252
private function getAffectedSites() {
53-
global $app, $conf;
53+
global $app;
5454

5555
if($this->dataRecord['type'] === 'php') {
5656
$rlike = $this->dataRecord['id'].'|,'.$this->dataRecord['id'].'|'.$this->dataRecord['id'].',';
57-
$affected_snippets = $app->db->queryAllRecords('SELECT directive_snippets_id FROM directive_snippets WHERE required_php_snippets REGEXP ? AND type = ?', $rlike, 'apache');
57+
$affected_snippets = $app->db->queryAllRecords('SELECT directive_snippets_id FROM directive_snippets WHERE required_php_snippets REGEXP ?', $rlike);
5858
if(is_array($affected_snippets) && !empty($affected_snippets)) {
5959
foreach($affected_snippets as $snippet) {
6060
$sql_in[] = $snippet['directive_snippets_id'];
6161
}
62-
$affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE server_id = ? AND directive_snippets_id IN ?', $conf['server_id'], $sql_in);
62+
$affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE directive_snippets_id IN ?', $sql_in);
6363
}
6464
} elseif($this->dataRecord['type'] === 'apache' || $this->dataRecord['type'] === 'nginx') {
65-
$affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE server_id = ? AND directive_snippets_id = ?', $conf['server_id'], $this->dataRecord['id']);
65+
$affected_sites = $app->db->queryAllRecords('SELECT domain_id FROM web_domain WHERE directive_snippets_id = ?', $this->dataRecord['id']);
6666
}
6767

6868
return $affected_sites;

‎interface/web/admin/templates/server_config_jailkit_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<div class="form-group">
2121
<label class="col-sm-3 control-label">{tmpl_var name='jailkit_hardlinks_txt'}</label>
2222
<div class="col-sm-9"><select name="jailkit_hardlinks" id="jailkit_hardlinks" class="form-control">
23-
<a href="#" data-toggle="tooltip" title="{tmpl_var name='tooltip_jailkit_hardlinks_txt'}">{tmpl_var name="jailkit_hardlinks"}</a>
23+
<a data-toggle="tooltip" title="{tmpl_var name='tooltip_jailkit_hardlinks_txt'}">{tmpl_var name="jailkit_hardlinks"}</a>
2424
</select></div>
2525
</div>
2626

0 commit comments

Comments
 (0)