--- loncom/homework/outputtags.pm	2004/10/26 15:03:08	1.35
+++ loncom/homework/outputtags.pm	2005/04/07 06:56:22	1.38
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # tags that create controlled output
 #
-# $Id: outputtags.pm,v 1.35 2004/10/26 15:03:08 albertel Exp $
+# $Id: outputtags.pm,v 1.38 2005/04/07 06:56:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -122,7 +122,7 @@ sub end_displaytitle {
 
 sub multipart {
     my ($uri)=@_;
-    if (!defined($uri)) { $uri=$ENV{'request.uri'}; }
+    if (!defined($uri)) { $uri=$env{'request.uri'}; }
     my @parts;
     my $metadata = &Apache::lonnet::metadata($uri,'packages');
     foreach (split(/\,/,$metadata)) {
@@ -152,7 +152,7 @@ sub start_displayweight {
 	    if (!defined($weight) || ($weight eq '')) { $weight=1; }
 	    $result.=$weight;
 	} else {
-	    my @parts=&multipart($ENV{'request.uri'});
+	    my @parts=&multipart($env{'request.uri'});
 	    my $weight;
 	    if (@parts) {
 	        foreach my $part (@parts) {
@@ -185,23 +185,21 @@ sub start_displaystudentphoto {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
     my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
-    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="/uploaded/$domain/$user/internal/studentphoto.gif";
-	my $tokenurl=&Apache::lonnet::tokenwrapper($url);
+    if ($target eq 'web' && $user eq $env{'user.name'}) {
+	my $url=&Apache::lonnet::studentphoto($domain,$user,"gif");
 	my $args;
 	my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
 	if ($width) { $args.=" width=\"$width\" "; }
 	my $height=&Apache::lonxml::get_param('heigth',$parstack,$safeeval);
 	if ($height) { $args.=" height=\"$height\" "; }
-	$result.=" <img $args src=\"$tokenurl\" alt=\"$user\@$domain\" />";
+	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval);
+	if ($align) { $args.=" align=\"$align\" "; }
+	$result.=" <img $args src=\"$url\" alt=\"$user\@$domain\" />";
     }
-    if ($target eq 'tex' && $ENV{'request.role'} =~ /^cc/) {
-	my $ret=&Apache::lonnet::reply("studentphoto:$domain:$user:eps",&Apache::lonnet::homeserver($user,$domain));
-	my $url="/uploaded/$domain/$user/internal/studentphoto.eps";
-	my $tokenurl=&Apache::lonnet::tokenwrapper($url);
+    if ($target eq 'tex' && $env{'request.role'} =~ /^cc/) {
+	my $url=&Apache::lonnet::studentphoto($domain,$user,"eps");
 	my $ua=new LWP::UserAgent;
-	my $request=new HTTP::Request('GET',$tokenurl);
+	my $request=new HTTP::Request('GET',$url);
 	my $response=$ua->request($request);
 	if ($response->is_success) {
 	    my $file=$user."_".$domain."_studentphoto.eps";
@@ -211,6 +209,8 @@ sub start_displaystudentphoto {
 	    my $width_param=&Apache::londefdef::image_size($Apache::lonnet::perlvar{'lonPrtDir'}."/$file",'0.3',$parstack,$safeeval);
 	    $result.=' \graphicspath{{'.$Apache::lonnet::perlvar{'lonPrtDir'}.
 		'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
+	} else {
+	    $result="$user\@$domain";
 	}
     }
     return $result;