--- loncom/interface/loncreateuser.pm	2003/07/18 19:50:28	1.61
+++ loncom/interface/loncreateuser.pm	2003/07/19 21:44:51	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.61 2003/07/18 19:50:28 www Exp $
+# $Id: loncreateuser.pm,v 1.64 2003/07/19 21:44:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -280,13 +280,16 @@ END
 <table border=2>
 <tr><th>Revoke</th><th>Delete</th><th>Role</th><th>Extent</th><th>Start</th><th>End</th>
 END
-	   foreach my $area (keys(%rolesdump)) {
+	   foreach my $area (sort keys(%rolesdump)) {
                next if ($area =~ /^rolesdef/);
                my $role = $rolesdump{$area};
                my $thisrole=$area;
                $area =~ s/\_\w\w$//;
                my ($role_code,$role_end_time,$role_start_time) = 
                    split(/_/,$role);
+# Is this a custom role? Get role owner and title.
+	       my ($croleudom,$croleuname,$croletitle)=
+	           ($role_code=~/^cr\/(\w+)\/(\w+)\/(\w+)$/);
                my $bgcol='ffffff';
                my $allowed=0;
                my $delallowed=0;
@@ -312,10 +315,17 @@ END
                        (&Apache::lonnet::allowed('dro',$ccdomain))) {
                        $delallowed=1;
                    }
+# - custom role. Needs more info, too
+		   if ($croletitle) {
+		       if (&Apache::lonnet::allowed('ccr',$1.'/'.$2)) {
+			   $allowed=1;
+			   $thisrole.='.'.$role_code;
+		       }
+		   }
                    # Compute the background color based on $area
                    $bgcol=$1.'_'.$2;
-                   $bgcol=~s/[^8-9b-e]//g;
-                   $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',0,6);
+                   $bgcol=~s/[^7-9a-e]//g;
+                   $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
                    if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
                        $carea.='<br>Section/Group: '.$3;
                    }
@@ -347,7 +357,7 @@ END
                    }
                }
                my $row = '';
-               $row.='<tr bgcolor=#"'.$bgcol.'"><td>';
+               $row.='<tr bgcolor="#'.$bgcol.'"><td>';
                my $active=1;
                $active=0 if (($role_end_time) && ($now>$role_end_time));
                if (($active) && ($allowed)) {
@@ -365,7 +375,14 @@ END
                } else {
                    $row.='&nbsp;';
                }
-               $row.= '</td><td>'.&Apache::lonnet::plaintext($role_code).
+	       my $plaintext='';
+	       unless ($croletitle) {
+		   $plaintext=&Apache::lonnet::plaintext($role_code);
+	       } else {
+	           $plaintext=
+		"Customrole '$croletitle' defined by $croleuname\@$croleudom";
+	       }
+               $row.= '</td><td>'.$plaintext.
                       '</td><td>'.$area.
                       '</td><td>'.($role_start_time?localtime($role_start_time)
                                                    : '&nbsp;' ).
@@ -735,7 +752,8 @@ END
 	next if (! $ENV{$_});
 	# Revoke roles
 	if ($_=~/^form\.rev/) {
-	    if ($_=~/^form\.rev\:([^\_]+)\_([^\_]+)$/) {
+	    if ($_=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
+# Revoke standard role
 	        $r->print('Revoking '.$2.' in '.$1.': <b>'.
                      &Apache::lonnet::assignrole($ENV{'form.ccdomain'},
                      $ENV{'form.ccuname'},$1,$2,$now).'</b><br>');
@@ -752,6 +770,12 @@ END
 	                     $ENV{'course.'.$cid.'.home'}).'</b><br>');
 		}
 	    } 
