--- loncom/xml/lonxml.pm	2009/04/13 20:15:44	1.492
+++ loncom/xml/lonxml.pm	2009/10/04 03:40:13	1.494.4.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.492 2009/04/13 20:15:44 raeburn Exp $
+# $Id: lonxml.pm,v 1.494.4.2 2009/10/04 03:40:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -109,6 +109,7 @@ use Apache::lonfeedback();
 use Apache::lonmsg();
 use Apache::loncacc();
 use Apache::lonmaxima();
+use Apache::lonr();
 use Apache::lonlocal;
 
 #====================================   Main subroutine: xmlparse  
@@ -755,6 +756,13 @@ sub init_safespace {
   $safehole->wrap(\&Apache::lonmaxima::maxima_cas_formula_fix,$safeeval,
 		  '&maxima_cas_formula_fix');
 
+  $safehole->wrap(\&Apache::lonr::r_eval,$safeeval,'&r_eval');
+  $safehole->wrap(\&Apache::lonr::Rentry,$safeeval,'&Rentry');
+  $safehole->wrap(\&Apache::lonr::Rarray,$safeeval,'&Rarray');
+  $safehole->wrap(\&Apache::lonr::r_check,$safeeval,'&r_check');
+  $safehole->wrap(\&Apache::lonr::r_cas_formula_fix,$safeeval,
+                  '&r_cas_formula_fix');
+ 
   $safehole->wrap(\&Apache::caparesponse::capa_formula_fix,$safeeval,
 		  '&capa_formula_fix');
 
@@ -1035,7 +1043,7 @@ sub get_id {
     my ($parstack,$safeeval)=@_;
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
     if ($env{'request.state'} eq 'construct' && $id =~ /([._]|[^\w\d\s[:punct:]])/) {
-	&error(&mt("ID &quot;[_1]&quot; contains invalid characters, IDs are only allowed to contain letters, numbers, spaces and -",'<tt>'.$id.'</tt>'));
+	&error(&mt("ID [_1] contains invalid characters, IDs are only allowed to contain letters, numbers, spaces and -",'<tt>'.$id.'</tt>'));
     }
     if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
     return $id;
@@ -1504,6 +1512,15 @@ SIMPLECONTENT
   return $filecontents;
 }
 
+sub createnewjs {
+    my $filecontents=(<<SIMPLECONTENT);
+<script type="text/javascript" language="Javascript">
+
+</script>
+SIMPLECONTENT
+    return $filecontents;
+}
+
 sub verify_html {
     my ($filecontents)=@_;
     if ($filecontents!~/(?:\<|\&lt\;)(?:html|xml)[^\<]*(?:\>|\&gt\;)/is) {
@@ -1679,9 +1696,8 @@ sub get_target {
 
 sub handler {
     my $request=shift;
-    
+
     my $target=&get_target();
-    
     $Apache::lonxml::debug=$env{'user.debug'};
     
     &Apache::loncommon::content_type($request,'text/html');
@@ -1690,6 +1706,21 @@ sub handler {
 	$request->set_last_modified(&Apache::lonnet::metadata($request->uri,
 							      'lastrevisiondate'));
     }
+    # Embedded Flash movies (e.g., from Camtasia) served from https will not display in IE
+    #   if XML config file has expired from cache.
+    if ($ENV{'SERVER_PORT'} == 443) {
+        if ($request->uri =~ /\.xml$/) {
+            my ($httpbrowser,$clientbrowser) =
+                &Apache::loncommon::decode_user_agent($request);
+            if ($clientbrowser =~ /^explorer$/i) {
+                delete $request->headers_out->{'Cache-control'};
+                delete $request->headers_out->{'Pragma'};
+                my $expiration = time + 60;
+                my $date=strftime("%a, %d %b %Y %H:%M:%S GMT",gmtime($expiration));
+                $request->headers_out->set("Expires" => $date);
+            }
+        }
+    }
     $request->send_http_header;
     
     return OK if $request->header_only;
@@ -1697,11 +1728,12 @@ sub handler {
 
     my $file=&Apache::lonnet::filelocation("",$request->uri);
     my $filetype;
-    if ($file =~ /\.sty$/) {
-	$filetype='sty';
+    if ($file =~ /\.(sty|css|js|txt)$/) {
+	$filetype=$1;
     } else {
 	$filetype='html';
     }
+
 #
 # Edit action? Save file.
 #
@@ -1730,7 +1762,9 @@ ENDNOTFOUND
 	if ($env{'request.state'} ne 'published') {
 	    if ($filetype eq 'sty') {
 		$filecontents=&createnewsty();
-	    } else {
+            } elsif ($filetype eq 'js') {
+                $filecontents=&createnewjs();
+            } elsif (($filetype ne 'css') && ($filetype ne 'txt')) {
 		$filecontents=&createnewhtml();
 	    }
 	    $env{'form.editmode'}='Edit'; #force edit mode
@@ -1746,27 +1780,43 @@ ENDNOTFOUND
 						    ['editmode']);
 	}
 	if (!$env{'form.editmode'} || $env{'form.viewmode'} || $env{'form.discardview'}) {
-	    &Apache::structuretags::reset_problem_globals();
-	    $result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
-						'',%mystyle);
+            if ($filetype eq 'html' || $filetype eq 'sty') {
+	        &Apache::structuretags::reset_problem_globals();
+	        $result = &Apache::lonxml::xmlparse($request,$target,
+                                                    $filecontents,'',%mystyle);
 	    # .html files may contain <problem> or <Task> need to clean
 	    # up if it did
-	    &Apache::structuretags::reset_problem_globals();
-	    &Apache::lonhomework::finished_parsing();
+	        &Apache::structuretags::reset_problem_globals();
+	        &Apache::lonhomework::finished_parsing();
+            } else {
+                $result = $filecontents;
+            }
 	    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 						    ['rawmode']);
 	    if ($env{'form.rawmode'}) { $result = $filecontents; }
-	    if ($filetype eq 'sty') {
+	    if ($filetype ne 'html') {
+                my $nochgview = 1; 
 		my $controls =
-		    ($env{'request.state'} eq 'construct') ? &Apache::londefdef::edit_controls()
+		    ($env{'request.state'} eq 'construct') ? &Apache::londefdef::edit_controls($nochgview)
 		                                           : '';
-		my %options = ('bgcolor' => '#FFFFFF');
-		$result = 
-		    &Apache::loncommon::start_page(undef,undef,\%options).
-		    $controls.
-		    $result.
-		    &Apache::loncommon::end_page();
-	    }
+                if ($filetype ne 'sty') {
+                    $result =~ s/</&lt;/g;
+                    $result =~ s/>/&gt;/g;
+                    $result = '<table class="LC_sty_begin">'.
+                              '<tr><td><b><pre>'.$result.
+                              '</pre></b></td></tr></table>';
+                }
+                if ($env{'environment.remote'} eq 'off') {
+                    my %options = ('bgcolor' => '#FFFFFF');
+		    $result = 
+		        &Apache::loncommon::start_page(undef,undef,\%options).
+		        $controls.
+		        $result.
+		        &Apache::loncommon::end_page();
+                } else {
+                    $result = $controls.$result;
+                }
+            }
 	}
     }
 
@@ -1800,7 +1850,7 @@ ENDNOTFOUND
 		&Apache::lonxml::message_location().
 		$edit_info.
 		&Apache::loncommon::end_page();
-	}
+        }
     }
     if ($filetype eq 'html') { &writeallows($request->uri); }