Skip to content

Commit 2560fcd

Browse files
author
thom
committed
Resolve merge conflict
2 parents 202d03d + a265c64 commit 2560fcd

File tree

160 files changed

+422
-235
lines changed

Some content is hidden

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

160 files changed

+422
-235
lines changed

‎install/lib/installer_base.lib.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,6 +1169,9 @@ public function configure_postfix($options = '') {
11691169
$postconf_commands = array_merge($postconf_commands, array_filter(explode("\n", $content)));
11701170
}
11711171

1172+
// Remove comment lines, these would give fatal errors when passed to postconf.
1173+
$postconf_commands = array_filter($postconf_commands, function($line) { return preg_match('/^[^#]/', $line); });
1174+
11721175
//* These postconf commands will be executed on installation only
11731176
if($this->is_update == false) {
11741177
$postconf_commands = array_merge($postconf_commands, array(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
'datatype' => 'VARCHAR',
7777
'formtype' => 'TEXT',
7878
'validators' => array ( 0 => array ( 'type' => 'REGEX',
79-
'regex' => '/^[\s0-9\,\:]{0,255}$/',
79+
'regex' => '/^\d{1,5}(?::\d{1,5})?(?:,\d{1,5}(?::\d{1,5})?)*$/',
8080
'errmsg'=> 'tcp_ports_error_regex'),
8181
),
8282
'default' => '20,21,22,25,53,80,110,143,443,465,587,993,995,3306,8080,8081,10000',
@@ -88,8 +88,8 @@
8888
'datatype' => 'VARCHAR',
8989
'formtype' => 'TEXT',
9090
'validators' => array ( 0 => array ( 'type' => 'REGEX',
91-
'regex' => '/^[\s0-9\,\:]{0,255}$/',
92-
'errmsg'=> 'tcp_ports_error_regex'),
91+
'regex' => '/^\d{1,5}(?::\d{1,5})?(?:,\d{1,5}(?::\d{1,5})?)*$/',
92+
'errmsg'=> 'udp_ports_error_regex'),
9393
),
9494
'default' => '53,3306',
9595
'value' => '',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ $wb['tcp_port_help_txt'] = 'Separated by comma';
66
$wb['udp_port_help_txt'] = 'Separated by comma';
77
$wb['active_txt'] = 'Active';
88
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
9-
$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
10-
$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
9+
$wb['tcp_ports_error_regex'] = 'Character not allowed in TCP port definition. Allowed characters are numbers, colons (:) and commas.';
10+
$wb['udp_ports_error_regex'] = 'Character not allowed in UDP port definition. Allowed characters are numbers, colons (:) and commas.';
1111
?>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
$wb['server_id_txt'] = 'Servidor';
3-
$wb['tcp_port_txt'] = 'Portas tcp abertas';
4-
$wb['udp_port_txt'] = 'Portas udp abertas';
3+
$wb['tcp_port_txt'] = 'Portas TCP abertas';
4+
$wb['udp_port_txt'] = 'Portas UDP abertas';
55
$wb['tcp_port_help_txt'] = 'Separado por vírgula';
66
$wb['udp_port_help_txt'] = 'Separado por vírgula';
77
$wb['active_txt'] = 'Ativo';

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
$wb['list_head_txt'] = 'Firewall';
33
$wb['active_txt'] = 'Ativo';
44
$wb['server_id_txt'] = 'Servidor';
5-
$wb['tcp_port_txt'] = 'Portas tcp abertas';
6-
$wb['udp_port_txt'] = 'Portas udp abertas';
5+
$wb['tcp_port_txt'] = 'Portas TCP abertas';
6+
$wb['udp_port_txt'] = 'Portas UDP abertas';
77
$wb['add_new_record_txt'] = 'Adicionar nova regra';
88
?>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ $wb['tcp_port_help_txt'] = 'Separated by comma';
66
$wb['udp_port_help_txt'] = 'Separated by comma';
77
$wb['active_txt'] = 'Active';
88
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
9-
$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
10-
$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
9+
$wb['tcp_ports_error_regex'] = 'Character not allowed in TCP port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
10+
$wb['udp_ports_error_regex'] = 'Character not allowed in UDP port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
1111
?>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ $wb['tcp_port_help_txt'] = 'Adskilt af komma';
66
$wb['udp_port_help_txt'] = 'Adskilt af komma';
77
$wb['active_txt'] = 'Aktiv';
88
$wb['firewall_error_unique'] = 'Der er allerede en firewall post for denne server.';
9-
$wb['tcp_ports_error_regex'] = 'Tegn ikke tilladt i tcp port definition. Tilladt tegn er tal, \\":\\" og \\",\\".';
10-
$wb['udp_ports_error_regex'] = 'Tegn ikke tilladt i udp port definition. Tilladt tegn er tal, \\":\\" og \\",\\".';
9+
$wb['tcp_ports_error_regex'] = 'Tegn ikke tilladt i TCP port definition. Tilladt tegn er tal, \\":\\" og \\",\\".';
10+
$wb['udp_ports_error_regex'] = 'Tegn ikke tilladt i UDP port definition. Tilladt tegn er tal, \\":\\" og \\",\\".';
1111
?>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ $wb['tcp_port_help_txt'] = 'Separated by comma';
66
$wb['udp_port_help_txt'] = 'Separated by comma';
77
$wb['active_txt'] = 'Active';
88
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
9-
$wb['active_txt'] = 'Active';
10-
$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, ":" and ",".';
11-
$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, ":" and ",".';
12-
?>
9+
$wb['tcp_ports_error_regex'] = 'Character not allowed in TCP port definition. Allowed characters are numbers, colons (:) and commas.';
10+
$wb['udp_ports_error_regex'] = 'Character not allowed in UDP port definition. Allowed characters are numbers, colons (:) and commas.';
11+
?>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ $wb['tcp_port_help_txt'] = 'Vesszővel elválasztva';
66
$wb['udp_port_help_txt'] = 'Vesszővel elválasztva';
77
$wb['active_txt'] = 'Aktív';
88
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
9-
$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
10-
$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
9+
$wb['tcp_ports_error_regex'] = 'Character not allowed in TCP port definition. Allowed characters are numbers, colons (:) and commas.';
10+
$wb['udp_ports_error_regex'] = 'Character not allowed in UDP port definition. Allowed characters are numbers, colons (:) and commas.';
1111
?>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ $wb['tcp_port_help_txt'] = 'Dipisahkan oleh koma';
66
$wb['udp_port_help_txt'] = 'Dipisahkan oleh koma';
77
$wb['active_txt'] = 'Aktif';
88
$wb['firewall_error_unique'] = 'Telah ada record firewall untuk server ini.';
9-
$wb['tcp_ports_error_regex'] = 'Karakter di definisi port tcp tidak diperbolehkan. Karakter yang diizinkan adalah angka, : dan ,.';
10-
$wb['udp_ports_error_regex'] = 'Karakter di definisi port udp tidak diperbolehkan. Karakter yang diizinkan adalah angka, : dan ,.';
9+
$wb['tcp_ports_error_regex'] = 'Karakter di definisi port TCP tidak diperbolehkan. Karakter yang diizinkan adalah angka, : dan ,.';
10+
$wb['udp_ports_error_regex'] = 'Karakter di definisi port UDP tidak diperbolehkan. Karakter yang diizinkan adalah angka, : dan ,.';
1111
?>

0 commit comments

Comments
 (0)