Merge.

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

index bae9511e84dbc267f4fbac1672b7318d6fe0707d..5e0fbdce5e3fd901305a3c6350fc4eaf91ceb56a 100755 (executable)
--- a/web/sshow.pl
+++ b/web/sshow.pl
@@ -74,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>
@@ -110,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 {