From e756e7e8a99d604ef85a9630c856bc0ffae2a3f0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 10 Jan 2012 05:16:15 -0500
Subject: [PATCH] Fixed: FS#1967 - AWStats statistics not accessible when the website uses suphp.

---
 interface/web/dns/form/dns_soa.tform.php |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php
index e9a8f43..4490d55 100644
--- a/interface/web/dns/form/dns_soa.tform.php
+++ b/interface/web/dns/form/dns_soa.tform.php
@@ -62,7 +62,7 @@
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'SELECT',
 			'datasource'	=> array ( 	'type'	=> 'SQL',
-										'querystring' => 'SELECT server_id,server_name FROM server WHERE dns_server = 1 AND {AUTHSQL} ORDER BY server_name',
+										'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND dns_server = 1 AND {AUTHSQL} ORDER BY server_name',
 										'keyfield'=> 'server_id',
 										'valuefield'=> 'server_name'
 									 ),
@@ -82,7 +82,7 @@
 										1 => array (	'type'	=> 'UNIQUE',
 														'errmsg'=> 'origin_error_unique'),
 										2 => array (	'type'	=> 'REGEX',
-														'regex' => '/^[\w\.\-]{2,64}\.[a-zA-Z]{2,10}[\.]{0,1}$/',
+														'regex' => '/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,30}[\.]{0,1}$/',
 														'errmsg'=> 'origin_error_regex'),
 									),
 			'default'	=> '',
@@ -108,7 +108,7 @@
 			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
 														'errmsg'=> 'mbox_error_empty'),
 										1 => array (	'type'	=> 'REGEX',
-														'regex' => '/^[\w\.\-]{0,64}\.$/',
+														'regex' => '/^[[a-zA-Z0-9\.\-\_]{0,64}\.$/',
 														'errmsg'=> 'mbox_error_regex'),
 									),
 			'default'	=> '',
@@ -127,7 +127,7 @@
 		'refresh' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
-			'default'	=> '28800',
+			'default'	=> '7200',
 			'value'		=> '',
 			'width'		=> '10',
 			'maxlength'	=> '10'
@@ -135,7 +135,7 @@
 		'retry' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
-			'default'	=> '7200',
+			'default'	=> '540',
 			'value'		=> '',
 			'width'		=> '10',
 			'maxlength'	=> '10'
@@ -159,7 +159,7 @@
 		'ttl' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
-			'default'	=> '86400',
+			'default'	=> '3600',
 			'value'		=> '',
 			'width'		=> '10',
 			'maxlength'	=> '10'
@@ -172,6 +172,26 @@
 			'width'		=> '30',
 			'maxlength'	=> '255'
 		),
+		'also_notify' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+//			'validators'    => array (  0 => array (    'type'  => 'ISIPV4',
+//														'errmsg'=> 'also_notify_error_regex'
+//													),
+//									),
+			'default'	=> '',
+			'value'		=> '',
+			'width'		=> '30',
+			'maxlength'	=> '255'
+		),
+		'update_acl' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'value'		=> '',
+			'width'		=> '30',
+			'maxlength'	=> '255'
+		),
 		'active' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'CHECKBOX',

--
Gitblit v1.9.1