* added copyright header to each file

* added XSL stylesheet to each file
* added DTD to some files (TODO: Add DTD to the remaining files and validate them against the DTD)
* added a Document Type Definition which allows to validate package files

3 files changed, 69 insertions, 63 deletions

diff --git a/packages/tinydns/tinydns.xml b/packages/tinydns/tinydns.xml
index b4aaa4fe..ac9359c5 100644
--- a/packages/tinydns/tinydns.xml
+++ b/packages/tinydns/tinydns.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
         <copyright>
@@ -46,8 +47,9 @@
     <faq>Currently there are no FAQ items provided.</faq>
 	<name>tinydns</name>
 	<version>1.0</version>
-	<configpath>installedpackages->package->tinydns</configpath>
 	<title>DNS Cache-Server: Settings</title>
+	<aftersaveredirect>/pkg_edit.php?xml=tinydns.xml&amp;id=0</aftersaveredirect>
+	<include_file>/usr/local/pkg/tinydns.inc</include_file>
 	<menu>
 		<name>DNS Servers</name>
 		<tooltiptext></tooltiptext>
@@ -81,7 +83,7 @@
 			<url>/pkg_edit.php?xml=tinydns_sync.xml&amp;id=0</url>
 		</tab>
 	</tabs>
-	<aftersaveredirect>/pkg_edit.php?xml=tinydns.xml&amp;id=0</aftersaveredirect>
+	<configpath>installedpackages->package->tinydns</configpath>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
@@ -137,31 +139,6 @@
 		<chmod>077</chmod>
 		<item>http://www.pfsense.com/packages/config/tinydns/tinydns_sync.xml</item>
 	</additional_files_needed>
-	<custom_php_install_command>
-		tinydns_custom_php_install_command();
-	</custom_php_install_command>
-	<custom_php_deinstall_command>
-		tinydns_custom_php_deinstall_command();
-	</custom_php_deinstall_command>
-	<custom_add_php_command>
-		tinydns_custom_php_changeip_command();
-		tinydns_custom_php_install_command();
-		tinydns_create_zone_file();
-		tinydns_setup_ping_items();
-	</custom_add_php_command>
-	<custom_php_resync_config_command>
-		tinydns_custom_php_changeip_command();
-		tinydns_custom_php_install_command();
-		tinydns_create_zone_file();
-		tinydns_setup_ping_items();
-	</custom_php_resync_config_command>
-	<custom_delete_php_command>
-		tinydns_custom_php_changeip_command();
-		tinydns_custom_php_install_command();
-		tinydns_create_zone_file();
-		tinydns_setup_ping_items();
-	</custom_delete_php_command>
-	<include_file>/usr/local/pkg/tinydns.inc</include_file>
 	<fields>
 		<field>
 		 	<fielddescr>Enable DNS Forwarders</fielddescr>
@@ -182,57 +159,81 @@
 			<type>checkbox</type>
 		</field>		
 		<field>
-			<fieldname>ipaddress</fieldname>
 			<fielddescr>IP Address</fielddescr>
+			<fieldname>ipaddress</fieldname>
 			<description>Bind TinyDNS to this IP address. Enable DNS Forwarders bind TinyDNS to the LAN IP.</description>
 			<type>input</type>
 		</field>
 		<field>
-			<fieldname>refreshinterval</fieldname>
 			<fielddescr>Refresh Interval</fielddescr>
+			<fieldname>refreshinterval</fieldname>
 			<description>Controls how often the monitoring ip adresses are polled</description>
 			<type>input</type>
 		</field>
 		<field>
-			<fieldname>syncxmlrpc</fieldname>
 			<fielddescr>XMLRPC Sync</fielddescr>
+			<fieldname>syncxmlrpc</fieldname>
 			<description>Sync TinyDNS configuration to backup firewalls</description>
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fieldname>minsegment</fieldname>
 			<fielddescr>Minimum segment size</fielddescr>
+			<fieldname>minsegment</fieldname>
 			<description>Recommended size: 10240 or larger.</description>
 			<type>input</type>
 			<value>10240</value>
 		</field>
 		<field>
-			<fieldname>maxfilesize</fieldname>
 			<fielddescr>Maximum file size</fielddescr>
+			<fieldname>maxfilesize</fieldname>
 			<description>Recommended size: 10240 or larger.</description>
 			<type>input</type>
 			<value>10240</value>
 		</field>
 		<field>
