--- loncom/homework/randomlabel.pm	2002/11/07 19:48:51	1.39
+++ loncom/homework/randomlabel.pm	2003/02/07 22:03:21	1.43
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.39 2002/11/07 19:48:51 albertel Exp $
+# $Id: randomlabel.pm,v 1.43 2003/02/07 22:03:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,35 +82,25 @@ sub check_int {
 sub start_randomlabel {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  &Apache::lonxml::startredirection();
-  push (@Apache::lonxml::extlinks, '/res/adm/includes/GLabel.class');
   push (@Apache::lonxml::namespace,'randomlabel');
   my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
   if ( $bgimg !~ /^http:/ ) {
-    push (@Apache::lonxml::extlinks,$bgimg);
     $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
-    if ($bgimg =~ /$Apache::lonnet::perlvar{'lonDocRoot'}/) {
-      $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//;
-    } elsif ($bgimg =~ m:^/home/.*/public_html:) {
-      $bgimg =~ s:^/home/(.*)/public_html:/~$1:;
+    if (&Apache::lonnet::repcopy($bgimg) ne OK) {
+	$bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
     }
-#    $bgimg='http://'.$ENV{'SERVER_NAME'}.$bgimg;
   }
-  my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);
-  my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
   my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
   my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
   my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
-  if (!$code) { $code='GLabel.class'; }
-  if (!$codebase) { $codebase='/res/adm/includes/'; }
   $Apache::randomlabel::tlabel_cnt=0;
   $Apache::randomlabel::ilabel_cnt=0;
   if ($target eq 'web') {
-    $result.='<img src="/cgi-bin/randomlabel.png?';
-    $result.="BGIMG=".&Apache::lonnet::escape('/home/httpd/html/'.$bgimg);
+      &Apache::lonxml::startredirection();
+      $result.="BGIMG=".&Apache::lonnet::escape($bgimg);
   } elsif ($target eq 'tex') {
     my $newbgimg = $bgimg;
-    $bgimg=~s/(.gif|.jpg)$/.eps/;
+    $bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i;
     $bgimg= &Apache::lonnet::filelocation($bgimg);
     if (not $ENV{'request.role'}=~/^au\./) {
 	$bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
@@ -172,16 +162,19 @@ sub end_randomlabel {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
   my $count;
-  $result=&Apache::lonxml::endredirection();
-  $result=~s/\s*&/&/g;
-  $result=~s/\s*$//;
   pop @Apache::lonxml::namespace;
   if ($target eq 'web') {
-    $count = $Apache::randomlabel::tlabel_cnt;
-    if( $count != 0) { $result.= "&COUNT=$count"; }
-    $count = $Apache::randomlabel::ilabel_cnt;
-    if( $count != 0) { $result.= "&ICOUNT=$count"; }
-    $result.='" /><br />'."\n";
+      my $args=&Apache::lonxml::endredirection();
+      $args=~s/\s*&/&/g;
+      $args=~s/\s*$//;
+      $count = $Apache::randomlabel::tlabel_cnt;
+      if( $count != 0) { $args.= "&COUNT=$count"; }
+      $count = $Apache::randomlabel::ilabel_cnt;
+      if( $count != 0) { $args.= "&ICOUNT=$count"; }
+      my $token=$Apache::lonxml::curdepth.'_'.$$;
+      $result.='<img src="/adm/randomlabel.png?token='.$token;
+      $result.='" /><br />'."\n";
+      &Apache::lonnet::appenv(("imagerequest.$token"=>&Apache::lonnet::escape($args)));
   } elsif ($target eq 'tex') {
       $result='\end{picture}\\\\';
 	  @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;
@@ -283,7 +276,7 @@ sub end_labelgroup {
 	&Apache::lonxml::error('Unknown type of label :'.$type.':');
       }
       if ($target eq 'web') {
-	$result .= '&'. $str  .'='.$label;
+	$result .= '&'. $str  .'='.&Apache::lonnet::escape($label);
 	$result .= '&'. $xstr .'='.$x;
 	$result .= '&'. $ystr .'='.$y;
       }
@@ -380,11 +373,11 @@ sub start_label {
   my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
   if ($target eq 'web' || $target eq 'tex' ||
       $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
-    my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
+    my $ltext=&Apache::lonxml::get_all_text("/label",$parser);
     $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
     if ($type eq 'image') {
       &Apache::lonxml::debug("Turning $ltext and $Apache::lonxml::pwd[-1]");
-      $ltext="http://$ENV{'SERVER_NAME'}".&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],
+      $ltext=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],
 					   $ltext);
       &Apache::lonxml::debug("into $ltext");
       my $description = &Apache::lonxml::get_param('description',
@@ -394,14 +387,14 @@ sub start_label {
     push(@Apache::randomlabel::label_arr,$ltext);
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,"$type Label");
-    my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
+    my $text=&Apache::lonxml::get_all_text("/label",$parser);
     if ($type eq 'image') {
       $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
       $result.=&Apache::edit::text_arg('Description:','description',$token);
     }
     if ($type eq 'text') { $result.="Label Text:"; }
-    if ($type eq 'image') { $result.="Path to image:"; }
-    $result.=&Apache::edit::editline('',$text,'',20).
+    if ($type eq 'image') { $result.="Path to image:&nbsp;"; }
+    $result.=&Apache::edit::editline('',$text,'',50).
       &Apache::edit::end_table();
   } elsif ($target eq 'modified') {
     my $text=$$parser[-1]->get_text("/label");