--- loncom/interface/loncreateuser.pm	2003/06/19 21:46:38	1.55
+++ loncom/interface/loncreateuser.pm	2003/07/17 18:14:41	1.58
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.55 2003/06/19 21:46:38 www Exp $
+# $Id: loncreateuser.pm,v 1.58 2003/07/17 18:14:41 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,7 +46,7 @@
 # 05/10,10/16 Gerd Kortemeyer 
 # 02/11/02 Matthew Hall
 #
-# $Id: loncreateuser.pm,v 1.55 2003/06/19 21:46:38 www Exp $
+# $Id: loncreateuser.pm,v 1.58 2003/07/17 18:14:41 www Exp $
 ###
 
 package Apache::loncreateuser;
@@ -116,15 +116,19 @@ $selscript
 $bodytag
 <form action="/adm/createuser" method="post" name="crtuser">
 <input type="hidden" name="phase" value="get_user_info">
-<p>
+<h2>Set Individual User Roles</h2>
 <table>
 <tr><td>Username:</td><td><input type="text" size="15" name="ccuname">
 </td><td rowspan="2">$sellink</td></tr><tr><td>
 Domain:</td><td>$domform</td></tr>
-</table> 
-</p>
-<input type="submit" value="Continue">
+</table>
+<input name="userrole" type="submit" value="User Roles" />
 </form>
+<form action="/adm/createuser" method="post" name="docustom">
+<input type="hidden" name="phase" value="selected_custom_edit">
+<h2>Edit Custom Role Privileges</h2>
+Name of Role: <input type="text" size="15" name="rolename" /><br />
+<input name="customeditor" type="submit" value="Custom Role Editor" />
 </body>
 </html>
 ENDDOCUMENT
