--- loncom/interface/slotrequest.pm	2015/09/27 14:21:48	1.129
+++ loncom/interface/slotrequest.pm	2023/07/12 15:48:23	1.147
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for requesting to have slots added to a students record
 #
-# $Id: slotrequest.pm,v 1.129 2015/09/27 14:21:48 raeburn Exp $
+# $Id: slotrequest.pm,v 1.147 2023/07/12 15:48:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,16 +50,19 @@ sub fail {
     } else {
 	$r->print('<p>'.&mt('Failed.').'</p>');
     }
-    
+
     &return_link($r);
     &end_page($r);
 }
 
 sub start_page {
-    my ($r,$title,$brcrum,$js)=@_;
+    my ($r,$title,$brcrum,$bread_crumbs_component,$js,$mgr)=@_;
     my $args;
     if (ref($brcrum) eq 'ARRAY') {
         $args = {bread_crumbs => $brcrum};
+        if ($bread_crumbs_component) {
+            $args->{bread_crumbs_component} = $bread_crumbs_component;
+        }
     }
     if (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) {
         my %loaditems = (
@@ -71,6 +74,31 @@ sub start_page {
             $args = { 'add_entries' => \%loaditems };
         }
     }
+    unless (($env{'form.context'} eq 'usermanage') || (($mgr eq 'F') &&
+            (($env{'form.command'} eq 'release') ||
+             ($env{'form.command'} eq 'remove_registration')))) {
+        if ($env{'form.symb'}) {
+            my $symb=&unescape($env{'form.symb'});
+            my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($symb);
+            if ($resurl =~ /ext\.tool$/) {
+                my $target;
+                my ($marker,$exttool) = (split(m{/},$resurl))[3,4];
+                $marker=~s/\D//g;
+                if (($marker) && ($exttool) && ($env{'request.course.id'})) {
+                    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                    my ($idx,$crstool,$is_tool,%toolhash,%toolsettings);
+                    if ($resurl eq "adm/$cdom/$cnum/$marker/$exttool") {
+                        my %toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum);
+                        $target = $toolsettings{'target'};
+                    }
+                }
+                if ($target eq 'iframe') {
+                    $args->{'only_body'} = 1;
+                }
+            }
+        }
+    }
     $r->print(&Apache::loncommon::start_page($title,$js,$args));
 }
 
@@ -256,7 +284,7 @@ function uncheckSlotRadio() {
     }
     if (slotpicks.length) {
         for (var i=0; i<slotpicks.length; i++) {
-            slotpicks[i].checked = false;  
+            slotpicks[i].checked = false;
         }
     }
 }
