--- loncom/xml/scripttag.pm	2006/03/23 23:47:56	1.135
+++ loncom/xml/scripttag.pm	2007/01/23 21:28:41	1.140
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.135 2006/03/23 23:47:56 albertel Exp $
+# $Id: scripttag.pm,v 1.140 2007/01/23 21:28:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,7 +82,7 @@ sub end_LONCAPA_INTERNAL_TURN_STYLE_OFF
 
 sub start_LONCAPA_INTERNAL_LONHTTPD_PORT {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
 	if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
 	return '<script type="text/javascript">var lonhttpdport=\''.
@@ -116,7 +116,7 @@ sub start_script {
 	    ($env{'form.answer_output_mode'} ne 'tex') &&
 	    ($Apache::lonhomework::viewgrades == 'F')) {
 	    $Apache::lonxml::evaluate--;
-	    my (undef,undef,$udom,$uname)=&Apache::lonxml::whichuser();
+	    my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
 	    my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
 	    my $start_page =
 		&Apache::loncommon::start_page('Script Vars', undef,
@@ -126,6 +126,8 @@ sub start_script {
 	    my $end_page =
 		&Apache::loncommon::end_page({'js_ready' => 1,});
 
+	    $uname =~s/\W//g;
+	    $udom  =~s/\W//g;
 	    $result.="<script type=\"text/javascript\">
 // <![CDATA[
     function LONCAPA_scriptvars_".$uname."_".$udom."_"."$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>";
@@ -133,7 +135,7 @@ sub start_script {
 	    $listing=~s/\\/\\\\/g;
 	    $listing=~s/\'/\\\'/g;
 	    $result.=$listing;
-	    $result.= "</pre>$end_page');newWindow.document.close();newWindow.focus()}
+	    $result.= "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
 // ]]>
 </script><a href=\"javascript:LONCAPA_scriptvars_".$uname."_".$udom."_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />";
 	}
@@ -222,7 +224,7 @@ sub start_scriptlib {
 
   if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
       $target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
-      $target eq 'analyze') {
+      $target eq 'analyze' || $target eq 'webgrade') {
     $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
     $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
 				     $$parstack[$#$parstack]);
@@ -268,7 +270,7 @@ sub start_parserlib {
   my $error='';
   if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
       $target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
-      $target eq 'analyze') {
+      $target eq 'analyze' || $target eq 'webgrade') {
     $bodytext=$$parser[$#$parser]->get_text("/parserlib");
     $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
 				     $$parstack[$#$parstack]);
@@ -309,7 +311,7 @@ sub end_parserlib {
 sub start_window {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	&Apache::lonxml::startredirection;
     } elsif ($target eq 'tex') {
 	$result = '\unskip\footnote{';
@@ -331,7 +333,7 @@ sub start_window {
 sub end_window {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;
-  if ($target eq 'web') {
+  if ($target eq 'web' || $target eq 'webgrade') {
     my $output=&Apache::lonxml::endredirection;
     $output =~ s/[\n\r]/ /g;
 #    $output = &HTML::Entities::encode($output,'<>&"\'');
@@ -350,7 +352,15 @@ sub end_window {
 					'js_ready'  => 1,});
     my $end_page =
 	&Apache::loncommon::end_page({'js_ready' => 1,});
-    $result = "<script type=\"text/javascript\"> function LONCAPA_newwindow_$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=$width,height=$height,scrollbars=1');newWindow.document.open('text/html','replace');newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();}</script><a href=\"javascript:LONCAPA_newwindow_$Apache::lonxml::curdepth();void(0);\">$linktext</a>";
+    $result = "<script type=\"text/javascript\">
+//<!--
+ function LONCAPA_newwindow_$Apache::lonxml::curdepth() {
+newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1');
+newWindow.".&Apache::lonhtmlcommon::javascript_docopen().";
+newWindow.document.writeln('$start_page $output $end_page');
+newWindow.document.close();}
+//-->
+</script><a href=\"javascript:LONCAPA_newwindow_$Apache::lonxml::curdepth();void(0);\">$linktext</a>";
   } elsif ($target eq 'tex') {
       $result = '}';
   } else {
@@ -456,7 +466,7 @@ sub end_physnet {
 sub start_standalone {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  if ($target eq 'web' ) {
+  if ($target eq 'web' || $target eq 'webgrade') {
     if ( $env{'request.course.id'} ) {
       my $inside = &Apache::lonxml::get_all_text("/standalone",$parser,$style);
     } else {
@@ -469,7 +479,7 @@ sub start_standalone {
 sub end_standalone {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  if ($target eq 'web' ) {
+  if ($target eq 'web' || $target eq 'webgrade' ) {
     if ( $env{'request.course.id'} ) {
     } else {
       $result='</td></tr></table>';
@@ -487,8 +497,9 @@ sub start_comment {
     $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4)
   } elsif ( $target eq 'modified') {
     $result=$token->[4].&Apache::edit::modifiedfield("/comment",$parser);
-  } elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
-	    $target eq 'answer' || $target eq 'meta' || $target eq 'analyze') {
+  } elsif ( $target eq 'web'    || $target eq 'tex'  || $target eq 'grade'   ||
+	    $target eq 'answer' || $target eq 'meta' || $target eq 'analyze' ||
+	    $target eq 'webgrade') {
     #normally throw away comments
     my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style);
   }
@@ -530,7 +541,7 @@ sub start_num {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $result = '';
     my $inside = &Apache::lonxml::get_all_text_unbalanced("/num",$parser);
-    if ($target eq 'tex' || $target eq 'web') {
+    if ($target eq 'tex' || $target eq 'web' || $target eq 'webgrade') {
 	$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
 	if (!$Apache::lonxml::default_homework_loaded) {
 	    &Apache::lonxml::default_homework_load($safeeval);
@@ -551,9 +562,9 @@ sub end_num {
 sub start_parse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $result = '';
-    if ( $target eq 'web' || $target eq 'tex' ||
-	 $target eq 'grade' || $target eq 'answer' ||
-	 $target eq 'analyze') {
+    if ( $target eq 'web'    || $target eq 'tex'    ||
+	 $target eq 'grade'  || $target eq 'answer' ||
+	 $target eq 'analyze'|| $target eq 'webgrade') {
 	my $inside = &Apache::lonxml::get_all_text_unbalanced("/parse",$parser);
 	$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
 	if (!$Apache::lonxml::default_homework_loaded) {
@@ -581,9 +592,9 @@ sub end_parse {
 sub start_algebra {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $result = '';
-    if ( $target eq 'web' || $target eq 'tex' ||
-	 $target eq 'grade' || $target eq 'answer' ||
-	 $target eq 'analyze') {
+    if ( $target eq 'web'     || $target eq 'tex'    ||
+	 $target eq 'grade'   || $target eq 'answer' ||
+	 $target eq 'analyze' || $target eq 'webgrade') {
 	my $inside = &Apache::lonxml::get_all_text_unbalanced("/algebra",$parser);
 	$inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
 	if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {