[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /homework randomlylabel.pm

raeburn raeburn at source.lon-capa.org
Thu Jul 4 13:55:04 EDT 2024


raeburn		Thu Jul  4 17:55:04 2024 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/homework	randomlylabel.pm 
  Log:
  - For 2.11
    Reverse changes in 1.32 as LWPReq is not in 2.11
  
  
Index: loncom/homework/randomlylabel.pm
diff -u loncom/homework/randomlylabel.pm:1.37 loncom/homework/randomlylabel.pm:1.37.2.1
--- loncom/homework/randomlylabel.pm:1.37	Tue Apr  9 18:47:23 2024
+++ loncom/homework/randomlylabel.pm	Thu Jul  4 17:55:04 2024
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # randomlabel.png: composite together text and images into 1 image
 #
-# $Id: randomlylabel.pm,v 1.37 2024/04/09 18:47:23 raeburn Exp $
+# $Id: randomlylabel.pm,v 1.37.2.1 2024/07/04 17:55:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -210,10 +210,10 @@
 use Math::Trig();
 use GD;
 use GD::Polyline();
+use LWP::UserAgent(); 
 use Apache::lonnet;
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
-use LONCAPA::LWPReq;
 
 #
 # Note: Math::Trig is included in the standard perl package for many distros.
@@ -232,11 +232,11 @@
 	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 $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
-        my $response=&LONCAPA::LWPReq::makerequest($lonhost,$request,$file,'','','',1);
+        my $response=$ua->request($request,$file);
 	if ($response->is_success) {
 	    if ($response->content_type !~ m-/(png|jpg|jpeg)$-i) {
 		my $conv_image = Image::Magick->new;




More information about the LON-CAPA-cvs mailing list