Skip to content

Commit 642b7ca

Browse files
author
Marius Burkard
committed
Merge branch 'stable-3.1'
2 parents 094e6e2 + 6bc396c commit 642b7ca

File tree

242 files changed

+986
-719
lines changed

Some content is hidden

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

242 files changed

+986
-719
lines changed

‎install/dist/lib/centos_base.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public function configure_amavis() {
4848
$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
4949
$content = str_replace('{hostname}', $conf['hostname'], $content);
5050
$content = str_replace('/var/spool/amavisd/clamd.sock', $this->clamav_socket, $content);
51+
$content = str_replace('{amavis_config_dir}', $conf['amavis']['config_dir']);
5152
wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
5253
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
5354

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,7 @@ public function configure_amavis() {
507507
$content = str_replace('{mysql_server_port}', $conf["mysql"]["port"], $content);
508508
$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
509509
$content = str_replace('{hostname}', $conf['hostname'], $content);
510+
$content = str_replace('{amavis_config_dir}', $conf['amavis']['config_dir']);
510511
wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
511512
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
512513

‎install/lib/installer_base.lib.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,13 @@ public function configure_database() {
228228
//* ensure no modes with errors for ENGINE=MyISAM
229229
$this->db->query("SET sql_mode = ''");
230230

231+
$unwanted_sql_plugins = array('validate_password');
232+
$sql_plugins = $this->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ?", $unwanted_sql_plugins);
233+
if(is_array($sql_plugins) && !empty($sql_plugins)) {
234+
foreach ($sql_plugins as $plugin) echo "Login in to MySQL and disable $plugin[plugin_name] with:\n\n UNINSTALL PLUGIN $plugin[plugin_name];";
235+
die();
236+
}
237+
231238
//** Create the database
232239
if(!$this->db->query('CREATE DATABASE IF NOT EXISTS ?? DEFAULT CHARACTER SET ?', $conf['mysql']['database'], $conf['mysql']['charset'])) {
233240
$this->error('Unable to create MySQL database: '.$conf['mysql']['database'].'.');

‎install/lib/update.lib.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,13 @@ function updateDbAndIni() {
126126
//* ensure no modes with errors for ENGINE=MyISAM
127127
$inst->db->query("SET sql_mode = ''");
128128

129+
$unwanted_sql_plugins = array('validate_password');
130+
$sql_plugins = $inst->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ?", $unwanted_sql_plugins);
131+
if(is_array($sql_plugins) && !empty($sql_plugins)) {
132+
foreach ($sql_plugins as $plugin) echo "Login in to MySQL and disable $plugin[plugin_name] with:\n\n UNINSTALL PLUGIN $plugin[plugin_name];";
133+
die();
134+
}
135+
129136
//* Update $conf array with values from the server.ini that shall be preserved
130137
$tmp = $inst->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $conf['server_id']);
131138
$ini_array = ini_to_array(stripslashes($tmp['config']));

‎install/tpl/debian_postfix.conf.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ virtual_uid_maps = mysql:/etc/postfix/mysql-virtual_uids.cf
99
virtual_gid_maps = mysql:/etc/postfix/mysql-virtual_gids.cf
1010
sender_bcc_maps = proxy:mysql:{config_dir}/mysql-virtual_outgoing_bcc.cf
1111
inet_protocols=all
12+
inet_interfaces = all
1213
smtpd_sasl_auth_enable = yes
1314
broken_sasl_auth_clients = yes
1415
smtpd_sasl_authenticated_header = yes

‎install/tpl/fedora_amavisd_conf.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,7 @@ $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log)
785785

786786
$log_level = 0; # (defaults to 0)
787787

788+
include_config_files('{amavis_config_dir}/60-dkim');
788789

789790
$enable_dkim_verification = 1;
790791
$enable_dkim_signing = 1; # load DKIM signing code

‎install/tpl/opensuse_amavisd_conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ $DO_SYSLOG = 1;
779779
$LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log)
780780

781781
# DKIM
782-
782+
include_config_files('{amavis_config_dir}/60-dkim');
783783
$enable_dkim_verification = 1;
784784
$enable_dkim_signing = 1; # load DKIM signing code
785785
$signed_header_fields{'received'} = 0; # turn off signing of Received

‎interface/lib/classes/remote.d/server.inc.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,15 +236,21 @@ public function server_get_functions($session_id, $server_id)
236236
}
237237
}
238238

