--- loncom/lond	2004/10/26 14:55:49	1.264
+++ loncom/lond	2004/11/02 23:13:18	1.265
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.264 2004/10/26 14:55:49 albertel Exp $
+# $Id: lond,v 1.265 2004/11/02 23:13:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,6 +46,7 @@ use Authen::Krb5;
 use lib '/home/httpd/lib/perl/';
 use localauth;
 use localenroll;
+use localstudentphoto;
 use File::Copy;
 use LONCAPA::ConfigFileEdit;
 use LONCAPA::lonlocal;
@@ -57,7 +58,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.264 $'; #' stupid emacs
+my $VERSION='$Revision: 1.265 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -3792,9 +3793,46 @@ sub get_institutional_code_format_handle
     
     return 1;
 }
+&register_handler("autoinstcodeformat",
+		  \&get_institutional_code_format_handler,0,1,0);
 
-&register_handler("autoinstcodeformat", \&get_institutional_code_format_handler,
-		  0,1,0);
+#
+# Gets a student's photo to exist (in the correct image type) in the user's 
+# directory.
+# Formal Parameters:
+#    $cmd     - The command request that got us dispatched.
+#    $tail    - A colon separated set of words that will be split into:
+#               $domain - student's domain
+#               $uname  - student username
+#               $type   - image type desired
+#    $client  - The socket open on the client.
+# Returns:
+#    1 - continue processing.
+sub student_photo_handler {
+    my ($cmd, $tail, $client) = @_;
+    my ($domain,$uname,$type) = split(/:/, $tail);
+
+    my $path=&propath($domain,$uname).
+	'/userfiles/internal/studentphoto.'.$type;
+    if (-e $path) {
+	&Reply($client,"ok\n","$cmd:$tail");
+	return 1;
+    }
+    &mkpath($path);
+    my $file=&localstudentphoto::fetch($domain,$uname);
+    if (!$file) {
+	&Failure($client,"unavailable\n","$cmd:$tail");
+	return 1;
+    }
+    if (!-e $path) { &convert_photo($file,$path); }
+    if (-e $path) {
+	&Reply($client,"ok\n","$cmd:$tail");
+	return 1;
+    }
+    &Failure($client,"unable_to_convert\n","$cmd:$tail");
+    return 1;
+}
+&register_handler("studentphoto", \&student_photo_handler, 0, 1, 0);
 
 # mkpath makes all directories for a file, expects an absolute path with a
 # file or a trailing / if just a dir is passed
@@ -3804,7 +3842,7 @@ sub mkpath {
     my @parts=split(/\//,$file,-1);
     my $now=$parts[0].'/'.$parts[1].'/'.$parts[2];
     for (my $i=3;$i<= ($#parts-1);$i++) {
-	$now.='/'.$parts[$i];
+	$now.='/'.$parts[$i]; 
 	if (!-e $now) {
 	    if  (!mkdir($now,0770)) { return 0; }
 	}
@@ -3812,7 +3850,6 @@ sub mkpath {
     return 1;
 }
 
-
 #---------------------------------------------------------------
 #
 #   Getting, decoding and dispatching requests:
@@ -5378,6 +5415,11 @@ sub make_passwd_file {
     return $result;
 }
 
+sub convert_photo {
+    my ($start,$dest)=@_;
+    system("convert $start $dest");
+}
+
 sub sethost {
     my ($remotereq) = @_;
     my (undef,$hostid)=split(/:/,$remotereq);