--- loncom/xml/lonxml.pm	2009/05/28 17:08:43	1.496
+++ loncom/xml/lonxml.pm	2009/10/15 21:12:51	1.500
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.496 2009/05/28 17:08:43 bisitz Exp $
+# $Id: lonxml.pm,v 1.500 2009/10/15 21:12:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -757,6 +757,8 @@ sub init_safespace {
 		  '&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');
@@ -1041,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;
@@ -1544,12 +1546,16 @@ sub renderingoptions {
                        = &Apache::loncommon::plainlanguagedescription($_);
         }
     }
-    return
-       '<span class="LC_nobreak">'.
-       &mt('Language:').' '.
-       &Apache::loncommon::select_form($env{'form.languages'},'languages',
-                                                     %langchoices).'
-     </span>
+    my $output;
+    unless ($env{'form.forceedit'}) {
+       $output .= '  
+           <span class="LC_nobreak">'.
+           &mt('Language:').' '.
+           &Apache::loncommon::select_form($env{'form.languages'},'languages',
+                                           %langchoices).'
+           </span>';
+    }
+    $output .= '
      <span class="LC_nobreak">'.
        &mt('Math Rendering:').' '.
        &Apache::loncommon::select_form($env{'form.texengine'},'texengine',
@@ -1558,6 +1564,7 @@ sub renderingoptions {
                                                       'jsMath' => 'jsMath',
                                                       'mimetex' => 'mimetex (Convert to Images)')).'
      </span>';
+    return $output;
 }
 
 sub inserteditinfo {
@@ -1704,6 +1711,21 @@ sub handler {
 	$request->set_last_modified(&Apache::lonnet::metadata($request->uri,
 							      'lastrevisiondate'));
     }
+    # Embedded Flash movies 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;
@@ -1835,13 +1857,16 @@ ENDNOTFOUND
 		('add_entries' =>
                    {'onresize'     => $add_to_onresize,
                     'onload'       => $add_to_onload,   });
-
-         $options{'bread_crumbs'} = [{
-                        'href' => &Apache::loncommon::authorspace(),
-                        'text' => 'Construction Space'},
-                       {'href' => '',
-                        'text' => 'HTML Editor'}];
-
+            my $header;
+            if ($env{'request.state'} eq 'construct') {
+                $options{'bread_crumbs'} = [{
+                            'href' => &Apache::loncommon::authorspace(),
+                            'text' => 'Construction Space'},
+                           {'href' => '',
+                            'text' => 'HTML Editor'}];
+                $header = &Apache::loncommon::head_subbox(
+                              &Apache::loncommon::CSTR_pageheader());
+            }
 	    if ($env{'environment.remote'} ne 'off') {
 		$options{'bgcolor'}   = '#FFFFFF';
 		$options{'only_body'} = 1;
@@ -1852,8 +1877,7 @@ ENDNOTFOUND
 	    my $start_page = &Apache::loncommon::start_page(undef,$js,
 							    \%options);
             $result = $start_page
-                     .&Apache::loncommon::head_subbox(
-                          &Apache::loncommon::CSTR_pageheader())
+                     .$header
                      .&Apache::lonxml::message_location()
                      .$edit_info
                      .&Apache::loncommon::end_page();