From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Fri, 12 Jun 2020 16:51:03 +0000 (+0200)
Subject: ovpnmain.cgi: Use location-functions.pl
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2e270e1dbc249128c15c1c00e9dd23357e7bcee;p=people%2Fms%2Fipfire-2.x.git

ovpnmain.cgi: Use location-functions.pl

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 23bbf40757..457ebcf1f9 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -35,7 +35,7 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 require "${General::swroot}/countries.pl";
-require "${General::swroot}/geoip-functions.pl";
+require "${General::swroot}/location-functions.pl";
 
 # enable only the following on debugging purpose
 #use warnings;
@@ -2995,7 +2995,7 @@ END
     &Header::openbox('100%', 'LEFT', $Lang::tr{'ovpn con stat'});
 
     # Libloc database handle.
-    my $libloc_db_handle = &GeoIP::init();
+    my $libloc_db_handle = &Location::Functions::init();
 
 #
 #	<td><b>$Lang::tr{'protocol'}</b></td>
@@ -3047,8 +3047,8 @@ END
 		    $users[$uid]{'Proto'} = $proto;
 
 		    # get country code for "RealAddress"...
-		    my $ccode = &GeoIP::lookup_country_code($libloc_db_handle, (split ':', $users[$uid]{'RealAddress'})[0]);
-		    my $flag_icon = &GeoIP::get_flag_icon($ccode);
+		    my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, (split ':', $users[$uid]{'RealAddress'})[0]);
+		    my $flag_icon = &Location::Functions::get_flag_icon($ccode);
 		    $users[$uid]{'Country'} = "<a href='country.cgi#$ccode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode' /></a>";
 		    $uid++;
 		}