* added remaining DTDs

1 files changed, 50 insertions, 46 deletions

diff --git a/packages/pfstat.xml b/packages/pfstat.xml
index c390790e..29d52bc2 100644
--- a/packages/pfstat.xml
+++ b/packages/pfstat.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>
@@ -57,42 +58,32 @@
 	<menu>
 		<name>PFStat Graphs</name>
 		<tooltiptext>pfstat is a small utility that collects packet filter statistics and produces graphs.</tooltiptext>
-		<url>/pfstat.php</url>
 		<section>Status</section>
+		<url>/pfstat.php</url>
 	</menu>
-    	<additional_files_needed>
-	    <prefix>/usr/local/www/</prefix>
-	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/pfstat.php</item>
-	</additional_files_needed>	
-	<!-- configpath gets expanded out automatically and config items will be
-         stored in that location -->
-	<configpath>['installedpackages']['pfstat']['config']</configpath>
-	<!-- modify system will modify a file and make sure the text needed to run the
-         package is in place.  The following example edits /etc/crontab and adds the
-         code necessart to invoke the pfstat command every 5 minutes. -->
 	<modify_system>
-		<item>
+		<modifyitem>
 			<modifyfilename>/etc/crontab</modifyfilename>
 			<textneeded>
 */5	*	*	*	*	root	nice -n 20 /usr/local/bin/pfstat -q >> /var/log/pfstat
 			</textneeded>
-		</item>
-		<item>
+		</modifyitem>
+		<modifyitem>
 			<modifyfilename>/etc/crontab</modifyfilename>
 			<textneeded>
 */10	*	*	*	*	root	nice -n 20 /usr/local/bin/pfstat -c /usr/local/etc/pfstat.conf -d /var/log/pfstat
 			</textneeded>
-		</item>
-		<item>
+		</modifyitem>
+		<modifyitem>
 			<modifyfilename>/etc/crontab</modifyfilename>
 			<textneeded>
 1	1	*	*	1	root	nice -n 20 tail -n 50000 /var/log/pfstat >/tmp/pfstat &amp;&amp; mv /tmp/pfstat /var/log/pfstat
 			</textneeded>
-		</item>
+		</modifyitem>
 	</modify_system>
-	<!-- adddeleteeditpagefields items will appear on the first page where you can add / delete or edit
-         items.  An example of this would be the nat page where you add new nat redirects -->
+	<!-- configpath gets expanded out automatically and config items will be
+         stored in that location -->
+	<configpath>['installedpackages']['pfstat']['config']</configpath>
 	<adddeleteeditpagefields>
 		<columnitem>
 			<fielddescr>Graph Name</fielddescr>
@@ -102,7 +93,18 @@
 			<fielddescr>Description</fielddescr>
 			<fieldname>description</fieldname>
 		</columnitem>
-	</adddeleteeditpagefields>
+	</adddeleteeditpagefields>	
+	
+    	<additional_files_needed>
+	    <prefix>/usr/local/www/</prefix>
+	    <chmod>0755</chmod>
+	    <item>http://www.pfsense.com/packages/config/pfstat.php</item>
+	</additional_files_needed>	
+	<!-- modify system will modify a file and make sure the text needed to run the
+         package is in place.  The following example edits /etc/crontab and adds the
+         code necessart to invoke the pfstat command every 5 minutes. -->
+	<!-- adddeleteeditpagefields items will appear on the first page where you can add / delete or edit
+         items.  An example of this would be the nat page where you add new nat redirects -->
 	<!-- fields gets invoked when the user adds or edits a item.   the following items
          will be parsed and rendered for the user as a gui with input, and selectboxes. -->
 	<fields>
@@ -146,9 +148,6 @@
 			<combinefieldsbegin>true</combinefieldsbegin>
 		</field>
 		<field>
-			<combinefieldsend>true</combinefieldsend>
-			<dontdisplayname>true</dontdisplayname>
-			<dontcombinecells>true</dontcombinecells>
 			<fielddescr>Update interval duration</fielddescr>
 			<fieldname>fromclassification</fieldname>
 			<description></description>
@@ -160,8 +159,13 @@
 			<option><name>Weeks</name><value>weeks</value></option>
 			<option><name>Months</name><value>months</value></option>
 			</options>
