Diff for /loncom/homework/randomlabel.pm between versions 1.41 and 1.42

version 1.41, 2002/12/03 10:32:57 version 1.42, 2003/01/23 18:26:10
Line 86  sub start_randomlabel { Line 86  sub start_randomlabel {
   my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);    my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
   if ( $bgimg !~ /^http:/ ) {    if ( $bgimg !~ /^http:/ ) {
     $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);      $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
       if (&Apache::lonnet::repcopy($bgimg) ne OK) {
    $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
       }
   }    }
   my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));    my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
   my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));    my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
Line 97  sub start_randomlabel { Line 100  sub start_randomlabel {
       $result.="BGIMG=".&Apache::lonnet::escape($bgimg);        $result.="BGIMG=".&Apache::lonnet::escape($bgimg);
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
     my $newbgimg = $bgimg;      my $newbgimg = $bgimg;
     $bgimg=~s/(.gif|.jpg|.png)$/.eps/;      $bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i;
     $bgimg= &Apache::lonnet::filelocation($bgimg);      $bgimg= &Apache::lonnet::filelocation($bgimg);
     if (not $ENV{'request.role'}=~/^au\./) {      if (not $ENV{'request.role'}=~/^au\./) {
  $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;   $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;

Removed from v.1.41  
changed lines
  Added in v.1.42


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>