@@ -305,7 +333,7 @@ function toggleSlotMap(maprownum,rownum)
             for (var i=0; i<resrows.length; i++) {
                 resrows[i].style.display = rowdisplay;
                 if (rowdisplay == 'table-row') {
-                    mapbgidx ++;        
+                    mapbgidx ++;
                     var bgcolnew = mapbgidx % 2;
                     var bgcolold = (mapbgidx+1) % 2;
                     var k = i+parseInt(rownum)+1; 
@@ -340,7 +368,7 @@ function toggleSlotMap(maprownum,rownum)
                             if (table.rows[i].style.display != 'none') {
                                 idx ++;
                                 var bgcolnew = idx % 2;
-                                var bgcolold = (idx+1) % 2;  
+                                var bgcolold = (idx+1) % 2;
                                 j = i+1;
                                 if (document.getElementById('LC_slotmaprow_'+j)) {
                                     document.getElementById('LC_slotmaprow_'+j).className = rowclasses[bgcolnew];
@@ -384,7 +412,7 @@ sub get_course {
 
 sub get_reservation_ids {
     my ($slot_name)=@_;
-    
+
     my ($cnum,$cdom)=&get_course();
 
     my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
@@ -429,7 +457,7 @@ sub check_for_reservation {
 	|| &Apache::lonnet::error($course)
 	|| &Apache::lonnet::error(%slots)) {
 	return 'error: Unable to determine current status';
-    }    
+    }
     my @got;
     my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots,'starttime');
     foreach my $slot_name (@sorted_slots) {
@@ -465,7 +493,7 @@ sub get_consumed_uniqueperiods {
         return 'error: Unable to determine current status';
     }
     my @problems = $navmap->retrieveResources(undef,
-					      sub { $_[0]->is_problem() },1,0);
+					      sub { $_[0]->is_problem() || $_[0]->is_tool() },1,0);
     my %used_slots;
     foreach my $problem (@problems) {
 	my $symb = $problem->symb();
@@ -553,18 +581,18 @@ sub make_reservation {
 	return 'error: Unable to determine current status';
     }
 
-    my $parm_symb  = $symb;
+    my $symb_for_db = $symb;
     my $parm_level = 1;
     if ($use_slots eq 'map' || $use_slots eq 'map_map') {
 	my ($map) = &Apache::lonnet::decode_symb($symb);
-	$parm_symb = &Apache::lonnet::symbread($map);
+	$symb_for_db = &Apache::lonnet::symbread($map);
 	$parm_level = 2;
     }
 
     foreach my $other_slot (split(/:/, $value)) {
 	if ($other_slot eq $slot_name) {
 	    my %consumed=&Apache::lonnet::dump('slot_reservations', $cdom,
-					       $cnum, "^$slot_name\0");   
+					       $cnum, "^$slot_name\0");
 	    if (&Apache::lonnet::error($value)) { 
 		return 'error: Unable to determine current status';
 	    }
@@ -590,17 +618,17 @@ sub make_reservation {
 	my $num=(split('\0',$id))[1];
 	if ($num > $last) { $last=$num; }
     }
-    
+
     my $wanted=$last+1;
     &Apache::lonxml::debug("wanted $wanted<br />");
     if (scalar(@ids) >= $max) {
 	# full up
 	return undef;
     }
-    
+
     my %reservation=('name'      => $env{'user.name'}.':'.$env{'user.domain'},
 		     'timestamp' => time,
-		     'symb'      => $parm_symb);
+		     'symb'      => $symb_for_db);
 
     my $success=&Apache::lonnet::newput('slot_reservations',
 					{"$slot_name\0$wanted" =>
@@ -612,7 +640,9 @@ sub make_reservation {
 	if ($value) {
 	    $new_value=$value.':'.$new_value;
 	}
-        &store_slot_parm($symb,$slot_name,$parm_level,$new_value,$cnum,$cdom);
+        my $result = &store_slot_parm($symb,$symb_for_db,$slot_name,$parm_level,
+                                      $new_value,$cnum,$cdom,$env{'user.name'},
+                                      $env{'user.domain'},'reserve',$env{'form.context'});
 	return $wanted;
     }
 
@@ -621,29 +651,27 @@ sub make_reservation {
 }
 
 sub store_slot_parm {
-    my ($symb,$slot_name,$parm_level,$new_value,$cnum,$cdom) = @_;
-    my $result=&Apache::lonparmset::storeparm_by_symb($symb,
-                                                  '0_availablestudent',
-                                                   $parm_level, $new_value,
-                                                   'string',
-                                                   $env{'user.name'},
-                                                   $env{'user.domain'});
+    my ($symb_for_parm,$symb_for_db,$slot_name,$parm_level,$new_value,
+        $cnum,$cdom,$uname,$udom,$action,$context,$delflag) = @_;
+
+    # store new parameter string
+    my $result=&Apache::lonparmset::storeparm_by_symb($symb_for_parm,
+                                                      '0_availablestudent',
+                                                      $parm_level,$new_value,
+                                                      'string',$uname,$udom);
     &Apache::lonxml::debug("hrrm $result");
     my %storehash = (
-                       symb    => $symb,
+                       symb    => $symb_for_db,
                        slot    => $slot_name,
-                       action  => 'reserve',
-                       context => $env{'form.context'},
+                       action  => $action,
+                       context => $context,
                     );
 
     &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
-                               '',$env{'user.name'},$env{'user.domain'},
-                               $cnum,$cdom);
+                               $delflag,$uname,$udom,$cnum,$cdom);
     &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
-                               1,$env{'user.name'},$env{'user.domain'},
-                               $env{'user.name'},$env{'user.domain'});
-
-    return;
+                               $delflag,$uname,$udom,$uname,$udom);
+    return $result;
 }
 
 sub remove_registration {
@@ -676,7 +704,7 @@ sub remove_registration {
 
 sub remove_registration_user {
     my ($r) = @_;
-    
+
     my $slot_name = $env{'form.slotname'};
 
     my $name = &Apache::loncommon::plainname($env{'form.uname'},
@@ -686,7 +714,7 @@ sub remove_registration_user {
 
     my $msg = &mt('Remove [_1] from slot [_2] for [_3]',
 		  $name,$slot_name,$title);
-    
+
     &remove_registration_confirmation($r,$msg,['uname','udom','slotname',
 					       'entry','symb','context']);
 }
@@ -722,14 +750,14 @@ END_CONFIRM
 
 sub release_all_slot {
     my ($r,$mgr)=@_;
-    
+
     my $slot_name = $env{'form.slotname'};
 
     my ($cnum,$cdom)=&get_course();
 
     my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
 				       "^$slot_name\0");
-    
+
     $r->print('<p>'.&mt('Releasing reservations').'</p>');
 
     foreach my $entry (sort { $consumed{$a}{'name'} cmp 
@@ -739,7 +767,7 @@ sub release_all_slot {
 	    &release_reservation($slot_name,$uname,$udom,
 				 $consumed{$entry}{'symb'},$mgr);
         if (!$result) {
-            $r->print('<p><span class="LC_error">'.&mt($msg).'</span></p>');
+            $r->print('<p class="LC_error">'.&mt($msg).'</p>');
         } else {
 	    $r->print("<p>$msg</p>");
         }
@@ -769,11 +797,11 @@ sub release_slot {
     my ($result,$msg) =
 	&release_reservation($slot_name,$uname,$udom,$symb,$mgr);
     if (!$result) {
-        $r->print('<p><span class="LC_error">'.&mt($msg).'</span></p>');
+        $r->print('<p class="LC_error">'.&mt($msg).'</p>');
     } else {
         $r->print("<p>$msg</p>");
     }
-    
+
     if ($mgr eq 'F') {
 	$r->print('<p><a href="/adm/slotrequest?command=showslots">'.
 		  &mt('Return to slot list').'</a></p>');
@@ -787,26 +815,184 @@ sub release_reservation {
     my ($slot_name,$uname,$udom,$symb,$mgr) = @_;
     my %slot=&Apache::lonnet::get_slot($slot_name);
     my $description=&get_description($slot_name,\%slot);
+    my $msg;
 
     if ($mgr ne 'F') {
 	if ($slot{'starttime'} < time) {
-	    return (0,&mt('Not allowed to release Reservation: [_1], as it has already ended.',$description));
+	    return (0,&mt('Not allowed to release Reservation: [_1], as it has already started.',$description));
 	}
     }
+    my $context = $env{'form.context'};
 
-    # if the reservation symb is for a map get a resource in that map
-    # to check slot parameters on
+    # get navmap object
     my $navmap=Apache::lonnavmaps::navmap->new;
     if (!defined($navmap)) {
         return (0,'error: Unable to determine current status');
     }
+
+    my ($cnum,$cdom)=&get_course();
+
+    # get slot reservations, check if user has reservation
+    my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+                                       "^$slot_name\0");
+
+    #
+    # If release is because of a reservation *change*, symb(s) associated with reservation
+    # being dropped may differ from the current symb.
+    #
+    # We need to get symb(s) from slot_reservations.db, and for each symb, update
+    # the value of the availablestudent parameter, at the appropriate level
+    # (as dictated by the value of the useslots parameter for the symb and user).
+    #
+    # We also delete all entries for the slot being released, for the specific user.
+    #
+
+    my $conflict;
+
+    if (($env{'form.command'} eq 'change') && ($slot_name eq $env{'form.releaseslot'}) &&
+        ($env{'form.slotname'} ne $slot_name)) {
+        my %changedto = &Apache::lonnet::get_slot($env{'form.slotname'});
+
+        # check for conflicts
+        my ($to_uniq_start,$to_uniq_end,$from_uniq_start,$from_uniq_end);
+        if (ref($changedto{'uniqueperiod'}) eq 'ARRAY') {
+            ($to_uniq_start,$to_uniq_end) = @{$changedto{'uniqueperiod'}};
+        }
+        if (ref($slot{'uniqueperiod'}) eq 'ARRAY') {
+            ($from_uniq_start,$from_uniq_end) = @{$slot{'uniqueperiod'}};
+        }
+        my $to_start = $changedto{'starttime'};
+        my $to_end = $changedto{'endtime'};
+        my $from_start = $slot{'starttime'};
+        my $from_end = $slot{'endtime'};
+
+        if (!
+             ($from_start < $to_uniq_start && $from_end < $to_uniq_start) ||
+             ($from_start > $to_uniq_end   && $from_end > $to_uniq_end  )) {
+            $conflict = 1;
+        }
+        if (!
+             ($to_start < $from_uniq_start && $to_end < $from_uniq_start) ||
+             ($to_start > $from_uniq_end   && $to_end > $from_uniq_end  )) {
+            $conflict = 1;
+        }
+
+        if ($conflict) {
+            my %symbs_for_slot;
+            my (%to_delete,%failed,%released);
+            foreach my $entry (keys(%consumed)) {
+                if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) {
+                    $symbs_for_slot{$consumed{$entry}->{'symb'}} = 1;
+                    $to_delete{$entry} = 1;
+                }
+            }
+            if (keys(%to_delete)) {
+                my @removals = keys(%to_delete);
+                if (&Apache::lonnet::del('slot_reservations',\@removals,
+                                     $cdom,$cnum) eq 'ok') {
+                    foreach my $item (keys(%symbs_for_slot)) {
+                        my $result = &update_selectable($navmap,$slot_name,$item,$cdom,
+                                                        $cnum,$udom,$uname,$context);
+                        if ($result =~ /^error/) {
+                            $failed{$item} = 1;
+                        } else {
+                            $released{$item} = 1;
+                        }
+                    }
+                }
+            }
+            if (keys(%released)) {
+                $msg = '<span style="font-weight: bold;">'.
+                       &mt('Released Reservation: [_1]',$description).'</span>&nbsp;&nbsp;'.
+                       &mt('The following items had their reservation status change').':';
+                my (%folders,%pages,%container,%titles);
+                foreach my $item (keys(%released)) {
+                    my $res = $navmap->getBySymb($item);
+                    if (ref($res)) {
+                        $titles{$item} = $res->title();
+                        if ($res->is_map()) {
+                            $folders{$item}{'title'} = $titles{$item};
+                            if ($res->is_page()) {
+                                $pages{$item}{'title'} = $titles{$item};
+                            } else {
+                                $folders{$item}{'title'} = $titles{$item};
+                            }
+                        } else {
+                            my $mapsrc = $res->enclosing_map_src();
+                            my $map = $navmap->getResourceByUrl($mapsrc);
+                            if (ref($map)) {
+                                if ($map->id() eq '0.0') {
+                                    $container{$mapsrc}{'title'} &mt('Top level of course');
+                                } else {
+                                    $container{$mapsrc}{'title'} = $map->title();
+                                    if ($map->is_page()) {
+                                        $container{$mapsrc}{'page'} = 1;
+                                    }
+                                }
+                            }
+                            $container{$mapsrc}{'resources'}{$item} = 1;
+                        }
+                    }
+                }
+                $msg .= '<ul>';
+                if (keys(%folders)) {
+                    $msg .= '<li>'.&mt('Folders').': '.
+                            join(', ', map { $folders{$_}{'title'} } (sort { $folders{$b}{'title'} cmp $folders{$a}{'title'} } (keys(%folders)))).
+                            '</li>';
+                }
+                if (keys(%pages)) {
+                    $msg .= '<li>'.&mt('Composite Pages').': '.
+                            join(', ', map { $pages{$_}{'title'} } (sort { $pages{$b}{'title'} cmp $pages{$a}{'title'} } (keys(%pages)))).
+                            '</li>';
+                }
+                if (keys(%container)) {
+                    $msg .= '<li>'.&mt('Resources').':<ul>';
+                    foreach my $key (sort { $container{$b}{'title'} cmp $container{$a}{'title'} } (keys(%container))) {
+                        if (ref($container{$key}{'resources'}) eq 'HASH') {
+                            $msg .= '<li>'.
+                                    join(', ', map { $titles{$_} } (sort(keys(%{$container{$key}{'resources'}}))));
+                            if ($container{$key}{'page'}) {
+                                $msg .= ' '.&mt('(in composite page [_1])',$container{$key}{'title'}).'</li>';
+                            } else {
+                                $msg .= ' '.&mt('(in folder [_1])',$container{$key}{'title'}).'</li>';
+                            }
+                        }
+                    }
+                    $msg .= '</ul></li>';
+                }
+                $msg .= '</ul>';
+                my $person = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+                my $subject = &mt('Reservation change: [_1]',$description);
+                my $msgbody = &mt('Reservation released by [_1] for [_2].',$person,$description);
+                $msg .= &slot_change_messaging($slot{'reservationmsg'},$subject,$msgbody,'release');
+                return (1,$msg);
+            } else {
+                if (keys(%to_delete)) {
+                    $msg = &mt('Reservation release partially complete for [_1]',$description);
+                } else {
+                    $msg = &mt('No entries found for this user to release for [_1].',$description);
+                }
+                return (0,$msg);
+            }
+        } else {
+            $msg = &mt('No conflict found; not releasing: [_1].',$description);
+            return (0,$msg);
+        }
+    }
+
+    my $map_symb;
+    my $parm_symb = $symb;
     my $passed_resource = $navmap->getBySymb($symb);
+
+    # if the reservation symb is for a map get a resource in that map
+    # to check slot parameters on
+    my $parm_level = 1;
     if (ref($passed_resource)) {
         if ($passed_resource->is_map()) {
 	    my ($a_resource) = 
                 $navmap->retrieveResources($passed_resource, 
-                                           sub {$_[0]->is_problem()},0,1);
-            $symb = $a_resource->symb();
+                    sub {$_[0]->is_problem() || $_[0]->is_tool() },0,1);
+            $parm_symb = $a_resource->symb();
         }
     } else {
         unless ($mgr eq 'F') {
@@ -814,68 +1000,132 @@ sub release_reservation {
         }
     }
 
-    # get parameter string, check for existence, rebuild string with the slot
-    my $student = &Apache::lonnet::EXT("resource.0.availablestudent",
-                                       $symb,$udom,$uname);
-    my @slots = split(/:/,$student);
-
-    my @new_slots;
-    foreach my $exist_slot (@slots) {
-	if ($exist_slot eq $slot_name) { next; }
-	push(@new_slots,$exist_slot);
+    # Get value of useslots parameter in effect for this user.
+    # If value is map or map_map, then the parm level is 2 (i.e.,
+    # non-recursive enclosing map/folder level for specific user)
+    # and the symb for this reservation in slot_reservations.db
+    # will be the symb of the map itself.
+
+    my $use_slots = &Apache::lonnet::EXT('resource.0.useslots',
+                                         $parm_symb,$udom,$uname);
+    if (&Apache::lonnet::error($use_slots)) {
+        return (0,'error: Unable to determine current status');
+    }
+    if ($use_slots eq 'map' || $use_slots eq 'map_map') {
+        $parm_level = 2;
+        if ($passed_resource->is_map()) {
+            $map_symb = $passed_resource->symb();
+        } else {
+            my ($map) = &Apache::lonnet::decode_symb($symb);
+            $map_symb = &Apache::lonnet::symbread($map);
+        }
     }
-    my $new_param = join(':',@new_slots);
 
-    my ($cnum,$cdom)=&get_course();
+    #
+    # If release is *not* because of a reservation change, i.e., this is a "drop"
+    # by a student, or a removal for a single student by an instructor then
+    # only remove one entry from slot_reservations.db, where both the user
+    # and the symb match the current context.  If useslots was set to map or
+    # map_map, then the symb to match in slot_reservations.db is the symb of
+    # the enclosing map/folder, not the symb of the resource.
+    #
 
-    # get slot reservations, check if user has one, if so remove reservation
-    my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
-				       "^$slot_name\0");
+    my ($match,$symb_to_check);
+    if ($parm_level == 2) {
+        $symb_to_check = $map_symb;
+    } else {
+        $symb_to_check = $parm_symb;
+    }
     foreach my $entry (keys(%consumed)) {
-	if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) {
-	    &Apache::lonnet::del('slot_reservations',[$entry],
-				 $cdom,$cnum);
-            my %storehash = (
-                               symb    => $symb,
-                               slot    => $slot_name,
-                               action  => 'release',
-                               context => $env{'form.context'},
-                        );
-            &Apache::lonnet::write_log('slotreservationslog',\%storehash,
-                                       1,$uname,$udom,$cnum,$cdom);
-            &Apache::lonnet::write_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
-                                       1,$uname,$udom,$uname,$udom);
-	}
+        if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) {
+            if ($consumed{$entry}->{'symb'} eq $symb_to_check) {
+                if (&Apache::lonnet::del('slot_reservations',[$entry],
+                                         $cdom,$cnum) eq 'ok') {
+                    $match = $symb_to_check;
+                }
+                last;
+            }
+        }
+    }
+    if ($match) {
+        if (&update_selectable($navmap,$slot_name,$symb,$cdom,
+                               $cnum,$udom,$uname,$context) =~ /^error/) {
+            if ($mgr eq 'F') {
+                $msg = &mt('Reservation release partially complete for: [_1]',"$uname:$udom").'<br />'.
+                       &mt('Update of availablestudent parameter for [_1] was not completed.',"$uname:$udom");
+            } else {
+                $msg = &mt('Release partially complete for: [_1]',$description);
+            }
+            return (0,$msg);
+        } else {
+            if ($mgr eq 'F') {
+                $msg = &mt('Released Reservation for user: [_1]',"$uname:$udom");
+            } else {
+                $msg = '<span style="font-weight: bold;">'.&mt('Released reservation: [_1]',$description).'</span><br /><br />';
+                my $person = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+                my $subject = &mt('Reservation change: [_1]',$description);
+                my $msgbody = &mt('Reservation released by [_1] for [_2].',$person,$description);
+                $msg .= &slot_change_messaging($slot{'reservationmsg'},$subject,$msgbody,'release');
+            }
+            return (1,$msg);
+        }
+    } else {
+        $msg = &mt('Release failed for: [_1]',$description);
+        return (0,$msg);
     }
+}
+
+sub update_selectable {
+    my ($navmap,$slot_name,$symb,$cdom,$cnum,$udom,$uname,$context) = @_;
+    return 'error: ' unless (ref($navmap));
+    my $symb_for_parm = $symb;
+    my $passed_resource = $navmap->getBySymb($symb);
+    return 'error: invalid symb' unless (ref($passed_resource));
 
-    my $use_slots = &Apache::lonnet::EXT("resource.0.useslots",
-					 $symb,$udom,$uname);
+    # if the reservation symb is for a map get a resource in that map
+    # to check slot parameters on
+    if ($passed_resource->is_map()) {
+        my ($a_resource) =
+            $navmap->retrieveResources($passed_resource,
+                                       sub {$_[0]->is_problem() || $_[0]->is_tool() },0,1);
+        $symb_for_parm = $a_resource->symb();
+    }
+    # get parameter string, check for existence, rebuild string with the slot
+    my $student = &Apache::lonnet::EXT('resource.0.availablestudent',
+                                       $symb_for_parm,$udom,$uname);
+
+    # Get value of useslots parameter in effect for this user.
+    # If value is map or map_map, then the parm level is 2 (i.e.,
+    # non-recursive enclosing map/folder level for specific user)
+    # and the symb for this reservation in slot_reservations.db
+    # will be the symb of the map itself.
+
+    my $use_slots = &Apache::lonnet::EXT('resource.0.useslots',
+                                         $symb_for_parm,$udom,$uname);
     &Apache::lonxml::debug("use_slots is  $use_slots<br />");
 
-    if (&Apache::lonnet::error($use_slots)) { 
-	return (0,'error: Unable to determine current status');
+    if (&Apache::lonnet::error($use_slots)) {
+        return 'error: Unable to determine current status';
     }
 
     my $parm_level = 1;
     if ($use_slots eq 'map' || $use_slots eq 'map_map') {
-	$parm_level = 2;
+        $parm_level = 2;
     }
-    # store new parameter string
-    my $result=&Apache::lonparmset::storeparm_by_symb($symb,
-						      '0_availablestudent',
-						      $parm_level, $new_param,
-						      'string', $uname, $udom);
-    my $msg;
-    if ($mgr eq 'F') {
-	$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom");
-    } else {
-	$msg = '<span style="font-weight: bold;">'.&mt('Released reservation: [_1]',$description).'</span><br /><br />';
-        my $person = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
-        my $subject = &mt('Reservation change: [_1]',$description);
-        my $msgbody = &mt('Reservation released by [_1] for [_2].',$person,$description);
-        $msg .= &slot_change_messaging($slot{'reservationmsg'},$subject,$msgbody,'release');
+
+    my @slots = split(/:/,$student);
+
+    my @new_slots;
+    foreach my $exist_slot (@slots) {
+        next if ($exist_slot eq $slot_name);
+        push(@new_slots,$exist_slot);
     }
-    return (1,$msg);
+    my $new_value = join(':',@new_slots);
+
+    my $result = &store_slot_parm($symb_for_parm,$symb,$slot_name,$parm_level,
+                                  $new_value,$cnum,$cdom,$uname,$udom,'release',
+                                  $context,1);
+    return $result;
 }
 
 sub delete_slot {
@@ -897,7 +1147,7 @@ sub delete_slot {
 	if ($ret eq 'ok') {
 	    $r->print('<p>'.&mt('Slot [_1] marked as deleted.','<tt>'.$slot_name.'</tt>').'</p>');
 	} else {
-	    $r->print('<p><span class="LC_error">'.&mt('An error occurred when attempting to delete slot: [_1]','<tt>'.$slot_name.'</tt>')." ($ret)</span></p>");
+	    $r->print('<p class="LC_error">'.&mt('An error occurred when attempting to delete slot: [_1]','<tt>'.$slot_name.'</tt>')." ($ret)</p>");
 	}
     } else {
 	if (%consumed) {
@@ -913,15 +1163,32 @@ sub delete_slot {
 
 sub return_link {
     my ($r) = @_;
+    my $target = &return_target();
     if (($env{'form.command'} eq 'manageresv') || ($env{'form.context'} eq 'usermanage')) {
-	$r->print('<p><a href="/adm/slotrequest?command=manageresv">'.
-                  &mt('Return to reservations'));  
+	$r->print('<p><a href="/adm/slotrequest?command=manageresv" target="'.$target.'">'.
+                  &mt('Return to reservations').'</a></p>'); 
     } else {
-        $r->print('<p><a href="/adm/flip?postdata=return:">'.
+        $r->print('<p><a href="/adm/flip?postdata=return:" target="'.$target.'">'.
 	          &mt('Return to last resource').'</a></p>');
     }
 }
 
+sub return_target {
+    my ($target,$ltitarget,$deeplinktarget);
+    if ($env{'request.lti.login'}) {
+         $ltitarget = $env{'request.lti.target'};
+    }
+    if ($env{'request.deeplink.login'}) {
+        $deeplinktarget = $env{'request.deeplink.target'};
+    }
+    if (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) {
+        $target = '_self';
+    } else {
+        $target = '_top';
+    }
+    return $target;
+}
+
 sub get_slot {
     my ($r,$symb,$conflictable_slot,$inhibit_return_link)=@_;
 
@@ -929,18 +1196,24 @@ sub get_slot {
     my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot);
 
     if ($slot_name =~ /^error: (.*)/) {
-	$r->print('<p><span class="LC_error">'
+	$r->print('<p class="LC_error">'
                  .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
-                 .'</span></p>');
+                 .'</p>');
 	&return_link($r);
 	return 0;
     }
     if ($slot_name && $slot_name ne $conflictable_slot) {
 	my %slot=&Apache::lonnet::get_slot($slot_name);
 	my $description1=&get_description($slot_name,\%slot);
+        my $slottype1=$slot{'type'};
 	%slot=&Apache::lonnet::get_slot($env{'form.slotname'});
 	my $description2=&get_description($env{'form.slotname'},\%slot);
-	if ($slot_name ne $env{'form.slotname'}) {
+        if ($slottype1 eq 'preassigned') {
+            $r->print('<p>'.&mt('You already have a reservation: "[_1]", assigned by your instructor.',
+                                $description1).'</p>'.
+                      '<p>'.&mt('Your instructor must unassign it before you can make a new reservation.').
+                      '</p>');
+        } elsif ($slot_name ne $env{'form.slotname'}) {
 	    $r->print(<<STUFF);
 <form method="post" action="/adm/slotrequest">
    <input type="hidden" name="symb" value="$env{'form.symb'}" />
@@ -978,9 +1251,9 @@ STUFF
     if (defined($reserved)) {
 	my $retvalue = 0;
 	if ($slot_name =~ /^error: (.*)/) {
-	    $r->print('<p><span class="LC_error">'
+	    $r->print('<p class="LC_error">'
                      .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
-                     .'</span></p>');
+                     .'</p>');
 	} elsif ($reserved > -1) {
 	    $r->print('<p style="font-weight: bold;">'.&mt('Successfully signed up:  [_1]',$description).'</p>');
 	    $retvalue = 1;
@@ -1067,7 +1340,7 @@ sub allowed_slot {
     if (($slot->{'endreserve'}) &&
         ($slot->{'endreserve'} < time)) {
         return 0;
-    }    
+    }
     &Apache::lonxml::debug("$slot_name reserve good");
 
     my $userallowed=0;
@@ -1114,14 +1387,25 @@ sub allowed_slot {
     # not allowed for this resource
     if (defined($slot->{'symb'})) {
         my $exclude = 1;
-        my ($slotmap,$slotid,$sloturl) = &Apache::lonnet::decode_symb($slot->{'symb'});
-        if ($sloturl=~/\.(page|sequence)$/) {
-            my ($map,$id,$url) = &Apache::lonnet::decode_symb($symb);
-            if (($map ne '') && ($map eq $slotmap)) {
+        my @symbs;
+        if ($slot->{'symb'} =~ /,/) {
+            @symbs = split(/\s*,\s*/,$slot->{'symb'});
+        } else {
+            @symbs = ($slot->{'symb'});
+        }
+        my ($map,$id,$url) = &Apache::lonnet::decode_symb($symb);
+        foreach my $reqsymb (@symbs) {
+            next if ($reqsymb eq '');
+            my ($slotmap,$slotid,$sloturl) = &Apache::lonnet::decode_symb($reqsymb);
+            if ($sloturl=~/\.(page|sequence)$/) {
+                if (($map ne '') && ($map eq $sloturl)) {
+                    $exclude = 0;
+                    last;
+                }
+            } elsif ($reqsymb eq $symb) {
                 $exclude = 0;
+                last;
             }
-        } elsif ($slot->{'symb'} eq $symb) {
-            $exclude = 0;
         }
         if ($exclude) {
             unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) {
@@ -1164,7 +1448,8 @@ sub show_choices {
     if (!@{$available}) {
         $output = '<span class="LC_info">'.&mt('No available times.').'</span>';
         if ($env{'form.command'} ne 'manageresv') {
-            $output .= ' <a href="/adm/flip?postdata=return:">'.
+            my $target = &return_target();
+            $output .= ' <a href="/adm/flip?postdata=return:" target="'.$target.'">'.
                        &mt('Return to last resource').'</a>';
         }
         if ($class) {
@@ -1202,7 +1487,7 @@ sub show_choices {
                      );
         foreach my $option (@options) {
             my $onclick = "toggleSlotDisplay(this.form,'$num');";
-            if (($option eq 'show') && ($env{'form.command'} eq 'manageresv')) {  
+            if (($option eq 'show') && ($env{'form.command'} eq 'manageresv')) {
                 $onclick .= "currSlotDisplay$num(this.form,'$num');"; 
             }
             $output .= '<span class="LC_nobreak"><label>'.
@@ -1222,7 +1507,7 @@ sub show_choices {
 // <![CDATA[
 function currSlotDisplay$num() {
     var currslot = new Array($numreserved);
-$js    
+$js
     for (var j=0; j<$numreserved; j++) {
         if (document.getElementById('LC_slotrow_$num\_'+currslot[j])) {
             document.getElementById('LC_slotrow_$num\_'+currslot[j]).style.display = '';
@@ -1385,7 +1670,7 @@ sub to_show {
 	}
 	return 0;
     }
-    
+
     return 1;
 }
 
@@ -1424,10 +1709,6 @@ sub show_table {
     } 
     my $available;
     if ($mgr eq 'F') {
-    # FIXME: This line should be deleted once Slots uses breadcrumbs
-    $r->print('<br />'.&Apache::loncommon::help_open_topic(
-        'Slot About', &mt('Help on slots')));
-
 	$r->print('<div>');
 	$r->print('<form method="post" action="/adm/slotrequest">
 <input type="hidden" name="command" value="uploadstart" />
@@ -1437,7 +1718,7 @@ sub show_table {
 	$r->print('<form method="post" action="/adm/helper/newslot.helper">
 <input type="submit" name="newslot" value="'.&mt('Create a New Slot').'" />
 </form>');
-	$r->print(&Apache::loncommon::help_open_topic('Slot AddInterface'));
+	$r->print(&Apache::loncommon::help_open_topic('Slot About'));
 	$r->print('</div>');
     }
 
@@ -1449,7 +1730,7 @@ sub show_table {
         );
         return;
     }
-    
+
     my %Saveable_Parameters = ('show'              => 'array',
 			       'when'              => 'scalar',
 			       'order'             => 'scalar',
@@ -1478,12 +1759,13 @@ sub show_table {
 	     'secret'          => 'Secret Word',
 	     'space'           => '# of students/max',
 	     'ip'              => 'IP or DNS restrictions',
-	     'symb'            => 'Resource/Map slot is restricted to.',
+	     'symb'            => 'Resource(s)/Map(s) slot is restricted to.',
 	     'allowedsections' => 'Sections slot is restricted to.',
 	     'allowedusers'    => 'Users slot is restricted to.',
 	     'uniqueperiod'    => 'Period of time slot is unique',
 	     'scheduled'       => 'Scheduled Students',
-	     'proctor'         => 'List of proctors');
+	     'proctor'         => 'List of proctors',
+	     'iptied'          => 'Unique IP each student',);
     if ($crstype eq 'Community') {
         $show_fields{'startreserve'} = &mt('Time members can start reserving');
         $show_fields{'endreserve'} = &mt('Time members can no longer reserve');
@@ -1491,7 +1773,7 @@ sub show_table {
     }
     my @show_order=('name','description','type','starttime','endtime',
 		    'startreserve','endreserve','reservationmsg','secret','space',
-		    'ip','symb','allowedsections','allowedusers','uniqueperiod',
+		    'ip','iptied','symb','allowedsections','allowedusers','uniqueperiod',
 		    'scheduled','proctor');
     my @show = 
 	(exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show')
@@ -1538,7 +1820,7 @@ sub show_table {
     my $name_filter = {'type'  => $name_filter_type,
 		       'value' => $env{'form.name_filter_value'},};
 
-    
+
     #deleted slot filtering
     #default to hide if no value
     $env{'form.deleted'} ||= 'hide';
@@ -1590,15 +1872,16 @@ sub show_table {
     $r->print('</div>');
     $r->print('<p><input type="submit" name="start" value="'.&mt('Update Display').'" /></p>');
     my $linkstart='<a href="/adm/slotrequest?command=showslots&amp;order=';
-    $r->print(&Apache::loncommon::start_data_table().
-	      &Apache::loncommon::start_data_table_header_row().'
-	       <th></th>');
+    my $tableheader = &Apache::loncommon::start_data_table().
+	              &Apache::loncommon::start_data_table_header_row().'
+	              <th></th>';
     foreach my $which (@show_order) {
 	if ($which ne 'proctor' && exists($show{$which})) {
-	    $r->print('<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>');
+	    $tableheader .= '<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>';
 	}
     }
-    $r->print(&Apache::loncommon::end_data_table_header_row());
+    $tableheader .= &Apache::loncommon::end_data_table_header_row();
+    my $shownheader = 0;
 
     my %name_cache;
     my $slotsort = sub {
@@ -1617,7 +1900,7 @@ sub show_table {
 		return lc($a) cmp lc($b);
 	    }
 	} elsif ($env{'form.order'} eq 'uniqueperiod') {
-	    
+
 	    if ($slots{$a}->{'uniqueperiod'}[0] 
 		ne $slots{$b}->{'uniqueperiod'}[0]) {
 		return ($slots{$a}->{'uniqueperiod'}[0]
@@ -1651,7 +1934,7 @@ sub show_table {
 	}
 	my $description=&get_description($slot,$slots{$slot});
 	my ($id_count,$ids);
-	    
+
 	if (exists($show{'scheduled'}) || exists($show{'space'}) ) {
 	    my $re_str = "$slot\0";
 	    my @this_slot = grep(/^\Q$re_str\E/,keys(%consumed));
@@ -1693,13 +1976,21 @@ sub show_table {
 		localtime($slots{$slot}{'uniqueperiod'}[1]);
 	}
 
-	my $title;
+	my @titles;
 	if (exists($slots{$slot}{'symb'})) {
-	    my (undef,undef,$res)=
-		&Apache::lonnet::decode_symb($slots{$slot}{'symb'});
-	    $res =   &Apache::lonnet::clutter($res);
-	    $title = &Apache::lonnet::gettitle($slots{$slot}{'symb'});
-	    $title='<a href="'.$res.'?symb='.$slots{$slot}{'symb'}.'">'.$title.'</a>';
+            my @symbs;
+            if ($slots{$slot}{'symb'} =~ /,/) {
+                @symbs = split(/\s*,\s*/,$slots{$slot}{'symb'});
+            } else {
+                @symbs = ($slots{$slot}{'symb'});
+            }
+            foreach my $reqsymb (@symbs) {
+	        my (undef,undef,$res) =
+		    &Apache::lonnet::decode_symb($reqsymb);
+	        $res = &Apache::lonnet::clutter($res);
+	        my $title = &Apache::lonnet::gettitle($reqsymb);
+	        push(@titles,'<a href="'.$res.'?symb='.$reqsymb.'">'.$title.'</a>');
+            }
 	}
 
 	my $allowedsections;
@@ -1747,30 +2038,39 @@ sub show_table {
                                                delete => 'Delete',
                                                slotlog => 'History',
         );
-	my $edit=(<<"EDITLINK");
+        my ($edit,$delete,$showlog,$remove_all);
+        if ($mgr) {
+	    $edit=(<<"EDITLINK");
 <a href="/adm/helper/newslot.helper?name=$slot">$lt{'edit'}</a>
 EDITLINK
 
-	my $delete=(<<"DELETELINK");
+	    $delete=(<<"DELETELINK");
 <a href="/adm/slotrequest?command=delete&amp;slotname=$slot">$lt{'delete'}</a>
 DELETELINK
 
-        my $showlog=(<<"LOGLINK");
+            $remove_all=&remove_link($slot,'remove all').'<br />';
+
+            if ($ids eq '') {
+                undef($remove_all);
+            } else {
+                undef($delete);
+            }
+        }
+
+        $showlog=(<<"LOGLINK");
 <a href="/adm/slotrequest?command=slotlog&amp;slotname=$slot">$lt{'slotlog'}</a>
 LOGLINK
 
-        my $remove_all=&remove_link($slot,'remove all').'<br />';
-
-        if ($ids eq '') {
-            undef($remove_all);
-        } else {
-            undef($delete);
-        }
 	if ($slots{$slot}{'type'} ne 'schedulable_student') {
             undef($showlog); 
 	    undef($remove_all);
 	}
 
+        unless ($shownheader) {
+            $r->print($tableheader);
+            $shownheader = 1;
+        }
+
 	my $row_start=&Apache::loncommon::start_data_table_row();
 	my $row_end=&Apache::loncommon::end_data_table_row();
         $r->print($row_start.
@@ -1815,8 +2115,18 @@ LOGLINK
 	if (exists($show{'ip'})) {
 	    $colspan++;$r->print("<td>$slots{$slot}{'ip'}</td>\n");
 	}
+        if (exists($show{'iptied'})) {
+            $colspan++;
+            if ($slots{$slot}{'iptied'} eq 'yes') {
+                $r->print('<td>'.&mt('Yes')."</td>\n");
+            } elsif ($slots{$slot}{'iptied'} eq 'answer') {
+                $r->print('<td>'.&mt('Yes, including post-answer date')."</td>\n");
+            } else {
+                $r->print('<td>'.&mt('No')."</td>\n");
+            }
+        }
 	if (exists($show{'symb'})) {
-	    $colspan++;$r->print("<td>$title</td>\n");
+	    $colspan++;$r->print("<td>".join('<br />',@titles)."</td>\n");
 	}
 	if (exists($show{'allowedsections'})) {
 	    $colspan++;$r->print("<td>$allowedsections</td>\n");
@@ -1839,12 +2149,18 @@ $row_end
 STUFF
         }
     }
-    $r->print(&Apache::loncommon::end_data_table().'</form>');
+    if ($shownheader) {
+        $r->print(&Apache::loncommon::end_data_table());
+    } else {
+        $r->print('<p>'.&mt('No slots meet the criteria for display').'</p>');
+    }
+    $r->print('</form>');
     return;
 }
 
 sub manage_reservations {
     my ($r,$crstype,$slots,$consumed_uniqueperiods,$allavailable) = @_;
+    my ($cnum,$cdom)=&get_course();
     my $navmap = Apache::lonnavmaps::navmap->new();
     $r->print('<p>'
              .&mt('Instructors may use a reservation system to place restrictions on when and where assignments can be worked on.')
@@ -1876,9 +2192,107 @@ sub manage_reservations {
                   '</span>');
         return;
     }
-    my (%parent,%shownparent,%container,%container_title,%contents);
-    my ($depth,$count,$reservable,$lastcontainer,$rownum,$shown) = (0,0,0,0,0,0);
-    my @backgrounds = ("LC_odd_row","LC_even_row");
+    my (%output,%slotinfo,%statusbymap,%repsymbs,%shownmaps);
+    my @possibles = $navmap->retrieveResources(undef,
+                                              sub { $_[0]->is_problem() || $_[0]->is_tool() },1,0);
+
+    foreach my $resource (@possibles) {
+        my ($useslots) = $resource->slot_control();
+        next if (($useslots eq '') || ($useslots =~ /^\s*no\s*$/i));
+        my $symb = $resource->symb();
+        my ($slot_status,$date,$slot_name) = $resource->check_for_slot('0');
+        my ($msg,$get_choices,$slotdescription);
+        my $status = $resource->simpleStatus('0');
+        my ($msg,$get_choices,$slotdescription);
+        if ($slot_name ne '') {
+            my %slot=&Apache::lonnet::get_slot($slot_name);
+            $slotdescription=&get_description($slot_name,\%slot);
+        }
+        if ($slot_status == $resource->NOT_IN_A_SLOT) {
+            $msg=&mt('No current reservation.');
+            $get_choices = 1;
+        } elsif ($slot_status == $resource->NEEDS_CHECKIN) {
+            $msg='<span class="LC_nobreak">'.&mt('Reserved:').
+                 '&nbsp;'.$slotdescription.'</span><br />'.
+                 &mt('Access requires proctor validation.');
+        } elsif ($slot_status == $resource->WAITING_FOR_GRADE) {
+            $msg=&mt('Submitted and currently in grading queue.');
+        } elsif ($slot_status == $resource->CORRECT) {
+            $msg=&mt('Problem is unavailable.');
+        } elsif ($slot_status == $resource->RESERVED) {
+            $msg='<span class="LC_nobreak">'.&mt('Reserved:').
+                 '&nbsp;'.$slotdescription.'</span><br />'.
+                 &mt('Problem is currently available.');
+        } elsif ($slot_status == $resource->RESERVED_LOCATION) {
+            $msg='<span class="LC_nobreak">'.&mt('Reserved:').
+                 '&nbsp;'.$slotdescription.'</span><br />'.
+                 &mt('Problem is available at a different location.');
+            $get_choices = 1;
+        } elsif ($slot_status == $resource->RESERVED_LATER) {
+            $msg='<span class="LC_nobreak">'.&mt('Reserved:').
+                 '&nbsp;'.$slotdescription.'</span><br />'.
+                 &mt('Problem will be available later.');
+            $get_choices = 1;
+        } elsif ($slot_status == $resource->RESERVABLE) {
+            $msg=&mt('Reservation needed');
+            $get_choices = 1;
+        } elsif ($slot_status == $resource->RESERVABLE_LATER) {
+            $msg=&mt('Reservation needed: will be reservable later.');
+        } elsif ($slot_status == $resource->NOTRESERVABLE) {
+            $msg=&mt('Reservation needed: none available.');
+        } elsif ($slot_status == $resource->UNKNOWN) {
+            $msg=&mt('Unable to determine status due to network problems.');
+        } else {
+            if ($status != $resource->OPEN) {
+                $msg = &Apache::lonnavmaps::getDescription($resource,'0');
+            }
+        }
+        $output{$symb}{'msg'} = $msg;
+        if (($status == $resource->OPEN) && ($get_choices)) {
+            $output{$symb}{'hasaction'} = 1;
+        }
+        my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($symb);
+        $mapurl = &Apache::lonnet::clutter($mapurl);
+        unless ($mapurl =~ /default\.sequence$/) {
+            $shownmaps{$mapurl} = 1;
+            my $map = $navmap->getResourceByUrl($mapurl);
+            if (ref($map)) {
+                my @pcs = split(/,/,$map->map_hierarchy());
+                shift(@pcs);
+                shift(@pcs);
+                if (@pcs) {
+                    map { $shownmaps{$navmap->getByMapPc($_)->src()} = 1; } reverse(@pcs);
+                }
+            }
+        }
+        if (($useslots eq 'map_map') || ($useslots eq 'map')) {
+            if ($slot_status ne '') {
+                if (ref($statusbymap{$mapurl}{$slot_status}) eq 'ARRAY') {
+                    push(@{$statusbymap{$mapurl}{$slot_status}},$symb);
+                } else {
+                    $statusbymap{$mapurl}{$slot_status} = [$symb];
+                }
+            }
+        }
+    }
+
+    foreach my $mapurl (keys(%statusbymap)) {
+        if (ref($statusbymap{$mapurl}) eq 'HASH') {
+            if (keys(%{$statusbymap{$mapurl}}) == 1) {
+                my @values = values(%{$statusbymap{$mapurl}});
+                my $repsymb = $values[0][0];
+                if (ref($output{$repsymb}) eq 'HASH') {
+                    $output{$mapurl}{'msg'} = $output{$repsymb}{'msg'};
+                    $output{$mapurl}{'hasaction'} = $output{$repsymb}{'hasaction'};
+                }
+                $repsymbs{$mapurl} = $repsymb;
+            }
+        }
+    }
+
+    my (%parent,%container,%container_title);
+    my ($depth,$count,$reservable,$currcontainer,$rownum,$mapnum,$shown) = (0,0,0,0,0,0,0);
+    my @backgrounds = ("LC_even_row","LC_odd_row");
     my $numcolors = scalar(@backgrounds);
     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif");
     my $slotheader = '<p>'.
@@ -1886,254 +2300,125 @@ sub manage_reservations {
                  '</p>'.
                  '<table class="LC_data_table LC_tableOfContent" id="LC_slot_reservations">'."\n";
     my $shownheader = 0;
+    my $currmap;
     my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
-    my (@ordered,%output,$mapitem,$got_map_slot,$currmapoutput,$mapnum);
-    $mapnum = 0;
-    $shown = 0;
     while (my $resource = $it->next()) {
         if ($resource == $it->BEGIN_MAP()) {
             $depth++;
-            $parent{$depth} = $lastcontainer;
-        }
-        if ($resource == $it->END_MAP()) {
-            $depth--;
-            $lastcontainer = $parent{$depth};
-            my %allstatuses;
-            foreach my $symb (@ordered) {
-                if (ref($output{$symb}) eq 'HASH') {
-                    if (($output{$symb}{'type'} eq 'map_map') || ($output{$symb}{'type'} eq 'map')) {
-                        if ($output{$symb}{'slotstatus'} ne '') {
-                            if (ref($allstatuses{$output{$symb}{'slotstatus'}}) eq 'ARRAY') {
-                                push(@{$allstatuses{$output{$symb}{'slotstatus'}}},$symb);
+            $parent{$depth} = $currcontainer;
+            if (ref($container{$currcontainer})) {
+                my $currmapres = $container{$currcontainer};
+                my $currmaptitle = $container_title{$currcontainer};
+                $currmap = $currmapres->src();
+                my $currmaptype = 'sequence';
+                if ($currmapres->is_page()) {
+                    $currmaptype = 'page';
+                }
+                if ($shownmaps{$currmap}) {
+                    $mapnum ++;
+                    $rownum ++;
+                    $shown ++;
+                    if (!$shownheader) {
+                        $r->print($slotheader);
+                        $shownheader = 1;
+                    }
+                    my $bgcolor = $backgrounds[$shown % $numcolors];
+                    my ($spacers,$icon);
+                    my $row = '<tr class="'.$bgcolor.'" id="LC_slotmaprow_'.$rownum.'">';
+                    if (ref($statusbymap{$currmap}) eq 'HASH') {
+                        my ($spacers,$icon) = &show_map_row($depth-1,$location,$currmaptype,$currmaptitle);
+                        my $arrowstate = 'open';
+                        if (keys(%{$statusbymap{$currmap}}) == 1) {
+                            $arrowstate = 'closed';
+                        }
+                        $row .= '<td>'.$spacers.'<img src="/adm/lonIcons/arrow.'.$arrowstate.'.gif" '.
+                                'id="arrow'.$mapnum.'" '.'alt="arrow" onmouseover="this.style.cursor=\'pointer\'" '.
+                                'onclick="'."toggleSlotMap('$mapnum','$rownum');".'" />'.
+                                $icon.('&nbsp;' x6).'</td>'."\n";
+                        if (ref($output{$currmap}) eq 'HASH') {
+                            my $formnum = $mapnum.'_'.$reservable+1;
+                            my $class = 'LC_slotmaptext_'.$mapnum;
+                            if ($output{$currmap}{'hasaction'}) {
+                                $row .= '<td valign="top"><span class="'.$class.'">'.
+                                          $output{$currmap}{'msg'}.
+                                          '</span></td><td valign="top">'.
+                                          &slot_chooser($repsymbs{$currmap},$class,$formnum,
+                                                        $allavailable,$slots,$consumed_uniqueperiods).
+                                          '</td>';
                             } else {
-                                $allstatuses{$output{$symb}{'slotstatus'}} = [$symb];
+                                $row .= '<td colspan="2" valign="middle"><span class="'.$class.'">'.
+                                          $output{$currmap}{'msg'}.
+                                          '</span></td>';
                             }
+                            $row .= '</tr>'."\n";
+                        } else {
+                            $row .= '<td colspan="2">&nbsp;</td></tr>'."\n";
                         }
-                    }
-                }
-            }
-            if (keys(%allstatuses) == 1) {
-                $got_map_slot = 1;
-                my $repsymb;
-                my @values = values(%allstatuses);
-                if (ref($values[0]) eq 'ARRAY') {
-                    if (ref($output{$values[0][0]}) eq 'HASH') {
-                        $repsymb = $values[0][0];
-                    }
-                }
-                if (($mapitem) && ($repsymb)) {
-                    my $formnum = $mapnum.'_'.$output{$repsymb}{'reservable'};
-                    my $class = 'LC_slotmaptext_'.$mapnum;
-                    if ($output{$repsymb}{'hasaction'}) {
-                        $mapitem .= '<td valign="top"><span class="'.$class.'">'.
-                                    $output{$repsymb}{'msg'}.
-                                    '</span></td><td valign="top">'.
-                                    &slot_chooser($repsymb,$class,$formnum,$allavailable,$slots,
-                                                  $consumed_uniqueperiods).
-                                   '</td>';
-
                     } else {
-                        $mapitem .= '<td colspan="2" valign="middle"><span class="'.$class.'">'.
-                                    $output{$repsymb}{'msg'}.
-                                    '</span></td>';
+                        my ($spacers,$icon) = &show_map_row($depth,$location,$currmaptype,$currmaptitle);
+                        $row .= '<td>'.$spacers.$icon.('&nbsp;' x6).'</td><td colspan="2">&nbsp;</td></tr>'."\n";
                     }
-                }
-                my $counter = 0;
-                foreach my $symb (@ordered) {
-                    if (ref($output{$symb}) eq 'HASH') {
-                        $counter ++;
-                        my $bgcolor = $backgrounds[($output{$symb}{'shown'} + $counter) % $numcolors];
-                        $currmapoutput .= $output{$symb}{'header'}.
-                                          '<tr class="'.$bgcolor.' LC_slotresrow_'.$output{$symb}{'mapnum'}.'"'.
-                                          ' style="display:none" id="LC_slotresrow_'.$output{$symb}{'rownum'}.'">'.
-                                          $output{$symb}{'info'}.
-                                          $output{$symb}{'data'}.'</tr>'."\n";
-                    }
-                }
-            } else {
-                my $counter = 0;
-                foreach my $symb (@ordered) {
-                    if (ref($output{$symb}) eq 'HASH') {
-                        $counter ++;
-                        my $bgcolor = $backgrounds[($output{$symb}{'shown'} + $counter) % $numcolors];
-                        $currmapoutput .= $output{$symb}{'header'}.
-                                          '<tr class="'.$bgcolor.' LC_slotresrow_'.$output{$symb}{'mapnum'}.'"'.
-                                          ' style="display:table-row" id="LC_slotresrow_'.$output{$symb}{'rownum'}.'">'.
-                                          $output{$symb}{'info'}.
-                                          $output{$symb}{'data'}.'</tr>'."\n";
-                        $shown ++;
-                    }
-                }
-            }
-            if ($mapitem) {
-                if ($got_map_slot) {
-                    $mapitem =~ s{(<img src=\"/adm/lonIcons/arrow\.)open(\.gif\")}{$1closed$2};
-                    $mapitem .= '</tr>'."\n";
-                } else {
-                    $mapitem .= '<td colspan="2">&nbsp;</td></tr>'."\n";
+                    $r->print($row);
                 }
             }
-            $r->print($mapitem.$currmapoutput);
-            @ordered=();
-            undef(%output);
-            $currmapoutput = '';
-            $got_map_slot = '';
-            $mapitem = '';
-        }
-        if (ref($resource)) {
+        } elsif ($resource == $it->END_MAP()) {
+            $depth--;
+            $currcontainer = $parent{$depth};
+        } elsif (ref($resource)) {
             my $symb = $resource->symb();
-            $contents{$lastcontainer} ++;
-            next if (!$resource->is_problem() && !$resource->is_sequence() && 
-                     !$resource->is_page());
+            next if (!$resource->is_problem() && !$resource->is_tool() &&
+                     !$resource->is_sequence() && !$resource->is_page());
             $count ++;
             if (($resource->is_sequence()) || ($resource->is_page())) {
-                $lastcontainer = $count;
-                $container{$lastcontainer} = $resource;
-                $container_title{$lastcontainer} = $resource->compTitle();
-            }
-            if ($resource->is_problem()) {
-                my ($useslots) = $resource->slot_control();
-                next if (($useslots eq '') || ($useslots =~ /^\s*no\s*$/i));
-                push(@ordered,$symb); 
-                $output{$symb}{type} = $useslots;  
-                my ($msg,$get_choices,$slotdescription);
-                my $title = $resource->compTitle();
-                my $status = $resource->simpleStatus('0');
-                my ($slot_status,$date,$slot_name) = $resource->check_for_slot('0');
-
-                $output{$symb}{'slotstatus'} = $slot_status;
-                $output{$symb}{'slotname'} = $slot_name; 
-                if ($slot_name ne '') {
-                    my %slot=&Apache::lonnet::get_slot($slot_name);
-                    $slotdescription=&get_description($slot_name,\%slot);
-                }
-                if ($slot_status == $resource->NOT_IN_A_SLOT) {
-                    $msg=&mt('No current reservation.');
-                    $get_choices = 1;
-                } elsif ($slot_status == $resource->NEEDS_CHECKIN) {
-                    $msg='<span class="LC_nobreak">'.&mt('Reserved:').
-                         '&nbsp;'.$slotdescription.'</span><br />'.
-                         &mt('Access requires proctor validation.');
-                } elsif ($slot_status == $resource->WAITING_FOR_GRADE) {
-                    $msg=&mt('Submitted and currently in grading queue.');
-                } elsif ($slot_status == $resource->CORRECT) {
-                    $msg=&mt('Problem is unavailable.');
-                } elsif ($slot_status == $resource->RESERVED) {
-                    $msg='<span class="LC_nobreak">'.&mt('Reserved:').
-                         '&nbsp;'.$slotdescription.'</span><br />'.
-                         &mt('Problem is currently available.');
-                } elsif ($slot_status == $resource->RESERVED_LOCATION) {
-                    $msg='<span class="LC_nobreak">'.&mt('Reserved:').
-                         '&nbsp;'.$slotdescription.'</span><br />'.
-                         &mt('Problem is available at a different location.');
-                    $get_choices = 1;
-                } elsif ($slot_status == $resource->RESERVED_LATER) {
-                    $msg='<span class="LC_nobreak">'.&mt('Reserved:').
-                         '&nbsp;'.$slotdescription.'</span><br />'.
-                         &mt('Problem will be available later.');
-                    $get_choices = 1;
-                } elsif ($slot_status == $resource->RESERVABLE) {
-                    $msg=&mt('Reservation needed');
-                    $get_choices = 1;
-                } elsif ($slot_status == $resource->RESERVABLE_LATER) {
-                    $msg=&mt('Reservation needed: will be reservable later.');
-                } elsif ($slot_status == $resource->NOTRESERVABLE) {
-                    $msg=&mt('Reservation needed: none available.');
-                } elsif ($slot_status == $resource->UNKNOWN) {
-                    $msg=&mt('Unable to determine status due to network problems.');
-                } else {
-                    if ($status != $resource->OPEN) {
-                        $msg = &Apache::lonnavmaps::getDescription($resource,'0'); 
-                    }
-                }
-                $output{$symb}{'msg'} = $msg;
+                $currcontainer = $count;
+                $container{$currcontainer} = $resource;
+                $container_title{$currcontainer} = $resource->compTitle();
+            }
+            if ($resource->is_problem() || $resource->is_tool()) {
+                next unless (exists($output{$symb}));
                 $reservable ++;
-                $output{$symb}{'reservable'} = $reservable;
-                my $treelevel = $depth;
-                my $higherup = $lastcontainer;
-                if ($depth > 1) {
-                    my @maprows;
-                    while ($treelevel > 1) {
-                        if (ref($container{$higherup})) {
-                            my $res = $container{$higherup};
-                            last if (defined($shownparent{$higherup}));
-                            my $maptitle = $res->compTitle();
-                            my $type = 'sequence';
-                            if ($res->is_page()) {
-                                $type = 'page';
-                            }
-                            &show_map_row($treelevel,$location,$type,$maptitle,
-                                          \@maprows);
-                            $shownparent{$higherup} = 1;
-                        }
-                        $treelevel --;
-                        $higherup = $parent{$treelevel};
-                    }
-                    for (my $i=0; $i<@maprows; $i++) {
-                        $mapnum ++;
-                        $rownum ++;
-                        $shown ++;
-                        my $bgcolor = $backgrounds[$shown % $numcolors];
-                        if (!$shownheader) {
-                            $mapitem .= $slotheader;
-                            $shownheader = 1;
-                        }
-                        if (ref($maprows[$i]) eq 'ARRAY') {
-                            if ($i < scalar(@maprows)-1) {
-                                $mapitem .= '<tr class="'.$bgcolor.'" id="LC_slotmaprow_'.$rownum.'">'.
-                                            '<td>'.join('',@{$maprows[$i]}).'</td>'.
-                                            '<td colspan="2">&nbsp;</td></tr>'."\n";
-                            } else {
-                                $mapitem .= 
-                                   '<tr class="'.$bgcolor.'" id="LC_slotmaprow_'.$rownum.'">'.
-                                   '<td>'.$maprows[$i][0].
-                                   '<img src="/adm/lonIcons/arrow.open.gif" id="arrow'.$mapnum.'" '.
-                                   'alt="arrow" onmouseover="this.style.cursor=\'pointer\'" '.
-                                   'onclick="'."toggleSlotMap('$mapnum','$rownum');".'" />'.
-                                   $maprows[$i][1].('&nbsp;' x6).'</td>'."\n";
-                            }
-                        }
-                    }
-                    $output{$symb}{'mapnum'} = $mapnum;
-                }
                 $rownum ++;
-                $output{$symb}{'rownum'} = $rownum;
-                $output{$symb}{'shown'} = $shown;
                 if (!$shownheader) {
-                    $output{$symb}{'header'} = $slotheader;
+                    $r->print($slotheader);
                     $shownheader = 1;
                 }
-                $output{$symb}{'info'} = '<td>';
+                my $style;
+                if (exists($output{$currmap})) {
+                    $style = 'none';
+                } else {
+                    $style = 'table-row';
+                    $shown ++;
+                }
+                my $title = $resource->compTitle();
+                my $bgcolor = $backgrounds[$shown % $numcolors];
+                $r->print('<tr class="'.$bgcolor.' LC_slotresrow_'.$mapnum.'"'.
+                          ' style="display:'.$style.'" id="LC_slotresrow_'.$rownum.'">'.
+                          '<td>');
                 for (my $i=0; $i<$depth; $i++) {
-                    $output{$symb}{'info'} .= '<img src="'.$location.'" alt="" />';
+                    $r->print('<img src="'.$location.'" alt="" />');
                 }
-                $output{$symb}{'info'} .= '<a href="'.$resource->src().'?symb='.$symb.'">'.
-                                         '<img class="LC_contentImage" src="/adm/lonIcons/';
+                $r->print('<a href="'.$resource->src().'?symb='.$symb.'">'.
+                          '<img class="LC_contentImage" src="/adm/lonIcons/');
                 if ($resource->is_task()) {
-                    $output{$symb}{'info'} .= 'task.gif" alt="'.&mt('Task');
+                    $r->print('task.gif" alt="'.&mt('Task'));
+                } elsif ($resource->is_tool()) {
+                    $r->print('unknown.gif" alt="'.&mt('External Tool'));
                 } else {
-                    $output{$symb}{'info'} .= 'problem.gif" alt="'.&mt('Problem');
-                }
-                $output{$symb}{'info'} .= '" /><b>'.$title.'</b></a>'.('&nbsp;' x6).'</td>';
-
-                my $hasaction;
-                if ($status == $resource->OPEN) {
-                    if ($get_choices) {
-                        $hasaction = 1;
-                        $output{$symb}{'hasaction'} = $hasaction;
-                    }
+                    $r->print('problem.gif" alt="'.&mt('Problem'));
                 }
+                $r->print('" /><b>'.$title.'</b></a>'.('&nbsp;' x6).'</td>');
                 my $class = 'LC_slottext_'.$mapnum;
-                if ($hasaction) {
-                    $output{$symb}{'data'} = '<td valign="top"><span class="'.$class.'">'.$msg.'</span></td>'.
-                                             '<td valign="top">'.
-                                             &slot_chooser($symb,$class,$reservable,$allavailable,$slots,
-                                                           $consumed_uniqueperiods).'</td>';
+                if ($output{$symb}{'hasaction'}) {
+                    $r->print('<td valign="top"><span class="'.$class.'">'.$output{$symb}{'msg'}.'</span></td>'.
+                              '<td valign="top">'.
+                              &slot_chooser($symb,$class,$reservable,$allavailable,$slots,
+                                            $consumed_uniqueperiods).'</td>');
                 } else {
-                    $output{$symb}{'data'} = '<td colspan="2" valign="middle">'.
-                                             '<span class="'.$class.'">'.$msg.'</span>'.
-                                             '</td>';
+                    $r->print('<td colspan="2" valign="middle">'.
+                              '<span class="'.$class.'">'.$output{$symb}{'msg'}.'</span>'.
+                              '</td>');
                 }
+                $r->print('</tr>'."\n");
             }
         }
     }
@@ -2154,9 +2439,9 @@ sub manage_reservations {
 }
 
 sub show_map_row {
-    my ($depth,$location,$type,$title,$maprows) = @_;
+    my ($depth,$location,$type,$title) = @_;
     my $spacers;
-    for (my $i=0; $i<$depth-2; $i++) {
+    for (my $i=0; $i<$depth-1; $i++) {
         $spacers .= '<img src="'.$location.'" alt="" />';
     }
     my $icon;
@@ -2166,8 +2451,7 @@ sub show_map_row {
         $icon = '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
     }
     $icon .= $title;
-    unshift (@{$maprows},[$spacers,$icon]);
-    return;
+    return ($spacers,$icon);
 }
 
 sub slot_chooser {
@@ -2186,9 +2470,26 @@ sub slot_chooser {
                 foreach my $slot (@{$allavailable}) {
                     # not allowed for this resource
                     if (ref($slots->{$slot}) eq 'HASH') {
-                        if ((defined($slots->{$slot}->{'symb'})) &&
-                            ($slots->{$slot}->{'symb'} ne $symb)) {
-                            next;
+                        if ($slots->{$slot}->{'symb'} ne '') {
+                            my ($map,$id,$url) = &Apache::lonnet::decode_symb($symb);
+                            my $exclude = 1;
+                            my @reqsymbs = split(/\s*,\s*/,$slots->{$slot}->{'symb'});
+                            if (@reqsymbs) {
+                                if (grep(/^\Q$symb\E$/,@reqsymbs)) {
+                                    $exclude = 0;
+                                } else {
+                                    foreach my $reqsymb (@reqsymbs) {
+                                        my (undef,undef,$sloturl) = &Apache::lonnet::decode_symb($reqsymb);
+                                        if ($sloturl=~/\.(page|sequence)$/) {
+                                            if (($map ne '') && ($map eq $sloturl)) {
+                                                $exclude = 0;
+                                                last;
+                                            }
+                                        }
+                                    }
+                                }
+                                next if ($exclude);
+                            }
                         }
                     }
                     push(@available,$slot);
@@ -2211,8 +2512,7 @@ sub show_reservations {
         $udom = $env{'user.domain'};
     }
     my $formname = 'slotlog';
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my ($cnum,$cdom)=&get_course();
     my $crstype = &Apache::loncommon::course_type();
     my %log=&Apache::lonnet::dump('nohist_'.$cdom.'_'.$cnum.'_slotlog',$udom,$uname);
     if ($env{'form.origin'} eq 'aboutme') {
@@ -2313,14 +2613,16 @@ sub show_reservations {
     if ($showntablehdr) {
         $r->print(&Apache::loncommon::end_data_table().'<br />');
         if (($curr{'page'} > 1) || ($more_records)) {
-            $r->print('<table><tr>');
+            $r->print('<p>');
             if ($curr{'page'} > 1) {
-                $r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');
+                $r->print('<input type="button" onclick="javascript:chgPage('."'previous'".');" value="'.
+                          &mt('Previous [_1] changes',$curr{'show'}).'" />');
             }
             if ($more_records) {
-                $r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
+                $r->print('<input type="button" onclick="javascript:chgPage('."'next'".');" value="'.
+                          &mt('Next [_1] changes',$curr{'show'}).'" />');
             }
-            $r->print('</tr></table>');
+            $r->print('</p>');
             $r->print(<<"ENDSCRIPT");
 <script type="text/javascript">
 // <![CDATA[
@@ -2385,8 +2687,7 @@ sub show_reservations_log {
         return;
     }
     my $formname = 'reservationslog';
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my ($cnum,$cdom)=&get_course();
     my %slotlog=&Apache::lonnet::dump('nohist_slotreservationslog',$cdom,$cnum);
     if ((keys(%slotlog))[0]=~/^error\:/) { undef(%slotlog); }
 
@@ -2524,14 +2825,16 @@ sub show_reservations_log {
     if ($showntablehdr) {
         $r->print(&Apache::loncommon::end_data_table().'<br />');
         if (($curr{'page'} > 1) || ($more_records)) {
-            $r->print('<table><tr>');
+            $r->print('<p>');
             if ($curr{'page'} > 1) {
-                $r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');
+                $r->print('<input type="button" onclick="javascript:chgPage('."'previous'".');" value="'.
+                          &mt('Previous [_1] changes',$curr{'show'}).'" />');
             }
             if ($more_records) {
-                $r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
+                $r->print('<input type="button" onclick="javascript:chgPage('."'next'".');" value="'.
+                          &mt('Next [_1] changes',$curr{'show'}).'" />');
             }
-            $r->print('</tr></table>');
+            $r->print('</p>');
             $r->print(<<"ENDSCRIPT");
 <script type="text/javascript">
 function chgPage(caller) {
@@ -2613,7 +2916,7 @@ sub display_filter {
     my (%titles,%maptitles);
     my $output = '<br /><table><tr><td valign="top">'.
                  '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><br />'.
-                 &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
+                 &Apache::lonmeta::selectbox('show',$curr->{'show'},'',undef,
                                               (&mt('all'),5,10,20,50,100,1000,10000)).
                  '</td><td>&nbsp;&nbsp;</td>';
     my $startform =
@@ -2671,8 +2974,9 @@ sub display_filter {
         }
         $output .= '</select></td>';
     }
-    $output .= '<td>&nbsp;&nbsp;</td><td valign="middle"><input type="submit" value="'.
-               &mt('Update Display').'" /></tr></table>'.
+    $output .= '<td>&nbsp;&nbsp;</td></tr></table>'.
+               '<p><input type="submit" value="'.
+               &mt('Update Display').'" /></p>'.
                '<p class="LC_info">'.
                &mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
                   ,'2.9.0');
@@ -2720,7 +3024,7 @@ sub slot_change_messaging {
 }
 
 sub upload_start {
-    my ($r)=@_;    
+    my ($r)=@_;
     $r->print(
         &Apache::grades::checkforfile_js()
        .'<h2>'.&mt('Upload a file containing the slot definitions').'</h2>'
@@ -2878,8 +3182,10 @@ sub csv_upload_map {
     if (!$env{'form.datatoken'}) {
 	$datatoken=&Apache::loncommon::upfile_store($r);
     } else {
-	$datatoken=$env{'form.datatoken'};
-	&Apache::loncommon::load_tmp_file($r);
+        $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});
+        if ($datatoken ne '') {
+            &Apache::loncommon::load_tmp_file($r,$datatoken);
+        }
     }
     my @records=&Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@records); }
@@ -2916,10 +3222,11 @@ sub csvupload_fields {
             ['endreserve','Reservation End Time'],
             ['reservationmsg','Message when reservation changed'],
 	    ['ip','IP or DNS restriction'],
+            ['iptied','Unique IP each student'],
 	    ['proctor','List of proctor ids'],
 	    ['description','Slot Description'],
 	    ['maxspace','Maximum number of reservations'],
-	    ['symb','Resource/Map Restriction'],
+	    ['symb','Resource(s)/Map(s) Restriction'],
 	    ['uniqueperiod','Date range of slot exclusion'],
 	    ['secret','Secret word proctor uses to validate'],
 	    ['allowedsections','Sections slot is restricted to'],
@@ -2929,7 +3236,10 @@ sub csvupload_fields {
 
 sub csv_upload_assign {
     my ($r,$mgr)= @_;
-    &Apache::loncommon::load_tmp_file($r);
+    my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'});
+    if ($datatoken ne '') {
+        &Apache::loncommon::load_tmp_file($r,$datatoken);
+    }
     my @slotdata = &Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@slotdata); }
     my %fields=&Apache::grades::get_fields();
@@ -2987,8 +3297,12 @@ sub csv_upload_assign {
 	}
 
 	if ($entries{$fields{'startreserve'}}) {
-	    $slot{'startreserve'}=
-		&UnixDate($entries{$fields{'startreserve'}},"%s");
+            my $date = &UnixDate($entries{$fields{'startreserve'}},"%s");
+            if ($date eq '') {
+                push(@errors,"$name -- No reservation start time set for slot -- value provided had invalid format");
+            } else {
+                $slot{'startreserve'} = $date;
+            }
 	}
 	if (defined($slot{'startreserve'})
 	    && $slot{'startreserve'} > $slot{'starttime'}) {
@@ -2997,8 +3311,12 @@ sub csv_upload_assign {
 	}
 
         if ($entries{$fields{'endreserve'}}) {
-            $slot{'endreserve'}=
-                &UnixDate($entries{$fields{'endreserve'}},"%s");
+            my $date = &UnixDate($entries{$fields{'endreserve'}},"%s");
+            if ($date eq '') {
+                push(@errors,"$name -- No reservation end time set for slot -- value provided had invalid format");
+            } else {
+                $slot{'endreserve'} = $date;
+            }
         }
         if (defined($slot{'endreserve'})
             && $slot{'endreserve'} > $slot{'starttime'}) {
@@ -3024,8 +3342,16 @@ sub csv_upload_assign {
 			 'secret','symb') {
 	    if ($entries{$fields{$key}}) {
 		$slot{$key}=$entries{$fields{$key}};
+                if ($key eq 'maxspace') {
+                    $slot{$key} =~ s/\D+//g;
+                }
 	    }
 	}
+        if ($entries{$fields{'iptied'}} =~ /^\s*(yes|1)\s*$/i) {
+            $slot{'iptied'}='yes'; 
+        } elsif ($entries{$fields{'iptied'}} =~ /^\s*answer\s*$/i) {
+            $slot{'iptied'}='answer';
+        }
         if ($entries{$fields{'allowedusers'}}) {
             $entries{$fields{'allowedusers'}} =~ s/^\s+//;
             $entries{$fields{'allowedusers'}} =~ s/\s+$//;
@@ -3058,12 +3384,14 @@ sub csv_upload_assign {
             }
         }
 	if ($entries{$fields{'uniqueperiod'}}) {
-	    my ($start,$end)=split(',',$entries{$fields{'uniqueperiod'}});
-	    my @times=(&UnixDate($start,"%s"),
-		       &UnixDate($end,"%s"));
-	    $slot{'uniqueperiod'}=\@times;
+            my ($start,$end)= map { &UnixDate($_,"%s"); } split(',',$entries{$fields{'uniqueperiod'}});
+            if (($start ne '') && ($end ne '')) {
+                $slot{'uniqueperiod'}=[$start,$end];
+            } else {
+                push(@errors,"$name -- Slot's unique period ignored -- one or both of the comma separated values for start and end had an invalid format");
+            }
 	}
-	if (defined($slot{'uniqueperiod'})
+	if (ref($slot{'uniqueperiod'}) eq 'ARRAY' 
 	    && $slot{'uniqueperiod'}[0] > $slot{'uniqueperiod'}[1]) {
 	    push(@errors,"$name not created -- Slot's unique period start time is later than the unique period's end time.");
 	    next;
@@ -3124,7 +3452,7 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
 
     my %crumb_titles = &slot_command_titles();
-    my $brcrum;
+    my ($brcrum,$bread_crumbs_component);
 
     my $vgr=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
     my $mgr=&Apache::lonnet::allowed('mgr',$env{'request.course.id'});
@@ -3149,7 +3477,7 @@ sub handler {
         if (ref($brcrum) eq 'ARRAY') {
             push(@{$brcrum},{href=>"/adm/slotrequest?command=showresv",text=>$title});
         }
-    } elsif (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) {  
+    } elsif (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) {
         if ($env{'form.command'} eq 'manageresv') {
             $title = 'Manage Reservations';
             $brcrum =[{href=>"/adm/slotrequest?command=manageresv",text=>$title}];
@@ -3160,8 +3488,10 @@ sub handler {
     } elsif ($vgr eq 'F') {
         if ($env{'form.command'} =~ /^(slotlog|showslots|uploadstart|csvuploadmap|csvuploadassign|delete|release|remove_registration)$/) {
             $brcrum =[{href=>"/adm/slotrequest?command=showslots",
-                       text=>$crumb_titles{'showslots'}}];
+                       text=>$crumb_titles{'showslots'},
+                       help=>'Slot_Use'}];
 	    $title = 'Managing Slots';
+            $bread_crumbs_component = 'Slots';
             unless ($env{'form.command'} eq 'showslots') {
                 if (ref($brcrum) eq 'ARRAY') {
                     push(@{$brcrum},{href=>"/adm/slotrequest?command=$env{'form.command'}",text=>$crumb_titles{$env{'form.command'}}});
@@ -3189,7 +3519,7 @@ sub handler {
     if (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) {
         $js = &reservation_js(\%slots,$consumed_uniqueperiods,$available,$got_slots,$symb);
     }
-    &start_page($r,$title,$brcrum,$js);
+    &start_page($r,$title,$brcrum,$bread_crumbs_component,$js,$mgr);
 
     if ($env{'form.command'} eq 'manageresv') {
         $allavailable = $available;
@@ -3226,7 +3556,7 @@ sub handler {
 	    }
 	    &csv_upload_map($r);
 	}
-    } elsif ($env{'form.command'} eq 'slotlog' && $mgr eq 'F') {
+    } elsif (($env{'form.command'} eq 'slotlog') && ($vgr eq 'F')) {
         &show_reservations_log($r);
     } else {
 	my $symb=&unescape($env{'form.symb'});
@@ -3248,7 +3578,8 @@ sub handler {
 	my ($status) = &Apache::lonhomework::check_slot_access('0',$type);
 	if ($status eq 'CAN_ANSWER' ||
 	    $status eq 'NEEDS_CHECKIN' ||
-	    $status eq 'WAITING_FOR_GRADE') {
+	    $status eq 'WAITING_FOR_GRADE' ||
+            $status eq 'NEED_DIFFERENT_IP') {
 	    &fail($r,'not_allowed');
 	    return OK;
 	}