Skip to content

Commit 1d7c7eb

Browse files
author
Till Brehm
committed
Merge branch 'develop' into '6497_php_sort_version_3'
# Conflicts: # install/sql/incremental/upd_dev_collection.sql
2 parents 695aaad + 9a10982 commit 1d7c7eb

File tree

79 files changed

+452
-75
lines changed

Some content is hidden

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

79 files changed

+452
-75
lines changed

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
ALTER TABLE `mail_user` CHANGE `quota` `quota` BIGINT(20) NOT NULL DEFAULT '0';
22
ALTER TABLE `server_php` ADD `sortprio` INT(20) NOT NULL DEFAULT '100' AFTER `active`;
33
ALTER TABLE `mail_user` ADD COLUMN `imap_prefix` varchar(255) NULL default NULL AFTER `backup_copies`;
4+
-- #6456 comodoca.com needs to become sectigo.com
5+
UPDATE `dns_ssl_ca` SET `ca_issue` = 'sectigo.com' WHERE `ca_issue` = 'comodo.com';
6+
UPDATE `dns_ssl_ca` SET `ca_issue` = 'sectigo.com' WHERE `ca_issue` = 'comodoca.com';
7+
UPDATE `dns_ssl_ca` SET `ca_name` = 'Sectigo (formerly Comodo CA)' WHERE `ca_issue` = 'sectigo.com';
8+
-- not updating the dns_rr table to change all CAA records that have comodo.com / comodoca.com - we should not touch users records imo - TP

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ INSERT INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `s
568568
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'certSIGN', 'certsign.ro', 'Y', '', 0),
569569
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'CFCA', 'cfca.com.cn', 'Y', '', 0),
570570
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Chunghwa Telecom', 'cht.com.tw', 'Y', '', 0),
571-
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Sectigo / Comodo CA', 'comodoca.com', 'Y', '', 0),
571+
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Sectigo (formerly Comodo CA)', 'sectigo.com', 'Y', '', 0),
572572
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'D-TRUST', 'd-trust.net', 'Y', '', 0),
573573
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'DigiCert', 'digicert.com', 'Y', '', 0),
574574
(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'DocuSign', 'docusign.fr', 'Y', '', 0),

‎install/tpl/postfix_3-0.conf.master‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@
1414
# validate DANE
1515
smtp_dns_support_level = dnssec
1616
smtp_tls_security_level = dane
17+
18+
# Disable SMTPUTF8 (until Dovecot supports it: https://git.ispconfig.org/ispconfig/ispconfig3/-/issues/6428)
19+
smtputf8_enable = no

‎install/tpl/server.ini.master‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ bind_user=root
142142
bind_group=bind
143143
bind_zonefiles_dir=/etc/bind
144144
bind_keyfiles_dir=/etc/bind
145+
bind_zonefiles_masterprefix=pri.
146+
bind_zonefiles_slaveprefix=slave/sec.
145147
named_conf_path=/etc/bind/named.conf
146148
named_conf_local_path=/etc/bind/named.conf.local
147149
disable_bind_log=n

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1614,17 +1614,27 @@ function datalogSave($action, $primary_id, $record_old, $record_new) {
16141614
return true;
16151615
}
16161616

1617-
function getAuthSQL($perm, $table = '') {
1618-
if($_SESSION["s"]["user"]["typ"] == 'admin' || $_SESSION['s']['user']['mailuser_id'] > 0) {
1617+
function getAuthSQL($perm, $table = '', $userid = NULL, $groups = NULL) {
1618+
if(($_SESSION["s"]["user"]["typ"] == 'admin' || $_SESSION['s']['user']['mailuser_id'] > 0 ) && $userid == NULL && $groups == NULL) {
16191619
return '1';
16201620
} else {
16211621
if ($table != ''){
16221622
$table = ' ' . $table . '.';
16231623
}
1624-
$groups = ( $_SESSION["s"]["user"]["groups"] ) ? $_SESSION["s"]["user"]["groups"] : 0;
16251624
$sql = '(';
1626-
$sql .= "(" . $table . "sys_userid = ".$_SESSION["s"]["user"]["userid"]." AND " . $table . "sys_perm_user like '%$perm%') OR ";
1627-
$sql .= "(" . $table . "sys_groupid IN (".$groups.") AND " . $table ."sys_perm_group like '%$perm%') OR ";
1625+
if ($userid === NULL) {
1626+
$userid = $_SESSION["s"]["user"]["userid"];
1627+
}
1628+
if ($userid > 0) {
1629+
$sql .= "(" . $table . "sys_userid = ".$userid." AND " . $table . "sys_perm_user like '%$perm%') OR ";
1630+
}
1631+
1632+
if ($groups === NULL) {
1633+
$groups = ( $_SESSION["s"]["user"]["groups"] ) ? $_SESSION["s"]["user"]["groups"] : 0;
1634+
}
1635+
if ($groups > 0) {
1636+
$sql .= "(" . $table . "sys_groupid IN (".$groups.") AND " . $table ."sys_perm_group like '%$perm%') OR ";
1637+
}
16281638
$sql .= $table . "sys_perm_other like '%$perm%'";
16291639
$sql .= ')';
16301640

‎interface/web/admin/form/server_config.tform.php‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1666,6 +1666,30 @@
16661666
'width' => '40',
16671667
'maxlength' => '255'
16681668
),
1669+
'bind_zonefiles_masterprefix' => array(
1670+
'datatype' => 'VARCHAR',
1671+
'formtype' => 'TEXT',
1672+
'default' => '',
1673+
'validators' => array( 0 => array ( 'type' => 'REGEX',
1674+
'regex' => '/^[a-zA-Z0-9\.\-\_\/]{0,128}$/',
1675+
'errmsg'=> 'bind_zonefiles_masterprefix_error_regex'),
1676+
),
1677+
'value' => '',
1678+
'width' => '40',
1679+
'maxlength' => '255'
1680+
),
1681+
'bind_zonefiles_slaveprefix' => array(
1682+
'datatype' => 'VARCHAR',
1683+
'formtype' => 'TEXT',
1684+
'default' => '',
1685+
'validators' => array( 0 => array ( 'type' => 'REGEX',
1686+
'regex' => '/^[a-zA-Z0-9\.\-\_\/]{0,128}$/',
1687+
'errmsg'=> 'bind_zonefiles_slaveprefix_error_regex'),
1688+
),
1689+
'value' => '',
1690+
'width' => '40',
1691+
'maxlength' => '255'
1692+
),
16691693
'named_conf_path' => array(
16701694
'datatype' => 'VARCHAR',
16711695
'formtype' => 'TEXT',

‎interface/web/admin/form/system_config.tform.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -661,6 +661,12 @@
661661
'default' => 'y',
662662
'value' => array(0 => 'n', 1 => 'y')
663663
),
664+
'show_delete_on_forms' => array (
665+
'datatype' => 'VARCHAR',
666+
'formtype' => 'CHECKBOX',
667+
'default' => 'n',
668+
'value' => array(0 => 'n', 1 => 'y')
669+
),
664670
'maintenance_mode' => array (
665671
'datatype' => 'VARCHAR',
666672
'formtype' => 'CHECKBOX',

‎interface/web/admin/lib/lang/ar_server_config.lng‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,5 +342,12 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d
342342
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
343343
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
344344
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';
345+
$wb['bind_zonefiles_masterprefix_txt'] = 'BIND master zonefiles prefix';
346+
$wb['bind_zonefiles_slaveprefix_txt'] = 'BIND slave zonefiles prefix';
347+
$wb['bind_keyfiles_dir_txt'] = 'BIND keyfiles directory';
348+
$wb['bind_keyfiles_dir_error_empty'] = 'BIND keyfiles directory is empty.';
349+
$wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master prefix.';
350+
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
351+
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';
345352
$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
346353
$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';

‎interface/web/admin/lib/lang/ar_system_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,5 @@ $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near
107107
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
108108
$wb['dns_show_zoneexport_txt'] = 'Show zone export.';
109109
$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
110+
$wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
110111
?>

‎interface/web/admin/lib/lang/bg_server_config.lng‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,5 +342,12 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d
342342
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
343343
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
344344
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';
345+
$wb['bind_zonefiles_masterprefix_txt'] = 'BIND master zonefiles prefix';
346+
$wb['bind_zonefiles_slaveprefix_txt'] = 'BIND slave zonefiles prefix';
347+
$wb['bind_keyfiles_dir_txt'] = 'BIND keyfiles directory';
348+
$wb['bind_keyfiles_dir_error_empty'] = 'BIND keyfiles directory is empty.';
349+
$wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master prefix.';
350+
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
351+
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';
345352
$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
346353
$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';

0 commit comments

Comments
 (0)