--- loncom/html/adm/helper/newslot.helper	2006/05/09 19:10:39	1.18
+++ loncom/html/adm/helper/newslot.helper	2006/06/25 21:57:56	1.20
@@ -157,6 +157,20 @@
         delete($helper->{'VARS'}{'endunique'});
       </exec>
     </condition>
+
+    <message>
+      </p><p>Proctored access:
+    </message>
+    <choices variable="useproctor">
+      <choice computer='no'>No proctor checkin required for access.</choice>
+      <choice computer='yes'>Require proctored checkin for access.</choice>
+      <defaultvalue>
+        my $default=&{$helper->{DATA}{origslot}}('proctor');
+        if ($default) { return 'yes'; }
+        return 'no';
+      </defaultvalue>
+    </choices>
+
     <message>
       </p><p>Secret word proctors use to checkin users:<br />&nbsp;&nbsp;&nbsp;
     </message>
@@ -211,22 +225,12 @@
 
   <state name="PROCTOR" title="Specify Proctors">
 
-    <nextstate>FINISH</nextstate>
+    <skip>
+      <clause>$helper->{'VARS'}{'useproctor'} eq 'no'</clause>
+      <nextstate>RESTRICTUSER</nextstate>
+    </skip>
 
-    <condition>
-       <clause>$helper->{'VARS'}{'type'} eq 'schedulable_student'</clause>
-       <nextstate>RESTRICTUSER</nextstate>
-    </condition>
-
-    <choices variable="noproctor">
-      <choice computer='no'>No proctor checkin required for access.</choice>
-      <choice computer='yes'>Require proctored access.</choice>
-      <defaultvalue>
-        my $default=&{$helper->{DATA}{origslot}}('proctor');
-        if ($default) { return 'yes'; }
-        return 'no';
-      </defaultvalue>
-    </choices>
+    <nextstate>RESTRICTUSER</nextstate>
 
     <student variable="proctor" multichoice="1" coursepersonnel="1"
              activeonly="1" emptyallowed="1">
@@ -243,6 +247,11 @@
 
 
   <state name="RESTRICTUSER" title="Restrict slot availability">
+    <skip>
+       <clause>$helper->{'VARS'}{'type'} ne 'schedulable_student'</clause>
+       <nextstate>FINISH</nextstate>
+    </skip>
+
     <nextstate>FINISH</nextstate>
     <message>
       <p>Slots are by default available to all users in a course, if you would like this slot to be restricted to a subset of users you can specify restrictions.</p>
@@ -297,7 +306,8 @@
 				     $helper->{'VARS'}{'endunique'}];
 	}
 
-        if ( $helper->{'VARS'}{'proctor'} =~/\S/ ) {
+        if ( $helper->{'VARS'}{'useproctor'} eq 'yes'
+	     && $helper->{'VARS'}{'proctor'} =~/\S/ ) {
 	    my @names;
 	    # just need the username/domain throw away the other data 
             # that <student> returns