[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm

[albertel]

albertel		Mon Mar 28 16:50:46 2005 EDT

  Modified files:              
    /loncom/homework	bridgetask.pm 
  Log:
  - clean up some code in bridgetask
  
  
  
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.5 loncom/homework/bridgetask.pm:1.6
--- loncom/homework/bridgetask.pm:1.5	Mon Mar 28 16:49:31 2005
+++ loncom/homework/bridgetask.pm	Mon Mar 28 16:50:46 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.5 2005/03/28 21:49:31 albertel Exp $
+# $Id: bridgetask.pm,v 1.6 2005/03/28 21:50:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -295,9 +295,8 @@
     my ($slot) = @_;
     my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
     my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
-    my $dom=(&Apache::lonxml::whichuser())[2];
-    my $user=$ENV{'form.proctorname'};
-    if ($ENV{'form.proctordomain'}) { $dom=$ENV{'form.proctordomain'}; }
+    $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.")
@@ -313,7 +312,7 @@
 <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 />