Merge branch 'master' into 'stable-3.1'

Master



See merge request !331

Author: Marius Burkard

interface/lib/classes/tform_base.inc.php

@@ -1039,7 +1039,7 @@ function validateField($field_name, $field_value, $validators) {
 				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'])) {

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

@@ -173,6 +173,7 @@ $wb['awstats_settings_txt'] = 'AWStats Einstellungen';
 $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';

interface/web/admin/lib/lang/en_server_config.lng

@@ -101,6 +101,7 @@ $wb["fastcgi_config_syntax_txt"] = 'FastCGI config syntax';
 $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';

interface/web/client/templates/domain_list.htm

@@ -45,10 +45,10 @@ <h1><tmpl_var name="list_head_txt"></h1>
 
             <tfoot>
                 <tr>
-                    <td colspan="4"><tmpl_var name="paging"></td>
+                    <td colspan="3"><tmpl_var name="paging"></td>
                 </tr>
             </tfoot>
             </table>
 </div>
 
-    
+    

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' => '',

interface/web/sites/web_vhost_domain_edit.php

@@ -757,6 +757,7 @@ function onShowEnd() {
 		 * 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.