--- loncom/html/adm/helper/newslot.helper	2017/06/23 20:14:36	1.30.2.1
+++ loncom/html/adm/helper/newslot.helper	2015/09/23 23:05:04	1.31
@@ -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>
@@ -244,37 +220,31 @@
 
     <choices variable="restricttosymb">
       <choice nextstate="PROCTOR" computer='any'>usable for any resource.</choice>
+      <choice nextstate="MAPSELECT" computer='map'>restricted to resources in a specific folder/composite page.</choice>
       <choice nextstate="RESOURCESELECT" computer='resource'>restricted to a specific resource.</choice>
       <defaultvalue>
         my $default=&{$helper->{DATA}{origslot}}('symb');
-        if ($default) { return 'resource'; }
-        return 'any';
+        if ($default) {
+            if ($default =~ /\.(page|sequence)$/) {
+                return 'map';
+            } else {
+                return 'resource';
+            }
+        } else {
+            return 'any';
+        }
       </defaultvalue>
     </choices>
     
     <message>
-	</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;
+	</p><p>IP restrictions:<br />&nbsp;&nbsp;&nbsp;      
     </message>
-
-    <string variable="ipallow" size="30">
+    <string variable="ip" size="30">
       <validator>
           return undef;
       </validator>
       <defaultvalue>
-        return &{$helper->{DATA}{origslot}}('ipallow');
+        return &{$helper->{DATA}{origslot}}('ip');
       </defaultvalue>
     </string>
     <message>  </p>  </message>
@@ -294,6 +264,18 @@
     </resource>    
   </state>
 
+  <state name="MAPSELECT" title="Specify Optional Attributes">
+
+    <nextstate>PROCTOR</nextstate>
+
+    <resource variable="symb">
+      <filterfunc>return $res->is_map()</filterfunc>
+      <valuefunc>return $res->symb()</valuefunc>
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('symb');
+      </defaultvalue>
+    </resource>
+  </state>
 
   <state name="PROCTOR" title="Specify Proctors"
 	 help="Slot_SpecifyProctors">
@@ -364,32 +346,12 @@
 	    $slot{$which} = $helper->{'VARS'}{$which};
 	}
 
-	foreach my $which ('description','maxspace','secret','symb') {
+	foreach my $which ('ip','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')) {