--- monshow.orig	Wed Dec  5 12:54:14 2001
+++ monshow	Tue Mar 19 09:59:37 2002
@@ -69,6 +69,19 @@
 
 my ($DEP, $GROUP, $SERVICE, $STATUS, $TIME, $NEXT, $ALERTS, $SUMMARY, $DESC);
 
+my $CGI;
+my %QUERY_ARGS;
+if (defined $ENV{"REQUEST_METHOD"})
+{
+    unless ($CGI = new CGI)
+    {
+    	$CGI = 1;
+	err_die ("Can't create CGI object\n");
+    }
+    @ARGV = ()
+}
+
+
 # Untaint args, tainting is just for stuff which comes from CGI.
 for (@ARGV) {
     /(.*)/s or die;
@@ -82,16 +95,6 @@
 
 @ARGV == 0 || usage "No non-switch args expected\n";
 
-my $CGI;
-my %QUERY_ARGS;
-if (defined $ENV{"REQUEST_METHOD"})
-{
-    unless ($CGI = new CGI)
-    {
-    	$CGI = 1;
-	err_die ("Can't create CGI object\n");
-    }
-}
 
 if (!$CGI && $opt{"help"})
 {
