Skip to content

Commit e79795f

Browse files
author
Marius Burkard
committed
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
2 parents 92c1d33 + 634d3a7 commit e79795f

File tree

254 files changed

+872
-615
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

254 files changed

+872
-615
lines changed

‎install/install.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,17 +328,20 @@
328328
} else swriteln('[ERROR] Postfix not installed - skipping Mail');
329329

330330
//* Check for DNS
331-
if(!$conf['powerdns']['installed'] && !$conf['bind']['installed'] && !$conf['mydns']['installed']) {
332-
$conf['powerdns']['installed'] = $inst->force_configure_app('PowerDNS', false);
331+
// if(!$conf['powerdns']['installed'] && !$conf['bind']['installed'] && !$conf['mydns']['installed']) {
332+
if(!$conf['bind']['installed'] && !$conf['mydns']['installed']) {
333+
// $conf['powerdns']['installed'] = $inst->force_configure_app('PowerDNS', false);
333334
$conf['bind']['installed'] = $inst->force_configure_app('BIND', false);
334335
$conf['mydns']['installed'] = $inst->force_configure_app('MyDNS', false);
335336
}
336337
//* Configure PowerDNS
338+
/*
337339
if($conf['powerdns']['installed']) {
338340
swriteln('Configuring PowerDNS');
339341
$inst->configure_powerdns();
340342
$conf['services']['dns'] = true;
341343
}
344+
*/
342345
//* Configure Bind
343346
if($conf['bind']['installed']) {
344347
swriteln('Configuring BIND');

‎install/lib/installer_base.lib.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,15 @@ public function grant_master_database_rights($verbose = false) {
658658
if(!$this->dbmaster->query($query, $value['db'] . '.mail_backup', $value['user'], $host)) {
659659
$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
660660
}
661+
662+
$query = "GRANT SELECT, UPDATE(`dnssec_initialized`, `dnssec_info`, `dnssec_last_signed`) ON ?? TO ?@?";
663+
if ($verbose){
664+
echo $query ."\n";
665+
}
666+
if(!$this->dbmaster->query($query, $value['db'] . '.dns_soa', $value['user'], $host)) {
667+
$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
668+
}
669+
661670
}
662671

663672
}

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,5 +248,6 @@ UPDATE `sys_session` SET `date_created` = NULL WHERE `date_created` = '0000-00-0
248248
UPDATE `sys_session` SET `last_updated` = NULL WHERE `last_updated` = '0000-00-00 00:00:00';
249249
UPDATE `web_domain` SET `added_date` = NULL WHERE `added_date` = '0000-00-00';
250250
UPDATE `web_traffic` SET `traffic_date` = NULL WHERE `traffic_date` = '0000-00-00';
251+
ALTER TABLE `web_domain` ADD `http_port` INT NOT NULL DEFAULT '80' , ADD `https_port` INT NOT NULL DEFAULT '443' ;
251252

252253

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1979,6 +1979,8 @@ CREATE TABLE `web_domain` (
19791979
`http_port` int(11) unsigned NOT NULL DEFAULT '80',
19801980
`https_port` int(11) unsigned NOT NULL DEFAULT '443',
19811981
`folder_directive_snippets` text NOT NULL,
1982+
`http_port` INT NOT NULL DEFAULT '80',
1983+
`https_port` INT NOT NULL DEFAULT '443',
19821984
PRIMARY KEY (`domain_id`),
19831985
UNIQUE KEY `serverdomain` ( `server_id` , `ip_address`, `domain` )
19841986
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

‎install/tpl/debian_postfix.conf.master‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
2525
smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_maps.cf
2626
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps
2727
smtpd_helo_required = yes
28-
smtpd_helo_restrictions = reject_invalid_helo_hostname, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, warn_if_reject reject_unknown_helo_hostname, permit
29-
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf regexp:{config_dir}/tag_as_originating.re{reject_slm}, permit_mynetworks, check_sender_access regexp:{config_dir}/tag_as_foreign.re
28+
smtpd_helo_restrictions = permit_sasl_authenticated, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, reject_invalid_hostname, reject_non_fqdn_hostname, check_helo_access regexp:{config_dir}/blacklist_helo
29+
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
3030
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
3131
smtpd_client_message_rate_limit = 100
3232
maildrop_destination_concurrency_limit = 1
@@ -43,8 +43,3 @@ smtpd_tls_protocols = !SSLv2,!SSLv3
4343
smtp_tls_protocols = !SSLv2,!SSLv3
4444
smtpd_tls_exclude_ciphers = RC4, aNULL
4545
smtp_tls_exclude_ciphers = RC4, aNULL
46-
strict_rfc821_envelopes = yes
47-
disable_vrfy_command = yes
48-
allow_percent_hack = no
49-
swap_bangpath = no
50-
smtpd_reject_unlisted_sender = yes

‎install/tpl/fedora_postfix.conf.master‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
2222
smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_maps.cf
2323
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps
2424
smtpd_helo_required = yes
25-
smtpd_helo_restrictions = reject_invalid_helo_hostname, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, warn_if_reject reject_unknown_helo_hostname, permit
26-
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf regexp:{config_dir}/tag_as_originating.re{reject_slm}, permit_mynetworks, check_sender_access regexp:{config_dir}/tag_as_foreign.re
25+
smtpd_helo_restrictions = permit_sasl_authenticated, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, reject_invalid_hostname, reject_non_fqdn_hostname, check_helo_access regexp:{config_dir}/blacklist_helo
26+
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
2727
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
2828
smtpd_client_message_rate_limit = 100
2929
maildrop_destination_concurrency_limit = 1
@@ -40,8 +40,3 @@ smtpd_tls_protocols = !SSLv2,!SSLv3
4040
smtp_tls_protocols = !SSLv2,!SSLv3
4141
smtpd_tls_exclude_ciphers = RC4, aNULL
4242
smtp_tls_exclude_ciphers = RC4, aNULL
43-
strict_rfc821_envelopes = yes
44-
disable_vrfy_command = yes
45-
allow_percent_hack = no
46-
swap_bangpath = no
47-
smtpd_reject_unlisted_sender = yes

‎install/tpl/gentoo_postfix.conf.master‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
2121
smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_maps.cf
2222
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps
2323
smtpd_helo_required = yes
24-
smtpd_helo_restrictions = reject_invalid_helo_hostname, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, warn_if_reject reject_unknown_helo_hostname, permit
25-
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf regexp:{config_dir}/tag_as_originating.re{reject_slm}, permit_mynetworks, check_sender_access regexp:{config_dir}/tag_as_foreign.re
24+
smtpd_helo_restrictions = permit_sasl_authenticated, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, reject_invalid_hostname, reject_non_fqdn_hostname, check_helo_access regexp:{config_dir}/blacklist_helo
25+
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
2626
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
2727
smtpd_client_message_rate_limit = 100
2828
maildrop_destination_concurrency_limit = 1
@@ -39,8 +39,3 @@ smtpd_tls_protocols = !SSLv2,!SSLv3
3939
smtp_tls_protocols = !SSLv2,!SSLv3
4040
smtpd_tls_exclude_ciphers = RC4, aNULL
4141
smtp_tls_exclude_ciphers = RC4, aNULL
42-
strict_rfc821_envelopes = yes
43-
disable_vrfy_command = yes
44-
allow_percent_hack = no
45-
swap_bangpath = no
46-
smtpd_reject_unlisted_sender = yes

‎install/tpl/opensuse_postfix.conf.master‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
2424
smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_maps.cf
2525
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps
2626
smtpd_helo_required = yes
27-
smtpd_helo_restrictions = reject_invalid_helo_hostname, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, warn_if_reject reject_unknown_helo_hostname, permit
28-
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf regexp:{config_dir}/tag_as_originating.re{reject_slm}, permit_mynetworks, check_sender_access regexp:{config_dir}/tag_as_foreign.re
27+
smtpd_helo_restrictions = permit_sasl_authenticated, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, reject_invalid_hostname, reject_non_fqdn_hostname, check_helo_access regexp:{config_dir}/blacklist_helo
28+
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
2929
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
3030
smtpd_client_message_rate_limit = 100
3131
maildrop_destination_concurrency_limit = 1
@@ -42,8 +42,3 @@ smtpd_tls_protocols = !SSLv2,!SSLv3
4242
smtp_tls_protocols = !SSLv2,!SSLv3
4343
smtpd_tls_exclude_ciphers = RC4, aNULL
4444
smtp_tls_exclude_ciphers = RC4, aNULL
45-
strict_rfc821_envelopes = yes
46-
disable_vrfy_command = yes
47-
allow_percent_hack = no
48-
swap_bangpath = no
49-
smtpd_reject_unlisted_sender = yes

‎interface/lib/classes/tform_tpl_generator.inc.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,8 @@ function lng_add($lang, $formDef) {
311311
$fp = fopen($lng_file, "w");
312312
fwrite($fp, "<?php\n");
313313
foreach($wb_out as $key => $val) {
314+
$val = str_replace("'", "\\'",$val);
315+
$key = str_replace("'", "\\'",$key);
314316
$new_line = '$wb["'.$key.'"] = '."'$val';\n";
315317
fwrite($fp, $new_line);
316318

‎interface/lib/lang/cz.lng‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ $wb['page_next_txt'] = 'Další';
2323
$wb['page_back_txt'] = 'Zpět';
2424
$wb['delete_txt'] = 'Smazat';
2525
$wb['filter_txt'] = 'Filtrovat';
26-
$wb['add_new_record_txt'] = 'Přidat záznam';
26+
$wb['add_new_record_txt'] = 'Vytvořit záznam';
2727
$wb['btn_save_txt'] = 'Uložit';
28-
$wb['btn_cancel_txt'] = 'Zpět';
28+
$wb['btn_cancel_txt'] = 'Zrušit';
2929
$wb['top_menu_system'] = 'Systém';
3030
$wb['top_menu_client'] = 'Klienti';
3131
$wb['top_menu_email'] = 'E-mail';
@@ -71,7 +71,7 @@ $wb['datepicker_prevText'] = 'Předchozí';
7171
$wb['logout_txt'] = 'Odhlášení';
7272
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
7373
$wb['submit_confirmation'] = 'Opravdu chcete provést tuto akci ?';
74-
$wb['top_menu_mailuser'] = 'E-mailový uživatel';
74+
$wb['top_menu_mailuser'] = 'E-mail. uživ.';
7575
$wb['globalsearch_resultslimit_of_txt'] = 'z';
7676
$wb['globalsearch_resultslimit_results_txt'] = 'výsledky';
7777
$wb['globalsearch_noresults_text_txt'] = 'Žádné výsledky.';
@@ -151,3 +151,4 @@ $wb['security_check1_txt'] = 'Check for security permission:';
151151
$wb['security_check2_txt'] = 'failed.';
152152
$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
153153
?>
154+

0 commit comments

Comments
 (0)