--- loncom/xml/lonxml.pm	2009/02/18 06:43:55	1.491
+++ loncom/xml/lonxml.pm	2009/07/08 17:55:16	1.498
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.491 2009/02/18 06:43:55 raeburn Exp $
+# $Id: lonxml.pm,v 1.498 2009/07/08 17:55:16 bisitz 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) {
@@ -1551,6 +1568,7 @@ sub inserteditinfo {
       my $xml_help = '';
       my $initialize='';
       my $textarea_id = 'filecont';
+      my $dragmath_button;
       my ($add_to_onload, $add_to_onresize);
       $initialize=&Apache::lonhtmlcommon::spellheader();
       if ($filetype eq 'html' 
@@ -1588,6 +1606,10 @@ FULLPAGE
     }
 </script>
 FULLPAGE
+          if ($filetype eq 'html') {
+              $initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup');
+              $dragmath_button = &Apache::lonhtmlcommon::dragmath_button('filecont',1);
+          }
       }
 
       $add_to_onload = 'initDocument();';
@@ -1627,7 +1649,7 @@ $initialize
     <div class="LC_edit_problem_discards">
       <input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
       <input type="submit" name="Undo" accesskey="u" value="$lt{'un'}" />
-      $spelllink $htmlerror
+      $dragmath_button $spelllink $htmlerror
     </div>
     <div class="LC_edit_problem_saves">
       <input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
@@ -1674,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');
@@ -1692,11 +1713,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.
 #
@@ -1715,17 +1737,22 @@ sub handler {
     if ($filecontents eq -1) {
 	my $start_page=&Apache::loncommon::start_page('File Error');
 	my $end_page=&Apache::loncommon::end_page();
-	my $fnf=&mt('File not found');
+        my $errormsg='<p class="LC_error">'
+                    .&mt('File not found: [_1]'
+                        ,'<span class="LC_filename">'.$file.'</span>')
+                    .'</p>';
 	$result=(<<ENDNOTFOUND);
 $start_page
-<b>$fnf: $file</b>
+$errormsg
 $end_page
 ENDNOTFOUND
         $filecontents='';
 	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
@@ -1741,28 +1768,57 @@ 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') {
-		my $controls =
-		    ($env{'request.state'} eq 'construct') ? &Apache::londefdef::edit_controls()
-		                                           : '';
-		my %options = ('bgcolor' => '#FFFFFF');
-		$result = 
-		    &Apache::loncommon::start_page(undef,undef,\%options).
-		    $controls.
-		    $result.
-		    &Apache::loncommon::end_page();
-	    }
-	}
+            if ($filetype ne 'html') {
+                my $nochgview = 1; 
+                my $controls = '';
+                    if ($env{'request.state'} eq 'construct') {
+                        $controls = &Apache::loncommon::head_subbox(
+                                        &Apache::loncommon::CSTR_pageheader()
+                                       .&Apache::londefdef::edit_controls($nochgview));
+                    }
+                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 $brcrum;
+                    if ($env{'request.state'} eq 'construct') {
+                        $brcrum = [{'href' => &Apache::loncommon::authorspace(),
+                                    'text' => 'Construction Space'},
+                                   {'href' => '',
+                                    'text' => 'Editor'}];
+                    } else {
+                        $brcrum = ''; # FIXME: Where are we?
+                    }
+                    my %options = ('bread_crumbs' => $brcrum,
+                                   'bgcolor'      => '#FFFFFF');
+                    $result =
+                        &Apache::loncommon::start_page(undef,undef,\%options)
+                       .$controls
+                       .$result
+                       .&Apache::loncommon::end_page();
+                } else {
+                    $result = $controls.$result;
+                }
+            }
+        }
     }
 
 #
@@ -1779,8 +1835,14 @@ ENDNOTFOUND
 
 	    my %options = 
 		('add_entries' =>
-                   {'onresize' => $add_to_onresize,
-		    'onload'   => $add_to_onload,   });
+                   {'onresize'     => $add_to_onresize,
+                    'onload'       => $add_to_onload,   });
+
+         $options{'bread_crumbs'} = [{
+                        'href' => &Apache::loncommon::authorspace(),
+                        'text' => 'Construction Space'},
+                       {'href' => '',
+                        'text' => 'HTML Editor'}];
 
 	    if ($env{'environment.remote'} ne 'off') {
 		$options{'bgcolor'}   = '#FFFFFF';
@@ -1791,11 +1853,13 @@ ENDNOTFOUND
 		&Apache::loncommon::resize_textarea_js();
 	    my $start_page = &Apache::loncommon::start_page(undef,$js,
 							    \%options);
-	    $result=$start_page.
-		&Apache::lonxml::message_location().
-		$edit_info.
-		&Apache::loncommon::end_page();
-	}
+            $result = $start_page
+                     .&Apache::loncommon::head_subbox(
+                          &Apache::loncommon::CSTR_pageheader())
+                     .&Apache::lonxml::message_location()
+                     .$edit_info
+                     .&Apache::loncommon::end_page();
+        }
     }
     if ($filetype eq 'html') { &writeallows($request->uri); }