239-
public function server_get_app_version($session_id)
239+
public function server_get_app_version($session_id, $server_id = 0)
240240
{
241241
global $app;
242242
if(!$this->checkPerm($session_id, 'server_get')) {
243243
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
244244
return false;
245245
}
246246
if (!empty($session_id)) {
247-
$ispc_app_version = array('ispc_app_version' => ISPC_APP_VERSION);
247+
if($server_id === 0) $ispc_app_version = array('ispc_app_version' => ISPC_APP_VERSION);
248+
else {
249+
$rec = $app->db->queryOneRecord("SELECT data FROM monitor_data WHERE type = 'ispc_info' AND server_id = ?", $server_id);
250+
$rec = unserialize($rec['data']);
251+
$ispc_app_version = array('ispc_app_version' => $rec['version']);
252+
unset($rec);
253+
}
248254
return $ispc_app_version;
249255
} else {
250256
return false;

‎interface/lib/lang/br.lng‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $wb['number_format_decimals_client'] = '2';
99
$wb['number_format_dec_point'] = '.';
1010
$wb['number_format_thousands_sep'] = '.';
1111
$wb['error_301'] = 'Módulo não permitido para o usuário atual.';
12-
$wb['error_302'] = 'Módulo inválido.';
12+
$wb['error_302'] = 'Módulo é inválido.';
1313
$wb['error_1001'] = 'Usuário ou senha em branco!';
1414
$wb['error_1002'] = 'Usuário ou senha incorretos!';
1515
$wb['error_1003'] = 'Usuário inativo!';
@@ -127,9 +127,9 @@ $wb['datalog_status_d_web_folder'] = 'Remover pasta protegida';
127127
$wb['datalog_status_i_web_folder_user'] = 'Adicionar usuário de pasta protegida';
128128
$wb['datalog_status_u_web_folder_user'] = 'Atualizar usuário de pasta protegida';
129129
$wb['datalog_status_d_web_folder_user'] = 'Remover usuário de pasta protegida';
130-
$wb['datalog_status_i_spamfilter_users'] = 'Adicionar configurações de filtro antispam';
131-
$wb['datalog_status_u_spamfilter_users'] = 'Atualizar configurações de filtro antispam';
132-
$wb['datalog_status_d_spamfilter_users'] = 'Remover configurações de filtro antispam';
130+
$wb['datalog_status_i_spamfilter_users'] = 'Adicionar configurações de filtro anti-spam';
131+
$wb['datalog_status_u_spamfilter_users'] = 'Atualizar configurações de filtro anti-spam';
132+
$wb['datalog_status_d_spamfilter_users'] = 'Remover configurações de filtro anti-spam';
133133
$wb['login_as_txt'] = 'Acessar como';
134134
$wb['no_domain_perm'] = 'Você não tem permissão para este domínio.';
135135
$wb['no_destination_perm'] = 'Você não tem permissão para este destino.';
@@ -144,19 +144,20 @@ $wb['strength_2'] = 'Razoável';
144144
$wb['strength_3'] = 'Boa';
145145
$wb['strength_4'] = 'Forte';
146146
$wb['strength_5'] = 'Muito Forte';
147-
$wb['weak_password_txt'] = 'A senha escolhida não corresponde às diretrizes de segurança. São necessários no mínimo {chars} caracteres e dificuldade \\"{strength}\\".';
147+
$wb['weak_password_txt'] = 'A senha escolhida não corresponde às diretrizes de segurança. São necessários no mínimo {chars} caracteres e dificuldade {strength}.';
148148
$wb['weak_password_length_txt'] = 'A senha escolhida não corresponde às diretrizes de segurança. São necessários no mínimo {chars} caracteres.';
149149
$wb['security_check1_txt'] = 'Verifique se há permissão de segurança:';
150150
$wb['security_check2_txt'] = 'falha';
151151
$wb['err_csrf_attempt_blocked'] = 'CSRF temporariamente bloqueado.';
152-
$wb['select_directive_snippet_txt'] = 'Diretiva de fragmentação';
153-
$wb['select_master_directive_snippet_txt'] = 'Diretiva de fragmentação mestre';
154-
$wb['None'] = 'None';
155-
$wb['datalog_status_i_xmpp_domain'] = 'Create XMPP domain';
156-
$wb['datalog_status_u_xmpp_domain'] = 'Update XMPP domain';
157-
$wb['datalog_status_d_xmpp_domain'] = 'Delete XMPP domain';
158-
$wb['datalog_status_i_xmpp_user'] = 'Create XMPP user';
159-
$wb['datalog_status_u_xmpp_user'] = 'Update XMPP user';
160-
$wb['datalog_status_d_xmpp_user'] = 'Delete XMPP user';
161152
$wb['datalog_changes_close_txt'] = 'Close';
153+
$wb['select_directive_snippet_txt'] = 'Diretiva de trechos de código';
154+
$wb['select_master_directive_snippet_txt'] = 'Diretiva mestre de trechos de código';
155+
$wb['None'] = 'Nenhum';
156+
$wb['datalog_status_i_xmpp_domain'] = 'Adicionar domínio XMPP';
157+
$wb['datalog_status_u_xmpp_domain'] = 'Atualizar domínio XMPP';
158+
$wb['datalog_status_d_xmpp_domain'] = 'Remover domínio XMPP';
159+
$wb['datalog_status_i_xmpp_user'] = 'Adicionar usuário XMPP';
160+
$wb['datalog_status_u_xmpp_user'] = 'Atualizar usuário XMPP';
161+
$wb['datalog_status_d_xmpp_user'] = 'Remover usuário XMPP';
162162
?>
163+

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
$wb['1001'] = 'Usuário ou senha em branco.';
2+
$wb['1001'] = 'Usuário ou senha está em branco.';
33
$wb['1002'] = 'Usuário ou senha errados.';
44
$wb['Groups'] = 'Grupos';
55
$wb['groups_description'] = 'Edição dos grupos de usuários do sistema';
@@ -26,6 +26,7 @@ $wb['FastCGI'] = 'FastCGI';
2626
$wb['Jailkit'] = 'Jailkit';
2727
$wb['Rescue'] = 'Manutenção';
2828
$wb['Server IP addresses'] = 'Endereço IP do servidor';
29+
$wb['Server IPv4 mapping'] = 'Mapeamento IPv4 do servidor';
2930
$wb['Additional PHP Versions'] = 'Versões adicionais do php';
3031
$wb['Firewall'] = 'Firewall';
3132
$wb['Interface'] = 'Interface';
@@ -44,9 +45,10 @@ $wb['Import'] = 'Importar';
4445
$wb['Remote Actions'] = 'Ações remotas';
4546
$wb['Do OS-Update'] = 'Atualização do SO';
4647
$wb['Do ISPConfig-Update'] = 'Atualização do ISPConfig';
47-
$wb['Directive Snippets'] = 'Diretivas de fragmentação';
48+
$wb['Directive Snippets'] = 'Diretivas de trechos de código';
4849
$wb['Sites'] = 'Sites';
4950
$wb['DNS'] = 'DNS';
50-
$wb['Server'] = 'Server';
51-
$wb['Updates'] = 'Updates';
51+
$wb['Server'] = 'Servidor';
52+
$wb['Updates'] = 'Atualizações';
5253
?>
54+

0 commit comments

Comments
 (0)