[BACK]Return to slotrequest.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/slotrequest.pm between versions 1.59 and 1.63

version 1.59, 2006/04/25 15:32:20 version 1.63, 2006/05/30 12:46:09
Line 36  use Apache::lonlocal; Line 36  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::lonnavmaps();  use Apache::lonnavmaps();
 use Date::Manip;  use Date::Manip;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
   
 sub fail {  sub fail {
     my ($r,$code)=@_;      my ($r,$code)=@_;
     if ($code eq 'not_valid') {      if ($code eq 'not_valid') {
  $r->print('<p>'.&mt('Unable to understand what resource you wanted to sign up for.').'</p>');   $r->print('<p>'.&mt('Unable to understand what resource you wanted to sign up for.').'</p>');
       } elsif ($code eq 'not_available') {
    $r->print('<p>'.&mt('No slots are available.').'</p>');
     } elsif ($code eq 'not_allowed') {      } elsif ($code eq 'not_allowed') {
  $r->print('<p>'.&mt('Not allowed to sign up or change reservations at this time.').'</p>');   $r->print('<p>'.&mt('Not allowed to sign up or change reservations at this time.').'</p>');
     } else {      } else {
Line 253  sub make_reservation { Line 256  sub make_reservation {
   
     my $parm_symb  = $symb;      my $parm_symb  = $symb;
     my $parm_level = 1;      my $parm_level = 1;
     if ($use_slots eq 'sequence') {      if ($use_slots eq 'map') {
  my ($map) = &Apache::lonnet::decode_symb($symb);   my ($map) = &Apache::lonnet::decode_symb($symb);
  $parm_symb = &Apache::lonnet::symbread($map);   $parm_symb = &Apache::lonnet::symbread($map);
  $parm_level = 2;   $parm_level = 2;
Line 492  sub release_reservation { Line 495  sub release_reservation {
     }      }
   
     my $parm_level = 1;      my $parm_level = 1;
     if ($use_slots eq 'sequence') {      if ($use_slots eq 'map') {
  $parm_level = 2;   $parm_level = 2;
     }      }
     # store new parameter string      # store new parameter string
Line 762  sub show_choices { Line 765  sub show_choices {
     $command='get';      $command='get';
  }   }
     }      }
     my $escsymb=&Apache::lonnet::escape($symb);      my $escsymb=&escape($symb);
     $form=<<STUFF;      $form=<<STUFF;
    <form method="POST" action="/adm/slotrequest">     <form method="POST" action="/adm/slotrequest">
      <input type="submit" name="Select" value="$text" />       <input type="submit" name="Select" value="$text" />
Line 861  sub remove_link { Line 864  sub remove_link {
  undef($udom);   undef($udom);
     }      }
   
     $slotname  = &Apache::lonnet::escape($slotname);      $slotname  = &escape($slotname);
     $entry     = &Apache::lonnet::escape($entry);      $entry     = &escape($entry);
     $uname     = &Apache::lonnet::escape($uname);      $uname     = &escape($uname);
     $udom      = &Apache::lonnet::escape($udom);      $udom      = &escape($udom);
     $symb      = &Apache::lonnet::escape($symb);      $symb      = &escape($symb);
   
     return <<"END_LINK";      return <<"END_LINK";
  <a href="/adm/slotrequest?command=remove_registration&slotname=$slotname&entry=$entry&uname=$uname&udom=$udom&symb=$symb"   <a href="/adm/slotrequest?command=remove_registration&slotname=$slotname&entry=$entry&uname=$uname&udom=$udom&symb=$symb"
Line 1146  sub show_table { Line 1149  sub show_table {
  if (exists($show{'proctor'})) {   if (exists($show{'proctor'})) {
     $rowspan=2;      $rowspan=2;
     @proctors= map {      @proctors= map {
  my ($uname,$udom)=split(/@/,$_);   my ($uname,$udom)=split(/:/,$_);
  my $fullname=$name_cache{$_};   my $fullname=$name_cache{$_};
  if (!defined($fullname)) {   if (!defined($fullname)) {
     $fullname = &Apache::loncommon::plainname($uname,$udom);      $fullname = &Apache::loncommon::plainname($uname,$udom);
Line 1549  sub handler { Line 1552  sub handler {
     &csv_upload_map($r);      &csv_upload_map($r);
  }   }
     } else {      } else {
  my $symb=&Apache::lonnet::unescape($env{'form.symb'});   my $symb=&unescape($env{'form.symb'});
    if (!defined($symb)) {
       &fail($r,'not_valid');
       return OK;
    }
  my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb);   my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb);
  my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);   my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
  if ($useslots ne 'resource' && $useslots ne 'sequence') {   if ($useslots ne 'resource' && $useslots ne 'map') {
     &fail($r,'not_valid');      &fail($r,'not_available');
     return OK;      return OK;
  }   }
  $env{'request.symb'}=$symb;   $env{'request.symb'}=$symb;
Removed from v.1.59  
changed lines
  Added in v.1.63

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