--- loncom/html/adm/helper/newslot.helper	2010/10/31 15:32:15	1.27
+++ loncom/html/adm/helper/newslot.helper	2020/04/08 20:54:58	1.30.6.2
@@ -26,8 +26,32 @@
 	  my $name=$helper->{VARS}{'origname'};
 	  my %slot=&Apache::lonnet::get('slots', [$name], $cdom, $cnum);
 	  if (!ref($slot{$name})) { return $default; }
-	  if (!exists($slot{$name}{$which})) { return $default; }
-	  return $slot{$name}{$which};
+          if (($which eq 'ipdeny') || ($which eq 'ipallow')) {
+              if (!exists($slot{$name}{'ip'})) { return $default; }
+          } else {
+              if (!exists($slot{$name}{$which})) { return $default; }
+          }
+          if (($which eq 'ipdeny') || ($which eq 'ipallow')) {
+              my @allows;
+              my @denies;
+              foreach my $item (split(',',$slot{$name}{'ip'})) {
+                  $item =~ s/^\s*//;
+                  $item =~ s/\s*$//;
+                  if ($item =~ /^\!(.+)$/) {
+                      push(@denies,$1);
+                  } else {
+                      push(@allows,$item);
+                  }
+              }
+              if ($which eq 'ipdeny') {
+                  return join(',',@denies);
+              }
+              if ($which eq 'ipallow') {
+                  return join(',',@allows);
+              }
+          } else {
+              return $slot{$name}{$which};
+          }
       }
     </exec>
     <message>
@@ -112,6 +136,20 @@
         </validator>
       </date>
       <message>
+        </p><p>Time students can no longer reserve:<br />&nbsp;&nbsp;&nbsp;
+      </message>
+      <date variable="endreserve" hoursminutes="1" anytime="1">
+        <defaultvalue>
+          return &{$helper->{DATA}{origslot}}('endreserve','anytime');
+        </defaultvalue>
+        <validator>
+           if (defined($val) && $val > $helper->{'VARS'}{'starttime'}) {
+               return 'Reservation end time must come before the slot has started.';
+           }
+           return undef;
+        </validator>
+      </date>
+      <message>
          </p><p>Maximum number of students allowed in this slot:<br />&nbsp;&nbsp;&nbsp;
       </message>
       <string variable="maxspace" size="4">
@@ -168,12 +206,36 @@
       <clause>$helper->{'VARS'}{'type'} eq 'preassigned'</clause>
       <exec>
         delete($helper->{'VARS'}{'startreserve'});
+        delete($helper->{'VARS'}{'endreserve'});
         delete($helper->{'VARS'}{'maxspace'});
-        delete($helper->{'VARS'}{'startunique'});
-        delete($helper->{'VARS'}{'endunique'});
       </exec>
+      <message>
+         </p><p>Period of time when this slot can only be uniquely assigned:<br />&nbsp;&nbsp;&nbsp;Start:
+      </message>
+      <date variable="startunique" hoursminutes="1" anytime="1">
+        <defaultvalue>
+          my $default=&{$helper->{DATA}{origslot}}('uniqueperiod','anytime');
+          if ($default eq 'anytime') { return 'anytime' };
+          if (ref($default)) { return $default->[0]; }
+          return 'anytime';
+        </defaultvalue>
+      </date>
+      <message><br />&nbsp;&nbsp;&nbsp;End: </message>
+      <date variable="endunique" hoursminutes="1" anytime="1">
+        <defaultvalue>
+          my $default=&{$helper->{DATA}{origslot}}('uniqueperiod','anytime');
+          if ($default eq 'anytime') { return 'anytime' };
+          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>
-
     <message>
       </p><p>Proctored access:
     </message>
@@ -214,14 +276,28 @@
     </choices>
     
     <message>
-	</p><p>IP restrictions:<br />&nbsp;&nbsp;&nbsp;      
+	</p><p>IP restrictions -- allow from all except:<br />&nbsp;&nbsp;&nbsp;      
+    </message>
+
+    <string variable="ipdeny" size="30">
+      <validator>
+          return undef;
+      </validator>
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('ipdeny');
+      </defaultvalue>
+    </string>
+
+    <message>
+        </p><p>IP restrictions -- deny from all except: <br />&nbsp;&nbsp;&nbsp;
     </message>
