aboutsummaryrefslogtreecommitdiffstats
path: root/config/countryblock/countryblock.tmp
diff options
context:
space:
mode:
authorTom Schaefer <tom@tomschaefer.org>2011-01-31 13:39:26 -0500
committerTom Schaefer <tom@tomschaefer.org>2011-01-31 13:41:37 -0500
commit7c61cec6833ae3c9dcb6a8105ef75af35a785016 (patch)
treedb4c15f8748b4be5d4aa8a13463cbba85e67249b /config/countryblock/countryblock.tmp
parent686faeab1a7aac13e992b4b3d9d3bd2d4ea727dd (diff)
downloadpfsense-packages-7c61cec6833ae3c9dcb6a8105ef75af35a785016.tar.gz
pfsense-packages-7c61cec6833ae3c9dcb6a8105ef75af35a785016.tar.bz2
pfsense-packages-7c61cec6833ae3c9dcb6a8105ef75af35a785016.zip
Update to be independant of countryipblocks site to relieve bandwidth
Diffstat (limited to 'config/countryblock/countryblock.tmp')
-rw-r--r--[-rwxr-xr-x]config/countryblock/countryblock.tmp57
1 files changed, 54 insertions, 3 deletions
diff --git a/config/countryblock/countryblock.tmp b/config/countryblock/countryblock.tmp
index 605b0d3a..94fffcc3 100755..100644
--- a/config/countryblock/countryblock.tmp
+++ b/config/countryblock/countryblock.tmp
@@ -41,7 +41,9 @@ if (count($_POST)>0) {
exec("mkdir lists");
foreach ($lines as $line) {
//echo("fetch -o lists http://www.countryipblocks.net/e_country_data/{$line}_cidr.txt");
- exec("fetch -o lists/temp http://www.countryipblocks.net/e_country_data/{$line}_cidr.txt");
+ //Fetch countries from server
+ exec("fetch -o lists/temp http://127.0.0.1//packages/countryblock/CIDR/{$line}_cidr.txt");
+ //exec("fetch -o lists/temp http://www.countryipblocks.net/e_country_data/{$line}_cidr.txt");
exec("cat lists/temp >> lists/countries.txt");
$filename = basename($line);
//Extract list
@@ -80,7 +82,7 @@ if (count($_POST)>0) {
<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="">
@@ -304,7 +306,7 @@ background-color: #F3F3F3;
?>
- of 246 selected. </h3><input type="checkbox" name="checkall" onClick="checkUncheckAll(this);"/>select/unselect
+ of 252 selected. </h3><input type="checkbox" name="checkall" onClick="checkUncheckAll(this);"/>select/unselect
<br/>
@@ -639,6 +641,14 @@ ob_end_clean();
echo "<li><input name='formCountry[]' type='checkbox' value='BO' checked/>Bolivia</li>";
else
echo "<li><input name='formCountry[]' type='checkbox' value='BO' />Bolivia</li>";
+
+ob_start();
+$results = exec("cat countries.txt | grep BQ");
+ob_end_clean();
+ if ($results == 'BQ')
+ echo "<li><input name='formCountry[]' type='checkbox' value='BQ' checked/>Bonaire, Saint Eustatius and Saba</li>";
+ else
+ echo "<li><input name='formCountry[]' type='checkbox' value='BQ' />Bonaire, Saint Eustatius and Saba</li>";
ob_start();
$results = exec("cat countries.txt | grep BA");
@@ -868,6 +878,15 @@ ob_end_clean();
echo "<li><input name='formCountry[]' type='checkbox' value='CU' checked/>Cuba</li>";
else
echo "<li><input name='formCountry[]' type='checkbox' value='CU' />Cuba</li>";
+
+ob_start();
+$results = exec("cat countries.txt | grep CW");
+ob_end_clean();
+ if ($results == 'CW')
+ echo "<li><input name='formCountry[]' type='checkbox' value='CW' checked/>Curacao</li>";
+ else
+ echo "<li><input name='formCountry[]' type='checkbox' value='CW' />Curacao</li>";
+
ob_start();
$results = exec("cat countries.txt | grep CY");
@@ -1361,6 +1380,14 @@ ob_end_clean();
echo "<li><input name='formCountry[]' type='checkbox' value='JP' checked/>Japan</li>";
else
echo "<li><input name='formCountry[]' type='checkbox' value='JP' />Japan</li>";
+
+ob_start();
+$results = exec("cat countries.txt | grep JE");
+ob_end_clean();
+ if ($results == 'JE')
+ echo "<li><input name='formCountry[]' type='checkbox' value='JE' checked/>Jersey</li>";
+ else
+ echo "<li><input name='formCountry[]' type='checkbox' value='JE' />Jersey</li>";
ob_start();
$results = exec("cat countries.txt | grep JO");
@@ -2013,6 +2040,14 @@ ob_end_clean();
<ul class="categoryitems">
<?php
ob_start();
+$results = exec("cat countries.txt | grep BL");
+ob_end_clean();
+ if ($results == 'BL')
+ echo "<li><input name='formCountry[]' type='checkbox' value='BL' checked/>Saint Barthelemy</li>";
+ else
+ echo "<li><input name='formCountry[]' type='checkbox' value='BL' />Saint Barthelemy</li>";
+
+ob_start();
$results = exec("cat countries.txt | grep SH");
ob_end_clean();
if ($results == 'SH')
@@ -2035,6 +2070,14 @@ ob_end_clean();
echo "<li><input name='formCountry[]' type='checkbox' value='LC' checked/>Saint Lucia</li>";
else
echo "<li><input name='formCountry[]' type='checkbox' value='LC' />Saint Lucia</li>";
+
+ob_start();
+$results = exec("cat countries.txt | grep MF");
+ob_end_clean();
+ if ($results == 'MF')
+ echo "<li><input name='formCountry[]' type='checkbox' value='MF' checked/>Saint Martin</li>";
+ else
+ echo "<li><input name='formCountry[]' type='checkbox' value='MF' />Saint Martin</li>";
ob_start();
$results = exec("cat countries.txt | grep PM");
@@ -2123,6 +2166,14 @@ ob_end_clean();
echo "<li><input name='formCountry[]' type='checkbox' value='SG' checked/>Singapore</li>";
else
echo "<li><input name='formCountry[]' type='checkbox' value='SG' />Singapore</li>";
+
+ob_start();
+$results = exec("cat countries.txt | grep SX");
+ob_end_clean();
+ if ($results == 'SX')
+ echo "<li><input name='formCountry[]' type='checkbox' value='SX' checked/>Sint Maarten</li>";
+ else
+ echo "<li><input name='formCountry[]' type='checkbox' value='SX' />Sint Maarten</li>";
ob_start();
$results = exec("cat countries.txt | grep SK");