--- loncom/interface/loncreateuser.pm	2001/03/03 00:50:11	1.6
+++ loncom/interface/loncreateuser.pm	2001/04/24 15:01:25	1.14
@@ -16,7 +16,7 @@
 #
 # 2/14 Gerd Kortemeyer)
 #
-# 2/14,2/17,2/19,2/20,2/21,2/22,2/23,3/2 Gerd Kortemeyer
+# 2/14,2/17,2/19,2/20,2/21,2/22,2/23,3/2,3/17,3/24,04/12 Gerd Kortemeyer
 #
 package Apache::loncreateuser;
 
@@ -108,7 +108,9 @@ ENDENHEAD
     my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
     my %incdomains; 
     my %inccourses;
-    $incdomains{$ENV{'user.domain'}}=1;
+    map {
+       $incdomains{$_}=1;
+    } %Apache::lonnet::hostdom;
     map {
 	if ($_=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) {
 	    $inccourses{$1.'_'.$2}=1;
@@ -182,7 +184,7 @@ ENDNUSER
                  my %coursedata=&Apache::lonnet::coursedescription($1.'_'.$2);
                  my $carea='Course: '.$coursedata{'description'};
                  $inccourses{$1.'_'.$2}=1;
-                 if (&Apache::lonnet::allowed('c'.$trole,$1.'_'.$2)) {
+                 if (&Apache::lonnet::allowed('c'.$trole,$1.'/'.$2)) {
 		     $allows=1;
                  }
                  $bgcol=$1.'_'.$2;
@@ -193,11 +195,14 @@ ENDNUSER
 		 }
                  $area=$carea;
 	      } else {
-                 if ($1) {
-		     $incdomains{$1}=1;
+                 if ($area=~/^\/(\w+)\//) {
                      if (&Apache::lonnet::allowed('c'.$trole,$1)) {
 			 $allows=1;
                      }
+                 } else {
+                     if (&Apache::lonnet::allowed('c'.$trole,'/')) {
+			 $allows=1;
+                     }
                  }
 	      }
 
@@ -224,21 +229,44 @@ ENDNUSER
 	   $r->print('</table>');
          }   
     }
-    $r->print('<hr><h3>Add Roles</h3><h4>System Level</h4>');
-    $r->print('<h4>Domain Level</h4>');
+    $r->print('<hr><h3>Add Roles</h3>');
+#
+# Domain level
+#
+    $r->print('<h4>Domain Level</h4>'.
+    '<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>'.
+    '<th>Start</th><th>End</th></tr>');
     map {
 	my $thisdomain=$_;
         map {
             if (&Apache::lonnet::allowed('c'.$_,$thisdomain)) {
-		$r->print($_.' - '.$thisdomain.'<br>');
+               my $plrole=&Apache::lonnet::plaintext($_);
+               $r->print(<<ENDDROW);
+<tr>
+<td><input type=checkbox name="act_$thisdomain\_$_"></td>
+<td>$plrole</td>
+<td>$thisdomain</td>
+<td><input type=hidden name="start_$thisdomain\_$_" value=''>
+<a href=
+"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$thisdomain\_$_.value,'start_$thisdomain\_$_','cu.pres','dateset')">Set Start Date</a></td>
+<td><input type=hidden name="end_$thisdomain\_$_" value=''>
+<a href=
+"javascript:pjump('date_end','End Date $plrole',document.cu.end_$thisdomain\_$_.value,'end_$thisdomain\_$_','cu.pres','dateset')">Set End Date</a></td>
+</tr>
+ENDDROW
             }
-        } ('dc','cc','li','dg','au');
+        } ('dc','li','dg','au');
     } sort keys %incdomains;
+    $r->print('</table>');
+#
+# Course level
+#
     $r->print('<h4>Course Level</h4>'.
     '<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>'.
     '<th>Group/Section</th><th>Start</th><th>End</th></tr>');
     map {
 	my $thiscourse=$_;
+        $thiscourse=~s:/:_:g;
         my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
         my $area=$coursedata{'description'};
         my $bgcol=$thiscourse;
@@ -263,7 +291,7 @@ ENDNUSER
 ENDROW
 
             }
-        } ('st','ta','ep','ad','in');
+        } ('st','ta','ep','ad','in','cc');
     } sort keys %inccourses;
     $r->print('</table>');
     $r->print('<input type=submit value="Modify User">');
@@ -320,6 +348,17 @@ ENDTHREEHEAD
            $r->print('Revoking '.$2.' in '.$1.': '.
           &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'},
                                       $1,$2,$now).'<br>');
+           if ($2 eq 'st') {
+               $1=~/^\/(\w+)\/(\w+)/;
+               my $cid=$1.'_'.$2;
+	       $r->print('Drop from classlist: '.
+          &Apache::lonnet::critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
+	              $ENV{'course.'.$cid.'.num'}.':classlist:'.
+                      &Apache::lonnet::escape($ENV{'form.cuname'}.':'.
+                                              $ENV{'form.cdomain'}).'='.
+                      &Apache::lonnet::escape($now.':'),
+	              $ENV{'course.'.$cid.'.home'}).'<br>');
+           }
 	}
     } keys %ENV;
     map {
@@ -339,7 +378,31 @@ ENDTHREEHEAD
             $r->print('Assigning: '.$3.' in '.$url.': '.
           &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'},
                                       $url,$3,$end,$start).'<br>');
-	}
+            if ($3 eq 'st') {
+		$url=~/^\/(\w+)\/(\w+)/;
+                my $cid=$1.'_'.$2;
+               $r->print('Add to classlist: '.
+          &Apache::lonnet::critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
+	              $ENV{'course.'.$cid.'.num'}.':classlist:'.
+                      &Apache::lonnet::escape($ENV{'form.cuname'}.':'.
+                                              $ENV{'form.cdomain'}).'='.
+                      &Apache::lonnet::escape($end.':'.$start),
+	              $ENV{'course.'.$cid.'.home'}).'<br>');
+	    }
+	} elsif (($_=~/^form\.act\_([^\_]+)\_([^\_]+)$/) && ($ENV{$_})) {
+            my $url='/'.$1.'/';
+            my $start=$now;
+            if ($ENV{'form.start_'.$1.'_'.$2}) {
+		$start=$ENV{'form.start_'.$1.'_'.$2};
+            }
+            my $end=0;
+            if ($ENV{'form.end_'.$1.'_'.$2}) {
+		$end=$ENV{'form.end_'.$1.'_'.$2};
+            }
+            $r->print('Assigning: '.$2.' in '.$url.': '.
+          &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'},
+                                      $url,$2,$end,$start).'<br>');
+        }
     } keys %ENV;
     $r->print('</body></html>');
 }
@@ -371,7 +434,7 @@ sub handler {
        }
    } else {
       $ENV{'user.error.msg'}=
-        "/adm/createcourse:mau:0:0:Cannot modify user data";
+        "/adm/createuser:mau:0:0:Cannot modify user data";
       return HTTP_NOT_ACCEPTABLE; 
    }
    return OK;