--- loncom/homework/randomlylabel.pm	2005/04/07 06:56:22	1.26
+++ loncom/homework/randomlylabel.pm	2007/09/25 22:56:48	1.29
@@ -1,8 +1,7 @@
-#!/usr/bin/perl
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.26 2005/04/07 06:56:22 albertel Exp $
+# $Id: randomlylabel.pm,v 1.29 2007/09/25 22:56:48 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -206,6 +205,9 @@ use GD;
 use GD::Polyline();
 use LWP::UserAgent();
 use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 sub get_image {
     my ($imgsrc,$set_trans)=@_;
@@ -269,20 +271,24 @@ sub handler {
     my $r = shift;
     $r->content_type('image/png');
     $r->send_http_header;
-    my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
-    my $image;
-    my $prefix="cgi.$id.";
+
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+
+    my $prefix;
     if ($ENV{'QUERY_STRING'}=~/OBJCOUNT\=/) {
-	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
 	$prefix='form.';
+    } else {
+	$prefix="cgi.$env{'form.token'}.";
     }
+
+    my $image;
     if (defined($env{$prefix."BGIMG"})) {
-	my $bgimg=&Apache::lonnet::unescape($env{$prefix."BGIMG"});
+	my $bgimg=&unescape($env{$prefix."BGIMG"});
 	#&Apache::lonnet::logthis("BGIMG is ".$bgimg);
 	$image=&get_image($bgimg,0);
 	if (! defined($image)) {
 	    &Apache::lonnet::logthis('Unable to create image object for -'.
-				     $id.'-'.$bgimg);
+				     $env{'form.token'}.'-'.$bgimg);
 	    return OK;
 	}
     } elsif (defined($env{$prefix."SIZE"})) {
@@ -299,7 +305,7 @@ sub handler {
 	    $image->transparent($bgcolor);
 	}
     } else {
-	&Apache::lonnet::logthis('Unable to create image object, no info');
+	&Apache::lonnet::logthis('Unable to create image object, no info '.$prefix);
 	return OK;
     }
     #binmode(STDOUT);
@@ -372,7 +378,7 @@ sub handler {
 	} elsif ($type eq 'IMAGE') {
 	    my ($x,$y,$file,$transparent,$srcX,$srcY,$destW,$destH,$srcW,
 		$srcH)=split(':',$env{$prefix."OBJ$i"});
-	    $file=&Apache::lonnet::unescape($file);
+	    $file=&unescape($file);
 	    if (!defined($transparent)) { $transparent=1; }
 	    my $subimage=&get_image($file,$transparent);
 	    if (!defined($subimage)) {
@@ -389,7 +395,7 @@ sub handler {
 	} elsif ($type eq 'LABEL') {
 	    my ($x,$y,$text,$font,$color,$direction)=
 		split(':',$env{$prefix."OBJ$i"});
-	    $text=&Apache::lonnet::unescape($text);
+	    $text=&unescape($text);
 	    my $imcolor=&get_color_from_hexstring($image,$color);
 	    my $type='normal';
 	    my ($height,$fontref);