From: root <root@space>
Date: Wed, 4 Apr 2007 10:13:50 +0000 (+0200)
Subject: More TG06 merge/messups.
X-Git-Url: https://git.sesse.net/?p=nms;a=commitdiff_plain;h=695c9e23ff4269be48270335b2fcaf4e8a9dab9a

More TG06 merge/messups.
---

diff --git a/web/nettkart.pl b/web/nettkart.pl
index cab7a3b..89c63ea 100755
--- a/web/nettkart.pl
+++ b/web/nettkart.pl
@@ -31,7 +31,7 @@ if ($night) {
 	my $blank = $text_img->colorAllocateAlpha(0, 0, 0, 127);
 	$text_img->filledRectangle(0, 0, $text_img->width - 1, $text_img->height - 1, $blank);
 } else {
-	$img = GD::Image->new('snmp-bg.png');
+	$img = GD::Image->new('bg07.png');
 	$text_img = $img;
 }
 
@@ -53,7 +53,7 @@ $text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf",
 $text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*2.0/4.0, "1 Gbit/sec");
 $text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*3.0/4.0, "100 Mbit/sec");
 $text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*4.0/4.0, "10 Mbit/sec");
-$text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 1000, 620, "NMS (C) 2005-2006 Tech:Server");
+$text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 1000, 620, "NMS (C) 2005-2007 Tech:Server");
 
 my $q = $dbh->prepare('select * from switches natural join placements natural left join
 ( select switch,sum(bytes_in) as bytes_in,sum(bytes_out) as bytes_out from get_datarate() group
diff --git a/web/portkart.pl b/web/portkart.pl
index 10436fd..28e043f 100755
--- a/web/portkart.pl
+++ b/web/portkart.pl
@@ -24,7 +24,7 @@ $img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0,
 $img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*1.0/3.0, "100 Mbit/sec");
 $img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*2.0/3.0, "10 Mbit/sec");
 $img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*3.0/3.0, "1 Mbit/sec");
-$img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 1000, 620, "NMS (C) 2005-2006 Tech:Server");
+$img->stringFT($blk, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 1000, 620, "NMS (C) 2005-2007 Tech:Server");
 
 my $q = $dbh->prepare('select switch,port,bytes_in,bytes_out,placement,switchtype from switches natural join placements natural join get_datar
 ate() where switchtype in (\'es3024\')');