diff options
Diffstat (limited to 'lib/MasterWebInterface/Handler')
| -rwxr-xr-x | lib/MasterWebInterface/Handler/ErrorPages.pm | 4 | ||||
| -rwxr-xr-x | lib/MasterWebInterface/Handler/Games.pm | 9 | ||||
| -rwxr-xr-x | lib/MasterWebInterface/Handler/Json/JsonServerInfo.pm | 26 | ||||
| -rwxr-xr-x | lib/MasterWebInterface/Handler/Json/JsonServerList.pm | 17 | ||||
| -rwxr-xr-x | lib/MasterWebInterface/Handler/ServInfo.pm | 109 | ||||
| -rwxr-xr-x | lib/MasterWebInterface/Handler/Servers.pm | 28 |
6 files changed, 142 insertions, 51 deletions
diff --git a/lib/MasterWebInterface/Handler/ErrorPages.pm b/lib/MasterWebInterface/Handler/ErrorPages.pm index 1678acc..81e4091 100755 --- a/lib/MasterWebInterface/Handler/ErrorPages.pm +++ b/lib/MasterWebInterface/Handler/ErrorPages.pm @@ -31,7 +31,7 @@ sub handle404 } $self->resStatus(404); - $self->htmlHeader(title => '404 - Not Found'); + $self->htmlHeader(title => '404 - Not Found', meta_desc => "The page at this link was not found. Try the homepage and find it from there?"); $self->htmlFilterBox(title => "Servers", action => "/s", sel => 's', fq => ''); div class => "mainbox warning"; @@ -71,7 +71,7 @@ sub handle500 } $self->resStatus(500); - $self->htmlHeader(title => '500 - Internal Server Error'); + $self->htmlHeader(title => '500 - Internal Server Error', meta_desc => "Catastrophic failure. Try again later or ping the website admin."); $self->htmlFilterBox(title => "Servers", action => "/s", sel => 's', fq => ''); div class => "mainbox warning"; diff --git a/lib/MasterWebInterface/Handler/Games.pm b/lib/MasterWebInterface/Handler/Games.pm index cec7ab1..31090a2 100755 --- a/lib/MasterWebInterface/Handler/Games.pm +++ b/lib/MasterWebInterface/Handler/Games.pm @@ -7,7 +7,7 @@ use Exporter 'import'; TUWF::register( qr{g} => \&gamelist, - qr{g/all} => \&gamelist, + qr{g/(all)} => \&gamelist, ); # @@ -37,7 +37,7 @@ sub gamelist all => $all, ); - $self->htmlHeader(title => "Browse Games"); + $self->htmlHeader(title => "Browse Games", meta_desc => "Browse through all games that currently have servers online uplinking to the masterserver."); $self->htmlFilterBox(title => "Games", action => "/g/all", sel => 'g', fq => $f->{q}); # @@ -94,7 +94,10 @@ sub gamelist } else { - td $gn; + td class => "tc2 icon", + style => "background-image: url(/icon32/333networks.png);", + title => $gn, + ''; } # number of beacons / servers diff --git a/lib/MasterWebInterface/Handler/Json/JsonServerInfo.pm b/lib/MasterWebInterface/Handler/Json/JsonServerInfo.pm index a3b2d08..519017e 100755 --- a/lib/MasterWebInterface/Handler/Json/JsonServerInfo.pm +++ b/lib/MasterWebInterface/Handler/Json/JsonServerInfo.pm @@ -2,11 +2,14 @@ package MasterWebInterface::Handler::Json::JsonServerInfo; use strict; use TUWF ':html'; use Exporter 'import'; +use Socket; use JSON; TUWF::register( qr{json/([\w]{1,20})/(\w{4}:\w{4}:\w{4}:\w{4}:\w{4}:\w{4}:\w{4}:\w{4}):(\d{1,5})} => \&json_serverinfo, # ipv6 qr{json/([\w]{1,20})/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}):(\d{1,5})} => \&json_serverinfo, # ipv4 + qr{json/([\w]{1,20})/([\w\.]{3,63}):(\d{1,5})} => \&json_serverinfo, #domain name + ); # @@ -14,7 +17,16 @@ TUWF::register( # sub json_serverinfo { - my ($self, $gamename, $ip, $port) = @_; + my ($self, $gamename, $addr, $port) = @_; + + # domain name check + my $ip = $addr; + if ($addr =~ m/[a-z]/ig ) + { + # $addr holds a value that is a domain. try to resolve. + my $packed_ip = gethostbyname($ip); + $ip = inet_ntoa($packed_ip) if (defined $packed_ip); + } # select server from database my $info = $self->dbGetServerInfo( @@ -45,6 +57,11 @@ sub json_serverinfo for (my $i=0; defined $pl_list->[$i]->{name}; $i++) { + + # fix html "injection" (quick fix, ask Yorhel for better suited solution) + s/</</g for values %{$pl_list->[$i]}; + s/>/>/g for values %{$pl_list->[$i]}; + $players{"player_$i"} = $pl_list->[$i]; } @@ -53,6 +70,9 @@ sub json_serverinfo # find the correct thumbnail, otherwise game default, otherwise 333 default my $mapname = lc $info->{mapname}; + + # FIXME + $info->{debug_map_path} = "$self->{root}/s/map/$info->{gamename}/$mapname.jpg"; # if map figure exists, use it if (-e "$self->{root}/s/map/$info->{gamename}/$mapname.jpg") @@ -72,6 +92,10 @@ sub json_serverinfo # 333networks default $info->{mapurl} = "/map/default/333networks.jpg"; } + + # fix html "injection" (quick fix, ask Yorhel for better suited solution) + s/</</g for values %{$info}; + s/>/>/g for values %{$info}; # response as json data $self->resJSON($info); diff --git a/lib/MasterWebInterface/Handler/Json/JsonServerList.pm b/lib/MasterWebInterface/Handler/Json/JsonServerList.pm index e108066..d02455f 100755 --- a/lib/MasterWebInterface/Handler/Json/JsonServerList.pm +++ b/lib/MasterWebInterface/Handler/Json/JsonServerList.pm @@ -21,10 +21,16 @@ sub serverlist_json { get => 's', required => 0, default => 'gamename', enum => [qw|hostname gamename country added gametype numplayers mapname|] }, { get => 'o', required => 0, default => 'a', enum => ['a','d'] }, { get => 'p', required => 0, default => 1, template => 'page' }, - { get => 'r', required => 0, default => 100, template => 'page' }, + { get => 'r', required => 0, default => 50, template => 'page' }, { get => 'q', required => 0, default => '', maxlength => 90 }, { get => 'g', required => 0, default => '', maxlength => 90 }, { get => 'a', required => 0, default => '', maxlength => 200 }, + + #{ get => 'gamename', required => 0, default => '', maxlength => 90 }, # gamename in advanced search + { get => 'gametype', required => 0, default => '', maxlength => 90 }, # gametype + { get => 'hostname', required => 0, default => '', maxlength => 90 }, # hostname (replaces q in advanced search) + { get => 'mapname', required => 0, default => '', maxlength => 90 }, # mapname + { get => 'country', required => 0, default => '', maxlength => 90 }, # country (code) ); # allow all outside sources to access the json api @@ -56,13 +62,20 @@ sub serverlist_json # parse extra request parameters for ubrowser.333networks.com ($f->{a} =~ m/popserv/ig) ? (popserv => 1) : (), ($f->{a} =~ m/utdemo/ig) ? (utdemo => 1) : (), + + gametype => $f->{gametype}, + hostname => $f->{hostname}, + mapname => $f->{mapname}, + country => $f->{country}, ); # get total number of players in selected page(s) my $pl = 0; for (@{$list}) { - $pl += $_->{numplayers} + $pl += $_->{numplayers}; + s/</</g for values %{$_}; + s/>/>/g for values %{$_}; } # response as json data diff --git a/lib/MasterWebInterface/Handler/ServInfo.pm b/lib/MasterWebInterface/Handler/ServInfo.pm index 8b3d7d8..e22b4a6 100755 --- a/lib/MasterWebInterface/Handler/ServInfo.pm +++ b/lib/MasterWebInterface/Handler/ServInfo.pm @@ -2,6 +2,7 @@ package MasterWebInterface::Handler::ServInfo; use strict; use warnings; use utf8; +use Socket; use TUWF ':html'; use POSIX 'strftime'; use Exporter 'import'; @@ -9,15 +10,25 @@ use Exporter 'import'; TUWF::register( qr{([\w]{1,20})/(\w{4}:\w{4}:\w{4}:\w{4}:\w{4}:\w{4}:\w{4}:\w{4}):(\d{1,5})} => \&show_server, #ipv6 qr{([\w]{1,20})/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}):(\d{1,5})} => \&show_server, #ipv4 + qr{([\w]{1,20})/([\w\.]{3,63}):(\d{1,5})} => \&show_server, #domain name ); - + # # Display server information # ################################################################################ sub show_server { - my ($self, $gamename, $ip, $port) = @_; + my ($self, $gamename, $addr, $port) = @_; + + # domain name check + my $ip = $addr; + if ($addr =~ m/[a-z]/ig ) + { + # $addr holds a value that is a domain. try to resolve. + my $packed_ip = gethostbyname($ip); + $ip = inet_ntoa($packed_ip) if (defined $packed_ip); + } # select server from database my $info = $self->dbGetServerInfo( @@ -43,8 +54,13 @@ sub show_server return; } + # meta data + my $img = (-e "$self->{root}/s/map/default/$gamename.jpg") + ? "/map/default/$gamename.jpg" : "/map/default/333networks.jpg"; + my $desc = "It seems the server you were looking for does not exist in our database, perhaps our search function may yield results? You tried to access ".($ip // "[no ip]")." in $gamename."; + # otherwise not found in database, soft error page (no 404 status) - $self->htmlHeader(title => 'Server not found'); + $self->htmlHeader(title => 'Server not found', meta_desc => $desc, meta_img => $img); $self->htmlFilterBox( sel => 's', fq => '', @@ -66,11 +82,20 @@ sub show_server p; txt "You tried to access "; - span class => "hilit", $ip // "[no ip]"; + span class => "hilit"; + txt ($addr // ""); + if ($addr =~ m/[a-z]/ig ) + { + txt " ("; + txt ($ip // "[no ip]"); + txt ")"; + } + end; txt " in "; span class => "hilit", $gamename; txt "."; end; + end; end; $self->htmlFooter; @@ -83,10 +108,50 @@ sub show_server # info exists. sanity checks $gamename = $info->{gamename} // $gamename; my $gamedescription = $self->dbGetGameDesc($info->{gamename}) // $info->{gamename}; + + my $mapfig = "/map/default/333networks.jpg"; + my $mapfile = lc ($info->{mapname} // ""); + + # some games may be merged gamename-wise + my $gamenamedir = ($gamename =~ m/mohaa/) ? "mohaa" : $gamename; + + # if map figure exists, use it + if (-e "$self->{root}/s/map/$gamenamedir/$mapfile.jpg") + { + # map image + $mapfig = "/map/$gamenamedir/$mapfile.jpg"; + } + # if not, game default image + elsif (-e "$self->{root}/s/map/default/$gamename.jpg") + { + # game image + $mapfig = "/map/default/$gamename.jpg"; + } + # otherwise 333networks default + else + { + # 333networks default + $mapfig = "/map/default/333networks.jpg"; + } + + # map title/name (not lowercase) + my $mapname = $info->{mapname} // $info->{maptitle} // "Untitled"; + my $maptitle = ( $info->{maptitle} && lc $info->{maptitle} ne "untitled" ) + ? $info->{maptitle} : $mapname; + + + my ($flag, $country) = $self->countryflag($info->{country} // ""); + + #meta description + my $desc = "Address: ". ($info->{ip} // "0.0.0.0"). ":" . ($info->{hostport} // 0) . " ($country) + Players: ". ($info->{numplayers} // 0) ."/". ($info->{maxplayers} // 0) ." + GameType: " . ($info->{gametype} // "") . " + Map: $maptitle"; # # generate info page - $self->htmlHeader(title => $info->{hostname} // "Server"); + $self->htmlHeader(title => $info->{hostname} // "Server", meta_img => $mapfig, meta_desc => $desc); + $self->htmlFilterBox( gamename => $gamename, sel => 's', @@ -133,34 +198,6 @@ sub show_server # find the correct thumbnail, otherwise game default, otherwise 333 default div class => "thumbnail"; - my $mapfig = "/map/default/333networks.jpg"; - my $mapfile = lc ($info->{mapname} // ""); - - # if map figure exists, use it - if (-e "$self->{root}/s/map/$gamename/$mapfile.jpg") - { - # map image - $mapfig = "/map/$gamename/$mapfile.jpg"; - } - # if not, game default image - elsif (-e "$self->{root}/s/map/default/$gamename.jpg") - { - # game image - $mapfig = "/map/default/$gamename.jpg"; - } - # otherwise 333networks default - else - { - # 333networks default - $mapfig = "/map/default/333networks.jpg"; - } - - # map title/name (not lowercase) - my $mapname = $info->{mapname} // $info->{maptitle} // "Untitled"; - my $maptitle = ( $info->{maptitle} && lc $info->{maptitle} ne "untitled" ) - ? $info->{maptitle} - : $mapname; - img src => $mapfig, alt => $mapfig, title => $mapname; @@ -235,8 +272,6 @@ sub show_server # location data Tr; td class => "wc1", "Location:"; - - my ($flag, $country) = $self->countryflag($info->{country} // ""); td; img class => "flag", src => "/flag/$flag.svg"; txt " ". $country; @@ -381,6 +416,7 @@ sub show_server end; end; } + end; # playerinfo # disable stats that are considered irrelevant. can be re-enabled with "if (1)" @@ -448,6 +484,8 @@ sub show_server ($self->{site_url} . "/json/" . $gamename . "/" . ($info->{ip} // "0.0.0.0") . ":" . ($info->{hostport} // 0) ); end; + if (0) # disable PNG banners because perfomance issues + { Tr; th; txt "Server Banner:"; @@ -457,6 +495,7 @@ sub show_server a href => ($self->{site_url} . "/png/" . $gamename . "/" . ( $info->{ip} // "0.0.0.0" ) . ":" . ($info->{hostport} // 0)), ($self->{site_url} . "/png/" . $gamename . "/" . ( $info->{ip} // "0.0.0.0" ) . ":" . ($info->{hostport} // 0)); end; + } end; end; # mainbox details diff --git a/lib/MasterWebInterface/Handler/Servers.pm b/lib/MasterWebInterface/Handler/Servers.pm index 34c0182..f1c50d2 100755 --- a/lib/MasterWebInterface/Handler/Servers.pm +++ b/lib/MasterWebInterface/Handler/Servers.pm @@ -13,9 +13,11 @@ TUWF::register( # # Generate a list of selected games in the database per game (arg: gamename) # -sub serverlist +sub serverlist { my($self, $adv, $gamename) = @_; + $adv = "s" unless $adv; + $gamename = "all" unless $gamename; # sorting, page my $f = $self->formValidate( @@ -54,8 +56,14 @@ sub serverlist !($gamename eq "333networks" or $f->{gamename} eq "333networks") ? ( nolist => "333networks") : (), ); + # meta data + my $img = (-e "$self->{root}/s/map/default/$gamename.jpg") + ? "/map/default/$gamename.jpg" : "/map/default/333networks.jpg"; + my $label = $self->dbGetGameDesc($gamename) // ""; + my $desc = "There are $p $label servers currently listed online."; + # Write page - $self->htmlHeader(title => "Servers"); + $self->htmlHeader(title => "$label Serverlist", meta_desc => $desc, meta_img => $img); # search box type: simple or advanced if ($adv eq 'adv') @@ -118,10 +126,10 @@ sub serverlist # country flag # TODO: advanced filter by country only - my ($flag, $country) = $self->countryflag($l->{country}); + my ($flag, $country) = $self->countryflag($l->{country} // ""); td class => "tc1", style => "background-image: url(/flag/$flag.svg);", - title => $country, + title => $country // "", ''; # server name (and defaults) @@ -145,14 +153,18 @@ sub serverlist } else { - td $gn; + td class => "tc3 icon", + style => "background-image: url(/icon32/333networks.png);", + title => $l->{label}; + a href => "/$adv/$gn", ""; + end; } # game type (hover: raw, display: parsed) # TODO: advanced filter by gametype only td class => "tc4", - title => $l->{gametype}, - $self->better_gametype($l->{gametype}); + title => $l->{gametype} // "", + $self->better_gametype($l->{gametype} // ""); # number of players / maximum players td class => "tc5"; @@ -162,7 +174,7 @@ sub serverlist end; # map title/name - my $maplabel = ($l->{maptitle} && lc $l->{maptitle} ne "untitled" ? $l->{maptitle} : $l->{mapname}); + my $maplabel = ($l->{maptitle} && lc $l->{maptitle} ne "untitled" ? $l->{maptitle} : $l->{mapname} // ""); td class => "tc6", title => $maplabel // "---", $maplabel // "---"; end; }, |