--- loncom/homework/imagechoice.pm 2004/09/09 20:35:10 1.6 +++ loncom/homework/imagechoice.pm 2008/10/13 14:06:47 1.15 @@ -1,4 +1,4 @@ -# $Id: imagechoice.pm,v 1.6 2004/09/09 20:35:10 albertel Exp $ +# $Id: imagechoice.pm,v 1.15 2008/10/13 14:06:47 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,7 +25,10 @@ package Apache::imagechoice; use strict; use Apache::Constants qw(:common :http); - +use Apache::lonnet; +use Apache::lonlocal; +use LONCAPA; + sub deletedata { my ($id)=@_; @@ -33,49 +36,64 @@ sub deletedata { } sub closewindow { - my ($r,$output,$filename,$needimage)=@_; + my ($r,$output,$filename,$needimage,$display)=@_; if ($needimage) { $needimage=""; } - $r->print(<<"ENDSUBM"); - - - +ENDSUBM + + my $start_page = + &Apache::loncommon::start_page('Close Window',$js, + {'bgcolor' => '#FFFFFF', + 'only_body' => 1, + 'add_entries' => { + onload => 'submitthis();'},}); + + my $end_page = + &Apache::loncommon::end_page(); + + $r->print(<<"ENDSUBM"); +$start_page

Position Selected

+$display $needimage - - +$end_page 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; } + my $display; 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.';'; + $display.="

The X coordinate is $x

\n"; } - 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.';'; + $display.="

The Y coordinate is $y

\n"; } } elsif ($type eq 'polygon' or $type eq 'box') { my $coordstr; @@ -83,65 +101,75 @@ sub storedata { $coordstr.='('.shift(@coords).','.shift(@coords).')-'; } chop($coordstr); - $output.='opener.document.forms.'.$ENV{"imagechoice.$id.formname"}.'.'.$ENV{"imagechoice.$id.formcoord"}.'.value="'.$coordstr.'";'; + $display.="

The selected coordinates are $coordstr

\n"; + $output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formcoord"}.'.value="'.$coordstr.'";'; + } + if ($display) { + $display.="

If this window fails to close you may need to manually replace the old coordinates with the above value.

\n"; } - &deletedata($id); - &closewindow($r,$output,$filename,$needimage); + &closewindow($r,$output,$filename,$needimage,$display); } sub getcoord { my ($r,$type,$filename,$id)=@_; - my $heading='Select Position on Image'; + my $heading=&mt('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'; + $heading=&mt('Select First Coordinate on Image'); #$nextstage=''; } elsif ($step == 1) { - $heading='Select Second Coordinate on Image'; + $heading=&mt('Select Second Coordinate on Image'); #$nextstage=''; } else { - $heading='Select Finish to store selection.'; - $nextstage=''; + $heading=&mt('Select Finish to save selection'); + $nextstage=''; } } elsif ($type eq 'polygon') { - $heading='Enter Coordinate or click finish to close Polygon'; - $nextstage=''; + $heading=&mt('Enter Coordinate or click finish to close Polygon'); + $nextstage=''; } elsif ($type eq 'point') { - $heading='Click to select a Coordinate or click Finish to store current selection.'; - $nextstage=''; + $heading=&mt('Click to select a Coordinate or click Finish to save current selection'); + $nextstage=''; } + + my $start_page = + &Apache::loncommon::start_page('Get Coordinates',undef, + {'bgcolor' => '#FFFFFF', + 'only_body' => 1,}); + + my $end_page = + &Apache::loncommon::end_page(); + my $canceltext=&mt('Cancel'); $r->print(<<"END"); - - +$start_page

$heading

$nextstage - +
- - +$end_page 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); + &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 +202,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 +218,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 +230,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; @@ -211,27 +239,28 @@ sub drawimage { &drawX(\%data,$imid,$x,$y); if ($type eq "polygon") { &drawPolygon(\%data,$id,$imid); } if ($type eq "box") { &drawBox(\%data,$id,$imid); } - &Apache::lonnet::appenv(%data); + &Apache::lonnet::appenv(\%data); return "/adm/randomlabel.png?token=$imid" } sub handler { my ($r)=@_; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); + $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 = &unescape($env{"imagechoice.$id.file"}); + my $formname = $env{"imagechoice.$id.formname"}; + if ($env{'form.cancel'} eq &mt('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 &mt('Finish')) { &storedata($r,$type,$imurl,$id); } else { &getcoord($r,$type,$imurl,$id); 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.