Minor style cleanups

2 files changed, 85 insertions, 92 deletions

diff --git a/packages/ifstated.xml b/packages/ifstated.xml
index 7ec83eec..1e57ce81 100644
--- a/packages/ifstated.xml
+++ b/packages/ifstated.xml
@@ -1,87 +1,87 @@
 <packagegui>
+    <name>ifstated</name>
+    <version>20041117</version>
+    <title>ifstated: Settings</title>
+    <menu>
 	<name>ifstated</name>
-	<version>20041117</version>
-	<title>ifstated: Settings</title>
-	<menu>
-		<name>ifstated</name>
-		<tooltiptext>Modify ifstated settings.</tooltiptext>
-		<section>Services</section>
-		<configfile>ifstated.xml</configfile>
-		<url>/pkg_edit.php?xml=ifstated.xml&amp;id=0</url>
-	</menu>
-	<aftersaveredirect>pkg_edit.php?xml=ifstated.xml&amp;id=0</aftersaveredirect>
-	<configpath>installedpackages->package->$packagename->configuration->settings</configpath>
-	<modify_system>
-		<item>
-			<modifyfilename>/etc/sysctl.conf</modifyfilename>
-			<textneeded>net.inet.carp.preempt=1</textneeded>
-		</item>
-	</modify_system>
-	<fields>
-		<field>
-			<fielddescr>External Test IP</fielddescr>
-			<fieldname>exttestip</fieldname>
-			<description>Enter an IP to test external connectivity with. This should be a host with extremely high availability.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fielddescr>Internal Test IP</fielddescr>
-			<fieldname>inttestip</fieldname>
-			<description>Enter an IP to test internal connectivity with. This should be a host with extremely high availability.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fielddescr>Paired Firewall External IP</fielddescr>
-			<fieldname>pairextip</fieldname>
-			<description>Enter the real IP of the other firewall's (real) external interface.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fielddescr>Paired Firewall Internal IP</fielddescr>
-			<fieldname>pairintip</fieldname>
-			<description>Enter the real IP of the other firewall's  (real) internal interface.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fielddescr>Initial State</fielddescr>
-			<fieldname>initstate</fieldname>
-			<description>Enter the desired initial state for this firewall.</description>
-			<type>select</type>
-			<options>
-				<option>
-					<name>Primary</name>
-					<value>primary</value>
-				</option>
-				<option>
-					<name>Backup</name>
-					<value>backup</value>
-				</option>
-			</options>
-		</field>
-	</fields>
-	<custom_php_install_command>
-		global $config;
-		mwexec("rm /usr/local/etc/rc.d/ifstated*");
-		$fout = fopen("/usr/local/etc/rc.d/ifstated.sh","w");
-		fwrite($fout,"#!/bin/sh\n\n/usr/local/sbin/ifstated\n");
-		fclose($fout);
-		mwexec("chmod a+x /usr/local/etc/rc.d/radiusd.sh");
-	</custom_php_install_command>
-	<custom_add_php_command>
-                        global $config;
-                        $fout = fopen("/usr/local/etc/ifstated.conf","w");
-                        if($config['installedpackages']['ifstated']['config'] != "") {
-                        fwrite($fout, "init-state " . $_POST['initstate'] . "\n\n");
-                        fwrite($fout, "carp_up = \"((carp0 link up) and (carp1 link up))\"\ncarp_down = \"((! carp0 link up) and (! carp1 link up))\"\ncarp_sync= \"((carp0 link up and carp1 link up) or ((!carp0 link up) and (!carp1 link up)))\"\n\n");
-                        fwrite($fout, "net = '( \"ping -q -c 1 -t 1 " . $_POST['exttestip'] . " > /dev/null\" every 10 and \"ping -q -c 1 -t 1 " . $_POST['inttestip'] . " > /dev/null\" every 10)'\n\n");
-                        fwrite($fout, "peer = '( \"ping -q -c 1 -t 1 " . $_POST['pairextip'] . " > /dev/null\" every 10 and \"ping -q -c 1 -t 1 " . $_POST['pairintip'] . " > /dev/null\" every 10)'\n\n");
-                        fwrite($fout, "state auto {\nif \$carp_up {\nset-state primary\n}\nif \$carp_down {\nset-state backup\n}\n}\n\n");
-                        fwrite($fout, "state primary {\ninit {\nrun \"ifconfig carp0 advskew 10\"\nrun \"ifconfig carp1 advskew 10\"\n}\nif ! \$net {\nset-state demoted\n}\n}\n\nstate demoted {\ninit {\nrun \"ifconfig carp0 advskew 254\"\nrun \"ifconfig carp1 advskew 254\"\n}\nif \$net {\nset-state primary\n}\n}\n\n");
-			fwrite($fout, "state promoted {\ninit {\nrun \"ifconfig carp0 advskew 0\"\nrun \"ifconfig carp1 advskew 0\"\n}\nif \$peer or ! \$net {\nset-state backup\n}\n}\n\n");
-			fwrite($fout, "state backup {\ninit {\nrun \"ifconfig carp0 advskew 100\"\nrun \"ifconfig carp1 advskew 100\"\n}\nif ! \$carp_sync and \$net and \"sleep 5\" every 10 {\nif (! \$carp_sync) and \$net {\nset-state promoted\n}\n}\n}\n");
-                        }
-                        fclose($fout);
-                        mwexec("/usr/bin/killall -HUP ifstated");
-	</custom_add_php_command>
+	<tooltiptext>Modify ifstated settings.</tooltiptext>
+	<section>Services</section>
+	<configfile>ifstated.xml</configfile>
+	<url>/pkg_edit.php?xml=ifstated.xml&amp;id=0</url>
+    </menu>
+    <aftersaveredirect>pkg_edit.php?xml=ifstated.xml&amp;id=0</aftersaveredirect>
+    <configpath>installedpackages->package->$packagename->configuration->settings</configpath>
+    <modify_system>
+	<item>
+	    <modifyfilename>/etc/sysctl.conf</modifyfilename>
+	    <textneeded>net.inet.carp.preempt=1</textneeded>
+	</item>
+    </modify_system>
+    <fields>
+	<field>
+	    <fielddescr>External Test IP</fielddescr>
+	    <fieldname>exttestip</fieldname>
+	    <description>Enter an IP to test external connectivity with. This should be a host with extremely high availability.</description>
+	    <type>input</type>
+	</field>
+	<field>
+	    <fielddescr>Internal Test IP</fielddescr>
+	    <fieldname>inttestip</fieldname>
+	    <description>Enter an IP to test internal connectivity with. This should be a host with extremely high availability.</description>
+	    <type>input</type>
+	</field>
+	<field>
+	    <fielddescr>Paired Firewall External IP</fielddescr>
+	    <fieldname>pairextip</fieldname>
+	    <description>Enter the real IP of the other firewall's (real) external interface.</description>
+	    <type>input</type>
+	</field>
+	<field>
+	    <fielddescr>Paired Firewall Internal IP</fielddescr>
+	    <fieldname>pairintip</fieldname>
+	    <description>Enter the real IP of the other firewall's  (real) internal interface.</description>
+	    <type>input</type>
+	</field>
+	<field>
+	    <fielddescr>Initial State</fielddescr>
+	    <fieldname>initstate</fieldname>
+	    <description>Enter the desired initial state for this firewall.</description>
+	    <type>select</type>
+	    <options>
+		<option>
+			<name>Primary</name>
+			<value>primary</value>
+		</option>
+		<option>
+			<name>Backup</name>
+			<value>backup</value>
+		</option>
+	    </options>
+	</field>
+    </fields>
+    <custom_php_install_command>
+	global $config;
+	mwexec("rm /usr/local/etc/rc.d/ifstated*");
+	$fout = fopen("/usr/local/etc/rc.d/ifstated.sh","w");
+	fwrite($fout,"#!/bin/sh\n\n/usr/local/sbin/ifstated\n");
+	fclose($fout);
+	mwexec("chmod a+x /usr/local/etc/rc.d/radiusd.sh");
+    </custom_php_install_command>
+    <custom_add_php_command>
+	global $config;
+	$fout = fopen("/usr/local/etc/ifstated.conf","w");
+	if($config['installedpackages']['ifstated']['config'] != "") {
+	fwrite($fout, "init-state " . $_POST['initstate'] . "\n\n");
+	fwrite($fout, "carp_up = \"((carp0 link up) and (carp1 link up))\"\ncarp_down = \"((! carp0 link up) and (! carp1 link up))\"\ncarp_sync= \"((carp0 link up and carp1 link up) or ((!carp0 link up) and (!carp1 link up)))\"\n\n");
+	fwrite($fout, "net = '( \"ping -q -c 1 -t 1 " . $_POST['exttestip'] . " > /dev/null\" every 10 and \"ping -q -c 1 -t 1 " . $_POST['inttestip'] . " > /dev/null\" every 10)'\n\n");
+	fwrite($fout, "peer = '( \"ping -q -c 1 -t 1 " . $_POST['pairextip'] . " > /dev/null\" every 10 and \"ping -q -c 1 -t 1 " . $_POST['pairintip'] . " > /dev/null\" every 10)'\n\n");
+	fwrite($fout, "state auto {\nif \$carp_up {\nset-state primary\n}\nif \$carp_down {\nset-state backup\n}\n}\n\n");
+	fwrite($fout, "state primary {\ninit {\nrun \"ifconfig carp0 advskew 10\"\nrun \"ifconfig carp1 advskew 10\"\n}\nif ! \$net {\nset-state demoted\n}\n}\n\nstate demoted {\ninit {\nrun \"ifconfig carp0 advskew 254\"\nrun \"ifconfig carp1 advskew 254\"\n}\nif \$net {\nset-state primary\n}\n}\n\n");
+	fwrite($fout, "state promoted {\ninit {\nrun \"ifconfig carp0 advskew 0\"\nrun \"ifconfig carp1 advskew 0\"\n}\nif \$peer or ! \$net {\nset-state backup\n}\n}\n\n");
+	fwrite($fout, "state backup {\ninit {\nrun \"ifconfig carp0 advskew 100\"\nrun \"ifconfig carp1 advskew 100\"\n}\nif ! \$carp_sync and \$net and \"sleep 5\" every 10 {\nif (! \$carp_sync) and \$net {\nset-state promoted\n}\n}\n}\n");
+	}
+	fclose($fout);
+	mwexec("/usr/bin/killall -HUP ifstated");
+    </custom_add_php_command>
 </packagegui>
 
