--- loncom/interface/slotrequest.pm	2006/04/25 15:32:20	1.59
+++ loncom/interface/slotrequest.pm	2006/05/18 20:53:24	1.62
@@ -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.59 2006/04/25 15:32:20 albertel Exp $
+# $Id: slotrequest.pm,v 1.62 2006/05/18 20:53:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,7 +41,8 @@ sub fail {
     my ($r,$code)=@_;
     if ($code eq 'not_valid') {
 	$r->print('<p>'.&mt('Unable to understand what resource you wanted to sign up for.').'</p>');
-
+    } elsif ($code eq 'not_available') {
+	$r->print('<p>'.&mt('No slots are available.').'</p>');
     } elsif ($code eq 'not_allowed') {
 	$r->print('<p>'.&mt('Not allowed to sign up or change reservations at this time.').'</p>');
     } else {
@@ -253,7 +254,7 @@ sub make_reservation {
 
     my $parm_symb  = $symb;
     my $parm_level = 1;
-    if ($use_slots eq 'sequence') {
+    if ($use_slots eq 'map') {
 	my ($map) = &Apache::lonnet::decode_symb($symb);
 	$parm_symb = &Apache::lonnet::symbread($map);
 	$parm_level = 2;
@@ -492,7 +493,7 @@ sub release_reservation {
     }
 
     my $parm_level = 1;
-    if ($use_slots eq 'sequence') {
+    if ($use_slots eq 'map') {
 	$parm_level = 2;
     }
     # store new parameter string
@@ -1146,7 +1147,7 @@ sub show_table {
 	if (exists($show{'proctor'})) {
 	    $rowspan=2;
 	    @proctors= map {
-		my ($uname,$udom)=split(/@/,$_);
+		my ($uname,$udom)=split(/:/,$_);
 		my $fullname=$name_cache{$_};
 		if (!defined($fullname)) {
 		    $fullname = &Apache::loncommon::plainname($uname,$udom);
@@ -1550,10 +1551,14 @@ sub handler {
 	}
     } else {
 	my $symb=&Apache::lonnet::unescape($env{'form.symb'});
+	if (!defined($symb)) {
+	    &fail($r,'not_valid');
+	    return OK;
+	}
 	my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb);
 	my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
-	if ($useslots ne 'resource' && $useslots ne 'sequence') {
-	    &fail($r,'not_valid');
+	if ($useslots ne 'resource' && $useslots ne 'map') {
+	    &fail($r,'not_available');
 	    return OK;
 	}
 	$env{'request.symb'}=$symb;