+			<combinefieldsend>true</combinefieldsend>
+			<dontdisplayname>true</dontdisplayname>
+			<dontcombinecells>true</dontcombinecells>
 		</field>
 		<field>
+			<fielddescr>none</fielddescr>
+			<fieldname>none</fieldname>
 		    <type>rowhelper</type>
 		    <rowhelper>
 			<rowhelperfield>
@@ -180,28 +184,28 @@
 			    <description></description>
 			    <type>select</type>
 			    <options>
-				<option><value>bytes_v4_in</value><name>Bytes in (IPv4)</name></option>
-				<option><value>bytes_v4_out</value><name>Bytes out (IPv4)</name></option>
-				<option><value>bytes_v6_in</value><name>Bytes in (IPv6)</name></option>
-				<option><value>bytes_v6_out</value><name>Bytes out (IPv6)</name></option>
-				<option><value>packets_v4_in_pass</value><name>Packets in passed (IPv4)</name></option>
-				<option><value>packets_v4_in_drop</value><name>Packets in dropped (IPv4)</name></option>
-				<option><value>packets_v4_out_pass</value><name>Packets out passed (IPv4)</name></option>
-				<option><value>packets_v4_out_drop</value><name>Packets out dropped (IPv4)</name></option>
-				<option><value>packets_v6_in_pass</value><name>Packets in passed (IPv6)</name></option>
-				<option><value>packets_v6_in_drop</value><name>Packets in dropped (IPv6)</name></option>
-				<option><value>packets_v6_out_pass</value><name>Packets out passed (IPv6)</name></option>
-				<option><value>packets_v6_out_drop</value><name>Packets out dropped (IPv6)</name></option>
-				<option><value>states_entries</value><name>State table entries</name></option>
-				<option><value>states_searches</value><name>State searches</name></option>
-				<option><value>states_inserts</value><name>State Table Insertions</name></option>
-				<option><value>states_removals</value><name>State Table Removals</name></option>
-				<option><value>counters_match</value><name>Match Counter</name></option>
-				<option><value>counters_badoffset</value><name>Bad Offset Counter</name></option>
-				<option><value>counters_fragment</value><name>Fragment Counter</name></option>
-				<option><value>counters_short</value><name>Short Counter</name></option>
-				<option><value>counters_normalize</value><name>Normalize Counter</name></option>
-				<option><value>counters_memory</value><name>Memory Counter</name></option>
+				<option><name>Bytes in (IPv4)</name><value>bytes_v4_in</value></option>
+				<option><name>Bytes out (IPv4)</name><value>bytes_v4_out</value></option>
+				<option><name>Bytes in (IPv6)</name><value>bytes_v6_in</value></option>
+				<option><name>Bytes out (IPv6)</name><value>bytes_v6_out</value></option>
+				<option><name>Packets in passed (IPv4)</name><value>packets_v4_in_pass</value></option>
+				<option><name>Packets in dropped (IPv4)</name><value>packets_v4_in_drop</value></option>
+				<option><name>Packets out passed (IPv4)</name><value>packets_v4_out_pass</value></option>
+				<option><name>Packets out dropped (IPv4)</name><value>packets_v4_out_drop</value></option>
+				<option><name>Packets in passed (IPv6)</name><value>packets_v6_in_pass</value></option>
+				<option><name>Packets in dropped (IPv6)</name><value>packets_v6_in_drop</value></option>
+				<option><name>Packets out passed (IPv6)</name><value>packets_v6_out_pass</value></option>
+				<option><name>Packets out dropped (IPv6)</name><value>packets_v6_out_drop</value></option>
+				<option><name>State table entries</name><value>states_entries</value></option>
+				<option><name>State searches</name><value>states_searches</value></option>
+				<option><name>State Table Insertions</name><value>states_inserts</value></option>
+				<option><name>State Table Removals</name><value>states_removals</value></option>
+				<option><name>Match Counter</name><value>counters_match</value></option>
+				<option><name>Bad Offset Counter</name><value>counters_badoffset</value></option>
+				<option><name>Fragment Counter</name><value>counters_fragment</value></option>
+				<option><name>Short Counter</name><value>counters_short</value></option>
+				<option><name>Normalize Counter</name><value>counters_normalize</value></option>
+				<option><name>Memory Counter</name><value>counters_memory</value></option>
 			    </options>
 			</rowhelperfield>
 			<rowhelperfield>