+	    if ($_=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
+# Revoke custom role
+		$r->print(
+                'Revoking custom role '.$4.' by '.$3.'\@'.$2.' in '.$1.': <b>'.
+		'</b><br>');
+	    }
 	} elsif ($_=~/^form\.del/) {
 	    if ($_=~/^form\.del\:([^\_]+)\_([^\_]+)$/) {
 	        $r->print('Deleting '.$2.' in '.$1.': '.
@@ -826,7 +850,9 @@ END
                               $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
                               $url,$2,$end,$start)
 			  .'</b><br>');
-	    }
+	    } else {
+		$r->print('<p>ERROR: Unknown command <tt>'.$_.'</tt></p><br>');
+            }
 	} 
     } # End of foreach (keys(%ENV))
     $r->print('</body></html>');
@@ -842,7 +868,7 @@ sub custom_role_editor {
 	$rolename=$ENV{'form.newrolename'};
     }
 
-    $rolename=~s/\W//gs;
+    $rolename=~s/[^A-Za-z0-9]//gs;
 
     unless ($rolename) {
 	&print_username_entry_form($r);
@@ -861,7 +887,6 @@ sub custom_role_editor {
 	$r->print('Existing Role "');
 # ------------------------------------------------- Get current role privileges
 	($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
-	$r->print($syspriv.' '.$dompriv.' '.$coursepriv);
     } else {
 	$r->print('New Role "');
 	$roledef='';
@@ -932,7 +957,7 @@ sub set_custom_role {
 
     my $rolename=$ENV{'form.rolename'};
 
-    $rolename=~s/\W//gs;
+    $rolename=~s/[^A-Za-z0-9]//gs;
 
     unless ($rolename) {
 	&print_username_entry_form($r);
@@ -979,8 +1004,19 @@ sub set_custom_role {
 	    $sysrole.=':'.$_;
 	}
     }
-    $r->print('Defining Role: '.
+    $r->print('<br />Defining Role: '.
 	   &Apache::lonnet::definerole($rolename,$sysrole,$domrole,$courole));
+    if ($ENV{'request.course.id'}) {
+        my $url='/'.$ENV{'request.course.id'};
+        $url=~s/\_/\//g;
+	$r->print('<br />Assigning Role to Self: '.
+	      &Apache::lonnet::assigncustomrole($ENV{'user.domain'},
+						$ENV{'user.name'},
+						$url,
+						$ENV{'user.domain'},
+						$ENV{'user.name'},
+						$rolename));
+    }
     $r->print('</body></html>');
 }
 
@@ -1026,6 +1062,10 @@ sub handler {
 sub course_level_table {
     my %inccourses = @_;
     my $table = '';
+# Custom Roles?
+
+    my %customroles=&my_custom_roles();
+
     foreach (sort( keys(%inccourses))) {
 	my $thiscourse=$_;
 	my $protectedcourse=$_;
@@ -1034,8 +1074,8 @@ sub course_level_table {
 	my $area=$coursedata{'description'};
 	if (!defined($area)) { $area='Unavailable course: '.$_; }
 	my $bgcol=$thiscourse;
-	$bgcol=~s/[^8-9b-e]//g;
-	$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',0,6);
+	$bgcol=~s/[^7-9a-e]//g;
+	$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
 	foreach  ('st','ta','ep','ad','in','cc') {
 	    if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {
 		my $plrole=&Apache::lonnet::plaintext($_);
@@ -1065,6 +1105,22 @@ ENDTIMEENTRY
                 $table.= "</tr>\n";
             }
         }
+        foreach (sort keys %customroles) {
+	    my $plrole=$_;
+	    $table .= <<ENDENTRY;
+<tr bgcolor="#$bgcol">
+<td><input type="checkbox" name="act_$protectedcourse\_$_"></td>
+<td>$plrole</td>
+<td>$area</td>
+<td><input type="text" size="5" name="sec_$protectedcourse\_$_"></td>
+<td><input type=hidden name="start_$protectedcourse\_$_" value=''>
+<a href=
+"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">Set Start Date</a></td>
+<td><input type=hidden name="end_$protectedcourse\_$_" value=''>
+<a href=
+"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">Set End Date</a></td></tr>
+ENDENTRY
+	}
     }
     return '' if ($table eq ''); # return nothing if there is nothing 
                                  # in the table