--- loncom/html/adm/helper/newslot.helper	2006/03/07 16:15:55	1.13
+++ loncom/html/adm/helper/newslot.helper	2006/05/09 19:06:07	1.16
@@ -64,6 +64,12 @@
       <defaultvalue>
         return &{$helper->{DATA}{origslot}}('endtime');
       </defaultvalue>
+      <validator>
+         if ($val < $helper->{'VARS'}{'starttime'}) {
+	     return 'End time must be later than the start time.';
+         }
+	 return undef;
+      </validator>
     </date>
     <message>
       <br />Type:
@@ -96,6 +102,12 @@
         <defaultvalue>
           return &{$helper->{DATA}{origslot}}('startreserve','anytime');
         </defaultvalue>
+        <validator>
+           if (defined($val) && $val > $helper->{'VARS'}{'starttime'}) {
+	       return 'Reservation time must come before the slot has started.';
+           }
+	   return undef;
+        </validator>
       </date>
       <message>
          </p><p>Maxium number of students allowed in this slot:<br />&nbsp;&nbsp;&nbsp;
@@ -128,6 +140,12 @@
           if (ref($default)) { return $default->[1]; }
           return 'anytime';
         </defaultvalue>
+        <validator>
+           if (defined($val) && $val < $helper->{'VARS'}{'startunique'}) {
+	       return 'End time must be later than the start time.';
+           }
+	   return undef;
+        </validator>
       </date>
     </condition>
     <condition>
@@ -272,39 +290,36 @@
 
         if ( $helper->{'VARS'}{'proctor'} =~/\S/ ) {
 	    my @names;
+	    # just need the username/domain throw away the other data 
+            # that <student> returns
 	    foreach my $user (split(/\|\|\|/, $helper->{'VARS'}{'proctor'})) {
 		my ($uname,$udomain)=split(/:/,$user);
-		push(@names,"$uname\@$udomain");
+		push(@names,"$uname:$udomain");
 	    }
-	    # make sure the usenrmaes are unique
+	    # make sure the usernmaes are unique
 	    my %proctors = map { ($_,1) } @names;
 	    $slot{'proctor'}=join(',',sort(keys(%proctors)));
 	}
 
-	if ( $helper->{'VARS'}{'allowedsections'} !~/\S/ );
-
-	    my @names;
-	    foreach my $item (split(/\|\|\|/, $helper->{'VARS'}{'allowedsections'})) {
-		my ($uname,$udomain)=split(/:/,$item);
-		push(@names,"$uname:$udomain");
-	    }
-
-	    # make sure the choices are unique
-	    my %proctors = map { ($_,1) } @names;
-	    $slot{'allowedsections'}=join(',',sort(keys(%proctors)));
+        if ( $helper->{'VARS'}{'allowedsections'} =~/\S/ ) {
+	    $slot{'allowedsections'}=
+		join(',',sort(split(/\|\|\|/,
+				    $helper->{'VARS'}{'allowedsections'})));
 	}
 
-        if ( $helper->{'VARS'}{$which} !~/\S/ );
-
+        if ( $helper->{'VARS'}{'allowedusers'} =~/\S/ ) {
 	    my @names;
-	    foreach my $item (split(/\|\|\|/, $helper->{'VARS'}{$which})) {
+	    # just need the username/domain throw away the other data 
+            # that <student> returns
+	    foreach my $item (split(/\|\|\|/,
+				    $helper->{'VARS'}{'allowedusers'})) {
 		my ($uname,$udomain)=split(/:/,$item);
 		push(@names,"$uname:$udomain");
 	    }
 
 	    # make sure the choices are unique
-	    my %proctors = map { ($_,1) } @names;
-	    $slot{$which}=join(',',sort(keys(%proctors)));
+	    my %users = map { ($_,1) } @names;
+	    $slot{'allowedusers'}=join(',',sort(keys(%users)));
 	}
 
         my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};