--- loncom/interface/slotrequest.pm	2020/04/08 20:06:59	1.125.2.3.4.2
+++ loncom/interface/slotrequest.pm	2018/07/02 20:34:52	1.139
@@ -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.125.2.3.4.2 2020/04/08 20:06:59 raeburn Exp $
+# $Id: slotrequest.pm,v 1.139 2018/07/02 20:34:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -260,6 +260,103 @@ function uncheckSlotRadio() {
         }
     }
 }
+
+function toggleSlotMap(maprownum,rownum) {
+    if (document.getElementById('arrow'+maprownum)) {
+        var img = document.getElementById('arrow'+maprownum);
+        var rowdisplay;
+        var celldisplay = '';
+        if (img.src.indexOf('arrow.open.gif')!=-1) {
+            img.src = '/adm/lonIcons/arrow.closed.gif';
+            rowdisplay = 'none';
+        }
+        else {
+            img.src = '/adm/lonIcons/arrow.open.gif';
+            rowdisplay = 'table-row';
+            celldisplay = 'none';
+        }
+        var resrows;
+        var maptext;
+        if (document.getElementsByClassName) {
+            resrows = document.getElementsByClassName('LC_slotresrow_'+maprownum);
+            maptext = document.getElementsByClassName('LC_slotmaptext_'+maprownum);
+        } else {
+            resrows = getElementsByClassName(document.body,'LC_slotresrow_'+maprownum);
+            maptext = getElementsByClassName(document.body,'LC_slotmaptext_'+maprownum);
+        }
+        if (maptext.length) {
+            for (var i=0; i<maptext.length; i++) {
+                maptext[i].style.display = celldisplay;
+            }
+        }
+        if (resrows.length) {
+           var mapbgidx = 0;
+           var rowclasses = ['LC_even_row','LC_odd_row'];
+           var mapbgClass = 'LC_even_row';
+           var regExpBg = /LC_odd_row/i;
+           if (rowdisplay == 'table-row') {
+                if (document.getElementById('LC_slotmaprow_'+rownum)) {
+                    mapbgClass = document.getElementById('LC_slotmaprow_'+rownum).className;
+                    if (regExpBg.test(mapbgClass)) {
+                        mapbgidx = 1;
+                    }
+                }
+            }
+            for (var i=0; i<resrows.length; i++) {
+                resrows[i].style.display = rowdisplay;
+                if (rowdisplay == 'table-row') {
+                    mapbgidx ++;        
+                    var bgcolnew = mapbgidx % 2;
+                    var bgcolold = (mapbgidx+1) % 2;
+                    var k = i+parseInt(rownum)+1; 
+                    if (document.getElementById('LC_slotresrow_'+k)) {
+                        document.getElementById('LC_slotresrow_'+k).className = document.getElementById('LC_slotresrow_'+k).className.replace(rowclasses[bgcolold],rowclasses[bgcolnew]);
+                    }
+                }
+            }
+            if (document.getElementById('LC_slot_reservations')) {
+                var numrowsOdd = resrows.length % 2;
+                if (numrowsOdd) {
+                    var lastbgClass = 'LC_even_row';
+                    var idx = 0;
+                    var lastresnum = parseInt(rownum) + resrows.length; 
+                    if (rowdisplay == 'none') {
+                        lastresnum = rownum;
+                        if (document.getElementById('LC_slotmaprow_'+rownum)) {
+                            lastbgClass = document.getElementById('LC_slotmaprow_'+rownum).className;
+                        }
+                    } else {
+                        lastresnum = parseInt(rownum) + resrows.length;
+                        if (document.getElementById('LC_slotresrow_'+lastresnum)) {
+                            lastbgClass = document.getElementById('LC_slotresrow_'+lastresnum).className;
+                        }
+                    }
+                    if (regExpBg.test(lastbgClass)) {
+                        idx = 1;
+                    }
+                    var table = document.getElementById('LC_slot_reservations');
+                    if ((table.rows.length) && (table.rows.length >= lastresnum)) {
+                        for (var i=lastresnum; i<table.rows.length; i++) {
+                            if (table.rows[i].style.display != 'none') {
+                                idx ++;
+                                var bgcolnew = idx % 2;
+                                var bgcolold = (idx+1) % 2;  
+                                j = i+1;
+                                if (document.getElementById('LC_slotmaprow_'+j)) {
+                                    document.getElementById('LC_slotmaprow_'+j).className = rowclasses[bgcolnew];
+                                } else {
+                                    if (document.getElementById('LC_slotresrow_'+j)) {
+                                        document.getElementById('LC_slotresrow_'+j).className = document.getElementById('LC_slotresrow_'+j).className.replace(rowclasses[bgcolold],rowclasses[bgcolnew]);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
 // ]]>
 </script>
 ENDSCRIPT
@@ -368,7 +465,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();
@@ -456,11 +553,11 @@ sub make_reservation {
 	return 'error: Unable to determine current status';
     }
 
-    my $symb_for_db = $symb;
+    my $parm_symb  = $symb;
     my $parm_level = 1;
     if ($use_slots eq 'map' || $use_slots eq 'map_map') {
 	my ($map) = &Apache::lonnet::decode_symb($symb);
-	$symb_for_db = &Apache::lonnet::symbread($map);
+	$parm_symb = &Apache::lonnet::symbread($map);
 	$parm_level = 2;
     }
 
@@ -503,7 +600,7 @@ sub make_reservation {
     
     my %reservation=('name'      => $env{'user.name'}.':'.$env{'user.domain'},
 		     'timestamp' => time,
-		     'symb'      => $symb_for_db);
+		     'symb'      => $parm_symb);
 
     my $success=&Apache::lonnet::newput('slot_reservations',
 					{"$slot_name\0$wanted" =>
@@ -515,9 +612,7 @@ sub make_reservation {
 	if ($value) {
 	    $new_value=$value.':'.$new_value;
 	}
-        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'});
+        &store_slot_parm($symb,$slot_name,$parm_level,$new_value,$cnum,$cdom);
 	return $wanted;
     }
 
@@ -526,27 +621,29 @@ sub make_reservation {
 }
 
 sub store_slot_parm {
-    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);
+    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'});
     &Apache::lonxml::debug("hrrm $result");
     my %storehash = (
-                       symb    => $symb_for_db,
+                       symb    => $symb,
                        slot    => $slot_name,
-                       action  => $action,
-                       context => $context,
+                       action  => 'reserve',
+                       context => $env{'form.context'},
                     );
 
     &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
-                               $delflag,$uname,$udom,$cnum,$cdom);
+                               '',$env{'user.name'},$env{'user.domain'},
+                               $cnum,$cdom);
     &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
-                               $delflag,$uname,$udom,$uname,$udom);
-    return $result;
+                               1,$env{'user.name'},$env{'user.domain'},
+                               $env{'user.name'},$env{'user.domain'});
+
+    return;
 }
 
 sub remove_registration {
@@ -642,7 +739,7 @@ sub release_all_slot {
 	    &release_reservation($slot_name,$uname,$udom,
 				 $consumed{$entry}{'symb'},$mgr);
         if (!$result) {
-            $r->print('<p class="LC_error">'.&mt($msg).'</p>');
+            $r->print('<p><span class="LC_error">'.&mt($msg).'</span></p>');
         } else {
 	    $r->print("<p>$msg</p>");
         }
@@ -672,7 +769,7 @@ sub release_slot {
     my ($result,$msg) =
 	&release_reservation($slot_name,$uname,$udom,$symb,$mgr);
     if (!$result) {
-        $r->print('<p class="LC_error">'.&mt($msg).'</p>');
+        $r->print('<p><span class="LC_error">'.&mt($msg).'</span></p>');
     } else {
         $r->print("<p>$msg</p>");
     }
@@ -690,184 +787,26 @@ 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 started.',$description));
+	    return (0,&mt('Not allowed to release Reservation: [_1], as it has already ended.',$description));
 	}
     }
-    my $context = $env{'form.context'};
 
-    # get navmap object
+    # if the reservation symb is for a map get a resource in that map
+    # to check slot parameters on
     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);
-            $parm_symb = $a_resource->symb();
+                                           sub {$_[0]->is_problem() || $_[0]->is_tool() },0,1);
+            $symb = $a_resource->symb();
         }
     } else {
         unless ($mgr eq 'F') {
@@ -875,132 +814,68 @@ sub release_reservation {
         }
     }
 
-    # 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);
-        }
-    }
-
-    #
-    # 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 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 ($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) ) {
-            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);
+    my @new_slots;
+    foreach my $exist_slot (@slots) {
+	if ($exist_slot eq $slot_name) { next; }
+	push(@new_slots,$exist_slot);
     }
-}
+    my $new_param = join(':',@new_slots);
 
-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 ($cnum,$cdom)=&get_course();
 
-    # 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,1);
-        $symb_for_parm = $a_resource->symb();
+    # get slot reservations, check if user has one, if so remove reservation
+    my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+				       "^$slot_name\0");
+    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('course','slotreservationslog',
+                                       \%storehash,1,$uname,$udom,$cnum,$cdom);
+            &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',
+                                       \%storehash,1,$uname,$udom,$uname,$udom);
+	}
     }