-			<fieldname>maxsegment</fieldname>
 			<fielddescr>Max Segment size</fielddescr>
+			<fieldname>maxsegment</fieldname>
 			<description>Recommended size: 20480 or larger.</description>
 			<type>input</type>
 			<value>20480</value>
 		</field>
 		<field>
-			<fieldname>maxfd</fieldname>
 			<fielddescr>Maximum file descriptors</fielddescr>
+			<fieldname>maxfd</fieldname>
 			<description>Recommended size: 100 or larger.</description>
 			<type>input</type>
 			<value>100</value>
 		</field>
 		<field>
-			<fieldname>maxchild</fieldname>
 			<fielddescr>Maximum children processes</fielddescr>
+			<fieldname>maxchild</fieldname>
 			<description>Recommended size: 40 or larger.</description>
 			<type>input</type>
 			<value>40</value>
 		</field>
 	</fields>
+	<custom_delete_php_command>
+		tinydns_custom_php_changeip_command();
+		tinydns_custom_php_install_command();
+		tinydns_create_zone_file();
+		tinydns_setup_ping_items();
+	</custom_delete_php_command>
+	<custom_add_php_command>
+		tinydns_custom_php_changeip_command();
+		tinydns_custom_php_install_command();
+		tinydns_create_zone_file();
+		tinydns_setup_ping_items();
+	</custom_add_php_command>
+	<custom_php_resync_config_command>
+		tinydns_custom_php_changeip_command();
+		tinydns_custom_php_install_command();
+		tinydns_create_zone_file();
+		tinydns_setup_ping_items();
+	</custom_php_resync_config_command>
+	<custom_php_install_command>
+		tinydns_custom_php_install_command();
+	</custom_php_install_command>
+	<custom_php_deinstall_command>
+		tinydns_custom_php_deinstall_command();
+	</custom_php_deinstall_command>
 </packagegui>
diff --git a/packages/tinydns/tinydns_domains.xml b/packages/tinydns/tinydns_domains.xml
index 2e9213d6..2a7bf6e6 100644
--- a/packages/tinydns/tinydns_domains.xml
+++ b/packages/tinydns/tinydns_domains.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
         <copyright>
@@ -45,9 +46,9 @@
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
 	<name>tinydnsdomains</name>
-	<configpath>installedpackages->package->tinydnsdomains</configpath>
-	<include_file>/usr/local/pkg/tinydns.inc</include_file>
+	<version>none</version>
 	<title>TinyDNS: Domains</title>
+	<include_file>/usr/local/pkg/tinydns.inc</include_file>
 	<tabs>
 		<tab>
 			<text>Settings</text>
@@ -75,6 +76,7 @@
 			<url>/pkg_edit.php?xml=tinydns_sync.xml&amp;id=0</url>
 		</tab>		
 	</tabs>
+	<configpath>installedpackages->package->tinydnsdomains</configpath>
 	<adddeleteeditpagefields>
 		<columnitem>
 			<fielddescr>Fully Qualified Domain Name (Hostname)</fielddescr>
@@ -95,29 +97,29 @@
 	</adddeleteeditpagefields>
 	<fields>
 		<field>
-			<fieldname>hostname</fieldname>
 			<fielddescr>Hostname or FQDN www.exampledomain.com</fielddescr>
+			<fieldname>hostname</fieldname>
 			<description>The DNS server will supply Records for the Fully Qualified Domain Name that is entered</description>
-			<required/>
 			<type>input</type>
 			<size>35</size>
+			<required/>
 		</field>
 		<field>
 			<fielddescr>Record type</fielddescr>
 			<fieldname>recordtype</fieldname>
 			<description>DNS Record types. A, PTR, MX, NS, SOA, TXT, CNAME</description>
-			<required/>
 			<type>select</type>
 			<size>1</size>
+			<required/>
 			<options>
-			    <option><value></value><name></name></option>
-			    <option><value>A</value><name>A</name></option>
-			    <option><value>MX</value><name>MX</name></option>
-			    <option><value>NS</value><name>NS</name></option>
-			    <option><value>SOA</value><name>SOA</name></option>
-			    <option><value>PTR</value><name>PTR</name></option>
-			    <option><value>CNAME</value><name>CNAME</name></option>
-			    <option><value>TXT</value><name>TXT</name></option>
+			    <option><name></name><value></value></option>
+			    <option><name>A</name><value>A</value></option>
+			    <option><name>MX</name><value>MX</value></option>
+			    <option><name>NS</name><value>NS</value></option>
+			    <option><name>SOA</name><value>SOA</value></option>
+			    <option><name>PTR</name><value>PTR</value></option>
+			    <option><name>CNAME</name><value>CNAME</value></option>
+			    <option><name>TXT</name><value>TXT</value></option>
 			</options>
 		</field>
 		<field>
