From 50922784c5d6b5206a830c73b467e1551f4cda5c Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 03 May 2016 09:14:18 -0400
Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
---
interface/web/dashboard/lib/lang/ja_dashlet_modules.lng | 1 +
interface/web/dns/form/dns_soa.tform.php | 2 +-
interface/web/dashboard/lib/lang/el_dashlet_modules.lng | 1 +
interface/web/dashboard/lib/lang/ro_dashlet_modules.lng | 1 +
interface/web/dashboard/lib/lang/se_dashlet_modules.lng | 1 +
interface/web/dashboard/dashlets/templates/modules.htm | 4 ++--
interface/web/dashboard/lib/lang/en_dashlet_modules.lng | 1 +
interface/web/client/templates/domain_list.htm | 4 ++--
interface/web/dashboard/lib/lang/hu_dashlet_modules.lng | 1 +
interface/web/admin/lib/lang/de_server_config.lng | 1 +
interface/web/dashboard/lib/lang/ca_dashlet_modules.lng | 1 +
interface/web/dashboard/lib/lang/cz_dashlet_modules.lng | 1 +
interface/web/dashboard/lib/lang/sk_dashlet_modules.lng | 1 +
interface/web/dashboard/lib/lang/pt_dashlet_modules.lng | 1 +
interface/web/dashboard/lib/lang/de_dashlet_modules.lng | 1 +
interface/web/dashboard/lib/lang/nl_dashlet_modules.lng | 1 +
interface/web/sites/web_vhost_domain_edit.php | 1 +
interface/web/dashboard/lib/lang/id_dashlet_modules.lng | 1 +
interface/web/dashboard/lib/lang/it_dashlet_modules.lng | 1 +
interface/web/admin/templates/system_config_domains_edit.htm | 12 ++++++------
interface/web/dashboard/lib/lang/br_dashlet_modules.lng | 1 +
interface/web/dashboard/lib/lang/bg_dashlet_modules.lng | 1 +
interface/web/admin/lib/lang/en_server_config.lng | 1 +
interface/web/dashboard/lib/lang/es_dashlet_modules.lng | 1 +
interface/web/dashboard/lib/lang/fi_dashlet_modules.lng | 1 +
interface/web/dashboard/lib/lang/pl_dashlet_modules.lng | 1 +
interface/web/dns/form/dns_alias.tform.php | 2 +-
interface/web/dashboard/lib/lang/hr_dashlet_modules.lng | 1 +
interface/lib/classes/tform_base.inc.php | 2 +-
interface/web/dashboard/lib/lang/tr_dashlet_modules.lng | 1 +
interface/web/dashboard/lib/lang/fr_dashlet_modules.lng | 1 +
interface/web/dashboard/lib/lang/ar_dashlet_modules.lng | 1 +
interface/web/dashboard/lib/lang/ru_dashlet_modules.lng | 1 +
33 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/interface/lib/classes/tform_base.inc.php b/interface/lib/classes/tform_base.inc.php
index edab62f..03ccb1e 100644
--- a/interface/lib/classes/tform_base.inc.php
+++ b/interface/lib/classes/tform_base.inc.php
@@ -1039,7 +1039,7 @@
break;
case 'V6PREFIXLENGTH':
// find shortes ipv6 subnet can`t be longer
- $sql_v6 = $app->db->queryOneRecord("SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND virtualhost = 'y' ORDER BY CHAR_LENGTH(ip_address) ASC LIMIT 0,1;");
+ $sql_v6 = $app->db->queryOneRecord("SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND virtualhost = 'y' ORDER BY CHAR_LENGTH(ip_address) ASC LIMIT 0,1");
$sql_v6_explode=explode(':',$sql_v6['ip_address']);
$explode_field_value = explode(':',$field_value);
if (count($sql_v6_explode) < count($explode_field_value) && isset($sql_v6['ip_address'])) {
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 6d3342c..c9fc989 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -173,6 +173,7 @@
$wb['backup_mode_txt'] = 'Backupmodus';
$wb['backup_mode_userzip'] = 'Backup Dateien gehören dem Web Benutzer (.zip Datei)';
$wb['backup_mode_rootgz'] = 'Backup aller Dateien des Webverzeichnisses als Root Benutzer';
+$wb['backup_time_txt'] = 'Backupzeit';
$wb['firewall_txt'] = 'Firewall';
$wb['mailbox_quota_stats_txt'] = 'E-Mailkonto Beschränkung Statistiken';
$wb['enable_ip_wildcard_txt'] = 'IP Adressen Wildcard (*) aktivieren';
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 19b08f1..c464ff9 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -101,6 +101,7 @@
$wb["backup_mode_txt"] = 'Backup mode';
$wb["backup_mode_userzip"] = 'Backup web files owned by web user as zip';
$wb["backup_mode_rootgz"] = 'Backup all files in web directory as root user';
+$wb["backup_time_txt"] = 'Backup time';
$wb["server_type_txt"] = 'Server Type';
$wb["nginx_vhost_conf_dir_txt"] = 'Nginx Vhost config dir';
$wb["nginx_vhost_conf_enabled_dir_txt"] = 'Nginx Vhost config enabled dir';
diff --git a/interface/web/admin/templates/system_config_domains_edit.htm b/interface/web/admin/templates/system_config_domains_edit.htm
index c651e42..95cc33b 100644
--- a/interface/web/admin/templates/system_config_domains_edit.htm
+++ b/interface/web/admin/templates/system_config_domains_edit.htm
@@ -6,13 +6,13 @@
<tmpl_if name="list_desc_txt"><p><tmpl_var name="list_desc_txt"></p></tmpl_if>
<div class="form-group">
- <div style="float:left;width:100%">
- <p class="label" style="width:270px">{tmpl_var name='use_domain_module_txt'}</p>
- <div class="col-sm-9">
- {tmpl_var name='use_domain_module'}
- </div>
+ <div class="col-sm-3 text-right">
+ {tmpl_var name='use_domain_module'}
</div>
- <div style="float:left;width:500px;margin-top:20px">{tmpl_var name='use_domain_module_hint'}</div>
+ <div class="col-sm-9">
+ <p><strong>{tmpl_var name='use_domain_module_txt'}</strong></p>
+ <p>{tmpl_var name='use_domain_module_hint'}</p>
+ </div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='new_domain_txt'}</label>
diff --git a/interface/web/client/templates/domain_list.htm b/interface/web/client/templates/domain_list.htm
index 825b298..8dda689 100644
--- a/interface/web/client/templates/domain_list.htm
+++ b/interface/web/client/templates/domain_list.htm
@@ -45,10 +45,10 @@
<tfoot>
<tr>
- <td colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="3"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
</div>
-
\ No newline at end of file
+
diff --git a/interface/web/dashboard/dashlets/templates/modules.htm b/interface/web/dashboard/dashlets/templates/modules.htm
index d42bf2e..0c7322b 100644
--- a/interface/web/dashboard/dashlets/templates/modules.htm
+++ b/interface/web/dashboard/dashlets/templates/modules.htm
@@ -9,8 +9,8 @@
<div class='title'>{tmpl_var name='modules_title'}</div>
</div>
</div>
- <a href='#' class='btn btn-default button' data-capp='{tmpl_var name="modules_name"}'>Go to {tmpl_var name='modules_title'}</a>
+ <a href='#' class='btn btn-default button' data-capp='{tmpl_var name="modules_name"}'>{tmpl_var name='go_to_txt'} {tmpl_var name='modules_title'}</a>
</li>
</tmpl_loop>
</ul>
- </div>
\ No newline at end of file
+ </div>
diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ar_dashlet_modules.lng
index 6a02127..af9fb02 100644
--- a/interface/web/dashboard/lib/lang/ar_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/ar_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/bg_dashlet_modules.lng b/interface/web/dashboard/lib/lang/bg_dashlet_modules.lng
index 2b0f0e2..6e6cd61 100644
--- a/interface/web/dashboard/lib/lang/bg_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/bg_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Налични Модули';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/br_dashlet_modules.lng b/interface/web/dashboard/lib/lang/br_dashlet_modules.lng
index 11268f7..fab0506 100644
--- a/interface/web/dashboard/lib/lang/br_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/br_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Módulos Disponíveis';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ca_dashlet_modules.lng
index 4d6a5d8..f8f0818 100644
--- a/interface/web/dashboard/lib/lang/ca_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/ca_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Modules disponibles';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
index 66275f1..25198e1 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Dostupné moduly';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/de_dashlet_modules.lng b/interface/web/dashboard/lib/lang/de_dashlet_modules.lng
index 3d2c6c6..0ac708c 100644
--- a/interface/web/dashboard/lib/lang/de_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/de_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Verfügbare Module';
+$wb['go_to_txt'] = 'Gehe zu';
?>
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
index 95f750a..6f2064f 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Διαθέσιμα αρθρώματα';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/en_dashlet_modules.lng b/interface/web/dashboard/lib/lang/en_dashlet_modules.lng
index 4bc94f7..ef088a3 100644
--- a/interface/web/dashboard/lib/lang/en_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/en_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = "Available Modules";
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/es_dashlet_modules.lng b/interface/web/dashboard/lib/lang/es_dashlet_modules.lng
index 66987b2..d567f09 100755
--- a/interface/web/dashboard/lib/lang/es_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/es_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Módulos disponibles';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_modules.lng b/interface/web/dashboard/lib/lang/fi_dashlet_modules.lng
index 6a02127..af9fb02 100644
--- a/interface/web/dashboard/lib/lang/fi_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/fi_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_modules.lng b/interface/web/dashboard/lib/lang/fr_dashlet_modules.lng
index 4d6a5d8..f8f0818 100644
--- a/interface/web/dashboard/lib/lang/fr_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/fr_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Modules disponibles';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_modules.lng b/interface/web/dashboard/lib/lang/hr_dashlet_modules.lng
index 76f2a1f..3798185 100644
--- a/interface/web/dashboard/lib/lang/hr_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/hr_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Dostupni moduli';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/hu_dashlet_modules.lng b/interface/web/dashboard/lib/lang/hu_dashlet_modules.lng
index 8d6a994..f5d38b5 100644
--- a/interface/web/dashboard/lib/lang/hu_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/hu_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Elérhető Modulok';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/id_dashlet_modules.lng b/interface/web/dashboard/lib/lang/id_dashlet_modules.lng
index 6a3a48c..7ce7159 100644
--- a/interface/web/dashboard/lib/lang/id_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/id_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Modul yang tersedia';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/it_dashlet_modules.lng b/interface/web/dashboard/lib/lang/it_dashlet_modules.lng
index d9e5cd8..69d5c07 100644
--- a/interface/web/dashboard/lib/lang/it_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/it_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Moduli disponibili';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ja_dashlet_modules.lng
index 6a02127..af9fb02 100644
--- a/interface/web/dashboard/lib/lang/ja_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/ja_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng
index 5b8067f..4788b7d 100644
--- a/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Beschikbare modules';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
index fafcc61..6f9b955 100644
--- a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Dostępne moduły';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_modules.lng b/interface/web/dashboard/lib/lang/pt_dashlet_modules.lng
index 6a02127..af9fb02 100644
--- a/interface/web/dashboard/lib/lang/pt_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/pt_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ro_dashlet_modules.lng
index 6a02127..af9fb02 100644
--- a/interface/web/dashboard/lib/lang/ro_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/ro_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/ru_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ru_dashlet_modules.lng
index f33ae57..e4ff421 100644
--- a/interface/web/dashboard/lib/lang/ru_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/ru_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Доступные модули';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_modules.lng b/interface/web/dashboard/lib/lang/se_dashlet_modules.lng
index a6f9728..4c77392 100644
--- a/interface/web/dashboard/lib/lang/se_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/se_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Tillgängliga moduler';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_modules.lng b/interface/web/dashboard/lib/lang/sk_dashlet_modules.lng
index 6a02127..af9fb02 100644
--- a/interface/web/dashboard/lib/lang/sk_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/sk_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_modules.lng b/interface/web/dashboard/lib/lang/tr_dashlet_modules.lng
index 90de86f..c551510 100644
--- a/interface/web/dashboard/lib/lang/tr_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/tr_dashlet_modules.lng
@@ -1,3 +1,4 @@
<?php
$wb['available_modules_txt'] = 'Kullanılabilecek Modüller';
+$wb['go_to_txt'] = 'Go to';
?>
diff --git a/interface/web/dns/form/dns_alias.tform.php b/interface/web/dns/form/dns_alias.tform.php
index defcda0..55833b7 100644
--- a/interface/web/dns/form/dns_alias.tform.php
+++ b/interface/web/dns/form/dns_alias.tform.php
@@ -88,7 +88,7 @@
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'name_error_empty'),
1 => array ( 'type' => 'REGEX',
- 'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
+ 'regex' => '/^[a-zA-Z0-9\.\-\_]{1,255}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php
index 05e9157..d76c403 100644
--- a/interface/web/dns/form/dns_soa.tform.php
+++ b/interface/web/dns/form/dns_soa.tform.php
@@ -137,7 +137,7 @@
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'mbox_error_empty'),
1 => array ( 'type' => 'REGEX',
- 'regex' => '/^[a-zA-Z0-9\.\-\_]{0,255}\.$/',
+ 'regex' => '/^[a-zA-Z0-9\.\-\_\+]{0,255}\.$/',
'errmsg'=> 'mbox_error_regex'),
),
'default' => '',
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
index 7d6f17a..3da4823 100644
--- a/interface/web/sites/web_vhost_domain_edit.php
+++ b/interface/web/sites/web_vhost_domain_edit.php
@@ -757,6 +757,7 @@
* Now we have to check, if we should use the domain-module to select the domain
* or not
*/
+ $settings = $app->getconf->get_global_config('domains');
if ($settings['use_domain_module'] == 'y') {
/*
* The domain-module is in use.
--
Gitblit v1.9.1