version 1.36, 2004/11/12 21:15:05
|
version 1.37, 2005/03/28 21:49:31
|
Line 186 sub start_displaystudentphoto {
|
Line 186 sub start_displaystudentphoto {
|
my $result; |
my $result; |
my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser(); |
my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser(); |
if ($target eq 'web' && $user eq $ENV{'user.name'}) { |
if ($target eq 'web' && $user eq $ENV{'user.name'}) { |
my $ret=&Apache::lonnet::reply("studentphoto:$domain:$user:gif",&Apache::lonnet::homeserver($user,$domain)); |
my $url=&Apache::lonnet::studentphoto($domain,$user,"gif"); |
my $url="/uploaded/$domain/$user/internal/studentphoto.gif"; |
|
my $tokenurl=&Apache::lonnet::tokenwrapper($url); |
|
my $args; |
my $args; |
my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval); |
my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval); |
if ($width) { $args.=" width=\"$width\" "; } |
if ($width) { $args.=" width=\"$width\" "; } |
Line 196 sub start_displaystudentphoto {
|
Line 194 sub start_displaystudentphoto {
|
if ($height) { $args.=" height=\"$height\" "; } |
if ($height) { $args.=" height=\"$height\" "; } |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval); |
if ($align) { $args.=" align=\"$align\" "; } |
if ($align) { $args.=" align=\"$align\" "; } |
$result.=" <img $args src=\"$tokenurl\" alt=\"$user\@$domain\" />"; |
$result.=" <img $args src=\"$url\" alt=\"$user\@$domain\" />"; |
} |
} |
if ($target eq 'tex' && $ENV{'request.role'} =~ /^cc/) { |
if ($target eq 'tex' && $ENV{'request.role'} =~ /^cc/) { |
my $ret=&Apache::lonnet::reply("studentphoto:$domain:$user:eps",&Apache::lonnet::homeserver($user,$domain)); |
my $url=&Apache::lonnet::studentphoto($domain,$user,"eps"); |
my $url="/uploaded/$domain/$user/internal/studentphoto.eps"; |
|
my $tokenurl=&Apache::lonnet::tokenwrapper($url); |
|
my $ua=new LWP::UserAgent; |
my $ua=new LWP::UserAgent; |
my $request=new HTTP::Request('GET',$tokenurl); |
my $request=new HTTP::Request('GET',$url); |
my $response=$ua->request($request); |
my $response=$ua->request($request); |
if ($response->is_success) { |
if ($response->is_success) { |
my $file=$user."_".$domain."_studentphoto.eps"; |
my $file=$user."_".$domain."_studentphoto.eps"; |