--- loncom/homework/outputtags.pm	2003/10/13 19:32:31	1.34
+++ loncom/homework/outputtags.pm	2004/10/26 15:03:08	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # tags that create controlled output
 #
-# $Id: outputtags.pm,v 1.34 2003/10/13 19:32:31 albertel Exp $
+# $Id: outputtags.pm,v 1.35 2004/10/26 15:03:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,7 @@ use Apache::lonnet;
 use POSIX qw(strftime);
 
 BEGIN {
-    &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight'));
+    &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight','displaystudentphoto'));
 }
 
 sub initialize_outputtags {
@@ -178,6 +178,48 @@ sub end_displayweight {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my @result;
     if ($target eq 'edit') { $result[1]='no'; }
+    return @result;
+}
+
+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);
+	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\" />";
+    }
+    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);
+	my $ua=new LWP::UserAgent;
+	my $request=new HTTP::Request('GET',$tokenurl);
+	my $response=$ua->request($request);
+	if ($response->is_success) {
+	    my $file=$user."_".$domain."_studentphoto.eps";
+	    open(FILE,">".$Apache::lonnet::perlvar{'lonPrtDir'}."/$file");
+	    print FILE $response->content;
+	    close(FILE);
+	    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.'} ';
+	}
+    }
+    return $result;
+}
+
+sub end_displaystudentphoto {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my @result;
+    if ($target eq 'edit') { $result[1]='no'; }
     return @result;
 }