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

Diff for /loncom/interface/slotrequest.pm between versions 1.35 and 1.38

version 1.35, 2005/11/21 21:20:06 version 1.38, 2006/01/24 06:41:16
Line 325  sub delete_slot { Line 325  sub delete_slot {
     my ($cnum,$cdom)=&get_course();      my ($cnum,$cdom)=&get_course();
     my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,      my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
        "^$slot_name\0");         "^$slot_name\0");
       my ($tmp) = %consumed;
       if ($tmp =~ /error: 2/) { undef(%consumed); }
   
     if (%slot && !%consumed) {      if (%slot && !%consumed) {
  $slot{'type'} = 'deleted';   $slot{'type'} = 'deleted';
Line 626  sub show_table { Line 628  sub show_table {
      'endtime'      => 'End Time',       'endtime'      => 'End Time',
              'startreserve' => 'Time students can start reserving',               'startreserve' => 'Time students can start reserving',
      'secret'       => 'Secret Word',       'secret'       => 'Secret Word',
      'maxspace'     => 'Maxium # of students',       'maxspace'     => 'Maximum # of students',
      'ip'           => 'IP or DNS restrictions',       'ip'           => 'IP or DNS restrictions',
      'symb'         => 'Resource slot is restricted to.',       'symb'         => 'Resource slot is restricted to.',
      'uniqueperiod' => 'Period of time slot is unique',       'uniqueperiod' => 'Period of time slot is unique',
Line 732  sub show_table { Line 734  sub show_table {
  my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,   my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
    "^$slot\0");     "^$slot\0");
  my $ids;   my $ids;
  foreach my $entry (sort(keys(%consumed))) {  
     my (undef,$id)=split("\0",$entry);   my ($tmp)=%consumed;
     my ($uname,$udom) = split('@',$consumed{$entry}{'name'});   if ($tmp !~ /^error: /) {
     my $name = &Apache::loncommon::plainname($uname,$udom);      foreach my $entry (sort(keys(%consumed))) {
     $ids.= '<nobr>'.$name.&remove_link($slot,$entry,$uname,$udom,   my (undef,$id)=split("\0",$entry);
        $consumed{$entry}{'symb'})   my ($uname,$udom) = split('@',$consumed{$entry}{'name'});
  .'</nobr><br />';   my $name = &Apache::loncommon::plainname($uname,$udom);
    $ids.= '<nobr>'.$name.&remove_link($slot,$entry,$uname,$udom,
      $consumed{$entry}{'symb'})
       .'</nobr><br />';
       }
  }   }
   
  my $start=($slots{$slot}->{'starttime'}?   my $start=($slots{$slot}->{'starttime'}?
Line 1129  sub handler { Line 1135  sub handler {
     } else {      } else {
  my $symb=&Apache::lonnet::unescape($env{'form.symb'});   my $symb=&Apache::lonnet::unescape($env{'form.symb'});
  my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb);   my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb);
  if ($res !~ /\.task$/) {   my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
    if ($useslots ne 'resource') {
     &fail($r,'not_valid');      &fail($r,'not_valid');
     return OK;      return OK;
  }   }
  $env{'request.symb'}=$symb;   $env{'request.symb'}=$symb;
  my ($status) = &Apache::lonhomework::check_task_access('0');   my $type = ($res =~ /\.task$/) ? 'Task'
                                  : 'problem';
    my ($status) = &Apache::lonhomework::check_slot_access('0',$type);
  if ($status eq 'CAN_ANSWER' ||   if ($status eq 'CAN_ANSWER' ||
     $status eq 'NEEDS_CHECKIN' ||      $status eq 'NEEDS_CHECKIN' ||
     $status eq 'WAITING_FOR_GRADE') {      $status eq 'WAITING_FOR_GRADE') {
Removed from v.1.35  
changed lines
  Added in v.1.38

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