--- loncom/html/adm/helper/newslot.helper	2005/10/17 21:19:30	1.5
+++ loncom/html/adm/helper/newslot.helper	2005/11/18 16:51:13	1.10
@@ -7,6 +7,8 @@
 	  if (exists($env{'form.name'}) ||
 	      $env{'form.name'} =~ /\S/) {
 	      $helper->{'VARS'}{'name'}=$env{'form.name'};
+	      $helper->{VARS}{'origname'}=$env{'form.name'};
+	      $helper->{DATA}{copy} = 1;
 	  }
       }
       $helper->{DATA}{origslot} = sub {
@@ -17,7 +19,7 @@
 	  }
 	  my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
 	  my $cdom  = $env{'course.'.$env{'request.course.id'}.'.domain'};
-	  my $name=$helper->{'VARS'}{'name'};
+	  my $name=$helper->{VARS}{'origname'};
 	  my %slot=&Apache::lonnet::get('slots', [$name], $cdom, $cnum);
 	  if (!ref($slot{$name})) { return $default; }
 	  if (!exists($slot{$name}{$which})) { return $default; }
@@ -27,18 +29,27 @@
     <message nextstate="OPTIONAL">
       <message_text>
           Name: <br />&nbsp;&nbsp;&nbsp;
-      </message_text>
+      </message_text>  
     </message>
     <string variable="name" size="30">
       <validator>
           if ($val=~/^\s*$/) { return 'Must specify a name'; }
-          if ($val=~/\s$/) { return 'Must not contain spaces'; }
+          if ($val=~/\s/) { return 'Must not contain spaces'; }
+          if ($val=~/\W/) { return 'Must contain only letters, numbers and _'; }
           return undef;
       </validator>
       <defaultvalue>
         return $helper->{'VARS'}{'name'};
       </defaultvalue>
     </string>
+    <condition>
+      <clause>$helper->{DATA}{copy}</clause>
+      <message nextstate="OPTIONAL">
+        <message_text>
+	<p>Changing the Name will create a new slot with the new name, and not rename the existing slot.</p>
+        </message_text>  
+      </message>
+    </condition>
     <message>
       <message_text><br />Start time:<br />&nbsp;&nbsp;&nbsp;</message_text>
     </message>
@@ -78,30 +89,64 @@
         return &{$helper->{DATA}{origslot}}('description');
       </defaultvalue>
     </string>
-    <message>
-      <message_text>
-          </p><p>Time students can start reserving:<br />&nbsp;&nbsp;&nbsp;
-      </message_text>
-    </message>
-    <date variable="startreserve" hoursminutes="1" anytime="1">
-      <defaultvalue>
-        return &{$helper->{DATA}{origslot}}('startreserve','anytime');
-      </defaultvalue>
-    </date>
-    <message>
-      <message_text>
-          </p><p>Maxium number of students allowed in this slot:<br />&nbsp;&nbsp;&nbsp;
-      </message_text>
-    </message>
-    <string variable="maxspace" size="4">
-      <validator>
-          if ($val ne '' && $val=~/\D/) { return 'Must be numeric.'; }
-          return undef;
-      </validator>
-      <defaultvalue>
-        return &{$helper->{DATA}{origslot}}('maxspace');
-      </defaultvalue>
-    </string>
+    <condition>
+      <clause>$helper->{'VARS'}{'type'} eq 'schedulable_student'</clause>
+      <message>
+        <message_text>
+            </p><p>Time students can start reserving:<br />&nbsp;&nbsp;&nbsp;
+        </message_text>
+      </message>
+      <date variable="startreserve" hoursminutes="1" anytime="1">
+        <defaultvalue>
+          return &{$helper->{DATA}{origslot}}('startreserve','anytime');
+        </defaultvalue>
+      </date>
+      <message>
+        <message_text>
+            </p><p>Maxium number of students allowed in this slot:<br />&nbsp;&nbsp;&nbsp;
+        </message_text>
+      </message>
+      <string variable="maxspace" size="4">
+        <validator>
+            if ($val ne '' && $val=~/\D/) { return 'Must be numeric.'; }
+            return undef;
+        </validator>
+        <defaultvalue>
+          return &{$helper->{DATA}{origslot}}('maxspace');
+        </defaultvalue>
+      </string>
+      <message>
+        <message_text>
+            </p><p>Period of time in which this slot is can only be uniquely chosen:<br />&nbsp;&nbsp;&nbsp;Start:
+        </message_text>
+      </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><message_text><br />&nbsp;&nbsp;&nbsp;End: </message_text></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>
+      </date>
+    </condition>
+    <condition>
+      <clause>$helper->{'VARS'}{'type'} eq 'preassigned'</clause>
+      <exec>
+        delete($helper->{'VARS'}{'startreserve'});
+        delete($helper->{'VARS'}{'maxspace'});
+        delete($helper->{'VARS'}{'startunique'});
+        delete($helper->{'VARS'}{'endunique'});
+      </exec>
+    </condition>
     <message>
       <message_text>
           </p><p>Secret word proctors use to checkin users:<br />&nbsp;&nbsp;&nbsp;
@@ -117,28 +162,6 @@
     </string>
     <message>
       <message_text>
-          </p><p>Period of time in which this slot is can only be uniquely chosen:<br />&nbsp;&nbsp;&nbsp;Start:
-      </message_text>
-    </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><message_text><br />&nbsp;&nbsp;&nbsp;End: </message_text></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>
-    </date>
-    <message>
-      <message_text>
           </p><p>Slot is:
       </message_text>
     </message>
@@ -217,7 +240,9 @@
 		my ($uname,$udomain)=split(/:/,$user);
 		push(@names,"$uname\@$udomain");
 	    }
-	    $slot{'proctor'}=join(',',@names);
+	    # make sure the usenrmaes are unique
+	    my %proctors = map { ($_,1) } @names;
+	    $slot{'proctor'}=join(',',sort(keys(%proctors)));
 	}
         my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};
         my $cdom  = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -231,13 +256,18 @@
                  "\n".'<li> Type: '.$slot{'type'}.'</li>';
         my %labels =
              map {($_->[0],$_->[1])} &Apache::slotrequest::csvupload_fields();
-        foreach my $which ('ip','proctor','description','maxspace',
-			   'secret','symb') {
+        foreach my $which ('ip','description','maxspace','secret','symb') {
 	    if (exists($slot{$which})) {
 		$result.="\n".'<li> '.$labels{$which}.': '.
 		    &HTML::Entities::encode($slot{$which}).'</li>';
 	    }
 	}
+        if (exists($slot{'proctor'})) {
+	    my $proctors = $slot{'proctor'};
+	    $proctors =~ s/,/, /g;
+	    $result.="\n".'<li> '.$labels{'proctor'}.': '.
+		&HTML::Entities::encode($proctors).'</li>';
+	}
         if (exists($slot{'uniqueperiod'})) {
 	    $result.=
                  "\n".'<li> '.$labels{'uniqueperiod'}.': '.