--- loncom/homework/bridgetask.pm	2005/03/28 19:26:10	1.4
+++ loncom/homework/bridgetask.pm	2005/03/28 21:50:46	1.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.4 2005/03/28 19:26:10 albertel Exp $
+# $Id: bridgetask.pm,v 1.6 2005/03/28 21:50:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -294,12 +294,9 @@ sub end_Criteria {
 sub proctor_validation_screen {
     my ($slot) = @_;
     my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
-    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 $dom=(&Apache::lonxml::whichuser())[2];
-    my $user=$ENV{'form.proctorname'};
-    if ($ENV{'form.proctordomain'}) { $dom=$ENV{'form.proctordomain'}; }
+    my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
+    $user=$ENV{'form.proctorname'};
+    if ($ENV{'form.proctordomain'}) { $domain=$ENV{'form.proctordomain'}; }
     my $msg;
     if ($ENV{'form.proctorpassword'}) {
 	$msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
@@ -315,11 +312,11 @@ sub proctor_validation_screen {
 <table>
   <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$user" /></td></tr>
   <tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
-  <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$dom" /></td></tr>
+  <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$domain" /></td></tr>
 </table>
 <input type="submit" name="checkoutbutton" value="Validate"  /><br />
 Student who should be logged in is:<br />
-<img src="$tokenurl" /><br />
+<img src="$url" /><br />
 </form>
 ENDCHECKOUT
     return $result;