From 66e957e85e7f59a48c60368f54618ee38e5ffa15 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 25 Oct 2009 13:11:32 +0000
Subject: [PATCH] Added: FS#938 - Add `also_notify` and `update_acl` to mydns
 table

---
 install/sql/ispconfig3.sql                   |   2 +
 interface/web/dns/form/dns_soa.tform.php     |  16 ++
 interface/web/dns/lib/lang/en_dns_soa.lng    |   2 +
 interface/web/dns/templates/dns_soa_edit.htm | 181 ++++++++++---------
 4 files changed, 115 insertions(+), 86 deletions(-)

diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 84ee263754..d863a59f40 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -231,6 +231,8 @@ CREATE TABLE `dns_soa` (
   `ttl` int(11) unsigned NOT NULL default '86400',
   `active` enum('N','Y') NOT NULL,
   `xfer` varchar(255) NOT NULL,
+  `also_notify` varchar(255) default NULL,
+  `update_acl` varchar(255) default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `origin` (`origin`),
   KEY `active` (`active`)
diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php
index 7a63938a45..1a688ea24a 100644
--- a/interface/web/dns/form/dns_soa.tform.php
+++ b/interface/web/dns/form/dns_soa.tform.php
@@ -172,6 +172,22 @@ $form["tabs"]['dns_soa'] = array (
 			'width'		=> '30',
 			'maxlength'	=> '255'
 		),
+		'also_notify' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'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',
diff --git a/interface/web/dns/lib/lang/en_dns_soa.lng b/interface/web/dns/lib/lang/en_dns_soa.lng
index e97fb24689..3c9a5b0a52 100644
--- a/interface/web/dns/lib/lang/en_dns_soa.lng
+++ b/interface/web/dns/lib/lang/en_dns_soa.lng
@@ -21,4 +21,6 @@ $wb["origin_error_regex"] = 'Zone has a invalid format.';
 $wb["ns_error_regex"] = 'NS has a invalid format.';
 $wb["mbox_error_empty"] = 'Email is empty.';
 $wb["mbox_error_regex"] = 'Email format invalid.';
+$wb["also_notify_txt"] = 'Also Notify';
+$wb["update_acl_txt"] = 'Update ACL';
 ?>
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_soa_edit.htm b/interface/web/dns/templates/dns_soa_edit.htm
index 9616ea7006..46a9243f66 100644
--- a/interface/web/dns/templates/dns_soa_edit.htm
+++ b/interface/web/dns/templates/dns_soa_edit.htm
@@ -1,86 +1,95 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_dns_soa">
-
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels"><legend>DNS Zone</legend>
-      <tmpl_if name="is_admin">
-      <div class="ctrlHolder">
-      	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
-        <select name="server_id" id="server_id" class="selectInput">
-					{tmpl_var name='server_id'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="client_group_id">{tmpl_var name='client_txt'}</label>
-        <select name="client_group_id" id="client_group_id" class="selectInput">
-					{tmpl_var name='client_group_id'}
-				</select>
-      </div>
-      </tmpl_if>
-      <tmpl_if name="is_reseller">
-      <div class="ctrlHolder">
-      	<label for="client_group_id">{tmpl_var name='client_txt'}</label>
-        <select name="client_group_id" id="client_group_id" class="selectInput">
-					{tmpl_var name='client_group_id'}
-				</select>
-      </div>
-      </tmpl_if>
-      <div class="ctrlHolder">
-      	<label for="origin">{tmpl_var name='origin_txt'}</label>
-        <input name="origin" id="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255" type="text" class="textInput" />
-				<p class="formHint">e.g. domain.tld.</p>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="ns">{tmpl_var name='ns_txt'}</label>
-        <input name="ns" id="ns" value="{tmpl_var name='ns'}" size="30" maxlength="255" type="text" class="textInput" />
-				<p class="formHint">e.g. ns1.domain.tld.</p>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="mbox">{tmpl_var name='mbox_txt'}</label>
-        <input name="mbox" id="mbox" value="{tmpl_var name='mbox'}" size="30" maxlength="255" type="text" class="textInput" />
-				<p class="formHint"> e.g. webmaster.domain.tld.</p>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="refresh">{tmpl_var name='refresh_txt'}</label>
-        <input name="refresh" id="refresh" value="{tmpl_var name='refresh'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
-			</div>
-      <div class="ctrlHolder">
-      	<label for="retry">{tmpl_var name='retry_txt'}</label>
-        <input name="retry" id="retry" value="{tmpl_var name='retry'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
-			</div>
-      <div class="ctrlHolder">
-      	<label for="expire">{tmpl_var name='expire_txt'}</label>
-        <input name="expire" id="expire" value="{tmpl_var name='expire'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
-			</div>
-      <div class="ctrlHolder">
-      	<label for="minimum">{tmpl_var name='minimum_txt'}</label>
-        <input name="minimum" id="minimum" value="{tmpl_var name='minimum'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
-			</div>
-      <div class="ctrlHolder">
-      	<label for="ttl">{tmpl_var name='ttl_txt'}</label>
-        <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
-			</div>
-      <div class="ctrlHolder">
-      	<label for="xfer">{tmpl_var name='xfer_txt'}</label>
-        <input name="xfer" id="xfer" value="{tmpl_var name='xfer'}" size="30" maxlength="255" type="text" class="textInput" />
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='active_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='active'}
-					</div>
-			</div>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-    <input name="serial" type="hidden" value="{tmpl_var name='serial'}">
-    
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_soa_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_soa">
+
+  <div class="pnl_formsarea">
+    <fieldset class="inlineLabels"><legend>DNS Zone</legend>
+      <tmpl_if name="is_admin">
+      <div class="ctrlHolder">
+      	<label for="server_id">{tmpl_var name='server_id_txt'}</label>
+        <select name="server_id" id="server_id" class="selectInput">
+					{tmpl_var name='server_id'}
+				</select>
+      </div>
+      <div class="ctrlHolder">
+      	<label for="client_group_id">{tmpl_var name='client_txt'}</label>
+        <select name="client_group_id" id="client_group_id" class="selectInput">
+					{tmpl_var name='client_group_id'}
+				</select>
+      </div>
+      </tmpl_if>
+      <tmpl_if name="is_reseller">
+      <div class="ctrlHolder">
+      	<label for="client_group_id">{tmpl_var name='client_txt'}</label>
+        <select name="client_group_id" id="client_group_id" class="selectInput">
+					{tmpl_var name='client_group_id'}
+				</select>
+      </div>
+      </tmpl_if>
+      <div class="ctrlHolder">
+      	<label for="origin">{tmpl_var name='origin_txt'}</label>
+        <input name="origin" id="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255" type="text" class="textInput" />
+				<p class="formHint">e.g. domain.tld.</p>
+			</div>
+      <div class="ctrlHolder">
+      	<label for="ns">{tmpl_var name='ns_txt'}</label>
+        <input name="ns" id="ns" value="{tmpl_var name='ns'}" size="30" maxlength="255" type="text" class="textInput" />
+				<p class="formHint">e.g. ns1.domain.tld.</p>
+			</div>
+      <div class="ctrlHolder">
+      	<label for="mbox">{tmpl_var name='mbox_txt'}</label>
+        <input name="mbox" id="mbox" value="{tmpl_var name='mbox'}" size="30" maxlength="255" type="text" class="textInput" />
+				<p class="formHint"> e.g. webmaster.domain.tld.</p>
+			</div>
+      <div class="ctrlHolder">
+      	<label for="refresh">{tmpl_var name='refresh_txt'}</label>
+        <input name="refresh" id="refresh" value="{tmpl_var name='refresh'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
+			</div>
+      <div class="ctrlHolder">
+      	<label for="retry">{tmpl_var name='retry_txt'}</label>
+        <input name="retry" id="retry" value="{tmpl_var name='retry'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
+			</div>
+      <div class="ctrlHolder">
+      	<label for="expire">{tmpl_var name='expire_txt'}</label>
+        <input name="expire" id="expire" value="{tmpl_var name='expire'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
+			</div>
+      <div class="ctrlHolder">
+      	<label for="minimum">{tmpl_var name='minimum_txt'}</label>
+        <input name="minimum" id="minimum" value="{tmpl_var name='minimum'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
+			</div>
+      <div class="ctrlHolder">
+      	<label for="ttl">{tmpl_var name='ttl_txt'}</label>
+        <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;Seconds
+			</div>
+      <div class="ctrlHolder">
+      	<label for="xfer">{tmpl_var name='xfer_txt'}</label>
+        <input name="xfer" id="xfer" value="{tmpl_var name='xfer'}" size="30" maxlength="255" type="text" class="textInput" />
+	  </div>
+	  <div class="ctrlHolder">
+      	<label for="also_notify">{tmpl_var name='also_notify_txt'}</label>
+        <input name="also_notify" id="also_notify" value="{tmpl_var name='also_notify'}" size="30" maxlength="255" type="text" class="textInput" />
+	  </div>
+	  <div class="ctrlHolder">
+      	<label for="update_acl">{tmpl_var name='update_acl_txt'}</label>
+        <input name="update_acl" id="update_acl" value="{tmpl_var name='update_acl'}" size="30" maxlength="255" type="text" class="textInput" />
+	  </div>
+	  
+      <div class="ctrlHolder">
+				<p class="label">{tmpl_var name='active_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='active'}
+					</div>
+			</div>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input name="serial" type="hidden" value="{tmpl_var name='serial'}">
+    
+    <div class="buttonHolder buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_soa_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
-- 
GitLab