proxy.cgi: Correctly validate domain lists

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / country.cgi

diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi
index a1cf24347396fcdd50a5b75465154ad6a2ea6dac..30111dc21757439db90c73126d40884c8e5fb093 100644 (file)
--- a/html/cgi-bin/country.cgi
+++ b/html/cgi-bin/country.cgi
@@ -21,8 +21,6 @@
 
 use strict;
 
-use Locale::Codes::Country;
-
 my $col;
 my $lines = '1';
 my $lines2 = '';
@@ -32,6 +30,8 @@ require "${General::swroot}/location-functions.pl";
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
+require "${General::swroot}/location-functions.pl";
+
 &Header::showhttpheaders();
 
 &Header::openpage($Lang::tr{'countries'}, 1, '');
@@ -53,7 +53,7 @@ print<<END;
 END
 
 # Get a list of all supported country codes.
-my @countries = Locale::Codes::Country::all_country_codes();
+my @countries = &Location::Functions::get_locations();
 
 # Loop through whole country list.
 foreach my $country (@countries) {
@@ -96,10 +96,17 @@ foreach my $country (@countries) {
 print "</table>";
 &Header::closebox();
 
-&Header::closebigbox();
+print <<END
+<div align='center'>
+<table width='80%'>
+<tr>
+       <td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td>
+</tr>
+</table>
+</div>
+END
+;
 
-print "<div style='text-align:center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></div>\n";
+&Header::closebigbox();
 
 &Header::closepage();
-
-