-    # 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);
+    my $use_slots = &Apache::lonnet::EXT("resource.0.useslots",
+					 $symb,$udom,$uname);
     &Apache::lonxml::debug("use_slots is  $use_slots<br />");
 
-    if (&Apache::lonnet::error($use_slots)) {
-        return 'error: Unable to determine current status';
+    if (&Apache::lonnet::error($use_slots)) { 
+	return (0,'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;
     }
-
-    my @slots = split(/:/,$student);
-
-    my @new_slots;
-    foreach my $exist_slot (@slots) {
-        next if ($exist_slot eq $slot_name);
-        push(@new_slots,$exist_slot);
+    # 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 $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;
+    return (1,$msg);
 }
 
 sub delete_slot {
@@ -1022,7 +897,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 class="LC_error">'.&mt('An error occurred when attempting to delete slot: [_1]','<tt>'.$slot_name.'</tt>')." ($ret)</p>");
+	    $r->print('<p><span class="LC_error">'.&mt('An error occurred when attempting to delete slot: [_1]','<tt>'.$slot_name.'</tt>')." ($ret)</span></p>");
 	}
     } else {
 	if (%consumed) {
@@ -1054,9 +929,9 @@ sub get_slot {
     my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot);
 
     if ($slot_name =~ /^error: (.*)/) {
-	$r->print('<p class="LC_error">'
+	$r->print('<p><span class="LC_error">'
                  .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
-                 .'</p>');
+                 .'</span></p>');
 	&return_link($r);
 	return 0;
     }
@@ -1109,9 +984,9 @@ STUFF
     if (defined($reserved)) {
 	my $retvalue = 0;
 	if ($slot_name =~ /^error: (.*)/) {
-	    $r->print('<p class="LC_error">'
+	    $r->print('<p><span class="LC_error">'
                      .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
-                     .'</p>');
+                     .'</span></p>');
 	} elsif ($reserved > -1) {
 	    $r->print('<p style="font-weight: bold;">'.&mt('Successfully signed up:  [_1]',$description).'</p>');
 	    $retvalue = 1;
@@ -1243,10 +1118,32 @@ sub allowed_slot {
     return 0 if (!$userallowed);
 
     # not allowed for this resource
-    if (defined($slot->{'symb'})
-	&& $slot->{'symb'} ne $symb) {
-        unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) {
-	    return 0;
+    if (defined($slot->{'symb'})) {
+        my $exclude = 1;
+        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;
+            }
+        }
+        if ($exclude) {
+            unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) {
+	        return 0;
+            }
         }
     }
 
@@ -1275,7 +1172,7 @@ sub get_description {
 }
 
 sub show_choices {
-    my ($r,$symb,$formname,$num,$slots,$consumed_uniqueperiods,$available,$got_slots)=@_;
+    my ($symb,$formname,$num,$class,$slots,$consumed_uniqueperiods,$available,$got_slots)=@_;
     my $output;
     &Apache::lonxml::debug("Checking Slots");
     if (!ref($available) eq 'ARRAY') {
@@ -1287,8 +1184,11 @@ sub show_choices {
             $output .= ' <a href="/adm/flip?postdata=return:">'.
                        &mt('Return to last resource').'</a>';
         }
-        $r->print($output);
-        return;
+        if ($class) {
+            return '<div class="'.$class.'">'.$output.'</div>';
+        } else {
+            return $output;
+        }
     }
     if (@{$available} > 1) {
         my $numavailable = scalar(@{$available});
@@ -1436,8 +1336,11 @@ STUFF
     if (@{$available} > 1) {
         $output .= '</div></fieldset>';
     }
-    $r->print($output);
-    return;
+    if ($class) {
+        return '<div class="'.$class.'">'.$output.'</div>';
+    } else {
+        return $output;
+    }
 }
 
 sub to_show {
@@ -1592,12 +1495,13 @@ sub show_table {
 	     'secret'          => 'Secret Word',
 	     'space'           => '# of students/max',
 	     'ip'              => 'IP or DNS restrictions',
-	     'symb'            => 'Resource 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');
@@ -1605,7 +1509,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')
@@ -1705,8 +1609,8 @@ sub show_table {
     $r->print('<p><input type="submit" name="start" value="'.&mt('Update Display').'" /></p>');
     my $linkstart='<a href="/adm/slotrequest?command=showslots&amp;order=';
     my $tableheader = &Apache::loncommon::start_data_table().
-                      &Apache::loncommon::start_data_table_header_row().'
-                      <th></th>';
+	              &Apache::loncommon::start_data_table_header_row().'
+	              <th></th>';
     foreach my $which (@show_order) {
 	if ($which ne 'proctor' && exists($show{$which})) {
 	    $tableheader .= '<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>';
@@ -1808,13 +1712,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;
@@ -1939,8 +1851,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");
@@ -1974,6 +1896,7 @@ STUFF
 
 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.')
@@ -2005,179 +1928,233 @@ sub manage_reservations {
                   '</span>');
         return;
     }
-    my (%parent,%shownparent,%container,%container_title,%contents);
-    my ($depth,$count,$reservable,$lastcontainer,$rownum) = (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>'.
                  &mt('Your reservation status for any such assignments is listed below:').
                  '</p>'.
-                 '<table class="LC_data_table LC_tableOfContent">'."\n";
+                 '<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);
     while (my $resource = $it->next()) {
         if ($resource == $it->BEGIN_MAP()) {
             $depth++;
-            $parent{$depth} = $lastcontainer;
-        }
-        if ($resource == $it->END_MAP()) {
-            $depth--;
-            $lastcontainer = $parent{$depth};
-        }
-        if (ref($resource)) {
-            my $symb = $resource->symb();
-            my $ressymb = $symb;
-            $contents{$lastcontainer} ++;
-            next if (!$resource->is_problem() && !$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));
-                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');
-                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'); 
+            $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;
                     }
-                }
-                $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;
+                    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';
                         }
-                        $treelevel --;
-                        $higherup = $parent{$treelevel};
-                    }
-                    foreach my $item (@maprows) {
-                        $rownum ++;
-                        my $bgcolor = $backgrounds[$rownum % $numcolors];
-                        if (!$shownheader) {
-                            $r->print($slotheader);
-                            $shownheader = 1;
+                        $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 {
+                                $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";
                         }
-                        $r->print('<tr class="'.$bgcolor.'">'.$item.'</tr>'."\n");
+                    } else {
+                        my ($spacers,$icon) = &show_map_row($depth,$location,$currmaptype,$currmaptitle);
+                        $row .= '<td>'.$spacers.$icon.('&nbsp;' x6).'</td><td colspan="2">&nbsp;</td></tr>'."\n";
                     }
+                    $r->print($row);
                 }
+            }
+        } elsif ($resource == $it->END_MAP()) {
+            $depth--;
+            $currcontainer = $parent{$depth};
+        } elsif (ref($resource)) {
+            my $symb = $resource->symb();
+            next if (!$resource->is_problem() && !$resource->is_tool() &&
+                     !$resource->is_sequence() && !$resource->is_page());
+            $count ++;
+            if (($resource->is_sequence()) || ($resource->is_page())) {
+                $currcontainer = $count;
+                $container{$currcontainer} = $resource;
+                $container_title{$currcontainer} = $resource->compTitle();
+            }
+            if (($resource->is_problem() || $resource->is_tool)) {
+                next unless (exists($output{$symb}));
+                $reservable ++;
                 $rownum ++;
-                my $bgcolor = $backgrounds[$rownum % $numcolors];
                 if (!$shownheader) {
                     $r->print($slotheader);
                     $shownheader = 1;
                 }
-                $r->print('<tr class="'.$bgcolor.'"><td>'."\n");
+                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++) {
                     $r->print('<img src="'.$location.'" alt="" />');
                 }
-                my $result = '<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()) {
-                    $result .= '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 {
-                    $result .= 'problem.gif" alt="'.&mt('Problem');
-                }
-                $result .= '" /><b>'.$title.'</b></a>'.('&nbsp;' x6).'</td>';
-                my $hasaction;
-                if ($status == $resource->OPEN) {
-                    if ($get_choices) {
-                        $hasaction = 1;
-                    }
+                    $r->print('problem.gif" alt="'.&mt('Problem'));
                 }
-                if ($hasaction) {
-                    $result .= '<td valign="top">'.$msg.'</td>'.
-                               '<td valign="top">';
+                $r->print('" /><b>'.$title.'</b></a>'.('&nbsp;' x6).'</td>');
+                my $class = 'LC_slottext_'.$mapnum;
+                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 {
-                    $result .= '<td colspan="2" valign="middle">'.$msg.'</td>';
-                }
-                $r->print($result);
-                if ($hasaction) {
-                    my @got_slots=&check_for_reservation($symb,'allslots');
-                    if ($got_slots[0] =~ /^error: /) {
-                        $r->print('<span class="LC_error">'.
-                                  &mt('An error occurred determining slot availability.').
-                                  '</span>');
-                    } else {
-                        my $formname = 'manageres_'.$reservable;
-                        if (ref($allavailable) eq 'ARRAY') {
-                            my @available;
-                            if (ref($slots) eq 'HASH') {
-                                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;
-                                        }
-                                    }
-                                    push(@available,$slot);
-                                }
-                            }  
-                            &show_choices($r,$symb,$formname,$reservable,$slots,$consumed_uniqueperiods,
-                                          \@available,\@got_slots);
-                        }
-                    }
-                    $r->print('</td>');
+                    $r->print('<td colspan="2" valign="middle">'.
+                              '<span class="'.$class.'">'.$output{$symb}{'msg'}.'</span>'.
+                              '</td>');
                 }
-                $r->print('</tr>');
+                $r->print('</tr>'."\n");
             }
         }
     }
