12 files changed, 1032 insertions, 1032 deletions
diff --git a/config/ipblocklist/class.phpmailer.tmp b/config/ipblocklist/class.phpmailer.tmp
index afb71b25..a4756c52 100644
--- a/config/ipblocklist/class.phpmailer.tmp
+++ b/config/ipblocklist/class.phpmailer.tmp
@@ -1906,4 +1906,4 @@ class PHPMailer {
 
 }
 
-?>
-\ No newline at end of file
+?>
diff --git a/config/ipblocklist/email.tmp b/config/ipblocklist/email.tmp
index d5051656..eac104dd 100644
--- a/config/ipblocklist/email.tmp
+++ b/config/ipblocklist/email.tmp
@@ -1,268 +1,268 @@
-<?php
-header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
-header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
-//$pgtitle = "Firewall: ipblocklist - Email";
-	
-	require("guiconfig.inc");
-	include("head.inc");
-
-	//set the config as a global variable
-	global $config;
-
-	$global_usage = '/usr/local/www/packages/ipblocklist/global_usage';
-	//$fh = fopen($global_usage, 'r');
-
-	//phpinfo();
-	
-	
-if (isset($_GET['save'])) {
-	exec("rm email_send.php");
-    exec("touch email_send.php");
-	$file = "email_send.php"; 
-	$smtp_auth = $_POST['smtp_auth'];
-	$smtp_secure = $_POST['smtp_secure'];
-	$host = $_POST['host'];
-	$port = $_POST['port'];
-	$user = $_POST['user'];
-	$pass = $_POST['pass'];
-	$html = $_POST['html'];
-	$from = $_POST['from'];
-	$to = $_POST['to'];
-	$subject = $_POST['subject'];
-	$fp = fopen($file, "w") or die("Couldn't open $file for writing!");
-	fwrite($fp, "<?php\ninclude(\"class.phpmailer.php\");\n\$mail             = new PHPMailer();
-\n\$mail->IsSMTP();\n\$mail->SMTPAuth   = ") or die("Couldn't write values to file!");
-	fwrite($fp, $smtp_auth) or die("Couldn't write values to file!");
-	fwrite($fp, ";\n\$mail->SMTPSecure = \"") or die("Couldn't write values to file!");
-	fwrite($fp, $smtp_secure) or die("Couldn't write values to file!");
-	fwrite($fp, "\";\n\$mail->Host       = \"") or die("Couldn't write values to file!");
-	fwrite($fp, $host) or die("Couldn't write values to file!");
-	fwrite($fp, "\";\n\$mail->Port       = ") or die("Couldn't write values to file!");
-	fwrite($fp, $port) or die("Couldn't write values to file!");
-	fwrite($fp, ";\n\$mail->Username   = \"") or die("Couldn't write values to file!");
-	fwrite($fp, $user);
-	fwrite($fp, "\";\n\$mail->Password   = \"") or die("Couldn't write values to file!");
-	fwrite($fp, $pass);
-	fwrite($fp, "\";\n\$mail->AddReplyTo(\"") or die("Couldn't write values to file!");
-	fwrite($fp, $from) or die("Couldn't write values to file!");
-	fwrite($fp, "\",\"pfsense ipblocklist\");\n\$mail->From       = \"") or die("Couldn't write values to file!");
-	fwrite($fp, $from) or die("Couldn't write values to file!");
-	fwrite($fp, "\";\n\$mail->Subject    = \"" . $subject . "\";\n\$mail->AltBody    = \"To view the message, please use an HTML compatible email viewer!\";\n\$mail->WordWrap   = 50;\n\$body 		    = \"IP-Blocklist encountered an event. A system log entry was made with details of event\";\n\$body 		   .= \"<br><br>\" . date('l jS \of F Y h:i:s A') . \"<br><br>Current Status = \";\nob_start();\n\$results = exec(\"pfctl -s rules | grep -c ipblocklist\");\nob_end_clean();\nif (\$results > '0')\n\$body 		   .= \"Running\";\nelse\n\$body 		   .= \"<span style='color:red'>Restarting</span>\";\nob_start();\n\$results = exec(\"tail -r /usr/local/www/packages/ipblocklist/errorOUT.txt\");\nob_end_clean();\n\$body 		   .= \"<br/><span style='color:red'>\";\n\$body 		   .= \$results;\n\$body 		   .= \"</span>\";\n\$body 		   .= \"<br>You are blocking \";\nob_start();\n\$results = exec(\"pfctl -T show -t ipblocklist |grep -v -c Z\");\nob_end_clean();\n\$body 		   .= \$results;\n\$body 		   .= \" Networks\";\n\n\$mail->MsgHTML(\$body);\n\$mail->AddAddress(\"") or die("Couldn't write values to file!");
-	fwrite($fp, $to) or die("Couldn't write values to file!");
-	fwrite($fp, "\");\n\$mail->IsHTML(") or die("Couldn't write values to file!");
-	fwrite($fp, $html) or die("Couldn't write values to file!");
-	fwrite($fp, ");\n\nif(!\$mail->Send()) {\n  echo \"Mailer Error: \" . \$mail->ErrorInfo;\n} else {\n  echo \"Message sent! - <a href=email.php>Go Back</a>\";\n}\n?>") or die("Couldn't write values to file!");
-	fclose($fp);
-	//echo "Saved successfully!";
-	
-	exec("rm email_config.html");
-    exec("touch email_config.html");
-	$file2 = "email_config.html";
-	$fp2 = fopen($file2, "w") or die("Couldn't open $file for writing!");
-	fwrite($fp2, "<table width=\"100%\" b align=\"center\"> 
-  <tr> 
-    <td>SMTP Auth</td>") or die("Couldn't write values to file!");
-	if ($smtp_auth=="true")
-    fwrite($fp2, "<td><select name=\"smtp_auth\"><option label=\"true\" value=\"true\" selected>Yes</option><option label=\"false\" value=\"false\">No</option></select></td>") or die("Couldn't write values to file!");
-	else
-	fwrite($fp2, "<td><select name=\"smtp_auth\"><option label=\"true\" value=\"true\">Yes</option><option label=\"false\" value=\"false\" selected>No</option></select></td>") or die("Couldn't write values to file!");
-  fwrite($fp2, "</tr> 
-  <tr class=\"d0\"> 
-    <td>SMTP Security</td>") or die("Couldn't write values to file!");
-	if ($smtp_secure=="ssl")
-    fwrite($fp2, "<td><select name=\"smtp_secure\"><option label=\"ssl\" value=\"ssl\" selected>ssl</option><option label=\"none\" value=\"none\">None</option></select></td>") or die("Couldn't write values to file!");
-	else 
-	fwrite($fp2, "<td><select name=\"smtp_secure\"><option label=\"ssl\" value=\"ssl\">ssl</option><option label=\"none\" value=\"none\" selected>None</option></select></td>") or die("Couldn't write values to file!");
-  fwrite($fp2, "</tr> 
-  <tr> 
-    <td>Host</td> 
-    <td><input type=\"text\" name=\"host\" value=\"" . $host ."\"></td> 
-  </tr> 
-  <tr class=\"d0\"> 
-    <td>Port</td> 
-    <td><input type=\"port\" name=\"port\" value=\"" . $port . "\"></td> 
-  </tr> 
-  <tr> 
-    <td>Username</td> 
-    <td><input type=\"user\" name=\"user\" value=\"" . $user . "\"></td> 
-  </tr> 
-  <tr class=\"d0\"> 
-    <td>Password</td> 
-    <td><input type=\"password\" name=\"pass\" value=\"" . $pass . "\"></td> 
-  </tr> 
-  <tr> 
-    <td>Use HTML formatting</td>") or die("Couldn't write values to file!");
-	if ($html=="true") 
-    fwrite($fp2, "<td><select name=\"html\"><option label=\"true\" value=\"true\" selected>Yes</option><option label=\"false\" value=\"false\">No</option></select></td>") or die("Couldn't write values to file!"); 
-	else
-	fwrite($fp2, "<td><select name=\"html\"><option label=\"true\" value=\"true\">Yes</option><option label=\"false\" value=\"false\" selected>No</option></select></td>") or die("Couldn't write values to file!");
-  fwrite($fp2, "</tr> 
-  <tr class=\"d0\"> 
-    <td>From email address</td> 
-    <td><input type=\"from\" name=\"from\" value=\"" . $from . "\"></td> 
-  </tr> 
-  <tr> 
-    <td>To email address</td> 
-    <td><input type=\"to\" name=\"to\" value=\"" . $to . "\"></td> 
-  </tr> 
-  <tr class=\"d0\"> 
-    <td>Subject</td> 
-    <td><input type=\"subject\" name=\"subject\" value=\"" . $subject . "\"></td> 
-  </tr> 
-</table> 
-<br> 
-<input type=\"submit\" value=\"Save\"> 
-</form>") or die("Couldn't write values to file!");
-	fclose($fp2);
-}
-if (isset($_GET['test'])) {
-    echo '<script type="text/javascript">' . "\n"; 
-	echo 'window.location="email_send.php";'; 
-	echo '</script>'; 
-}
-if (isset($_GET['reset'])) {
-	exec ("rm email_send.php");
-	exec ("rm email_config.html");
-    echo '<script type="text/javascript">' . "\n"; 
-	echo 'window.location="email.php";'; 
-	echo '</script>'; 
-}
-?>
-
-<html>
-<head>
-<style type="text/css">
-.style1 {
-	text-align: center;
-}
-tr.d0 td {
-	background-color: #eedddd; color: black;
-}
-</style>
-
-</head>
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
-
-
-<br /><br />
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr><td class="tabnavtbl">
-<?php
-	$tab_array = array();
-	$tab_array[0] = array("IP-Blocklist", false, "ipblocklist.php");
-	$tab_array[1] = array("Settings", false, "settings.php");
-	$tab_array[2] = array("Whitelist", false, "whitelist.php");
-	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
-	$tab_array[4] = array("Help", false, "http://forum.pfsense.org/index.php/topic,24769.0.html");
-	$tab_array[5] = array("Email", true, "email.php");
-	display_top_tabs($tab_array);
-?>
-  </td></tr>
-  <tr> 
-    <td>
-	<div id="mainarea">
-        <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-       <tr> 
-	<td class="listhdrr">Email Settings for SMTP mail</td>
-    
-	  </tr>
-      
-    <tr> 
-	<td class="listlr" valign="middle">
-  
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-
-<form name="emailform" method="post" action="email.php?save=1"> 
-<?php
-if (file_exists("email_send.php")) {
-    echo "<p>Your settings have already been set. Would you like to overwrite your email settings?</p>\n"; 
-	$content = file_get_contents('email_config.html');
-	echo $content;
-	echo "<p>\n"; 
-	echo "<input name=\"resetbutton\" type=\"button\" value=\"Reset email config\" onClick=\"window.location='email.php?reset=1'\" />\n";
-	echo "</p>\n"; 
-	echo "\n";
-} else {
-    echo "<table width=\"100%\" b align=\"center\">\n"; 
-	echo "  <tr>\n"; 
-	echo "    <td>SMTP Auth</td>\n"; 
-	echo "    <td><select name=\"smtp_auth\"><option label=\"true\" value=\"true\">Yes</option><option label=\"false\" value=\"false\">No</option></select></td>\n"; 
-	echo "  </tr>\n"; 
-	echo "  <tr class=\"d0\">\n"; 
-	echo "    <td>SMTP Security</td>\n"; 
-	echo "    <td><select name=\"smtp_secure\"><option label=\"ssl\" value=\"ssl\">ssl</option><option label=\"none\" value=\"none\">None</option></select></td>\n"; 
-	echo "  </tr>\n"; 
-	echo "  <tr>\n"; 
-	echo "    <td>Host</td>\n"; 
-	echo "    <td><input type=\"text\" name=\"host\" value=\"\"></td>\n"; 
-	echo "  </tr>\n"; 
-	echo "  <tr class=\"d0\">\n"; 
-	echo "    <td>Port</td>\n"; 
-	echo "    <td><input type=\"port\" name=\"port\" value=\"\"></td>\n"; 
-	echo "  </tr>\n"; 
-	echo "  <tr>\n"; 
-	echo "    <td>Username</td>\n"; 
-	echo "    <td><input type=\"user\" name=\"user\" value=\"\"></td>\n"; 
-	echo "  </tr>\n"; 
-	echo "  <tr class=\"d0\">\n"; 
-	echo "    <td>Password</td>\n"; 
-	echo "    <td><input type=\"password\" name=\"pass\" value=\"\"></td>\n"; 
-	echo "  </tr>\n"; 
-	echo "  <tr>\n"; 
-	echo "    <td>Use HTML formatting</td>\n"; 
-	echo "    <td><select name=\"html\"><option label=\"true\" value=\"true\">Yes</option><option label=\"false\" value=\"false\">No</option></select></td>\n"; 
-	echo "  </tr>\n"; 
-	echo "  <tr class=\"d0\">\n"; 
-	echo "    <td>From email address</td>\n"; 
-	echo "    <td><input type=\"from\" name=\"from\" value=\"\"></td>\n"; 
-	echo "  </tr>\n"; 
-	echo "  <tr>\n"; 
-	echo "    <td>To email address</td>\n"; 
-	echo "    <td><input type=\"to\" name=\"to\" value=\"\"></td>\n"; 
-	echo "  </tr>\n"; 
-	echo "  <tr class=\"d0\">\n"; 
-	echo "    <td>Subject</td>\n"; 
-	echo "    <td><input type=\"subject\" name=\"subject\" value=\"\"></td>\n"; 
-	echo "  </tr>\n"; 
-	echo "</table>\n"; 
-	echo "\n"; 
-	echo "<br>\n"; 
-	echo "<input type=\"submit\" value=\"Save\">\n"; 
-	echo "\n"; 
-	echo "\n"; 
-	echo "\n"; 
-	echo "</form>\n";
-}
-?>
-
-<input type="button" value="Test" onClick="window.location='email.php?test=1'">
-
-
-</td>
-</tr>
-</table>
-    </td>
-	  
-	 
-    </tr>
-   
-  
-</table>
-
-<br>
-
-
-<br><br>
-
-<p>
-</p>
-</td>
-	</tr>
-</table>
-
-<?php include("fend.inc"); ?>
-</body>
-</html>
+<?php
+header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
+header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
+//$pgtitle = "Firewall: ipblocklist - Email";
+	
+	require("guiconfig.inc");
+	include("head.inc");
+
+	//set the config as a global variable
+	global $config;
+
+	$global_usage = '/usr/local/www/packages/ipblocklist/global_usage';
+	//$fh = fopen($global_usage, 'r');
+
+	//phpinfo();
+	
+	
+if (isset($_GET['save'])) {
+	exec("rm email_send.php");
+    exec("touch email_send.php");
+	$file = "email_send.php"; 
+	$smtp_auth = $_POST['smtp_auth'];
+	$smtp_secure = $_POST['smtp_secure'];
+	$host = $_POST['host'];
+	$port = $_POST['port'];
+	$user = $_POST['user'];
+	$pass = $_POST['pass'];
+	$html = $_POST['html'];
+	$from = $_POST['from'];
+	$to = $_POST['to'];
+	$subject = $_POST['subject'];
+	$fp = fopen($file, "w") or die("Couldn't open $file for writing!");
+	fwrite($fp, "<?php\ninclude(\"class.phpmailer.php\");\n\$mail             = new PHPMailer();
+\n\$mail->IsSMTP();\n\$mail->SMTPAuth   = ") or die("Couldn't write values to file!");
+	fwrite($fp, $smtp_auth) or die("Couldn't write values to file!");
+	fwrite($fp, ";\n\$mail->SMTPSecure = \"") or die("Couldn't write values to file!");
+	fwrite($fp, $smtp_secure) or die("Couldn't write values to file!");
+	fwrite($fp, "\";\n\$mail->Host       = \"") or die("Couldn't write values to file!");
+	fwrite($fp, $host) or die("Couldn't write values to file!");
+	fwrite($fp, "\";\n\$mail->Port       = ") or die("Couldn't write values to file!");
+	fwrite($fp, $port) or die("Couldn't write values to file!");
+	fwrite($fp, ";\n\$mail->Username   = \"") or die("Couldn't write values to file!");
+	fwrite($fp, $user);
+	fwrite($fp, "\";\n\$mail->Password   = \"") or die("Couldn't write values to file!");
+	fwrite($fp, $pass);
+	fwrite($fp, "\";\n\$mail->AddReplyTo(\"") or die("Couldn't write values to file!");
+	fwrite($fp, $from) or die("Couldn't write values to file!");
+	fwrite($fp, "\",\"pfsense ipblocklist\");\n\$mail->From       = \"") or die("Couldn't write values to file!");
+	fwrite($fp, $from) or die("Couldn't write values to file!");
+	fwrite($fp, "\";\n\$mail->Subject    = \"" . $subject . "\";\n\$mail->AltBody    = \"To view the message, please use an HTML compatible email viewer!\";\n\$mail->WordWrap   = 50;\n\$body 		    = \"IP-Blocklist encountered an event. A system log entry was made with details of event\";\n\$body 		   .= \"<br><br>\" . date('l jS \of F Y h:i:s A') . \"<br><br>Current Status = \";\nob_start();\n\$results = exec(\"pfctl -s rules | grep -c ipblocklist\");\nob_end_clean();\nif (\$results > '0')\n\$body 		   .= \"Running\";\nelse\n\$body 		   .= \"<span style='color:red'>Restarting</span>\";\nob_start();\n\$results = exec(\"tail -r /usr/local/www/packages/ipblocklist/errorOUT.txt\");\nob_end_clean();\n\$body 		   .= \"<br/><span style='color:red'>\";\n\$body 		   .= \$results;\n\$body 		   .= \"</span>\";\n\$body 		   .= \"<br>You are blocking \";\nob_start();\n\$results = exec(\"pfctl -T show -t ipblocklist |grep -v -c Z\");\nob_end_clean();\n\$body 		   .= \$results;\n\$body 		   .= \" Networks\";\n\n\$mail->MsgHTML(\$body);\n\$mail->AddAddress(\"") or die("Couldn't write values to file!");
+	fwrite($fp, $to) or die("Couldn't write values to file!");
+	fwrite($fp, "\");\n\$mail->IsHTML(") or die("Couldn't write values to file!");
+	fwrite($fp, $html) or die("Couldn't write values to file!");
+	fwrite($fp, ");\n\nif(!\$mail->Send()) {\n  echo \"Mailer Error: \" . \$mail->ErrorInfo;\n} else {\n  echo \"Message sent! - <a href=email.php>Go Back</a>\";\n}\n?>") or die("Couldn't write values to file!");
+	fclose($fp);
+	//echo "Saved successfully!";
+	
+	exec("rm email_config.html");
+    exec("touch email_config.html");
+	$file2 = "email_config.html";
+	$fp2 = fopen($file2, "w") or die("Couldn't open $file for writing!");
+	fwrite($fp2, "<table width=\"100%\" b align=\"center\"> 
+  <tr> 
+    <td>SMTP Auth</td>") or die("Couldn't write values to file!");
+	if ($smtp_auth=="true")
+    fwrite($fp2, "<td><select name=\"smtp_auth\"><option label=\"true\" value=\"true\" selected>Yes</option><option label=\"false\" value=\"false\">No</option></select></td>") or die("Couldn't write values to file!");
+	else
+	fwrite($fp2, "<td><select name=\"smtp_auth\"><option label=\"true\" value=\"true\">Yes</option><option label=\"false\" value=\"false\" selected>No</option></select></td>") or die("Couldn't write values to file!");
+  fwrite($fp2, "</tr> 
+  <tr class=\"d0\"> 
+    <td>SMTP Security</td>") or die("Couldn't write values to file!");
+	if ($smtp_secure=="ssl")
+    fwrite($fp2, "<td><select name=\"smtp_secure\"><option label=\"ssl\" value=\"ssl\" selected>ssl</option><option label=\"none\" value=\"none\">None</option></select></td>") or die("Couldn't write values to file!");
+	else 
+	fwrite($fp2, "<td><select name=\"smtp_secure\"><option label=\"ssl\" value=\"ssl\">ssl</option><option label=\"none\" value=\"none\" selected>None</option></select></td>") or die("Couldn't write values to file!");
+  fwrite($fp2, "</tr> 
+  <tr> 
+    <td>Host</td> 
+    <td><input type=\"text\" name=\"host\" value=\"" . $host ."\"></td> 
+  </tr> 
+  <tr class=\"d0\"> 
+    <td>Port</td> 
+    <td><input type=\"port\" name=\"port\" value=\"" . $port . "\"></td> 
+  </tr> 
+  <tr> 
+    <td>Username</td> 
+    <td><input type=\"user\" name=\"user\" value=\"" . $user . "\"></td> 
+  </tr> 
+  <tr class=\"d0\"> 
+    <td>Password</td> 
+    <td><input type=\"password\" name=\"pass\" value=\"" . $pass . "\"></td> 
+  </tr> 
+  <tr> 
+    <td>Use HTML formatting</td>") or die("Couldn't write values to file!");
+	if ($html=="true") 
+    fwrite($fp2, "<td><select name=\"html\"><option label=\"true\" value=\"true\" selected>Yes</option><option label=\"false\" value=\"false\">No</option></select></td>") or die("Couldn't write values to file!"); 
+	else
+	fwrite($fp2, "<td><select name=\"html\"><option label=\"true\" value=\"true\">Yes</option><option label=\"false\" value=\"false\" selected>No</option></select></td>") or die("Couldn't write values to file!");
+  fwrite($fp2, "</tr> 
+  <tr class=\"d0\"> 
+    <td>From email address</td> 
+    <td><input type=\"from\" name=\"from\" value=\"" . $from . "\"></td> 
+  </tr> 
+  <tr> 
+    <td>To email address</td> 
+    <td><input type=\"to\" name=\"to\" value=\"" . $to . "\"></td> 
+  </tr> 
+  <tr class=\"d0\"> 
+    <td>Subject</td> 
+    <td><input type=\"subject\" name=\"subject\" value=\"" . $subject . "\"></td> 
+  </tr> 
+</table> 
+<br> 
+<input type=\"submit\" value=\"Save\"> 
+</form>") or die("Couldn't write values to file!");
+	fclose($fp2);
+}
+if (isset($_GET['test'])) {
+    echo '<script type="text/javascript">' . "\n"; 
+	echo 'window.location="email_send.php";'; 
+	echo '</script>'; 
+}
+if (isset($_GET['reset'])) {
+	exec ("rm email_send.php");
+	exec ("rm email_config.html");
+    echo '<script type="text/javascript">' . "\n"; 
+	echo 'window.location="email.php";'; 
+	echo '</script>'; 
+}
+?>
+
+<html>
+<head>
+<style type="text/css">
+.style1 {
+	text-align: center;
+}
+tr.d0 td {
+	background-color: #eedddd; color: black;
+}
+</style>
+
+</head>
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
+
+
+<br /><br />
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr><td class="tabnavtbl">
+<?php
+	$tab_array = array();
+	$tab_array[0] = array("IP-Blocklist", false, "ipblocklist.php");
+	$tab_array[1] = array("Settings", false, "settings.php");
+	$tab_array[2] = array("Whitelist", false, "whitelist.php");
+	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
+	$tab_array[4] = array("Help", false, "http://forum.pfsense.org/index.php/topic,24769.0.html");
+	$tab_array[5] = array("Email", true, "email.php");
+	display_top_tabs($tab_array);
+?>
+  </td></tr>
+  <tr> 
+    <td>
+	<div id="mainarea">
+        <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+       <tr> 
+	<td class="listhdrr">Email Settings for SMTP mail</td>
+    
+	  </tr>
+      
+    <tr> 
+	<td class="listlr" valign="middle">
+  
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+
+<form name="emailform" method="post" action="email.php?save=1"> 
+<?php
+if (file_exists("email_send.php")) {
+    echo "<p>Your settings have already been set. Would you like to overwrite your email settings?</p>\n"; 
+	$content = file_get_contents('email_config.html');
+	echo $content;
+	echo "<p>\n"; 
+	echo "<input name=\"resetbutton\" type=\"button\" value=\"Reset email config\" onClick=\"window.location='email.php?reset=1'\" />\n";
+	echo "</p>\n"; 
+	echo "\n";
+} else {
+    echo "<table width=\"100%\" b align=\"center\">\n"; 
+	echo "  <tr>\n"; 
+	echo "    <td>SMTP Auth</td>\n"; 
+	echo "    <td><select name=\"smtp_auth\"><option label=\"true\" value=\"true\">Yes</option><option label=\"false\" value=\"false\">No</option></select></td>\n"; 
+	echo "  </tr>\n"; 
+	echo "  <tr class=\"d0\">\n"; 
+	echo "    <td>SMTP Security</td>\n"; 
+	echo "    <td><select name=\"smtp_secure\"><option label=\"ssl\" value=\"ssl\">ssl</option><option label=\"none\" value=\"none\">None</option></select></td>\n"; 
+	echo "  </tr>\n"; 
+	echo "  <tr>\n"; 
+	echo "    <td>Host</td>\n"; 
+	echo "    <td><input type=\"text\" name=\"host\" value=\"\"></td>\n"; 
+	echo "  </tr>\n"; 
+	echo "  <tr class=\"d0\">\n"; 
+	echo "    <td>Port</td>\n"; 
+	echo "    <td><input type=\"port\" name=\"port\" value=\"\"></td>\n"; 
+	echo "  </tr>\n"; 
+	echo "  <tr>\n"; 
+	echo "    <td>Username</td>\n"; 
+	echo "    <td><input type=\"user\" name=\"user\" value=\"\"></td>\n"; 
+	echo "  </tr>\n"; 
+	echo "  <tr class=\"d0\">\n"; 
+	echo "    <td>Password</td>\n"; 
+	echo "    <td><input type=\"password\" name=\"pass\" value=\"\"></td>\n"; 
+	echo "  </tr>\n"; 
+	echo "  <tr>\n"; 
+	echo "    <td>Use HTML formatting</td>\n"; 
+	echo "    <td><select name=\"html\"><option label=\"true\" value=\"true\">Yes</option><option label=\"false\" value=\"false\">No</option></select></td>\n"; 
+	echo "  </tr>\n"; 
+	echo "  <tr class=\"d0\">\n"; 
+	echo "    <td>From email address</td>\n"; 
+	echo "    <td><input type=\"from\" name=\"from\" value=\"\"></td>\n"; 
+	echo "  </tr>\n"; 
+	echo "  <tr>\n"; 
+	echo "    <td>To email address</td>\n"; 
+	echo "    <td><input type=\"to\" name=\"to\" value=\"\"></td>\n"; 
+	echo "  </tr>\n"; 
+	echo "  <tr class=\"d0\">\n"; 
+	echo "    <td>Subject</td>\n"; 
+	echo "    <td><input type=\"subject\" name=\"subject\" value=\"\"></td>\n"; 
+	echo "  </tr>\n"; 
+	echo "</table>\n"; 
+	echo "\n"; 
+	echo "<br>\n"; 
+	echo "<input type=\"submit\" value=\"Save\">\n"; 
+	echo "\n"; 
+	echo "\n"; 
+	echo "\n"; 
+	echo "</form>\n";
+}
+?>
+
+<input type="button" value="Test" onClick="window.location='email.php?test=1'">
+
+
+</td>
+</tr>
+</table>
+    </td>
+	  
+	 
+    </tr>
+   
+  
+</table>
+
+<br>
+
+
+<br><br>
+
+<p>
+</p>
+</td>
+	</tr>
+</table>
+
+<?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/config/ipblocklist/firewall_shaper.tmp b/config/ipblocklist/firewall_shaper.tmp
index 10e921b4..833f87f8 100644
--- a/config/ipblocklist/firewall_shaper.tmp
+++ b/config/ipblocklist/firewall_shaper.tmp
@@ -1,11 +1,11 @@
-<html>
-<HEAD>
-<SCRIPT language="JavaScript">
-<!--
-window.parent.location="../../firewall_shaper.php";
-//-->
-</SCRIPT>
-</HEAD>
-
-
-</html>
-\ No newline at end of file
+<html>
+<HEAD>
+<SCRIPT language="JavaScript">
+<!--
+window.parent.location="../../firewall_shaper.php";
+//-->
+</SCRIPT>
+</HEAD>
+
+
+</html>
diff --git a/config/ipblocklist/index.tmp b/config/ipblocklist/index.tmp
index 7c768af6..bcbfad8f 100755
--- a/config/ipblocklist/index.tmp
+++ b/config/ipblocklist/index.tmp
@@ -8,4 +8,4 @@ window.parent.location="../../index.php";
 </HEAD>
 
 
-</html>
-\ No newline at end of file
+</html>
diff --git a/config/ipblocklist/interfaces.txt b/config/ipblocklist/interfaces.txt
index 124009d7..faba42a4 100644
--- a/config/ipblocklist/interfaces.txt
+++ b/config/ipblocklist/interfaces.txt
@@ -1 +1 @@
-any
-\ No newline at end of file
+any
diff --git a/config/ipblocklist/ipblocklist_if.tmp b/config/ipblocklist/ipblocklist_if.tmp
index 364133c8..69cad86e 100644
--- a/config/ipblocklist/ipblocklist_if.tmp
+++ b/config/ipblocklist/ipblocklist_if.tmp
@@ -1,217 +1,217 @@
-<?php 
-/*
-	interfaces_assign.php
-	part of m0n0wall (http://m0n0.ch/wall)
-	Written by Jim McBeath based on existing m0n0wall files
-	
-	Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
-	All rights reserved.
-	
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-	
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-//$pgtitle = "Firewall: Countryblock - Interfaces";
-header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
-header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
-require("guiconfig.inc");
-
-/*
-	In this file, "port" refers to the physical port name,
-	while "interface" refers to LAN, WAN, or OPTn.
-*/
-
-/* get list without VLAN interfaces */
-$portlist = get_interface_list();
-
-/* add VLAN interfaces */
-if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
-	$i = 0;
-	foreach ($config['vlans']['vlan'] as $vlan) {
-		$portlist['vlan' . $i] = $vlan;
-		$portlist['vlan' . $i]['isvlan'] = true;
-		$i++;
-	}
-}
-
-if ($_POST) {
-
-	unset($input_errors);
-
-	/* input validation */
-
-	/* Build a list of the port names so we can see how the interfaces map */
-	$portifmap = array();
-	foreach ($portlist as $portname => $portinfo) {
-		$portifmap[$portname] = array();
-		//echo($portname . "done");
-	}
-
-	/* Go through the list of ports selected by the user,
-	   build a list of port-to-interface mappings in portifmap */
-	   conf_mount_rw();
-	   $myFile = "interfaces.txt";
-	   
-			$fh = fopen($myFile, 'w+');
-			
-	   
-	foreach ($_POST as $ifname => $ifport) {
-		//echo $ifname;
-		//echo "<br>";
-		if ($ifname != "__csrf_magic"){
-		fwrite($fh, $ifname . "\n");
-		}
-		else {
-		}
-		//if (($ifname == 'lan') || ($ifname == 'wan') || (substr($ifname, 0, 3) == 'opt'))
-			//$portifmap[$ifport][] = strtoupper($ifname);
-	}
-
-	conf_mount_ro();
-
-
-	if (!$input_errors) {
-		/* No errors detected, so update the config */
-		foreach ($_POST as $ifname => $ifport) {
-			
-			if (($ifname == 'lan') || ($ifname == 'wan') ||
-				(substr($ifname, 0, 3) == 'opt')) {
-				
-				
-			}
-		}
-	
-		$savemsg = get_std_save_message($retval);
-	
-		
-		
-	}
-}
-
-
-
-
-
-
-include("head.inc");
-
-
-
-?>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
-<?php if ($input_errors) print_input_errors($input_errors); ?>
-<?php if ($savemsg) print_info_box("Interfaces selected - Click <a href='ipblocklist.php'>Here</a> to go back"); ?>
-<form action="" method="post" name="iform" id="iform">
-<br /><br />
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr><td class="tabnavtbl">
-<?php
-	$tab_array = array();
-	$tab_array[0] = array("IP-Blocklist", false, "ipblocklist.php");
-	$tab_array[1] = array("Settings", false, "settings.php");
-	$tab_array[2] = array("Whitelist", false, "whitelist.php");
-	$tab_array[3] = array("Interfaces", true, "ipblocklist_if.php");
-	$tab_array[4] = array("Help", false, "http://forum.pfsense.org/index.php/topic,24769.0.html");
-	$tab_array[5] = array("Email", false, "email.php");
-	display_top_tabs($tab_array);
-?> 
-  </td></tr>
-  <tr> 
-    <td>
-	<div id="mainarea">
-        <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-       <tr> 
-	<td class="listhdrr">Interface</td>
-	<td class="listhdr">Selected</td>
-	<td class="list">&nbsp;</td>
-  </tr>
-  <?php foreach ($config['interfaces'] as $ifname => $iface):
-  	if ($iface['descr'])
-		$ifdescr = $iface['descr'];
-	else
-		$ifdescr = strtoupper($ifname);
-	?>
-  <tr> 
-	<td class="listlr" valign="middle"><strong><?=$ifdescr;?></strong></td>
-	  <td valign="middle" class="listr">
-      	
-        
-      	
-		
-		  <?php foreach ($portlist as $portname => $portinfo): ?>
-		  
-		  	<?php  if ($portname == $iface['if']) {
-			
-			ob_start();
-			$resultsany = exec("cat interfaces.txt | grep any");
-			$results = exec("cat interfaces.txt | grep $portname");
-			ob_end_clean();
-			
-			if ($results == $portname || $resultsany == any)
-				echo "<input name='$portname' type='checkbox' value='$portname' checked/>$portname";
-			else
-				echo "<input name='$portname' type='checkbox' value='$portname' />$portname";
-			}
-			?>
-		  <?php endforeach; ?>
-		
-		</td>
-		<td valign="middle" class="list"> 
-		  
-		</td>
-  </tr>
-  <?php endforeach; ?>
-  
-  <tr>
-	<td class="list" colspan="3" height="10"></td>
-  </tr>
-  
-</table>
-</div>
-    <p><br>
-  <input type="submit" class="formbtn" value="Save">
-    </p>
-    <p>Select the interfaces you want secured. It's recommended to select all interfaces. </p>
-    <p>Default: All interfaces are seleted. <br>
-      <br>
-    </p>
-    <p></p></td>
-	</tr>
-</table>
-</form>
-<?php include("fend.inc"); ?>
-
-
-</body>
-</html>
-
-<?php
-conf_mount_rw();
-	if ($_POST) {
-		if (!$input_errors)
-			touch("interfaces.txt");
-		
-	}
-	conf_mount_ro();
-?>
+<?php 
+/*
+	interfaces_assign.php
+	part of m0n0wall (http://m0n0.ch/wall)
+	Written by Jim McBeath based on existing m0n0wall files
+	
+	Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
+	All rights reserved.
+	
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+	
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+	
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+	
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+//$pgtitle = "Firewall: Countryblock - Interfaces";
+header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
+header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
+require("guiconfig.inc");
+
+/*
+	In this file, "port" refers to the physical port name,
+	while "interface" refers to LAN, WAN, or OPTn.
+*/
+
+/* get list without VLAN interfaces */
+$portlist = get_interface_list();
+
+/* add VLAN interfaces */
+if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
+	$i = 0;
+	foreach ($config['vlans']['vlan'] as $vlan) {
+		$portlist['vlan' . $i] = $vlan;
+		$portlist['vlan' . $i]['isvlan'] = true;
+		$i++;
+	}
+}
+
+if ($_POST) {
+
+	unset($input_errors);
+
+	/* input validation */
+
+	/* Build a list of the port names so we can see how the interfaces map */
+	$portifmap = array();
+	foreach ($portlist as $portname => $portinfo) {
+		$portifmap[$portname] = array();
+		//echo($portname . "done");
+	}
+
+	/* Go through the list of ports selected by the user,
+	   build a list of port-to-interface mappings in portifmap */
+	   conf_mount_rw();
+	   $myFile = "interfaces.txt";
+	   
+			$fh = fopen($myFile, 'w+');
+			
+	   
+	foreach ($_POST as $ifname => $ifport) {
+		//echo $ifname;
+		//echo "<br>";
+		if ($ifname != "__csrf_magic"){
+		fwrite($fh, $ifname . "\n");
+		}
+		else {
+		}
+		//if (($ifname == 'lan') || ($ifname == 'wan') || (substr($ifname, 0, 3) == 'opt'))
+			//$portifmap[$ifport][] = strtoupper($ifname);
+	}
+
+	conf_mount_ro();
+
+
+	if (!$input_errors) {
+		/* No errors detected, so update the config */
+		foreach ($_POST as $ifname => $ifport) {
+			
+			if (($ifname == 'lan') || ($ifname == 'wan') ||
+				(substr($ifname, 0, 3) == 'opt')) {
+				
+				
+			}
+		}
+	
+		$savemsg = get_std_save_message($retval);
+	
+		
+		
+	}
+}
+
+
+
+
+
+
+include("head.inc");
+
+
+
+?>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
+<?php if ($input_errors) print_input_errors($input_errors); ?>
+<?php if ($savemsg) print_info_box("Interfaces selected - Click <a href='ipblocklist.php'>Here</a> to go back"); ?>
+<form action="" method="post" name="iform" id="iform">
+<br /><br />
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr><td class="tabnavtbl">
+<?php
+	$tab_array = array();
+	$tab_array[0] = array("IP-Blocklist", false, "ipblocklist.php");
+	$tab_array[1] = array("Settings", false, "settings.php");
+	$tab_array[2] = array("Whitelist", false, "whitelist.php");
+	$tab_array[3] = array("Interfaces", true, "ipblocklist_if.php");
+	$tab_array[4] = array("Help", false, "http://forum.pfsense.org/index.php/topic,24769.0.html");
+	$tab_array[5] = array("Email", false, "email.php");
+	display_top_tabs($tab_array);
+?> 
+  </td></tr>
+  <tr> 
+    <td>
+	<div id="mainarea">
+        <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+       <tr> 
+	<td class="listhdrr">Interface</td>
+	<td class="listhdr">Selected</td>
+	<td class="list">&nbsp;</td>
+  </tr>
+  <?php foreach ($config['interfaces'] as $ifname => $iface):
+  	if ($iface['descr'])
+		$ifdescr = $iface['descr'];
+	else
+		$ifdescr = strtoupper($ifname);
+	?>
+  <tr> 
+	<td class="listlr" valign="middle"><strong><?=$ifdescr;?></strong></td>
+	  <td valign="middle" class="listr">
+      	
+        
+      	
+		
+		  <?php foreach ($portlist as $portname => $portinfo): ?>
+		  
+		  	<?php  if ($portname == $iface['if']) {
+			
+			ob_start();
+			$resultsany = exec("cat interfaces.txt | grep any");
+			$results = exec("cat interfaces.txt | grep $portname");
+			ob_end_clean();
+			
+			if ($results == $portname || $resultsany == any)
+				echo "<input name='$portname' type='checkbox' value='$portname' checked/>$portname";
+			else
+				echo "<input name='$portname' type='checkbox' value='$portname' />$portname";
+			}
+			?>
+		  <?php endforeach; ?>
+		
+		</td>
+		<td valign="middle" class="list"> 
+		  
+		</td>
+  </tr>
+  <?php endforeach; ?>
+  
+  <tr>
+	<td class="list" colspan="3" height="10"></td>
+  </tr>
+  
+</table>
+</div>
+    <p><br>
+  <input type="submit" class="formbtn" value="Save">
+    </p>
+    <p>Select the interfaces you want secured. It's recommended to select all interfaces. </p>
+    <p>Default: All interfaces are seleted. <br>
+      <br>
+    </p>
+    <p></p></td>
+	</tr>
+</table>
+</form>
+<?php include("fend.inc"); ?>
+
+
+</body>
+</html>
+
+<?php
+conf_mount_rw();
+	if ($_POST) {
+		if (!$input_errors)
+			touch("interfaces.txt");
+		
+	}
+	conf_mount_ro();
+?>
diff --git a/config/ipblocklist/ipblocklist_list.tmp b/config/ipblocklist/ipblocklist_list.tmp
index 2ea5a68b..0603d4ce 100644
--- a/config/ipblocklist/ipblocklist_list.tmp
+++ b/config/ipblocklist/ipblocklist_list.tmp
@@ -1,113 +1,113 @@
-<?php
-header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
-header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
-
-echo "<a href=\"whitelist.php\"><img src=\"../../themes/nervecenter/images/icons/icon_plus.gif\" ALT=\"Whitelist\" ALIGN=RIGHT></a>\n"; 
-echo "Add List URL: <form method=\"post\" action=\"\">\n"; 
-echo "<input name=\"content\" type=\"text\" />\n"; 
-echo "<input type=\"image\" src=\"../../themes/nervecenter/images/icons/icon_plus.gif\" value=\"submit\">\n"; 
-echo "<a href=\"purge.php?line=0\">Purge All</a>\n";
-echo "<STYLE type=\"text/css\">\n"; 
-echo "   a img {border:none; }\n"; 
-echo " </STYLE>\n";
-
-function delLineFromFile($fileName, $lineNum){
-// check the file exists 
-  if(!is_writable($fileName))
-    {
-    // print an error
-    print "The file $fileName is not writable";
-    // exit the function
-    exit;
-    }
-  else
-      {
-    // read the file into an array    
-    $arr = file($fileName);
-    }
-
-  // the line to delete is the line number minus 1, because arrays begin at zero
-  $lineToDelete = $lineNum-1;
- 
-  // check if the line to delete is greater than the length of the file
-  if($lineToDelete > sizeof($arr))
-    {
-      // print an error
-    print "You have chosen a line number, <b>[$lineNum]</b>,  higher than the length of the file.";
-    // exit the function
-    exit;
-    }
-
-  //remove the line
-  unset($arr["$lineToDelete"]);
-
-  // open the file for reading
-  if (!$fp = fopen($fileName, 'w+'))
-    {
-    // print an error
-        print "Cannot open file ($fileName)";
-      // exit the function
-        exit;
-        }
-  
-  // if $fp is valid
-  if($fp)
-    {
-        // write the array to the file
-        foreach($arr as $line) { fwrite($fp,$line); }
-
-        // close the file
-        fclose($fp);
-        }
-
-echo "done";
-}
-
-
-$myFile = "lists.txt";
-$content = $_REQUEST['content'];
-$fh = fopen($myFile, 'a+');
-fwrite($fh, $content);
-if (strlen($content) > 1) {
-	fwrite($fh, "\n");
-	} else {
-}
-fclose($fh);
-
-
-//echo (filesize($myFile));
-if (filesize($myFile) > 1) {
-	//$fh = fopen($myFile, 'r');
-	//$theData = fread($fh, filesize($myFile));
-	//fclose($fh);
-	echo "<br/> Current List(s): <br/>";
-	// Get the whole file into a single string
-	$fileContents = file_get_contents($myFile);
- 
-	// Explode the file contents string by each line
-	$lines = explode(PHP_EOL, $fileContents); // Replace PHP_EOL with "\r\n" or "\n" or "\r" if you like
- 
-	// Iterate through each line and do what you need with it
-
-	foreach ($lines as $line) {
-	 $i++;
-	 echo "<a href=purge.php?line=$i style='border-style: none'><img src='../../themes/nervecenter/images/icons/icon_x.gif'></a>";
-	 echo " ";
-  	 echo $line;
-	 //echo "";
-       // echo $i;
-	 echo "<br/>";
-	 
-	}
-
-	
-	//echo $theData;
-
-
-}
-echo "<br/><br/>";
-
-
-
-
-?>
-\ No newline at end of file
+<?php
+header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
+header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
+
+echo "<a href=\"whitelist.php\"><img src=\"../../themes/nervecenter/images/icons/icon_plus.gif\" ALT=\"Whitelist\" ALIGN=RIGHT></a>\n"; 
+echo "Add List URL: <form method=\"post\" action=\"\">\n"; 
+echo "<input name=\"content\" type=\"text\" />\n"; 
+echo "<input type=\"image\" src=\"../../themes/nervecenter/images/icons/icon_plus.gif\" value=\"submit\">\n"; 
+echo "<a href=\"purge.php?line=0\">Purge All</a>\n";
+echo "<STYLE type=\"text/css\">\n"; 
+echo "   a img {border:none; }\n"; 
+echo " </STYLE>\n";
+
+function delLineFromFile($fileName, $lineNum){
+// check the file exists 
+  if(!is_writable($fileName))
+    {
+    // print an error
+    print "The file $fileName is not writable";
+    // exit the function
+    exit;
+    }
+  else
+      {
+    // read the file into an array    
+    $arr = file($fileName);
+    }
+
+  // the line to delete is the line number minus 1, because arrays begin at zero
+  $lineToDelete = $lineNum-1;
+ 
+  // check if the line to delete is greater than the length of the file
+  if($lineToDelete > sizeof($arr))
+    {
+      // print an error
+    print "You have chosen a line number, <b>[$lineNum]</b>,  higher than the length of the file.";
+    // exit the function
+    exit;
+    }
+
+  //remove the line
+  unset($arr["$lineToDelete"]);
+
+  // open the file for reading
+  if (!$fp = fopen($fileName, 'w+'))
+    {
+    // print an error
+        print "Cannot open file ($fileName)";
+      // exit the function
+        exit;
+        }
+  
+  // if $fp is valid
+  if($fp)
+    {
+        // write the array to the file
+        foreach($arr as $line) { fwrite($fp,$line); }
+
+        // close the file
+        fclose($fp);
+        }
+
+echo "done";
+}
+
+
+$myFile = "lists.txt";
+$content = $_REQUEST['content'];
+$fh = fopen($myFile, 'a+');
+fwrite($fh, $content);
+if (strlen($content) > 1) {
+	fwrite($fh, "\n");
+	} else {
+}
+fclose($fh);
+
+
+//echo (filesize($myFile));
+if (filesize($myFile) > 1) {
+	//$fh = fopen($myFile, 'r');
+	//$theData = fread($fh, filesize($myFile));
+	//fclose($fh);
+	echo "<br/> Current List(s): <br/>";
+	// Get the whole file into a single string
+	$fileContents = file_get_contents($myFile);
+ 
+	// Explode the file contents string by each line
+	$lines = explode(PHP_EOL, $fileContents); // Replace PHP_EOL with "\r\n" or "\n" or "\r" if you like
+ 
+	// Iterate through each line and do what you need with it
+
+	foreach ($lines as $line) {
+	 $i++;
+	 echo "<a href=purge.php?line=$i style='border-style: none'><img src='../../themes/nervecenter/images/icons/icon_x.gif'></a>";
+	 echo " ";
+  	 echo $line;
+	 //echo "";
+       // echo $i;
+	 echo "<br/>";
+	 
+	}
+
+	
+	//echo $theData;
+
+
+}
+echo "<br/><br/>";
+
+
+
+
+?>
diff --git a/config/ipblocklist/manual_add.tmp b/config/ipblocklist/manual_add.tmp
index ecf42678..361b782b 100755
--- a/config/ipblocklist/manual_add.tmp
+++ b/config/ipblocklist/manual_add.tmp
@@ -66,4 +66,4 @@ echo "<br/><br/>";
 
 
 
-?>
-\ No newline at end of file
+?>
diff --git a/config/ipblocklist/purge.tmp b/config/ipblocklist/purge.tmp
index 6bc8dde9..a5a6cdf8 100644
--- a/config/ipblocklist/purge.tmp
+++ b/config/ipblocklist/purge.tmp
@@ -1,20 +1,20 @@
-<?php
-header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
-header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
-$line = $_GET["line"];
-
-//echo("$line");
-
-//exec("more lists.txt > temp_lists.txt");
-if ($line == 0) {
-	exec("/bin/rm lists.txt");
-	} else {
-	exec("/usr/bin/sed $line'd' lists.txt > temp_lists.txt");
-	}
-exec("/usr/bin/more temp_lists.txt > lists.txt");
-exec("/bin/rm temp_lists.txt");
-
-
-header('Location: ipblocklist.php');
-
-?>
-\ No newline at end of file
+<?php
+header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
+header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
+$line = $_GET["line"];
+
+//echo("$line");
+
+//exec("more lists.txt > temp_lists.txt");
+if ($line == 0) {
+	exec("/bin/rm lists.txt");
+	} else {
+	exec("/usr/bin/sed $line'd' lists.txt > temp_lists.txt");
+	}
+exec("/usr/bin/more temp_lists.txt > lists.txt");
+exec("/bin/rm temp_lists.txt");
+
+
+header('Location: ipblocklist.php');
+
+?>
diff --git a/config/ipblocklist/purgeip.tmp b/config/ipblocklist/purgeip.tmp
index 6ce36dfe..b577b8af 100644
--- a/config/ipblocklist/purgeip.tmp
+++ b/config/ipblocklist/purgeip.tmp
@@ -1,26 +1,26 @@
-<?php
-$line = $_GET["line"];
-
-//echo("$line");
-//exec("more ips.ipfw > temp_ips.ipfw");
-if ($line == 0) {
-	exec("rm wlists.txt");
-	} else {
-	exec("sed $line'd' wlists.txt > temp_wlists.txt");
-	}
-exec("more temp_wlists.txt > wlists.txt");
-exec("rm temp_wlists.txt");
-
-
-?>
-<html>
-<HEAD>
-<SCRIPT language="JavaScript">
-<!--
-window.parent.location="ipblocklist.php";
-//-->
-</SCRIPT>
-</HEAD>
-
-
-</html>
-\ No newline at end of file
+<?php
+$line = $_GET["line"];
+
+//echo("$line");
+//exec("more ips.ipfw > temp_ips.ipfw");
+if ($line == 0) {
+	exec("rm wlists.txt");
+	} else {
+	exec("sed $line'd' wlists.txt > temp_wlists.txt");
+	}
+exec("more temp_wlists.txt > wlists.txt");
+exec("rm temp_wlists.txt");
+
+
+?>
+<html>
+<HEAD>
+<SCRIPT language="JavaScript">
+<!--
+window.parent.location="ipblocklist.php";
+//-->
+</SCRIPT>
+</HEAD>
+
+
+</html>
diff --git a/config/ipblocklist/settings.tmp b/config/ipblocklist/settings.tmp
index 37acc2a0..e27d22ac 100644
--- a/config/ipblocklist/settings.tmp
+++ b/config/ipblocklist/settings.tmp
@@ -1,198 +1,198 @@
-<?php
-header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
-header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
-//$pgtitle = "Firewall: Countryblock - Settings";
-	//	TomSchaefer.org countryblock package 2010
-	//
-	//	Notes: Find: ^(.*)$
-	//		Replace: ob_start();\n$results = exec("cat countries.txt | grep XX");\nob_end_clean();\n\tif ($results == 'XX')\n\t\techo "\1";\n\telse\n\t\techo "\1";\n
-	//
-	//
-	//
-	//
-	//require_once('config.inc');
-	require("guiconfig.inc");
-	include("head.inc");
-
-	//set the config as a global variable
-	global $config;
-
-	$global_usage = '/usr/local/www/packages/ipblocklist/global_usage';
-	//$fh = fopen($global_usage, 'r');
-
-	//phpinfo();
-	
-	
-?>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<!--<p class="pgtitle"><?=$pgtitle?></p>-->
-<br />
-<?php if ($input_errors) print_input_errors($input_errors); ?>
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<form method=POST action="">
-
-<?php if ($savemsg_cb) print_info_box($savemsg_cb); 
-		//if ($output) print_info_box($output,$output2);
-		echo($output);
-		echo($output2);
-	?>
-    <br /><br />
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr><td class="tabnavtbl">
-<?php
-	$tab_array = array();
-	$tab_array[0] = array("IP-Blocklist", false, "ipblocklist.php");
-	$tab_array[1] = array("Settings", true, "settings.php");
-	$tab_array[2] = array("Whitelist", false, "whitelist.php");
-	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
-	$tab_array[4] = array("Help", false, "http://forum.pfsense.org/index.php/topic,24769.0.html");
-	$tab_array[5] = array("Email", false, "email.php");
-	display_top_tabs($tab_array);
-?>
-
-  </td></tr>
-  <tr> 
-    <td>
-	<div id="mainarea">
-        <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-       <tr> 
-	<td class="listhdrr">Settings</td>
-    
-	  </tr>
-      
-    <tr> 
-	<td class="listlr" valign="middle">
-    
-<?php
-
-conf_mount_rw();
-
-
-
-	if(isset($_POST['formSubmit'])) 
-    {
-		$aipblocklist = $_POST['formipblocklist'];
-	
-		if(isset($_POST['formOutbound'])) 
-        {
-			$output2 = " and Outbound access is BLOCKED.</b>";
-			exec("touch OUTBOUND");
-		} 
-        else 
-        {
-			$output2 = " and Outbound access is ALLOWED.</b>";
-			exec("rm OUTBOUND");
-		}
-		
-		if(isset($_POST['formlogging'])) 
-        {
-			exec("touch logging");
-		} 
-        else 
-        {
-			exec("rm logging");
-		}
-
-		
-		
-		
-	}
-conf_mount_ro();
-?>
-
-
-
-
-</head>
-
-
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	<td >
-	
-
-	</form>
-	
-	<form action="<?php echo htmlentities($_SERVER['PHP_SELF']); ?>" method="post">
-	<p>
-    	<?php 
-		$countif = "interfaces.txt";
-		if (file_exists($countif)) {
-			$countif =  count(file($countif)); 
-			echo "$countlines"; 
-		} else {
-				echo "<span style='color:red'>Warning! No Interfaces Selected Click <a href='ipblocklist_if.php' target='_parent'><img src='../../themes/nervecenter/images/icons/icon_cablenic.gif' ALT='if'></a></span>";
-		}
-			
-		?>
-        </p>
-		
-      
-	<p>
-		Block outbound?
-<?php
-
-	if (file_exists("OUTBOUND")) {
-		echo "<input name='formOutbound' type='checkbox' value='Yes' checked/>";
-	} else {
-		echo "<input name='formOutbound' type='checkbox' value='Yes'/>";
-	}
-?>
-
-		<br>
-    Enable Logging?&nbsp;
-<?php
-
-	if (file_exists("logging")) {
-		echo "<input name='formlogging' type='checkbox' value='Yes' checked/>";
-	} else {
-		echo "<input name='formlogging' type='checkbox' value='Yes'/>";
-	}
-?>
-<br/>
-	
-
-
-
-
-	
-	
-	 
-	  </p>
-
-<br/>
-
-	
-
-</div>
-<?php
-	//This input guarantees that a POST is sent
-	echo "<input type='hidden' name='zzz' value='required'>";
-?>
-
-</td>
-</tr>
-</table>
-    </td>
-	  
-	 
-    </tr>
-   
-  
-</table>
-</div>
-<br />
-<input type="submit" name="formSubmit" value="Save" /><br><br>
-<p>
-</p>
-</td>
-	</tr>
-</table>
-</form>
-<?php include("fend.inc"); ?>
-</body>
-</html>
-
+<?php
+header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
+header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
+//$pgtitle = "Firewall: Countryblock - Settings";
+	//	TomSchaefer.org countryblock package 2010
+	//
+	//	Notes: Find: ^(.*)$
+	//		Replace: ob_start();\n$results = exec("cat countries.txt | grep XX");\nob_end_clean();\n\tif ($results == 'XX')\n\t\techo "\1";\n\telse\n\t\techo "\1";\n
+	//
+	//
+	//
+	//
+	//require_once('config.inc');
+	require("guiconfig.inc");
+	include("head.inc");
+
+	//set the config as a global variable
+	global $config;
+
+	$global_usage = '/usr/local/www/packages/ipblocklist/global_usage';
+	//$fh = fopen($global_usage, 'r');
+
+	//phpinfo();
+	
+	
+?>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<!--<p class="pgtitle"><?=$pgtitle?></p>-->
+<br />
+<?php if ($input_errors) print_input_errors($input_errors); ?>
+<?php if ($savemsg) print_info_box($savemsg); ?>
+<form method=POST action="">
+
+<?php if ($savemsg_cb) print_info_box($savemsg_cb); 
+		//if ($output) print_info_box($output,$output2);
+		echo($output);
+		echo($output2);
+	?>
+    <br /><br />
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr><td class="tabnavtbl">
+<?php
+	$tab_array = array();
+	$tab_array[0] = array("IP-Blocklist", false, "ipblocklist.php");
+	$tab_array[1] = array("Settings", true, "settings.php");
+	$tab_array[2] = array("Whitelist", false, "whitelist.php");
+	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
+	$tab_array[4] = array("Help", false, "http://forum.pfsense.org/index.php/topic,24769.0.html");
+	$tab_array[5] = array("Email", false, "email.php");
+	display_top_tabs($tab_array);
+?>
+
+  </td></tr>
+  <tr> 
+    <td>
+	<div id="mainarea">
+        <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+       <tr> 
+	<td class="listhdrr">Settings</td>
+    
+	  </tr>
+      
+    <tr> 
+	<td class="listlr" valign="middle">
+    
+<?php
+
+conf_mount_rw();
+
+
+
+	if(isset($_POST['formSubmit'])) 
+    {
+		$aipblocklist = $_POST['formipblocklist'];
+	
+		if(isset($_POST['formOutbound'])) 
+        {
+			$output2 = " and Outbound access is BLOCKED.</b>";
+			exec("touch OUTBOUND");
+		} 
+        else 
+        {
+			$output2 = " and Outbound access is ALLOWED.</b>";
+			exec("rm OUTBOUND");
+		}
+		
+		if(isset($_POST['formlogging'])) 
+        {
+			exec("touch logging");
+		} 
+        else 
+        {
+			exec("rm logging");
+		}
+
+		
+		
+		
+	}
+conf_mount_ro();
+?>
+
+
+
+
+</head>
+
+
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+	<td >
+	
+
+	</form>
+	
+	<form action="<?php echo htmlentities($_SERVER['PHP_SELF']); ?>" method="post">
+	<p>
+    	<?php 
+		$countif = "interfaces.txt";
+		if (file_exists($countif)) {
+			$countif =  count(file($countif)); 
+			echo "$countlines"; 
+		} else {
+				echo "<span style='color:red'>Warning! No Interfaces Selected Click <a href='ipblocklist_if.php' target='_parent'><img src='../../themes/nervecenter/images/icons/icon_cablenic.gif' ALT='if'></a></span>";
+		}
+			
+		?>
+        </p>
+		
+      
+	<p>
+		Block outbound?
+<?php
+
+	if (file_exists("OUTBOUND")) {
+		echo "<input name='formOutbound' type='checkbox' value='Yes' checked/>";
+	} else {
+		echo "<input name='formOutbound' type='checkbox' value='Yes'/>";
+	}
+?>
+
+		<br>
+    Enable Logging?&nbsp;
+<?php
+
+	if (file_exists("logging")) {
+		echo "<input name='formlogging' type='checkbox' value='Yes' checked/>";
+	} else {
+		echo "<input name='formlogging' type='checkbox' value='Yes'/>";
+	}
+?>
+<br/>
+	
+
+
+
+
+	
+	
+	 
+	  </p>
+
+<br/>
+
+	
+
+</div>
+<?php
+	//This input guarantees that a POST is sent
+	echo "<input type='hidden' name='zzz' value='required'>";
+?>
+
+</td>
+</tr>
+</table>
+    </td>
+	  
+	 
+    </tr>
+   
+  
+</table>
+</div>
+<br />
+<input type="submit" name="formSubmit" value="Save" /><br><br>
+<p>
+</p>
+</td>
+	</tr>
+</table>
+</form>
+<?php include("fend.inc"); ?>
+</body>
+</html>
+
diff --git a/config/ipblocklist/whitelist.tmp b/config/ipblocklist/whitelist.tmp
index e45cf2dd..98745fa2 100644
--- a/config/ipblocklist/whitelist.tmp
+++ b/config/ipblocklist/whitelist.tmp
@@ -1,175 +1,175 @@
-<?php
-header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
-header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
-//$pgtitle = "Firewall: IPblo - Whitelist";
-	
-	require("guiconfig.inc");
-	include("head.inc");
-
-	//set the config as a global variable
-	global $config;
-
-	$global_usage = '/usr/local/www/packages/ipblocklist/global_usage';
-	//$fh = fopen($global_usage, 'r');
-
-	//phpinfo();
-	
-
-	
-
-
-	
-?>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?=$pgtitle?></p>
-<?php if ($input_errors) print_input_errors($input_errors); ?>
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<form method=POST action="">
-<?php
-
-
-//mwexec("touch countries-white.txt");
-//$myFile = "countries-white.txt";
-//$fh = fopen($myFile, 'a+');
-
-
-?>
-<br /><br />
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr><td class="tabnavtbl">
-<?php
-	$tab_array = array();
-	$tab_array[0] = array("IP-Blocklist", false, "ipblocklist.php");
-	$tab_array[1] = array("Settings", false, "settings.php");
-	$tab_array[2] = array("Whitelist", true, "whitelist.php");
-	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
-	$tab_array[4] = array("Help", false, "http://forum.pfsense.org/index.php/topic,24769.0.html");
-	$tab_array[5] = array("Email", false, "email.php");
-	display_top_tabs($tab_array);
-?>
-  </td></tr>
-  <tr> 
-    <td>
-	<div id="mainarea">
-        <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-       <tr> 
-	<td class="listhdrr">Whitelist</td>
-    
-	  </tr>
-      
-    <tr> 
-	<td class="listlr" valign="middle">
-  
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-
-<span style="color:red">White lists</span> - The lists added here will be added to a whitelist
-  <br/>Add List URL:
-
-	<p><form method="post" action="">
-<input name="content" type="text" />
-<input type="image" src="../../themes/nervecenter/images/icons/icon_plus.gif" value="submit">
-<a href="purgeip.php?line=0">Purge All</a>
-
-<STYLE type="text/css">
-   a img {border:none; }
- </STYLE>
-</head>
-
-<?php
-
-
-$myFile = "wlists.txt";
-$content = $_REQUEST['content'];
-$fh = fopen($myFile, 'a+');
-fwrite($fh, $content);
-if (strlen($content) > 1) {
-	fwrite($fh, "\n");
-	} else {
-}
-fclose($fh);
-
-
-//echo (filesize($myFile));
-if (filesize($myFile) > 1) {
-	//$fh = fopen($myFile, 'r');
-	//$theData = fread($fh, filesize($myFile));
-	//fclose($fh);
-	echo "<br/> Current List(s): <br/>";
-	// Get the whole file into a single string
-	$fileContents = file_get_contents($myFile);
- 
-	// Explode the file contents string by each line
-	$lines = explode(PHP_EOL, $fileContents); // Replace PHP_EOL with "\r\n" or "\n" or "\r" if you like
- 
-	// Iterate through each line and do what you need with it
-
-	foreach ($lines as $line) {
-	 $i++;
-	 echo "<a href=purgeip.php?line=$i style='border-style: none'><img src='../../themes/nervecenter/images/icons/icon_x.gif'></a>";
-	 echo " ";
-  	 echo $line;
-	 //echo "";
-       // echo $i;
-	 echo "<br/>";
-	 
-	}
-
-	
-	//echo $theData;
-
-
-}
-echo "<br/><br/>";
-
-
-
-
-?></p>
-
-	
-</form>
-
-
-</div>
-
-
-</td>
-</tr>
-</table>
-    </td>
-	  
-	 
-    </tr>
-   
-  
-</table>
-
-</div>
-<p> <u>Usage</u>
-	<br/>
-	Add direct link to list and press <img src="../../themes/nervecenter/images/icons/icon_plus.gif">
- 	(Example: 
-	<a href="http://iblocklist.whitacrecomputers.com/files/bt_level1.gz">Level1</a>,
-	<a href="http://iblocklist.whitacrecomputers.com/files/bt_level2.gz">Level2</a>,
-	<a href="http://iblocklist.whitacrecomputers.com/files/bt_level3.gz">Level3</a>)
-	<br/>
-	Compressed lists should have .gz extention and follows PeerBlock syntax	<br/>
-	  <br/>
-	  </p>
-<br>
-
-<br><br>
-
-<p>
-</p>
-</td>
-	</tr>
-</table>
-</form>
-<?php include("fend.inc"); ?>
-</body>
-</html>
-
+<?php
+header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
+header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
+//$pgtitle = "Firewall: IPblo - Whitelist";
+	
+	require("guiconfig.inc");
+	include("head.inc");
+
+	//set the config as a global variable
+	global $config;
+
+	$global_usage = '/usr/local/www/packages/ipblocklist/global_usage';
+	//$fh = fopen($global_usage, 'r');
+
+	//phpinfo();
+	
+
+	
+
+
+	
+?>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
+<?php if ($input_errors) print_input_errors($input_errors); ?>
+<?php if ($savemsg) print_info_box($savemsg); ?>
+<form method=POST action="">
+<?php
+
+
+//mwexec("touch countries-white.txt");
+//$myFile = "countries-white.txt";
+//$fh = fopen($myFile, 'a+');
+
+
+?>
+<br /><br />
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr><td class="tabnavtbl">
+<?php
+	$tab_array = array();
+	$tab_array[0] = array("IP-Blocklist", false, "ipblocklist.php");
+	$tab_array[1] = array("Settings", false, "settings.php");
+	$tab_array[2] = array("Whitelist", true, "whitelist.php");
+	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
+	$tab_array[4] = array("Help", false, "http://forum.pfsense.org/index.php/topic,24769.0.html");
+	$tab_array[5] = array("Email", false, "email.php");
+	display_top_tabs($tab_array);
+?>
+  </td></tr>
+  <tr> 
+    <td>
+	<div id="mainarea">
+        <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+       <tr> 
+	<td class="listhdrr">Whitelist</td>
+    
+	  </tr>
+      
+    <tr> 
+	<td class="listlr" valign="middle">
+  
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+
+<span style="color:red">White lists</span> - The lists added here will be added to a whitelist
+  <br/>Add List URL:
+
+	<p><form method="post" action="">
+<input name="content" type="text" />
+<input type="image" src="../../themes/nervecenter/images/icons/icon_plus.gif" value="submit">
+<a href="purgeip.php?line=0">Purge All</a>
+
+<STYLE type="text/css">
+   a img {border:none; }
+ </STYLE>
+</head>
+
+<?php
+
+
+$myFile = "wlists.txt";
+$content = $_REQUEST['content'];
+$fh = fopen($myFile, 'a+');
+fwrite($fh, $content);
+if (strlen($content) > 1) {
+	fwrite($fh, "\n");
+	} else {
+}
+fclose($fh);
+
+
+//echo (filesize($myFile));
+if (filesize($myFile) > 1) {
+	//$fh = fopen($myFile, 'r');
+	//$theData = fread($fh, filesize($myFile));
+	//fclose($fh);
+	echo "<br/> Current List(s): <br/>";
+	// Get the whole file into a single string
+	$fileContents = file_get_contents($myFile);
+ 
+	// Explode the file contents string by each line
+	$lines = explode(PHP_EOL, $fileContents); // Replace PHP_EOL with "\r\n" or "\n" or "\r" if you like
+ 
+	// Iterate through each line and do what you need with it
+
+	foreach ($lines as $line) {
+	 $i++;
+	 echo "<a href=purgeip.php?line=$i style='border-style: none'><img src='../../themes/nervecenter/images/icons/icon_x.gif'></a>";
+	 echo " ";
+  	 echo $line;
+	 //echo "";
+       // echo $i;
+	 echo "<br/>";
+	 
+	}
+
+	
+	//echo $theData;
+
+
+}
+echo "<br/><br/>";
+
+
+
+
+?></p>
+
+	
+</form>
+
+
+</div>
+
+
+</td>
+</tr>
+</table>
+    </td>
+	  
+	 
+    </tr>
+   
+  
+</table>
+
+</div>
+<p> <u>Usage</u>
+	<br/>
+	Add direct link to list and press <img src="../../themes/nervecenter/images/icons/icon_plus.gif">
+ 	(Example: 
+	<a href="http://iblocklist.whitacrecomputers.com/files/bt_level1.gz">Level1</a>,
+	<a href="http://iblocklist.whitacrecomputers.com/files/bt_level2.gz">Level2</a>,
+	<a href="http://iblocklist.whitacrecomputers.com/files/bt_level3.gz">Level3</a>)
+	<br/>
+	Compressed lists should have .gz extention and follows PeerBlock syntax	<br/>
+	  <br/>
+	  </p>
+<br>
+
+<br><br>
+
+<p>
+</p>
+</td>
+	</tr>
+</table>
+</form>
+<?php include("fend.inc"); ?>
+</body>
+</html>
+