--- loncom/homework/randomlylabel.pm	2007/09/25 22:56:48	1.29
+++ loncom/homework/randomlylabel.pm	2017/05/23 03:07:34	1.32
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.29 2007/09/25 22:56:48 albertel Exp $
+# $Id: randomlylabel.pm,v 1.32 2017/05/23 03:07:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -203,24 +203,23 @@ use Apache::Constants qw(:common);
 use Apache::loncommon();
 use GD;
 use GD::Polyline();
-use LWP::UserAgent();
 use Apache::lonnet;
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
- 
+use LONCAPA::LWPReq; 
 
 sub get_image {
     my ($imgsrc,$set_trans)=@_;
     my $image;
     if ($imgsrc !~ m|^(/home/)|) {
-	if ($imgsrc !~ /^http:/) {
-	    $imgsrc="http://".$ENV{'HTTP_HOST'}.$imgsrc;
+	if ($imgsrc !~ /^https?\:/) {
+	    $imgsrc=&Apache::lonnet::absolute_url($ENV{'HTTP_HOST'}).$imgsrc;
 	}
-	my $ua=new LWP::UserAgent;
 	my $request=new HTTP::Request('GET',"$imgsrc");
 	$request->header(Cookie => $ENV{'HTTP_COOKIE'});
 	my $file="/tmp/imagetmp".$$;
-	my $response=$ua->request($request,$file);
+        my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
+        my $response=&LONCAPA::LWPReq::makerequest($lonhost,$request,$file,'','','',1);
 	if ($response->is_success) {
 	    if ($response->content_type !~ m-/(png|jpg|jpeg)$-i) {
 		my $conv_image = Image::Magick->new;
@@ -267,6 +266,23 @@ sub get_color_from_hexstring {
     return $imcolor;
 }
 
+sub add_click {
+    my ($image) = @_;
+
+    my $length=6;
+    my $bgcolor=&get_color_from_hexstring($image,'FFFFFF');
+    my $fgcolor=&get_color_from_hexstring($image,'009999');
+
+    my ($x,$y) = split(':',$env{'form.clickdata'});
+
+    $image->setThickness(3);
+    $image->line($x-$length,$y,        $x+$length,$y,        $bgcolor);
+    $image->line($x,        $y-$length,$x,        $y+$length,$bgcolor);
+    $image->setThickness(1);
+    $image->line($x-$length,$y,        $x+$length,$y,        $fgcolor);
+    $image->line($x,        $y-$length,$x,        $y+$length,$fgcolor);
+}
+
 sub handler {
     my $r = shift;
     $r->content_type('image/png');
@@ -429,6 +445,7 @@ sub handler {
 	    &Apache::lonnet::logthis("randomlylabel unable to handle object of type $type");
 	}
     }
+    if (exists($env{'form.clickdata'})) { &add_click($image); }
     $image->setThickness(1);
     $r->print($image->png);
     return OK;