From 593c32275adf2b5bc7a887ad1d14350863ee57e4 Mon Sep 17 00:00:00 2001
From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 4 Jan 2015 01:03:21 +0100
Subject: [PATCH] Move "sub get_geoip_locations" to firewall-lib.

---
 config/firewall/firewall-lib.pl | 33 +++++++++++++++++++++
 html/cgi-bin/geoip-block.cgi    | 51 ++++++++++-----------------------
 2 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl
index f3cd67fb09..3fa702f354 100755
--- a/config/firewall/firewall-lib.pl
+++ b/config/firewall/firewall-lib.pl
@@ -552,4 +552,37 @@ sub get_internal_firewall_ip_address
 	return 0;
 }
 
+sub get_geoip_locations() {
+	# Path to the directory which contains the binary geoip
+	# databases.
+	my $directory="/usr/share/xt_geoip/LE";
+
+	# Array to store the final country list.
+	my @country_codes = ();
+
+	# Open location and do a directory listing.
+	opendir(DIR, "$directory");
+	my @locations = readdir(DIR);
+	closedir(DIR);
+
+	# Loop through the directory listing, and cut of the file extensions.
+	foreach my $location (sort @locations) {
+		# skip . and ..
+		next if($location =~ /^\.$/);
+		next if($location =~ /^\.\.$/);
+
+		# Remove whitespaces.
+		chomp($location);
+
+		# Cut-off file extension.
+		my ($contry_code, $extension) = split(/\./, $location);
+
+		# Add country code to array.
+		push(@contry_codes, $contry_code);
+	}
+
+	# Return final array.
+	return @country_codes;
+}
+
 return 1;
diff --git a/html/cgi-bin/geoip-block.cgi b/html/cgi-bin/geoip-block.cgi
index eb18719192..f973351cb6 100644
--- a/html/cgi-bin/geoip-block.cgi
+++ b/html/cgi-bin/geoip-block.cgi
@@ -33,6 +33,7 @@ my $flagdir = "/srv/web/ipfire/html/images/flags";
 # File extension of the country flags.
 my $extension = "png";
 
+my $notice;
 my $settingsfile = "${General::swroot}/firewall/geoipblock";
 
 my %color = ();
@@ -52,7 +53,7 @@ my %cgiparams = ();
 &Header::getcgihash(\%cgiparams);
 
 # Call subfunction to get all available locations.
-my @locations = &get_geoip_locations();
+my @locations = &fwlib::get_geoip_locations();
 
 if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
 	# Check if we want to disable geoipblock.
@@ -75,13 +76,23 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
 
 	&General::writehash("$settingsfile", \%settings);
 
-#	&General::firewall_config_changed();
-#
-#	$notice = $Lang::tr{'p2p block save notice'};
+	# Mark the firewall config as changed.
+	&General::firewall_config_changed();
+
+	# Assign reload notice. We directly can use
+	# the notice from p2p block.
+	$notice = $Lang::tr{'p2p block save notice'};
 }
 
 &Header::openpage($Lang::tr{'geoipblock configuration'}, 1, '');
 
+# Print notice that a firewall reload is required.
+if ($notice) {
+	&Header::openbox('100%', 'left', $Lang::tr{'notice'});
+	print "<font class='base'>$notice</font>";
+	&Header::closebox();
+}
+
 # Checkbox pre-selection.
 my $checked;
 if ($settings{'GEOIPBLOCK_ENABLED'} eq "on") {
@@ -258,35 +269,3 @@ print"</form>\n";
 
 &Header::closebigbox();
 &Header::closepage();
-
-sub get_geoip_locations() {
-	# Path to the directory which contains the binary geoip
-	# databases.
-	my $directory="/usr/share/xt_geoip/BE";
-
-	# Array with the final contry codes list.
-	my @contry_codes;
-
-	# Open location and do a directory listing.
-	opendir(DIR, "$directory");
-	my @locations = readdir(DIR);
-	closedir(DIR);
-
-	# Loop through the directory listing, and cut of the file extensions.
-	foreach my $location (sort @locations) {	
-		# skip . and ..
-		next if($location =~ /^\.$/);
-		next if($location =~ /^\.\.$/);
-
-		# Remove whitespaces.
-		chomp($location);
-
-		# Cut-off file extension.
-		my ($contry_code, $extension) = split(/\./, $location);
-
-		# Add country code to array.
-		push(@contry_codes, $contry_code);
-	}
-
-	return @contry_codes;
-}
-- 
2.39.2