aboutsummaryrefslogtreecommitdiffstats
path: root/config/countryblock
diff options
context:
space:
mode:
Diffstat (limited to 'config/countryblock')
-rw-r--r--config/countryblock/countryblock.inc2
-rw-r--r--config/countryblock/countryblock.xml7
-rw-r--r--config/countryblock/countryblock_IPBlocklist.widget.tmp153
-rw-r--r--config/countryblock/countryblock_ipblocklist_widget.tmp116
4 files changed, 116 insertions, 162 deletions
diff --git a/config/countryblock/countryblock.inc b/config/countryblock/countryblock.inc
index 6aca3a91..64c1f4cc 100644
--- a/config/countryblock/countryblock.inc
+++ b/config/countryblock/countryblock.inc
@@ -64,8 +64,6 @@ function php_install_command_cb()
//rename PHP files from .tmp to .php
exec("cp /tmp/countryblock_IPBlocklist.widget.tmp /usr/local/www/widgets/widgets/countryblock_IPBlocklist.widget.php");
unlink_if_exists("/tmp/countryblock_IPBlocklist.widget.tmp");
- exec("cp /tmp/countryblock_ipblocklist_widget.tmp /usr/local/www/countryblock_ipblocklist_widget.php");
- unlink_if_exists("/tmp/ccountryblock_ipblocklist_widget.tmp");
exec("cp /tmp/class.phpmailer.tmp /usr/local/www/packages/countryblock/class.phpmailer.php");
unlink_if_exists("/tmp/class.phpmailer.tmp ");
diff --git a/config/countryblock/countryblock.xml b/config/countryblock/countryblock.xml
index 6e2ec635..1d278d20 100644
--- a/config/countryblock/countryblock.xml
+++ b/config/countryblock/countryblock.xml
@@ -166,14 +166,9 @@
</additional_files_needed>
<additional_files_needed>
<prefix>/tmp/</prefix>
- <chmod>0755</chmod>
+ <chmod>0644</chmod>
<item>http://www.pfsense.org/packages/config/countryblock/countryblock_IPBlocklist.widget.tmp</item>
</additional_files_needed>
- <additional_files_needed>
- <prefix>/tmp/</prefix>
- <chmod>0755</chmod>
- <item>http://www.pfsense.org/packages/config/countryblock/countryblock_ipblocklist_widget.tmp</item>
- </additional_files_needed>
<fields>
<field>
<fielddescr>Variable One</fielddescr>
diff --git a/config/countryblock/countryblock_IPBlocklist.widget.tmp b/config/countryblock/countryblock_IPBlocklist.widget.tmp
index e81f1a55..a62fcede 100644
--- a/config/countryblock/countryblock_IPBlocklist.widget.tmp
+++ b/config/countryblock/countryblock_IPBlocklist.widget.tmp
@@ -1,39 +1,116 @@
-<script type="text/javascript">
-
- function Ajax()
- {
- var
- $http,
- $self = arguments.callee;
-
- if (window.XMLHttpRequest) {
- $http = new XMLHttpRequest();
- } else if (window.ActiveXObject) {
- try {
- $http = new ActiveXObject('Msxml2.XMLHTTP');
- } catch(e) {
- $http = new ActiveXObject('Microsoft.XMLHTTP');
- }
- }
-
- if ($http) {
- $http.onreadystatechange = function()
- {
- if (/4|^complete$/.test($http.readyState)) {
- document.getElementById('ReloadThis').innerHTML = $http.responseText;
- setTimeout(function(){$self();}, 10000);
- }
- };
- $http.open('GET', '/countryblock_ipblocklist_widget.php');
- $http.send(null);
- }
-
- }
-
-</script>
-
- <script type="text/javascript">
- setTimeout(function() {Ajax();}, 10000);
- </script>
- <div id="ReloadThis">Ajax Loading...</div>
+<?php
+/*
+ Copyright 2011 Thomas Schaefer - Tomschaefer.org
+ Part of pfSense widgets (www.pfsense.com)
+ 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.
+*/
+
+$nocsrf = true;
+
+@require_once("guiconfig.inc");
+@require_once("pfsense-utils.inc");
+@require_once("functions.inc");
+
+$ipblocklist_file = "/usr/local/www/packages/ipblocklist/ipblocklist.php";
+$countryblock_file = "/usr/local/www/packages/countryblock/countryblock.php";
+
+echo "<table style=\"padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px\" width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"";
+echo" <tr>";
+if (file_exists($ipblocklist_file)) {
+ echo " <td class=\"listhdrr\">IP-Blocklist";
+ ob_start();
+ $results = exec("/sbin/pfctl -s rules | grep -c ipblocklist");
+ ob_end_clean();
+ if ($results > '2') echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_up.gif'>";
+ else
+ echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_down.gif'>";
+ echo "</td>";
+}
+if (file_exists($countryblock_file)) {
+ echo " <td class=\"listhdrr\">Countryblock";
+ ob_start();
+ $results = exec("/sbin/pfctl -s rules | grep -c countryblock");
+ ob_end_clean();
+ if ($results > '0') echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_up.gif'>";
+ else
+ echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_down.gif'>";
+ echo "</td>";
+}
+echo" </tr>";
+echo" <tr>";
+if (file_exists($ipblocklist_file)) {
+ echo " <td class=\"listlr\">";
+ ob_start();
+ $resultsIP = exec("/sbin/pfctl -T show -t ipblocklist |grep -v -c Z");
+ ob_end_clean();
+ echo $resultsIP;
+ echo " Networks";
+ echo "</td>";
+}
+if (file_exists($countryblock_file)) {
+ echo " <td class=\"listr\">";
+ ob_start();
+ $resultsCB = exec("pfctl -T show -t countryblock |grep -v -c Z");
+ ob_end_clean();
+ echo $resultsCB;
+ echo " Networks";
+ echo "</td>";
+}
+echo" </tr>";
+echo" <tr>";
+if (file_exists($ipblocklist_file)) {
+ ob_start();
+ $resultsIP = exec("tail -r /usr/local/www/packages/ipblocklist/errorOUT.txt");
+ ob_end_clean();
+ if ($resultsIP == "") {
+ echo " <td></td>";
+ } else {
+ echo " <td class=\"listlr\">";
+ echo "<br/><span style='color:red'>";
+ echo $resultsIP;
+ echo "</span>";
+ echo "</td>";
+ }
+}
+if (file_exists($countryblock_file)) {
+ ob_start();
+ $resultsCB = exec("tail -r /usr/local/www/packages/countryblock/errorOUT.txt");
+ ob_end_clean();
+ if ($resultsCB == "") {
+ echo " <td></td>";
+ } else {
+ echo " <td class=\"listlr\">";
+ echo "<br/><span style='color:red'>";
+ echo $resultsCB;
+ echo "</span>";
+ echo "</td>";
+ }
+}
+echo" </tr>";
+//echo" <tr>";
+//if (file_exists($ipblocklist_file)) echo " <td>&nbsp;</td>";
+//if (file_exists($countryblock_file)) echo " <td>&nbsp;</td>";
+//echo" </tr>";
+echo"</table>";
+
+?>
diff --git a/config/countryblock/countryblock_ipblocklist_widget.tmp b/config/countryblock/countryblock_ipblocklist_widget.tmp
deleted file mode 100644
index d8d0f780..00000000
--- a/config/countryblock/countryblock_ipblocklist_widget.tmp
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/*
- Copyright 2011 Thomas Schaefer - Tomschaefer.org
- Part of pfSense widgets (www.pfsense.com)
-
- 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.
-*/
-
-$nocsrf = true;
-
-@require_once("guiconfig.inc");
-@require_once("pfsense-utils.inc");
-@require_once("functions.inc");
-
-$ipblocklist_file = "/usr/local/www/packages/ipblocklist/ipblocklist.php";
-$countryblock_file = "/usr/local/www/packages/countryblock/countryblock.php";
-
-echo "<table style=\"padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px\" width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"";
-echo" <tr>";
-if (file_exists($ipblocklist_file)) {
- echo " <td class=\"listhdrr\">IP-Blocklist";
- ob_start();
- $results = exec("/sbin/pfctl -s rules | grep -c ipblocklist");
- ob_end_clean();
- if ($results > '2') echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_up.gif'>";
- else
- echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_down.gif'>";
- echo "</td>";
-}
-if (file_exists($countryblock_file)) {
- echo " <td class=\"listhdrr\">Countryblock";
- ob_start();
- $results = exec("/sbin/pfctl -s rules | grep -c countryblock");
- ob_end_clean();
- if ($results > '0') echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_up.gif'>";
- else
- echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_down.gif'>";
- echo "</td>";
-}
-echo" </tr>";
-echo" <tr>";
-if (file_exists($ipblocklist_file)) {
- echo " <td class=\"listlr\">";
- ob_start();
- $resultsIP = exec("/sbin/pfctl -T show -t ipblocklist |grep -v -c Z");
- ob_end_clean();
- echo $resultsIP;
- echo " Networks";
- echo "</td>";
-}
-if (file_exists($countryblock_file)) {
- echo " <td class=\"listr\">";
- ob_start();
- $resultsCB = exec("pfctl -T show -t countryblock |grep -v -c Z");
- ob_end_clean();
- echo $resultsCB;
- echo " Networks";
- echo "</td>";
-}
-echo" </tr>";
-echo" <tr>";
-if (file_exists($ipblocklist_file)) {
- ob_start();
- $resultsIP = exec("tail -r /usr/local/www/packages/ipblocklist/errorOUT.txt");
- ob_end_clean();
- if ($resultsIP == "") {
- echo " <td></td>";
- } else {
- echo " <td class=\"listlr\">";
- echo "<br/><span style='color:red'>";
- echo $resultsIP;
- echo "</span>";
- echo "</td>";
- }
-}
-if (file_exists($countryblock_file)) {
- ob_start();
- $resultsCB = exec("tail -r /usr/local/www/packages/countryblock/errorOUT.txt");
- ob_end_clean();
- if ($resultsCB == "") {
- echo " <td></td>";
- } else {
- echo " <td class=\"listlr\">";
- echo "<br/><span style='color:red'>";
- echo $resultsCB;
- echo "</span>";
- echo "</td>";
- }
-}
-echo" </tr>";
-//echo" <tr>";
-//if (file_exists($ipblocklist_file)) echo " <td>&nbsp;</td>";
-//if (file_exists($countryblock_file)) echo " <td>&nbsp;</td>";
-//echo" </tr>";
-echo"</table>";
-
-?> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 19:26:34 +0000