Hardcode theme to ipfire

[ipfire-2.x.git] / html / cgi-bin / remote.cgi

diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi
index 10d94fe99ba4759fbc7ac931cbf8e5aa7107f2b9..c76f5129ea862454eeaf41547600475487cdbe2d 100644 (file)
--- a/html/cgi-bin/remote.cgi
+++ b/html/cgi-bin/remote.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -28,7 +28,7 @@ use strict;
 use IO::Socket;
 
 require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/geoip-functions.pl";
+require "${General::swroot}/location-functions.pl";
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -40,7 +40,7 @@ my $errormessage='';
 my $counter = 0;
 
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
 
 &Header::showhttpheaders();
 
@@ -145,6 +145,11 @@ print <<END
        <td><input type='checkbox' name='ENABLE_SSH' $checked{'ENABLE_SSH'}{'on'} /></td>
        <td class='base' colspan='2'>$Lang::tr{'ssh access'}</td>
 </tr>
+<tr>
+       <td>&nbsp;</td>
+       <td><input type='checkbox' name='SSH_AGENT_FORWARDING' $checked{'SSH_AGENT_FORWARDING'}{'on'} /></td>
+       <td width='100%' class='base'>$Lang::tr{'ssh agent forwarding'}</td>
+</tr>
 <tr>
        <td>&nbsp;</td>
        <td><input type='checkbox' name='ENABLE_SSH_PORTFW' $checked{'ENABLE_SSH_PORTFW'}{'on'} /></td>
@@ -165,11 +170,6 @@ print <<END
        <td><input type='checkbox' name='SSH_PORT' $checked{'SSH_PORT'}{'on'} /></td>
        <td width='100%' class='base'>$Lang::tr{'ssh port'}</td>
 </tr>
-<tr>
-       <td>&nbsp;</td>
-       <td><input type='checkbox' name='SSH_AGENT_FORWARDING' $checked{'SSH_AGENT_FORWARDING'}{'on'} /></td>
-       <td width='100%' class='base'>$Lang::tr{'ssh agent forwarding'}</td>
-</tr>
 <tr>
        <td align='right' colspan='3'>
        <input type='submit' name='ACTION' value='$Lang::tr{'ssh tempstart15'}' />
@@ -185,7 +185,7 @@ print "</form>\n";
 
 &Header::openbox('100%', 'center', $Lang::tr{'ssh host keys'});
 
-print "<table class='tbl'>\n";
+print "<table class='tbl' width='100%'>\n";
 
 print <<END
 <thead>
@@ -213,7 +213,7 @@ print "</tbody>\n</table>\n";
 &Header::openbox('100%', 'center', $Lang::tr{'ssh active sessions'});
 
 print <<END;
-               <table class="tbl" width='66%'>
+               <table class="tbl" width="100%">
                        <thead>
                                <tr>
                                        <th align="center">
@@ -273,11 +273,10 @@ sub printactivelogins()
        if ( scalar(@output) == 0 )
        {
                # no logins appeared
-               my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'};
+               my $table_colour = ($id++ % 2) ? $color{'color20'} : $color{'color22'};
                print "<tr bgcolor='$table_colour'><td colspan='5'>$Lang::tr{'ssh no active logins'}</td></tr>\n";
        } else {
                # list active logins...
-
                foreach my $line (@output)
                {
                        my @arry = split(/\ +/, $line);
@@ -288,15 +287,15 @@ sub printactivelogins()
                        $remoteip =~ s/[()]//g;
 
                        # display more information about that IP adress...
-                       my $ccode = &GeoIP::lookup($remoteip);
-                       my $flag_icon = &GeoIP::get_flag_icon($ccode);
+                       my $ccode = &Location::Functions::lookup_country_code($remoteip);
+                       my $flag_icon = &Location::Functions::get_flag_icon($ccode);
 
                        # get rDNS...
                        my $iaddr = inet_aton($remoteip);
                        my $rdns = gethostbyaddr($iaddr, AF_INET);
-                       if (!$rdns) { $rdns = $Lang::tr{'lookup failed'}; };
+                       if (!$rdns) { $rdns = $Lang::tr{'ptr lookup failed'}; };
 
-                       my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'};
+                       my $table_colour = ($id++ % 2) ? $color{'color20'} : $color{'color22'};
 
                        print <<END;
                        <tr bgcolor='$table_colour'>