Skip to content

Commit df8e423

Browse files
author
Marius Burkard
committed
Merge branch 'stable-3.1'
2 parents e004715 + 9e1a303 commit df8e423

File tree

196 files changed

+2686
-2553
lines changed

Some content is hidden

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

196 files changed

+2686
-2553
lines changed

‎install/install.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@
445445
swriteln('Configuring Bastille Firewall');
446446
$inst->configure_bastille_firewall();
447447
$conf['services']['firewall'] = true;
448+
$conf['bastille']['installed'] = true;
448449
}
449450

450451
//* Configure Fail2ban

‎install/lib/installer_base.lib.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,11 @@ public function find_installed_apps() {
185185

186186
public function force_configure_app($service, $enable_force=true) {
187187
$force = false;
188-
swriteln("[WARN] autodetect for $service failed");
188+
if($enable_force == true) {
189+
swriteln("[WARN] autodetect for $service failed");
190+
} else {
191+
swriteln("[INFO] service $service not detected");
192+
}
189193
if($enable_force) {
190194
if(strtolower($this->simple_query("Force configure $service", array('y', 'n'), 'n') ) == 'y') {
191195
$force = true;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ function onLoad() {
4646
$app->tpl->newTemplate("tabbed_form.tpl.htm");
4747

4848
// Load table definition from file
49-
$app->tform->loadFormDef($tform_def_file, (isset($_SESSION['s']['module']['name']) ? $_SESSION['s']['module']['name'] : ''));
49+
//$app->tform->loadFormDef($tform_def_file, (isset($_SESSION['s']['module']['name']) ? $_SESSION['s']['module']['name'] : ''));
50+
$app->tform->loadFormDef($tform_def_file);
5051

5152
// Importing ID
5253
$this->id = (isset($_REQUEST["id"]))?$app->functions->intval($_REQUEST["id"]):0;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ $wb['do_not_try_rescue_httpd_txt'] = 'Deaktiviere HTTPD Monitoring';
157157
$wb['do_not_try_rescue_mongodb_txt'] = 'Deaktiviere MongoDB Monitoring';
158158
$wb['do_not_try_rescue_mysql_txt'] = 'Deaktiviere MySQL Monitoring';
159159
$wb['do_not_try_rescue_mail_txt'] = 'Deaktiviere E-Mail Monitoring';
160-
$wb['rescue_description_txt'] = '<b>Information:</b> Falls Sie MySQL stoppen möchten, wählen Sie die Funktion \'Deaktiviere MySQL Monitoring\' und warten Sie 2 bis 3 Minuten. Wenn Sie nicht 2 bis 3 Miunten warten wird ISPConfig versuchen MySQL wieder zu starten.';
160+
$wb['rescue_description_txt'] = '<b>Information:</b> Falls Sie MySQL stoppen möchten, wählen Sie die Funktion \'Deaktiviere MySQL Monitoring\' und warten Sie 2 bis 3 Minuten. Wenn Sie nicht 2 bis 3 Minuten warten wird ISPConfig versuchen MySQL wieder zu starten.';
161161
$wb['enable_sni_txt'] = 'Aktiviere SNI';
162162
$wb['set_folder_permissions_on_update_txt'] = 'Verzeichnisberechtigungen beim Update setzen';
163163
$wb['add_web_users_to_sshusers_group_txt'] = 'Webbenutzer zur -sshusers- hinzufügen';

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22
$wb['list_head_txt'] = 'Server';
33
$wb['server_name_txt'] = 'Servername';
4-
$wb['mail_server_txt'] = 'E-Mailserver';
5-
$wb['web_server_txt'] = 'Webserver';
6-
$wb['dns_server_txt'] = 'DNSserver';
7-
$wb['file_server_txt'] = 'Dateiserver';
8-
$wb['db_server_txt'] = 'Datenbankserver';
4+
$wb['mail_server_txt'] = 'E-Mail';
5+
$wb['web_server_txt'] = 'Web';
6+
$wb['dns_server_txt'] = 'DNS';
7+
$wb['file_server_txt'] = 'Datei';
8+
$wb['db_server_txt'] = 'Datenbank';
99
$wb['vserver_server_txt'] = 'vServer';
1010
$wb['add_new_record_txt'] = 'Neuen Server hinzufügen';
11-
$wb['proxy_server_txt'] = 'Proxyserver';
12-
$wb['firewall_server_txt'] = 'Firewallserver';
11+
$wb['proxy_server_txt'] = 'Proxy';
12+
$wb['firewall_server_txt'] = 'Firewall';
1313
$wb['xmpp_server_txt'] = 'XMPP';
1414
?>

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

100644100755
Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
<?php
2-
$wb['Groups'] = 'Grupos';
3-
$wb['groups_description'] = 'Formulario para editar los grupos de usuarios del sistema.';
4-
$wb['Servers'] = 'Servidor';
5-
$wb['Config'] = 'Configuración';
6-
$wb['Add user'] = 'Añadir usuario';
7-
$wb['Edit user'] = 'Editar usuario';
2+
$wb['1001'] = 'El nombre de usuario o contraseña están vacíos.';
3+
$wb['1002'] = 'El nombre de usuario o contraseña son incorrectos.';
84
$wb['Add group'] = 'Añadir grupo';
5+
$wb['Add user'] = 'Añadir usuario';
6+
$wb['Additional PHP Versions'] = 'Versiones adicionales de PHP';
7+
$wb['Config'] = 'Configuración';
8+
$wb['CP Users'] = 'Usuarios del sistema';
9+
$wb['DB Sync.'] = 'Sincronizar DB';
10+
$wb['Directive Snippets'] = 'Fragmentos de código';
11+
$wb['DNS'] = 'DNS';
12+
$wb['Do ISPConfig-Update'] = 'Actualizar ISPConfig';
13+
$wb['Do OS-Update'] = 'Actualizar el S.O.';
14+
$wb['Domains'] = 'Dominios';
915
$wb['Edit group'] = 'Editar grupo';
1016
$wb['Edit server'] = 'Editar servidor';
11-
$wb['Sync. Now'] = 'Sincronizar ahora';
12-
$wb['DB Sync.'] = 'Sincronizar DB';
13-
$wb['User Management'] = 'Administrador de usuarios';
14-
$wb['CP Users'] = 'Usuarios del sistema';
15-
$wb['Remote Users'] = 'Usuarios remotos';
16-
$wb['System'] = 'Sistema';
17-
$wb['Server Services'] = 'Servicios del servidor';
18-
$wb['Services'] = 'Servicios';
19-
$wb['Server Config'] = 'Configuración del servidor';
20-
$wb['Server'] = 'Servidor';
21-
$wb['Mail'] = 'Correo';
22-
$wb['Getmail'] = 'Getmail';
23-
$wb['Web'] = 'Web';
17+
$wb['Edit user'] = 'Editar usuario';
18+
$wb['Export'] = 'Exportar';
2419
$wb['FastCGI'] = 'FastCGI';
25-
$wb['Jailkit'] = 'Jailkit';
26-
$wb['Rescue'] = 'Rescatadores';
27-
$wb['Server IP addresses'] = 'Direcciones IP del servidor';
28-
$wb['Additional PHP Versions'] = 'Versiones adicionales de PHP';
29-
$wb['Directive Snippets'] = 'Fragmentos de código';
3020
$wb['Firewall'] = 'Corta fuego';
31-
$wb['Interface'] = 'Interfase';
21+
$wb['Getmail'] = 'Getmail';
22+
$wb['Groups'] = 'Grupos';
23+
$wb['groups_description'] = 'Formulario para editar los grupos de usuarios del sistema.';
24+
$wb['Import'] = 'Importar';
3225
$wb['Interface Config'] = 'Configuración principal';
33-
$wb['Domains'] = 'Dominios';
34-
$wb['Misc'] = 'Otros';
35-
$wb['Software'] = 'Apps & complementos';
36-
$wb['Repositories'] = 'Repositorios';
37-
$wb['Packages'] = 'Paquetes';
38-
$wb['Updates'] = 'Actualizaciones';
26+
$wb['Interface'] = 'Interfaz';
27+
$wb['Jailkit'] = 'Jailkit';
3928
$wb['Language Editor'] = 'Editor de idioma';
4029
$wb['Languages'] = 'Idiomas';
41-
$wb['New Language'] = 'Añadir idioma';
30+
$wb['Mail'] = 'Correo';
4231
$wb['Merge'] = 'Fusionar';
43-
$wb['Export'] = 'Exportar';
44-
$wb['Import'] = 'Importar';
32+
$wb['Misc'] = 'Otros';
33+
$wb['New Language'] = 'Añadir idioma';
34+
$wb['Packages'] = 'Paquetes';
4535
$wb['Remote Actions'] = 'Acciones remotas';
46-
$wb['Do OS-Update'] = 'Actualizar el SO';
47-
$wb['Do ISPConfig-Update'] = 'Actualizar ISPConfig';
48-
$wb['1001'] = 'El nombre de usuario o contraseña están vacíos.';
49-
$wb['1002'] = 'El nombre de usuario o contraseña son incorrectos.';
50-
$wb['Sites'] = 'Sites';
51-
$wb['DNS'] = 'DNS';
52-
?>
36+
$wb['Remote Users'] = 'Usuarios remotos';
37+
$wb['Repositories'] = 'Repositorios';
38+
$wb['Rescue'] = 'Rescatadores';
39+
$wb['Server Config'] = 'Configuración del servidor';
40+
$wb['Server IP addresses'] = 'Direcciones IP del servidor';
41+
$wb['Server Services'] = 'Servicios del servidor';
42+
$wb['Server'] = 'Servidor';
43+
$wb['Servers'] = 'Servidor';
44+
$wb['Services'] = 'Servicios';
45+
$wb['Sites'] = 'Sitios';
46+
$wb['Software'] = 'Apps & complementos';
47+
$wb['Sync. Now'] = 'Sincronizar ahora';
48+
$wb['System'] = 'Sistema';
49+
$wb['Updates'] = 'Actualizaciones';
50+
$wb['User Management'] = 'Administrador de usuarios';
51+
$wb['Web'] = 'Web';
52+
?>

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

100644100755
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
2-
$wb['Directive Snippets'] = 'Fragmentos de código';
3-
$wb['name_txt'] = 'Nombre del fragmento';
4-
$wb['type_txt'] = 'Tipo';
5-
$wb['snippet_txt'] = 'Fragmento';
62
$wb['active_txt'] = 'Habilitado';
3+
$wb['customer_viewable_txt'] = 'Visible por los clientes';
4+
$wb['Directive Snippets'] = 'Fragmentos de código';
75
$wb['directive_snippets_name_empty'] = 'Por favor ingrese un nombre para el fragmento.';
86
$wb['directive_snippets_name_error_unique'] = 'Ya existe un fragmento de código con ese nombre.';
7+
$wb['name_txt'] = 'Nombre del fragmento';
8+
$wb['snippet_txt'] = 'Fragmento';
9+
$wb['type_txt'] = 'Tipo';
910
$wb['variables_txt'] = 'Variables';
10-
$wb['customer_viewable_txt'] = 'Customer viewable';
11-
?>
11+
?>

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

100644100755
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
2-
$wb['list_head_txt'] = 'Fragmentos de código';
32
$wb['active_txt'] = 'Habilitado';
3+
$wb['add_new_record_txt'] = 'Añadir fragmentos de códigos';
4+
$wb['customer_viewable_txt'] = ''Visible por los clientes';
5+
$wb['list_head_txt'] = 'Fragmentos de código';
46
$wb['name_txt'] = 'Nombre del fragmento';
57
$wb['type_txt'] = 'Tipo';
6-
$wb['add_new_record_txt'] = 'Añadir fragmentos de códigos';
7-
$wb['customer_viewable_txt'] = 'Customer viewable';
8-
?>
8+
?>

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

100644100755
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
2+
$wb['active_txt'] = 'Habilitado';
3+
$wb['firewall_error_unique'] = 'Ya existe un registro de cortafuegos para este servidor.';
24
$wb['server_id_txt'] = 'Servidor';
3-
$wb['tcp_port_txt'] = 'Puertos TCP abiertos';
4-
$wb['udp_port_txt'] = 'Puertos UDP abiertos';
55
$wb['tcp_port_help_txt'] = 'Separados por coma';
6+
$wb['tcp_port_txt'] = 'Puertos TCP abiertos';
7+
$wb['tcp_ports_error_regex'] = 'Caracteres no permitidos en la definición de puertos tcp. Los caracteres permitidos son: números, \\":\\" y \\",\\".';
68
$wb['udp_port_help_txt'] = 'Separados por coma';
7-
$wb['active_txt'] = 'Habilitado';
8-
$wb['firewall_error_unique'] = 'Ya existe un registro de corta fuego para este servidor.';
9-
$wb['tcp_ports_error_regex'] = 'Caracteres no permitidos en la definición de puertos tcp. Los caracteres permitidos son números, \\":\\" y \\",\\".';
10-
$wb['udp_ports_error_regex'] = 'Caracteres no permitidos en la definición de puertos udp. Los caracteres permitidos son números, \\":\\" y \\",\\".';
11-
?>
9+
$wb['udp_port_txt'] = 'Puertos UDP abiertos';
10+
$wb['udp_ports_error_regex'] = 'Caracteres no permitidos en la definición de puertos udp. Los caracteres permitidos son: números, \\":\\" y \\",\\".';
11+
?>

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

100644100755
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
2-
$wb['list_head_txt'] = 'Corta fuego';
32
$wb['active_txt'] = 'Habilitado';
3+
$wb['add_new_record_txt'] = 'Añadir registro al cortafuegos';
4+
$wb['list_head_txt'] = 'Cortafuegos';
45
$wb['server_id_txt'] = 'Servidor';
56
$wb['tcp_port_txt'] = 'Puerto TCP abiertos';
67
$wb['udp_port_txt'] = 'Puertos UDP abiertos';
7-
$wb['add_new_record_txt'] = 'Añadir registro al corta fuego';
8-
?>
8+
?>

0 commit comments

Comments
 (0)