--- loncom/homework/imagechoice.pm	2005/02/17 09:01:03	1.7
+++ loncom/homework/imagechoice.pm	2005/04/07 06:56:21	1.8
@@ -1,4 +1,4 @@
-# $Id: imagechoice.pm,v 1.7 2005/02/17 09:01:03 albertel Exp $
+# $Id: imagechoice.pm,v 1.8 2005/04/07 06:56:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,7 +25,7 @@
 package Apache::imagechoice;
 use strict;
 use Apache::Constants qw(:common :http);
-
+use Apache::lonnet;
 
 sub deletedata {
     my ($id)=@_;
@@ -56,26 +56,26 @@ ENDSUBM
 sub storedata {
     my ($r,$type,$filename,$id)=@_;
 
-    my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"});
+    my (undef,@coords)=split(':',$env{"imagechoice.$id.coords"});
 
     my ($output,$needimage);
 
-    if ($ENV{"imagechoice.$id.formwidth"}) {
-	$output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formwidth"}.'.value=document.pickimg.width;';
+    if ($env{"imagechoice.$id.formwidth"}) {
+	$output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formwidth"}.'.value=document.pickimg.width;';
 	$needimage=1;
     }
-    if ($ENV{"imagechoice.$id.formheight"}) {
-	$output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formheight"}.'.value=document.pickimg.height;';
+    if ($env{"imagechoice.$id.formheight"}) {
+	$output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formheight"}.'.value=document.pickimg.height;';
 	$needimage=1;
     }
 
     if ($type eq 'point') {
-	my (undef,$x,$y)=split(':',$ENV{"imagechoice.$id.coords"});
-	if ($ENV{"imagechoice.$id.formx"}) {
-	    $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formx"}.'.value='.$x.';';
+	my (undef,$x,$y)=split(':',$env{"imagechoice.$id.coords"});
+	if ($env{"imagechoice.$id.formx"}) {
+	    $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formx"}.'.value='.$x.';';
 	}
-	if ($ENV{"imagechoice.$id.formy"}) {
-	    $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formy"}.'.value='.$y.';';
+	if ($env{"imagechoice.$id.formy"}) {
+	    $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formy"}.'.value='.$y.';';
 	}
     } elsif ($type eq 'polygon' or $type eq 'box') {
 	my $coordstr;
@@ -83,7 +83,7 @@ sub storedata {
 	    $coordstr.='('.shift(@coords).','.shift(@coords).')-';
 	}
 	chop($coordstr);
-	$output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formcoord"}.'.value="'.$coordstr.'";';
+	$output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formcoord"}.'.value="'.$coordstr.'";';
     }
 
     &deletedata($id);
@@ -95,7 +95,7 @@ sub getcoord {
     my $heading='Select Position on Image';
     my $nextstage='';
     if ($type eq 'box') {
-	my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"});
+	my (undef,@coords)=split(':',$env{"imagechoice.$id.coords"});
 	my $step=scalar(@coords)/2;
 	if ($step == 0) { 
 	    $heading='Select First Coordinate on Image';
@@ -131,17 +131,17 @@ END
 
 sub savecoord {
     my ($id,$type)=@_;
-    if (defined($ENV{"form.image.x"}) && defined($ENV{"form.image.y"})) {
+    if (defined($env{"form.image.x"}) && defined($env{"form.image.y"})) {
 	my $data;
 	if ($type eq 'point') {
-	    $data=join(':',(undef,$ENV{"form.image.x"},$ENV{"form.image.y"}));
+	    $data=join(':',(undef,$env{"form.image.x"},$env{"form.image.y"}));
 	} else {
-	    $data=join(':',($ENV{"imagechoice.$id.coords"},
-			    $ENV{"form.image.x"},$ENV{"form.image.y"}));
+	    $data=join(':',($env{"imagechoice.$id.coords"},
+			    $env{"form.image.x"},$env{"form.image.y"}));
 	}
 	&Apache::lonnet::appenv("imagechoice.$id.coords"=>$data);
     }
-    return int(scalar(split(':',$ENV{"imagechoice.$id.coords"}))/2);
+    return int(scalar(split(':',$env{"imagechoice.$id.coords"}))/2);
 }
 
 sub add_obj {
@@ -174,7 +174,7 @@ sub drawX {
 
 sub drawPolygon {
     my ($data,$id,$imid)=@_;
-    my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"});
+    my (undef,@coords)=split(':',$env{"imagechoice.$id.coords"});
     my $coordstr;
     while (@coords) {
 	$coordstr.='('.shift(@coords).','.shift(@coords).')-';
@@ -190,7 +190,7 @@ sub drawPolygon {
 
 sub drawBox {
     my ($data,$id,$imid)=@_;
-    my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"});
+    my (undef,@coords)=split(':',$env{"imagechoice.$id.coords"});
     if (scalar(@coords) < 4) { return ''; }
     my $width = 1;
     my $extrawidth = 2;
@@ -202,7 +202,7 @@ sub drawBox {
 sub drawimage {
     my ($r,$type,$filename,$id)=@_;
     my $imid=&Apache::loncommon::get_cgi_id();
-    my (undef,@coords)=split(':',$ENV{"imagechoice.$id.coords"});
+    my (undef,@coords)=split(':',$env{"imagechoice.$id.coords"});
     if (scalar(@coords) < 2) { return &Apache::lonnet::hreflocation('',$filename); }
     my %data;
     $data{"cgi.$imid.BGIMG"}=$filename;
@@ -221,18 +221,18 @@ sub handler {
     $r->send_http_header;
     my %data;
     my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
-    my $filename = &Apache::lonnet::unescape($ENV{"imagechoice.$id.file"});
-    my $formname = $ENV{"imagechoice.$id.formname"};
-    if ($ENV{'form.cancel'} eq 'Cancel') {
+    my $filename = &Apache::lonnet::unescape($env{"imagechoice.$id.file"});
+    my $formname = $env{"imagechoice.$id.formname"};
+    if ($env{'form.cancel'} eq 'Cancel') {
 	&deletedata($id);
 	&closewindow($r,'',$filename);
 	return OK;
     }
-    my $type=$ENV{"imagechoice.$id.type"};
-    if (defined($ENV{'form.type'})) { $type=$ENV{'form.type'}; }
+    my $type=$env{"imagechoice.$id.type"};
+    if (defined($env{'form.type'})) { $type=$env{'form.type'}; }
     my $numcoords=&savecoord($id,$type);
     my $imurl=&drawimage($r,$type,$filename,$id);
-    if (($ENV{'form.finish'} eq 'Finish')) {
+    if (($env{'form.finish'} eq 'Finish')) {
 	&storedata($r,$type,$imurl,$id);
     } else {
 	&getcoord($r,$type,$imurl,$id);