@@ -2198,19 +2175,68 @@ sub manage_reservations {
 }
 
 sub show_map_row {
-    my ($depth,$location,$type,$title,$maprows) = @_;
-    my $output = '<td>';
+    my ($depth,$location,$type,$title) = @_;
+    my $spacers;
     for (my $i=0; $i<$depth-1; $i++) {
-        $output .= '<img src="'.$location.'" alt="" />';
+        $spacers .= '<img src="'.$location.'" alt="" />';
     }
+    my $icon;
     if ($type eq 'page') {
-        $output .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />&nbsp;'."\n";
+        $icon = '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />&nbsp;'."\n";
     } else {
-        $output .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
+        $icon = '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
     }
-    $output .= $title.'</td><td colspan="2">&nbsp;</td>'."\n";
-    unshift (@{$maprows},$output);
-    return;
+    $icon .= $title;
+    return ($spacers,$icon);
+}
+
+sub slot_chooser {
+    my ($symb,$class,$formnum,$allavailable,$slots,$consumed_uniqueperiods) = @_;
+    my $output;
+    my @got_slots=&check_for_reservation($symb,'allslots');
+    if ($got_slots[0] =~ /^error: /) {
+        $output = '<span class="'.$class.'"><span class="LC_error">'.
+                  &mt('An error occurred determining slot availability.').
+                  '</span></span>';
+    } else {
+        my $formname = 'manageres_'.$formnum;
+        if (ref($allavailable) eq 'ARRAY') {
+            my @available;
+            if (ref($slots) eq 'HASH') {
+                foreach my $slot (@{$allavailable}) {
+                    # not allowed for this resource
+                    if (ref($slots->{$slot}) eq 'HASH') {
+                        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);
+                }
+            }
+            $output .= &show_choices($symb,$formname,$formnum,$class,
+                                     $slots,$consumed_uniqueperiods,
+                                     \@available,\@got_slots);
+        }
+    }
+    return $output;
 }
 
 sub show_reservations {
@@ -2222,8 +2248,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') {
@@ -2398,8 +2423,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); }
 
@@ -2894,8 +2918,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); }
@@ -2932,10 +2958,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 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'],
@@ -2945,7 +2972,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();
@@ -3050,6 +3080,11 @@ sub csv_upload_assign {
 		$slot{$key}=$entries{$fields{$key}};
 	    }
 	}
+        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+$//;
@@ -3274,13 +3309,14 @@ 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;
 	}
 	if ($env{'form.requestattempt'}) {
             $r->print('<div class="LC_left_float">'); 
-	    &show_choices($r,$symb,undef,undef,\%slots,$consumed_uniqueperiods,$available,$got_slots);
+	    $r->print(&show_choices($symb,undef,undef,undef,\%slots,$consumed_uniqueperiods,$available,$got_slots));
             $r->print('</div><div style="padding:0;clear:both;margin:0;border:0"></div>');
 	} elsif ($env{'form.command'} eq 'release') {
 	    &release_slot($r,$symb);