@@ -127,32 +129,34 @@
 			<type>checkbox</type>
 		</field>		
 		<field>
-			<fieldname>ipaddress</fieldname>
 			<fielddescr> FQDN or IP Address</fielddescr>
+			<fieldname>ipaddress</fieldname>
 			<description>IP Address for A Records. FQDN or Hostname for SOA, PTR, CNAME Records.  For NS Records an IP:FQDN</description>
-			<required/>
 			<type>input</type>
 			<size>40</size>
+			<required/>
 		</field>
 		<field>
-			<fieldname>ttl</fieldname>
 			<fielddescr>DNS record time to live</fielddescr>
+			<fieldname>ttl</fieldname>
 			<type>input</type>
 			<size>35</size>
 		</field>
 		<field>
-			<fieldname>monitorip</fieldname>
 			<fielddescr>IP to ping to ensure service is up</fielddescr>
+			<fieldname>monitorip</fieldname>
 			<type>input</type>
 			<size>35</size>
 		</field>
 		<field>
-			<fieldname>threshhold</fieldname>
 			<fielddescr>Time in minutes before DNS switches to backup host</fielddescr>
+			<fieldname>threshhold</fieldname>
 			<type>input</type>
 			<size>35</size>
 		</field>
 		<field>
+			<fielddescr>none</fielddescr>
+			<fieldname>none</fieldname>
 		    <type>rowhelper</type>
 		    <rowhelper>
 				<rowhelperfield>
@@ -192,14 +196,14 @@
 		    </rowhelper>
 		</field>
 	</fields>
-	<custom_add_php_command>
-		tinydns_create_zone_file();
-		tinydns_setup_ping_items();
-	</custom_add_php_command>
 	<custom_delete_php_command>
 		tinydns_create_zone_file();
 		tinydns_setup_ping_items();
 	</custom_delete_php_command>
+	<custom_add_php_command>
+		tinydns_create_zone_file();
+		tinydns_setup_ping_items();
+	</custom_add_php_command>
 	<custom_php_resync_config_command>
 		tinydns_create_zone_file();
 		tinydns_setup_ping_items();
diff --git a/packages/tinydns/tinydns_sync.xml b/packages/tinydns/tinydns_sync.xml
index 2097acc0..2156aaba 100644
--- a/packages/tinydns/tinydns_sync.xml
+++ b/packages/tinydns/tinydns_sync.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
         <copyright>
@@ -46,11 +47,7 @@
     <faq>Currently there are no FAQ items provided.</faq>
 	<name>tinydnssync</name>
 	<version>1.0</version>
-	<configpath>installedpackages->package->tinydns</configpath>
 	<title>TinyDNS: Manual Sync</title>
-	<custom_php_resync_config_command>
-		tinydns_do_xmlrpc_sync($_POST['ipaddress'], $_POST['password']);
-	</custom_php_resync_config_command>
 	<include_file>/usr/local/pkg/tinydns.inc</include_file>
 	<tabs>
 		<tab>
@@ -79,18 +76,22 @@
 			<active/>
 		</tab>
 	</tabs>
+	<configpath>installedpackages->package->tinydns</configpath>
 	<fields>
 		<field>
-			<fieldname>ipaddress</fieldname>
 			<fielddescr>IP Address</fielddescr>
+			<fieldname>ipaddress</fieldname>
 			<description>The IP address that TinyDNS will Sync its data to.</description>
 			<type>input</type>
 		</field>
 		<field>
-			<fieldname>password</fieldname>
 			<fielddescr>Password</fielddescr>
+			<fieldname>password</fieldname>
 			<description>Admin password on remote firewall to faciliate sync</description>
 			<type>password</type>
 		</field>
 	</fields>
+	<custom_php_resync_config_command>
+		tinydns_do_xmlrpc_sync($_POST['ipaddress'], $_POST['password']);
+	</custom_php_resync_config_command>
 </packagegui>