Diff for /loncom/homework/bridgetask.pm between versions 1.270 and 1.274

version 1.270, 2018/01/31 15:28:28 version 1.274, 2025/03/31 13:55:08
Line 32  package Apache::bridgetask; Line 32  package Apache::bridgetask;
   
 use strict;  use strict;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::loncommon;
 use Apache::File();  use Apache::File();
 use Apache::lonmenu;  use Apache::lonmenu;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonxml;  use Apache::lonxml;
 use Apache::slotrequest();  use Apache::slotrequest();
 use Apache::structuretags();  use Apache::structuretags();
   use HTML::Entities();
 use Time::HiRes qw( gettimeofday tv_interval );  use Time::HiRes qw( gettimeofday tv_interval );
 use LONCAPA;  use LONCAPA;
     
Line 65  sub initialize_bridgetask { Line 67  sub initialize_bridgetask {
 sub proctor_check_auth {  sub proctor_check_auth {
     my ($slot_name,$slot,$type)=@_;      my ($slot_name,$slot,$type)=@_;
     my $user=$env{'form.proctorname'};      my $user=$env{'form.proctorname'};
       $user =~ s/^\s+|\s+$//g;
     my $domain=$env{'form.proctordomain'};      my $domain=$env{'form.proctordomain'};
           
     my @allowed=split(",",$slot->{'proctor'});      my @allowed=split(",",$slot->{'proctor'});
Line 3277  sub proctor_validation_screen { Line 3280  sub proctor_validation_screen {
     my ($slot) = @_;      my ($slot) = @_;
     my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser();      my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser();
     my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');      my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
     if ($url ne '/adm/lonKaputt/lonlogo_broken.gif') {  
  $url = "<tr><td colspan=\"2\"><img src=\"$url\" /></td></tr>";  
     } else {  
  undef($url);  
     }  
   
     my $name=&Apache::loncommon::plainname($user,$domain);      my $name=&Apache::loncommon::plainname($user,$domain);
       
     my $msg;      my $msg;
     if ($env{'form.proctorpassword'}) {      if ($env{'form.proctorpassword'}) {
  $msg.='<p><span class="LC_warning">'   $msg.='<p><span class="LC_warning">'
Line 3312  sub proctor_validation_screen { Line 3309  sub proctor_validation_screen {
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
                             'prva' => "Proctor Validation",                              'prva' => "Proctor Validation",
                             'yoro' => "Your room's proctor needs to validate your access to this resource.",                              'yoro' => "Your room's proctor needs to validate your access to this resource.",
                             'prus'  => "Proctor's Username:",                              'prus'  => "Proctor's Username",
                             'pasw'  => "Password:",                              'pasw'  => "Password",
                             'prdo'  => "Proctor's Domain:",                              'prdo'  => "Proctor's Domain",
                             'vali'  => 'Validate',                              'vali'  => 'Validate',
                             'stui'  => "Student who should be logged in is:",                              'stui'  => "Student who should be logged in is:",
                             'name'  => "Name:",                              'name'  => "Name",
                             'sid'   => "Student/Employee ID",                              'sid'   => "Student/Employee ID",
                             'unam'  => "Username:",                              'unam'  => "Username",
                               'phot'  => "Photo", 
                            );                             );
     my $result= (<<ENDCHECKOUT);      my $proctortable =
 <h2>$lt{'prva'}</h2>          &Apache::lonhtmlcommon::start_pick_box()."\n".
     <p>$lt{'yoro'}</p>          &Apache::lonhtmlcommon::row_title('<label for="proctorname">'.$lt{'prus'}.'</label>').
     $msg          '<input type="text" name="proctorname" value="'.$env{'form.proctorname'}.'" '.
           'id="proctorname" autocomplete="new-password" />'.
           &Apache::lonhtmlcommon::row_closure()."\n".
           &Apache::lonhtmlcommon::row_title('<label for="proctorpassword">'.$lt{'pasw'}.'</label>').
           '<input type="password" name="proctorpassword" value="" '.
           'id="proctorpassword" autocomplete="new-password" />'.
           &Apache::lonhtmlcommon::row_closure()."\n".
           &Apache::lonhtmlcommon::row_title('<label for="proctordomain">'.$lt{'prdo'}.'</label>').
           '<input type="text" name="proctordomain" value="'.$env{'form.proctordomain'}.'" '.
           'id="proctordomain" autocomplete="off" />'.
           &Apache::lonhtmlcommon::row_closure(1)."\n".
           &Apache::lonhtmlcommon::end_pick_box()."\n";
   
       my $studenttable =
           &Apache::loncommon::start_data_table('LC_manage_reservations').
           &Apache::loncommon::start_data_table_row().
           '<th>'.$lt{'name'}.':</th><td>'.$name.'</td>'.
           &Apache::loncommon::end_data_table_row()."\n".
           &Apache::loncommon::start_data_table_row().
           '<th>'.$lt{'sid'}.':</th><td>'.$env{'environment.id'}.'</td>'.
           &Apache::loncommon::end_data_table_row()."\n".
           &Apache::loncommon::start_data_table_row().
           '<th>'.$lt{'unam'}.':</th><td>'.$user.':'.$domain.'</td>'.
           &Apache::loncommon::end_data_table_row();
       if ($url ne '/adm/lonKaputt/lonlogo_broken.gif') {
           $studenttable .= &Apache::loncommon::start_data_table_row().
                            '<th valign="top">'.$lt{'phot'}.'</th>'.
                            '<td valign="top"><img src="'.&HTML::Entities::encode($url,'&<>"').'" '.
                            'alt="'.&mt('Photo of [_1]',$name).'" /></td>'.
                            &Apache::loncommon::end_data_table_row()."\n";
       }
       $studenttable .= &Apache::loncommon::end_data_table()."\n";
       if ($msg ne '') {
           $msg = "<p>$msg</p>";
       } else {
           $msg = '<br /><br />';
       }
       return (<<ENDCHECKOUT);
   <div style="padding:0;clear:both;margin:0;border:0">
   <h2 class="LC_heading_2">$lt{'prva'}</h2><hr />
   <div class="LC_left_float">
   $lt{'yoro'}
   $msg
 <form name="checkout" method="post" action="$uri">  <form name="checkout" method="post" action="$uri">
 <input type="hidden" name="validate" value="yes" />  <input type="hidden" name="validate" value="yes" />
 <input type="hidden" name="submitted" value="yes" />  <input type="hidden" name="submitted" value="yes" />
 <table>  $proctortable
   <tr><td>$lt{'prus'}</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>  <br />
   <tr><td>$lt{'pasw'}</td><td><input type="password" name="proctorpassword" value="" /></td></tr>  <input type="submit" name="checkoutbutton" value="$lt{'vali'}" />
   <tr><td>$lt{'prdo'}</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>  
 </table>  
 <input type="submit" name="checkoutbutton" value="$lt{'vali'}"  /><br />  
 <table border="1">  
   <tr><td>  
     <table>  
       <tr><td colspan="2">$lt{'stui'}</td></tr>  
       <tr><td>$lt{'name'}</td><td>$name</td></tr>  
       <tr><td>$lt{'sid'}</td><td>$env{'environment.id'}</td></tr>  
       <tr><td>$lt{'unam'}</td><td>$user:$domain</td></tr>  
       $url  
     </table>  
   </tr></td>  
 </table>  
 </form>  </form>
   </div>
   <div class="LC_left_float">
   $lt{'stui'}
   <br /><br />
   $studenttable
   </div>
   </div>
 ENDCHECKOUT  ENDCHECKOUT
   
     return $result;  
 }  }
   
 1;  1;

Removed from v.1.270  
changed lines
  Added in v.1.274


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>