[LON-CAPA-cvs] cvs: loncom /interface lonhtmlcommon.pm /lonnet/perl lonnet.pm

Thu, 05 Aug 2004 16:59:29 -0000

albertel		Thu Aug  5 12:59:29 2004 EDT

  Modified files:              
    /loncom/interface	lonhtmlcommon.pm 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - BUG#3270, speel thing was screwing up the ssi_body call
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.85 loncom/interface/lonhtmlcommon.pm:1.86

--- loncom/interface/lonhtmlcommon.pm:1.85	Tue Jul 27 19:35:34 2004
+++ loncom/interface/lonhtmlcommon.pm	Thu Aug  5 12:59:29 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.85 2004/07/27 23:35:34 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.86 2004/08/05 16:59:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -875,6 +875,7 @@
     my $nothing = &javascript_nothing();
     return (<<ENDCHECK);
 <script type="text/javascript"> 
+// BEGIN LON-CAPA Internal
 var checkwin;
 
 function spellcheckerwindow() {
@@ -882,6 +883,7 @@
     checkwin.document.writeln('<html><body bgcolor="#DDDDDD"><form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form></body></html>');
     checkwin.document.close();
 }
+// END LON-CAPA Internal
 </script>
 ENDCHECK
 }
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.524 loncom/lonnet/perl/lonnet.pm:1.525
--- loncom/lonnet/perl/lonnet.pm:1.524	Thu Jul 22 19:08:44 2004
+++ loncom/lonnet/perl/lonnet.pm	Thu Aug  5 12:59:29 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.524 2004/07/22 23:08:44 raeburn Exp $
+# $Id: lonnet.pm,v 1.525 2004/08/05 16:59:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1131,10 +1131,10 @@
     my ($filelink,%form)=@_;
     my $output=($filelink=~/^http\:/?&externalssi($filelink):
                                      &ssi($filelink,%form));
-    $output=~s/^.*?\<body[^\>]*\>//si;
-    $output=~s/(.*)\<\/body\s*\>.*?$/$1/si;
     $output=~
             s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs;
+    $output=~s/^.*?\<body[^\>]*\>//si;
+    $output=~s/(.*)\<\/body\s*\>.*?$/$1/si;
     return $output;
 }
 



