2 files changed, 10 insertions, 40 deletions

diff --git a/web/nms.gathering.org/comment-add.pl b/web/nms.gathering.org/comment-add.pl
index 262d625..fd7e371 100755
--- a/web/nms.gathering.org/comment-add.pl
+++ b/web/nms.gathering.org/comment-add.pl
@@ -1,25 +1,20 @@
 #! /usr/bin/perl
-use CGI qw(fatalsToBrowser);
-use DBI;
+# vim:ts=8:sw=8
 use lib '../../include';
 use utf8;
-use nms;
+use nms::web;
 use strict;
 use warnings;
-use Data::Dumper;
 
-my $cgi = CGI->new;
-
-my $dbh = nms::db_connect();
-
-my $data = $dbh->quote($cgi->param('comment') || die );
-my $switch = $dbh->quote($cgi->param('switch') || die );
+my $data = db_safe_quote('comment');
+my $switch = db_safe_quote('switch');
 my $user = $dbh->quote($cgi->remote_user() || "undefined");
 
-
-my $q = $dbh->prepare("INSERT INTO switch_comments (time,username,switch,comment) values (now(),$user,(select switch from switches where sysname = $switch limit 1),$data)");
+my $q = $nms::web::dbh->prepare("INSERT INTO switch_comments (time,username,switch,comment) values (now(),$user,(select switch from switches where sysname = $switch limit 1),$data)");
 $q->execute();
 
-print $cgi->header(-type=>'text/json; charset=utf-8');
-print "{ 'state': 'ok' }";
+$nms::web::cc{'max-age'} = '0';
+$nms::web::cc{'stale-while-revalidate'} = '0';
+$nms::web::json{'state'} = 'ok';
 
+finalize_output();
diff --git a/web/nms.gathering.org/port-state.pl b/web/nms.gathering.org/port-state.pl
index e48e23a..f0efbf9 100755
--- a/web/nms.gathering.org/port-state.pl
+++ b/web/nms.gathering.org/port-state.pl
@@ -1,14 +1,10 @@
 #! /usr/bin/perl
 # vim:ts=8:sw=8
 
-use CGI qw(fatalsToBrowser);
-use DBI;
 use lib '../../include';
-use nms;
 use nms::web;
 use strict;
 use warnings;
-use Data::Dumper;
 
 my $query = 'select sysname,extract(epoch from date_trunc(\'second\',time)) as time, '.$nms::web::ifname.',ifhighspeed,ifhcinoctets,ifhcoutoctets from polls natural join switches where time in  (select max(time) from polls where ' . $nms::web::when . ' group by switch,ifname);';
 my $q = $nms::web::dbh->prepare($query);
@@ -22,24 +18,9 @@ while (my $ref = $q->fetchrow_hashref()) {
 	$nms::web::json{'switches'}{$ref->{'sysname'}}{'ports'}{$ref->{'ifname'}}{'time'} = $ref->{'time'};
 }
 
-my $q2 = $nms::web::dbh->prepare('select switch,sysname,placement,ip,switchtype,poll_frequency,community,last_updated from switches natural join placements');
 my $q3 = $nms::web::dbh->prepare('select distinct on (switch) switch,temp,time,sysname from switch_temp natural join switches where ' . $nms::web::when . ' order by switch,time desc');
 
-$q2->execute();
-while (my $ref = $q2->fetchrow_hashref()) {
-	$ref->{'placement'} =~ /\((-?\d+),(-?\d+)\),\((-?\d+),(-?\d+)\)/;
-	my ($x1, $y1, $x2, $y2) = ($1, $2, $3, $4);
-	my $sysname = $ref->{'sysname'};
-	$nms::web::json{'switches'}{$ref->{'sysname'}}{'switchtype'} = $ref->{'switchtype'};
-	$nms::web::json{'switches'}{$ref->{'sysname'}}{'management'}{'ip'} = $ref->{'ip'};
-	$nms::web::json{'switches'}{$ref->{'sysname'}}{'management'}{'poll_frequency'} = $ref->{'poll_frequency'};
-	$nms::web::json{'switches'}{$ref->{'sysname'}}{'management'}{'community'} = $ref->{'community'};
-	$nms::web::json{'switches'}{$ref->{'sysname'}}{'management'}{'last_updated'} = $ref->{'last_updated'};
-	$nms::web::json{'switches'}{$ref->{'sysname'}}{'placement'}{'x'} = $x2;
-	$nms::web::json{'switches'}{$ref->{'sysname'}}{'placement'}{'y'} = $y2;
-	$nms::web::json{'switches'}{$ref->{'sysname'}}{'placement'}{'width'} = $x1 - $x2;
-	$nms::web::json{'switches'}{$ref->{'sysname'}}{'placement'}{'height'} = $y1 - $y2;
-}
+
 $q3->execute();
 while (my $ref = $q3->fetchrow_hashref()) {
 	my $sysname = $ref->{'sysname'};
@@ -47,10 +28,4 @@ while (my $ref = $q3->fetchrow_hashref()) {
 	$nms::web::json{'switches'}{$ref->{'sysname'}}{'temp_time'} = $ref->{'time'};
 }
 
-my $q4 = $nms::web::dbh->prepare(' select linknet, (select sysname from switches where switch = switch1) as sysname1, addr1, (select sysname from switches where switch = switch2) as sysname2,addr2 from linknets');
-$q4->execute();
-while (my $ref = $q4->fetchrow_hashref()) {
-	$nms::web::json{'linknets'}{$ref->{'linknet'}} = $ref;
-}
-
 finalize_output();