diff --git a/pkg_config.xml b/pkg_config.xml
index d5301124..a68a2e63 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -131,14 +131,7 @@
     <package>
 	<name>ifstated</name>
 	<website>http://www.openbsd.org/</website>
-	<descr>
-	 The ifstated daemon runs commands in response to network state changes,
-which it determines by monitoring interface link state or running exter-
-nal tests.  For example, it can be used with carp(4) to change running
-services or to ensure that carp(4) interfaces stay in sync, or with pf(4)
-to test server or link availability and modify translation or routing
-rules. This package is currently useless without the carp package installed.
-	</descr>
+	<descr>The ifstated daemon runs commands in response to network state changes, which it determines by monitoring interface link state or running exter- nal tests.  For example, it can be used with carp(4) to change running services or to ensure that carp(4) interfaces stay in sync, or with pf(4) to test server or link availability and modify translation or routing rules. This package is currently useless without the carp package installed.</descr>
 	<category>Network Management</category>
 	<config_file>http://www.pfsense.com/packages/config/ifstated.xml</config_file>
 	<depends_on_package_base_url>http://www.pfsense.com/packages/All</depends_on_package_base_url>
@@ -147,5 +140,5 @@ rules. This package is currently useless without the carp package installed.
 	<status>ALPHA</status>
 	<configurationfile>ifstated.xml</configurationfile>
     </package>
-</packages>
+  </packages>
 </pfsensepkgs>