-    <string variable="ip" size="30">
+
+    <string variable="ipallow" size="30">
       <validator>
           return undef;
       </validator>
       <defaultvalue>
-        return &{$helper->{DATA}{origslot}}('ip');
+        return &{$helper->{DATA}{origslot}}('ipallow');
       </defaultvalue>
     </string>
     <message>  </p>  </message>
@@ -299,7 +375,7 @@
   </state>
 
 
-  <state name="FINISH" title="Creating/Modfying Slot">
+  <state name="FINISH" title="Creating/Modifying Slot">
 	    <message> Created Slot  </message>	
     <final>
       <finalcode>
@@ -311,12 +387,32 @@
 	    $slot{$which} = $helper->{'VARS'}{$which};
 	}
 
-	foreach my $which ('ip','description','maxspace','secret','symb') {
+	foreach my $which ('description','maxspace','secret','symb') {
 	    if ( $helper->{'VARS'}{$which} =~/\S/ ) {
 		$slot{$which} = $helper->{'VARS'}{$which};
 	    }
 	}
 
+        if ($helper->{'VARS'}{'ipdeny'} =~/\S/ ) {
+            foreach my $item (split(',',$helper->{'VARS'}{'ipdeny'})) {
+                $item =~ s/^\s*//;
+                $item =~ s/\s*$//;
+                $slot{'ip'} .= '!'.$item.',';
+            }
+        }
+
+        if ($helper->{'VARS'}{'ipallow'} =~/\S/ ) {
+            foreach my $item (split(',',$helper->{'VARS'}{'ipallow'})) {
+                $item =~ s/^\s*//;
+                $item =~ s/\s*$//;
+                $slot{'ip'} .= $item.',';
+            }
+        }
+
+        if ($slot{'ip'} ne '') {
+            $slot{'ip'} =~s /,$//;
+        }
+
         if ($helper->{'VARS'}{'type'} eq 'schedulable_student') {
             if (($helper->{'VARS'}{'reservationmsg'} eq 'only_student') ||
                ($helper->{'VARS'}{'reservationmsg'} eq 'student_and_user_notes_screen')) {
@@ -330,6 +426,10 @@
 		$slot{'startreserve'} = $helper->{'VARS'}{'startreserve'};
 	}
 
+        if ( $helper->{'VARS'}{'endreserve'} > 0) {
+            $slot{'endreserve'} = $helper->{'VARS'}{'endreserve'};
+        }
+
 	if ( $helper->{'VARS'}{'startunique'} > 0 &&
 	     $helper->{'VARS'}{'endunique'} > 0 ) {
 	    $slot{'uniqueperiod'} = [$helper->{'VARS'}{'startunique'},
@@ -377,6 +477,9 @@
         my $ret = &Apache::lonnet::cput('slots',
 					{$helper->{'VARS'}{'name'} => \%slot},
 					$cdom,$cname);
+        if ($ret eq 'ok') {
+            &Apache::lonnet::devalidate_slots_cache($cname,$cdom);
+        }
         $result.="\n ".'Name: '.&HTML::Entities::encode($helper->{'VARS'}{'name'}).'</li>'.
     "\n".'<li> Starts: '.&Apache::lonlocal::locallocaltime($slot{'starttime'}).'</li>'.
                  "\n".'<li> Ends: '.&Apache::lonlocal::locallocaltime($slot{'endtime'}).'</li>'.
@@ -395,6 +498,11 @@
 		    &Apache::lonlocal::locallocaltime($slot{'startreserve'}).'</li>';
 	}
 
+        if (exists($slot{'endreserve'})) {
+            $result.="\n".'<li> '.$labels{'endreserve'}.': '.
+                    &Apache::lonlocal::locallocaltime($slot{'endreserve'}).'</li>';
+        }
+
         if (exists($slot{'reservationmsg'})) {
             my %options = &Apache::slotrequest::slot_reservationmsg_options();
             $result.="\n".'<li> '.$labels{'reservationmsg'}.': '.