--- loncom/html/adm/helper/newslot.helper	2015/09/23 23:05:04	1.31
+++ loncom/html/adm/helper/newslot.helper	2015/09/27 22:35:50	1.32
@@ -220,12 +220,18 @@
 
     <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>
+      <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) {
-            if ($default =~ /\.(page|sequence)$/) {
+            my @symbs;
+            if ($default =~ /,/) {
+                @symbs = split(/\s*,\s*/,$default);
+            } else {
+                @symbs = ($default);
+            }
+            if (grep(/\.(page|sequence)$/,@symbs)) {
                 return 'map';
             } else {
                 return 'resource';
@@ -255,11 +261,17 @@
 
     <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>
@@ -268,11 +280,16 @@
 
     <nextstate>PROCTOR</nextstate>
 
-    <resource variable="symb">
+    <resource variable="symb" multichoice="1">
       <filterfunc>return $res->is_map()</filterfunc>
       <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>
@@ -314,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">
@@ -346,7 +363,7 @@
 	    $slot{$which} = $helper->{'VARS'}{$which};
 	}
 
-	foreach my $which ('ip','description','maxspace','secret','symb') {
+	foreach my $which ('ip','description','maxspace','secret') {
 	    if ( $helper->{'VARS'}{$which} =~/\S/ ) {
 		$slot{$which} = $helper->{'VARS'}{$which};
 	    }
@@ -361,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'};
 	}
@@ -384,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)));
 	}
@@ -425,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>';