--- loncom/html/adm/helper/newslot.helper	2020/01/13 16:59:17	1.30.4.1.2.1
+++ loncom/html/adm/helper/newslot.helper	2018/06/24 04:11:12	1.35
@@ -50,7 +50,7 @@
                   return join(',',@allows);
               }
           } else {
-              return $slot{$name}{$which};
+	      return $slot{$name}{$which};
           }
       }
     </exec>
@@ -267,16 +267,30 @@
 
     <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 -- allow from all except: <br />&nbsp;&nbsp;&nbsp;
     </message>
 
     <string variable="ipdeny" size="30">
@@ -287,9 +301,9 @@
         return &{$helper->{DATA}{origslot}}('ipdeny');
       </defaultvalue>
     </string>
-
+    
     <message>
-        </p><p>IP restrictions -- deny from all except: <br />&nbsp;&nbsp;&nbsp;
+	</p><p>IP restrictions -- deny from all except: <br />&nbsp;&nbsp;&nbsp;      
     </message>
 
     <string variable="ipallow" size="30">
@@ -300,6 +314,21 @@
         return &{$helper->{DATA}{origslot}}('ipallow');
       </defaultvalue>
     </string>
+
+    <message>
+      </p><p>Does each student need to use a unique IP address to access a resource with this slot?</p>
+    </message>
+    <choices variable="iptied">
+      <choice computer='no'>No. The student's IP address is not tied for later access to the same resource. </choice>
+      <choice computer='yes'>Yes. The IP address on a student's first access to a resource is tied for later access.</choice>
+      <choice computer='answer'>Yes. The IP address on a student's first access to a resource is tied for later access (including post-answer date).</choice>
+      <defaultvalue>
+        my $default=&{$helper->{DATA}{origslot}}('iptied');
+        if ($default eq 'yes') { return 'yes'; }
+        if ($default eq 'answer') { return 'answer'; }
+        return 'no';
+      </defaultvalue>
+    </choices>
     <message>  </p>  </message>
   </state>
 
@@ -308,15 +337,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 +407,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,7 +439,7 @@
 	    $slot{$which} = $helper->{'VARS'}{$which};
 	}
 
-	foreach my $which ('description','maxspace','secret','symb') {
+	foreach my $which ('description','maxspace','secret') {
 	    if ( $helper->{'VARS'}{$which} =~/\S/ ) {
 		$slot{$which} = $helper->{'VARS'}{$which};
 	    }
@@ -408,7 +460,7 @@
                 $slot{'ip'} .= $item.',';
             }
         }
-
+ 
         if ($slot{'ip'} ne '') {
             $slot{'ip'} =~s /,$//;
         }
@@ -422,6 +474,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'};
 	}
@@ -436,6 +499,10 @@
 				     $helper->{'VARS'}{'endunique'}];
 	}
 
+        if ( $helper->{'VARS'}{'iptied'} =~ /^(yes|answer)$/ ) {
+            $slot{'iptied'} = lc($helper->{'VARS'}{'iptied'});
+        }
+
         if ( $helper->{'VARS'}{'useproctor'} eq 'yes'
 	     && $helper->{'VARS'}{'proctor'} =~/\S/ ) {
 	    my @names;
@@ -445,7 +512,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 +553,35 @@
                  "\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{'iptied'})) {
+            $result.="\n".'<li> '.$labels{'iptied'}.': ';
+            if ($slot{'iptied'} eq 'yes') {
+                $result.=&Apache::lonlocal::mt('yes');
+            } elsif ($slot{'iptied'} eq 'answer') {
+                $result.=&Apache::lonlocal::mt('yes, including post-answer date');
+            }
+            $result.='</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>';