@@ -136,6 +140,14 @@ sub print_user_modification_page {
     my $ccuname=$ENV{'form.ccuname'};
     my $ccdomain=$ENV{'form.ccdomain'};
 
+    $ccuname=~s/\W//gs;
+    $ccdomain=~s/\W//gs;
+
+    unless (($ccuname) && ($ccdomain)) {
+	&print_username_entry_form($r);
+        return;
+    }
+
     my $defdom=$ENV{'request.role.domain'};
 
     my ($krbdef,$krbdefdom) =
@@ -286,12 +298,15 @@ END
                my $allowed=0;
                my $delallowed=0;
                if ($area =~ /^\/(\w+)\/(\d\w+)/ ) {
+                   my ($coursedom,$coursedir) = ($1,$2);
+                   # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3).
                    my %coursedata=
                        &Apache::lonnet::coursedescription($1.'_'.$2);
 		   my $carea;
 		   if (defined($coursedata{'description'})) {
 		       $carea='Course: '.$coursedata{'description'}.
-                              '<br />Domain: '.$1;
+                           '<br />Domain: '.$coursedom.('&nbsp;'x8).
+     &Apache::loncommon::syllabuswrapper('Syllabus',$coursedir,$coursedom);
 		   } else {
 		       $carea='Unavailable course: '.$area;
 		   }
@@ -345,7 +360,11 @@ END
                if (($active) && ($allowed)) {
                    $row.= '<input type="checkbox" name="rev:'.$thisrole.'">';
                } else {
-                   $row.='&nbsp;';
+                   if ($active) {
+                      $row.='&nbsp;';
+		   } else {
+                      $row.='expired or revoked';
+		   }
                }
 	       $row.='</td><td>';
                if ($delallowed) {
@@ -724,20 +743,20 @@ END
 	# Revoke roles
 	if ($_=~/^form\.rev/) {
 	    if ($_=~/^form\.rev\:([^\_]+)\_([^\_]+)$/) {
-	        $r->print('Revoking '.$2.' in '.$1.': '.
+	        $r->print('Revoking '.$2.' in '.$1.': <b>'.
                      &Apache::lonnet::assignrole($ENV{'form.ccdomain'},
-                     $ENV{'form.ccuname'},$1,$2,$now).'<br>');
+                     $ENV{'form.ccuname'},$1,$2,$now).'</b><br>');
 		if ($2 eq 'st') {
 		    $1=~/^\/(\w+)\/(\w+)/;
 		    my $cid=$1.'_'.$2;
-		    $r->print('Drop from classlist: '.
+		    $r->print('Drop from classlist: <b>'.
 			 &Apache::lonnet::critical('put:'.
                              $ENV{'course.'.$cid.'.domain'}.':'.
 	                     $ENV{'course.'.$cid.'.num'}.':classlist:'.
                          &Apache::lonnet::escape($ENV{'form.ccuname'}.':'.
                              $ENV{'form.ccdomain'}).'='.
                          &Apache::lonnet::escape($now.':'),
-	                     $ENV{'course.'.$cid.'.home'}).'<br>');
+	                     $ENV{'course.'.$cid.'.home'}).'</b><br>');
 		}
 	    } 
 	} elsif ($_=~/^form\.del/) {
@@ -748,14 +767,14 @@ END
 		if ($2 eq 'st') {
 		    $1=~/^\/(\w+)\/(\w+)/;
 		    my $cid=$1.'_'.$2;
-		    $r->print('Drop from classlist: '.
+		    $r->print('Drop from classlist: <b>'.
 			 &Apache::lonnet::critical('put:'.
                              $ENV{'course.'.$cid.'.domain'}.':'.
 	                     $ENV{'course.'.$cid.'.num'}.':classlist:'.
                          &Apache::lonnet::escape($ENV{'form.ccuname'}.':'.
                              $ENV{'form.ccdomain'}).'='.
                          &Apache::lonnet::escape($now.':'),
-	                     $ENV{'course.'.$cid.'.home'}).'<br>');
+	                     $ENV{'course.'.$cid.'.home'}).'</b><br>');
 		}
 	    } 
 	} elsif ($_=~/^form\.act/) {
@@ -776,16 +795,16 @@ END
 		# Assign the role and report it
 		$r->print('Assigning: '.$3.' in '.$url.
                          ($start?', starting '.localtime($start):'').
-                         ($end?', ending '.localtime($end):'').': '.
+                         ($end?', ending '.localtime($end):'').': <b>'.
                           &Apache::lonnet::assignrole(
                               $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
                               $url,$3,$end,$start).
-			  '<br>');
+			  '</b><br>');
 		# Handle students differently
 		if ($3 eq 'st') {
 		    $url=~/^\/(\w+)\/(\w+)/;
 		    my $cid=$1.'_'.$2;
-		    $r->print('Add to classlist: '.
+		    $r->print('Add to classlist: <b>'.
 			      &Apache::lonnet::critical(
 				  'put:'.$ENV{'course.'.$cid.'.domain'}.':'.
 	                           $ENV{'course.'.$cid.'.num'}.':classlist:'.
@@ -794,7 +813,7 @@ END
                                        $ENV{'form.ccdomain'} ).'='.
                                    &Apache::lonnet::escape($end.':'.$start),
 				       $ENV{'course.'.$cid.'.home'})
-			      .'<br>');
+			      .'</b><br>');
 		}
 	    } elsif ($_=~/^form\.act\_([^\_]+)\_([^\_]+)$/) {
 		# Activate roles for sections with two id numbers
@@ -808,16 +827,36 @@ END
 		my $url='/'.$1.'/';
 		# Assign the role and report it.
 		$r->print('Assigning: '.$2.' in '.$url.': '.
+                         ($start?', starting '.localtime($start):'').
+                         ($end?', ending '.localtime($end):'').': <b>'.
                           &Apache::lonnet::assignrole(
                               $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
                               $url,$2,$end,$start)
-			  .'<br>');
+			  .'</b><br>');
 	    }
 	} 
     } # End of foreach (keys(%ENV))
     $r->print('</body></html>');
 }
 
+# ========================================================== Custom Role Editor
+
+sub custom_role_editor {
+    my $r=shift;
+    my $rolename=$ENV{'form.rolename'};
+
+    $rolename=~s/\W//gs;
+
+    unless ($rolename) {
+	&print_username_entry_form($r);
+        return;
+    }
+
+    $r->print(&Apache::loncommon::bodytag(
+                                     'Create Users, Change User Privileges'));
+   $r->print('Not yet implemented.');
+}
+
 # ================================================================ Main Handler
 sub handler {
     my $r = shift;
@@ -843,6 +882,8 @@ sub handler {
            &print_user_modification_page($r);
        } elsif ($ENV{'form.phase'} eq 'update_user_data') {
            &update_user_data($r);
+       } elsif ($ENV{'form.phase'} eq 'selected_custom_edit') {
+           &custom_role_editor($r);
        }
    } else {
       $ENV{'user.error.msg'}=