[LON-CAPA-cvs] cvs: loncom /interface lonnavmaps.pm

Wed, 16 Nov 2005 21:09:33 -0000

albertel		Wed Nov 16 16:09:33 2005 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
  Log:
  - BUG# 4457 http headers were getting sent to early
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.347 loncom/interface/lonnavmaps.pm:1.348

--- loncom/interface/lonnavmaps.pm:1.347	Thu Nov 10 14:19:26 2005
+++ loncom/interface/lonnavmaps.pm	Wed Nov 16 16:09:33 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.347 2005/11/10 19:19:26 www Exp $
+# $Id: lonnavmaps.pm,v 1.348 2005/11/16 21:09:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -171,7 +171,6 @@
         &Apache::loncommon::content_type($r,'text/html');
     }
     &Apache::loncommon::no_cache($r);
-    $r->send_http_header;
 
     my %toplinkitems=();
     &add_linkitem(\%toplinkitems,'blank','',"Select Action");
@@ -194,6 +193,7 @@
 	     $navstatus
 MENU
 	}
+        $r->send_http_header;
 	my $html=&Apache::lonxml::xmlbegin();
 	$r->print(<<"ENDSUBM");
 	$html
@@ -209,7 +209,7 @@
 	<body bgcolor="#FFFFFF" onLoad="submitthis()"></body>
         </html>
 ENDSUBM
-        return;
+        return OK;
     }
     if ($ENV{QUERY_STRING} =~ /^launchExternal/) {
 	&Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
@@ -238,6 +238,7 @@
         $env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
         return HTTP_NOT_ACCEPTABLE;
     }
+    $r->send_http_header;
     my $html=&Apache::lonxml::xmlbegin();
     $r->print("$html<head>\n");
     $r->print("<title>".&mt('Navigate Course Contents')."</title>");



