Merge.

[nms] / web / sshow.pl
diff --git a/web/sshow.pl b/web/sshow.pl

index a16da779d0285e22b17b259e40f9a6b66045734b..5e0fbdce5e3fd901305a3c6350fc4eaf91ceb56a 100755 (executable)
--- a/web/sshow.pl
+++ b/web/sshow.pl
@@ -1,20 +1,11 @@
  #!/usr/bin/perl
  use lib '../include';
  use nms;
-#
-#
-
-my $username = '';
-my $password = 'removed';
-
-# Seconds to wait for connection
-my $timeout = 15;
  
  use warnings;
  use strict;
  use Switch;
  use CGI;
-use Net::Telnet;
  use DBI;
  
  # Grab from .htaccess-authentication
@@ -83,7 +74,7 @@ WHERE gid = ?::text::int")
  
  my $cgi = new CGI;
  
-print $cgi->header(-type=>'text/html');
+print $cgi->header(-type=>'text/html; charset=utf-8');
  
  print << "EOF";
  <html>
@@ -119,9 +110,6 @@ if (defined($cgi->param('agid'))) {
         my $gid = $cgi->param('gid');
         if (!defined($gid)) {
                 print "<font color=\"red\">Du har ikke valgt en gid å slette.</font>\n";
-       }
-       if ($cgi->param('agid') eq 'Disable') {
-               $sdisablegid->execute($gid);
                 print "<p>gid: ".$cgi->param('gid')." har blitt disablet.\n";
         }
         else {