From ea7d739ac1634e1f055b701e21d4121ee28047c9 Mon Sep 17 00:00:00 2001
From: Darkelarious <darkelarious@333networks.com>
Date: Sun, 5 Nov 2017 13:30:44 +0100
Subject: support for Rune map thumbnails

---
 CHANGELOG                                       | 3 +++
 README                                          | 1 +
 lib/MasterWebInterface/Handler/ServInfo.pm      | 8 ++++++--
 lib/MasterWebInterface/Handler/Tools/Version.pm | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 66d859b..3beb2be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,9 @@ AUTHOR
   darkelarious@333networks.com
 
 CHANGELOG
+3.0.2
+  * support for rune map thumbnails
+
 3.0.1 - 27 Sep 2017
   * do not display blacklisted servers in serverlists
   * show colored tags for direct uplinks, blacklisted- and passworded servers
diff --git a/README b/README
index 2464563..d5dc115 100755
--- a/README
+++ b/README
@@ -30,6 +30,7 @@ REQUIREMENTS
       DBI
       DBD::Pg / DBD::SQLite / DBD::mysql
       IP::Country::Fast
+      Image::Size
       TUWF (http://dev.yorhel.nl/tuwf)
 
 INSTALL
diff --git a/lib/MasterWebInterface/Handler/ServInfo.pm b/lib/MasterWebInterface/Handler/ServInfo.pm
index 3987e8c..8adf8c9 100755
--- a/lib/MasterWebInterface/Handler/ServInfo.pm
+++ b/lib/MasterWebInterface/Handler/ServInfo.pm
@@ -94,8 +94,12 @@ sub show_server {
         
         # get prefix and mapname
         my $mapname = lc $info->{mapname};
-        my ($pre,$post) = $mapname =~ /^(DM|CTF\-BT|BT|CTF|DOM|AS|JB|TO|SCR|MH)-(.*)/i;
-        my $prefix = ($pre ? uc $pre : "other");        
+        my ($pre,$post);
+           ($pre,$post) = $mapname =~ /^(DM|CTF\-BT|BT|CTF|DOM|AS|JB|TO|SCR|MH)-(.*)/i if ($info->{gamename} eq "ut");
+           ($pre,$post) = $mapname =~ /^(as|ar|coop|coop\d+|ctt|dk|dm|hb|nd)-(.*)/i    if ($info->{gamename} eq "rune");
+
+        $pre =~ s/(coop\d+)/coop/i;
+        my $prefix = ($pre ? uc $pre : "other");
         
         # if map figure exists, use it
         if (-e "$self->{map_dir}/$info->{gamename}/$prefix/$mapname.jpg") {
diff --git a/lib/MasterWebInterface/Handler/Tools/Version.pm b/lib/MasterWebInterface/Handler/Tools/Version.pm
index db306a1..5a9c9cd 100755
--- a/lib/MasterWebInterface/Handler/Tools/Version.pm
+++ b/lib/MasterWebInterface/Handler/Tools/Version.pm
@@ -30,8 +30,8 @@ sub version {
     p "This MasterServer Interface has the following version information:";
     table;
       Tr; td "build_type";    td "333networks Masterserver Web Interface ";end;
-      Tr; td "build_version"; td "3.0.1";end;
-      Tr; td "build_date";    td "2017-09-27";end;
+      Tr; td "build_version"; td "3.0.2";end;
+      Tr; td "build_date";    td "2017-11-05";end;
       Tr; td "build_author";  td "Darkelarious, darkelarious\@333networks.com";end;
     end;    
     
-- 
cgit v1.2.3