--- loncom/html/adm/helper/newslot.helper	2020/04/08 20:54:58	1.30.6.2
+++ loncom/html/adm/helper/newslot.helper	2015/09/27 22:35:50	1.32
@@ -26,32 +26,8 @@
 	  my $name=$helper->{VARS}{'origname'};
 	  my %slot=&Apache::lonnet::get('slots', [$name], $cdom, $cnum);
 	  if (!ref($slot{$name})) { return $default; }
-          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};
-          }
+	  if (!exists($slot{$name}{$which})) { return $default; }
+	  return $slot{$name}{$which};
       }
     </exec>
     <message>
@@ -208,34 +184,11 @@
         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>
@@ -267,37 +220,37 @@
 
     <choices variable="restricttosymb">
       <choice nextstate="PROCTOR" computer='any'>usable for any resource.</choice>
-      <choice nextstate="RESOURCESELECT" computer='resource'>restricted to a specific resource.</choice>
+      <choice nextstate="MAPSELECT" computer='map'>restricted to resources in specific folder(s)/composite page(s).</choice>
+      <choice nextstate="RESOURCESELECT" computer='resource'>restricted to specific resource(s).</choice>
       <defaultvalue>
         my $default=&{$helper->{DATA}{origslot}}('symb');
-        if ($default) { return 'resource'; }
-        return 'any';
+        if ($default) {
+            my @symbs;
+            if ($default =~ /,/) {
+                @symbs = split(/\s*,\s*/,$default);
+            } else {
+                @symbs = ($default);
+            }
+            if (grep(/\.(page|sequence)$/,@symbs)) {
+                return 'map';
+            } else {
+                return 'resource';
+            }
+        } else {
+            return 'any';
+        }
       </defaultvalue>
     </choices>
     
     <message>
-	</p><p>IP restrictions -- allow from all except:<br />&nbsp;&nbsp;&nbsp;      
+	</p><p>IP restrictions:<br />&nbsp;&nbsp;&nbsp;      
     </message>
-
-    <string variable="ipdeny" size="30">
+    <string variable="ip" 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="ipallow" size="30">
-      <validator>
-          return undef;
-      </validator>
-      <defaultvalue>
-        return &{$helper->{DATA}{origslot}}('ipallow');
+        return &{$helper->{DATA}{origslot}}('ip');
       </defaultvalue>
     </string>
     <message>  </p>  </message>
@@ -308,15 +261,38 @@
 
     <nextstate>PROCTOR</nextstate>
 
-    <resource variable="symb">
-      <filterfunc>return $res->is_problem()</filterfunc>
+    <resource variable="symb" multichoice="1">
+      <filterfunc>return $res->is_map() || $res->is_problem()</filterfunc>
+      <choicefunc>return $res->is_problem()</choicefunc>
       <valuefunc>return $res->symb()</valuefunc>
       <defaultvalue>
-        return &{$helper->{DATA}{origslot}}('symb');
+        my @defaults;
+        my $default=&{$helper->{DATA}{origslot}}('symb');
+        if ($default) {
+            @defaults=(split(/\s*,\s*/,$default));
+        }
+        return @defaults;
       </defaultvalue>
     </resource>    
   </state>
 
+  <state name="MAPSELECT" title="Specify Optional Attributes">
+
+    <nextstate>PROCTOR</nextstate>
+
+    <resource variable="symb" multichoice="1">
+      <filterfunc>return $res->is_map()</filterfunc>
+      <valuefunc>return $res->symb()</valuefunc>
+      <defaultvalue>
+        my @defaults;
+        my $default=&{$helper->{DATA}{origslot}}('symb');
+        if ($default) {
+            @defaults=(split(/\s*,\s*/,$default));
+        }
+        return @defaults;
+      </defaultvalue>
+    </resource>
+  </state>
 
   <state name="PROCTOR" title="Specify Proctors"
 	 help="Slot_SpecifyProctors">
@@ -355,16 +331,16 @@
     </message>
 
     <message>
-      Select sections to limit slot availability to: <br />&nbsp;&nbsp;&nbsp;
+      <h3>Select sections to limit slot availability to: </h3>&nbsp;&nbsp;&nbsp;
     </message>
     <section variable="allowedsections" multichoice="1" allowempty="1">
       <defaultvalue>
-        return join('|||',
+	return join('|||',
 		    split(',',&{$helper->{DATA}{origslot}}('allowedsections')));
       </defaultvalue>
     </section>
     <message>
-      Select users to limit slot availability to: <br />&nbsp;&nbsp;&nbsp;
+      <br /><h3>Select users to limit slot availability to: </h3>&nbsp;&nbsp;&nbsp;
     </message>
     <student variable="allowedusers" multichoice="1" coursepersonnel="1"
              activeonly="1" emptyallowed="1">
@@ -387,32 +363,12 @@
 	    $slot{$which} = $helper->{'VARS'}{$which};
 	}
 
-	foreach my $which ('description','maxspace','secret','symb') {
+	foreach my $which ('ip','description','maxspace','secret') {
 	    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')) {
@@ -422,6 +378,17 @@
             }
         }
 
+        if (($helper->{'VARS'}{'restricttosymb'} =~ /^(map|resource)$/) && 
+            ($helper->{'VARS'}{'symb'} =~ /\S/)) {
+            my @symbs;
+            foreach my $symb (split(/\|\|\|/, $helper->{'VARS'}{'symb'})) {
+                push(@symbs,$symb);
+            }
+            # make sure the symbs are unique
+            my %symbs = map { ($_,1) } @symbs;
+            $slot{'symb'}=join(',',sort(keys(%symbs)));
+        }
+
 	if ( $helper->{'VARS'}{'startreserve'} > 0) {
 		$slot{'startreserve'} = $helper->{'VARS'}{'startreserve'};
 	}
@@ -445,7 +412,7 @@
 		my ($uname,$udomain)=split(/:/,$user);
 		push(@names,"$uname:$udomain");
 	    }
-	    # make sure the usernmaes are unique
+	    # make sure the usernames are unique
 	    my %proctors = map { ($_,1) } @names;
 	    $slot{'proctor'}=join(',',sort(keys(%proctors)));
 	}
@@ -486,13 +453,26 @@
                  "\n".'<li> Type: '.$slot{'type'}.'</li>';
         my %labels =
              map {($_->[0],$_->[1])} &Apache::slotrequest::csvupload_fields();
-        foreach my $which ('ip','description','maxspace','secret','symb',
+        foreach my $which ('ip','description','maxspace','secret',
 			   'allowedsections','allowedusers') {
 	    if (exists($slot{$which})) {
 		$result.="\n".'<li> '.$labels{$which}.': '.
 		    &HTML::Entities::encode($slot{$which}).'</li>';
 	    }
 	}
+        if (exists($slot{'symb'})) {
+            $result.="\n".'<li> '.$labels{'symb'}.': ';
+            if ($slot{'symb'} =~ /,/) {
+                $result.='<ul>';
+                foreach my $symb (split(/\s*,\s*/,$slot{'symb'})) {
+                    $result.='<li>'.&HTML::Entities::encode($symb).'</li>';
+                }
+                $result.='</ul>';
+            } else {
+                $result.=&HTML::Entities::encode($slot{'symb'});
+            }
+            $result.='</li>';
+        }
 	if (exists($slot{'startreserve'})) {
 	    $result.="\n".'<li> '.$labels{'startreserve'}.': '.
 		    &Apache::lonlocal::locallocaltime($slot{'startreserve'}).'</li>';