--- loncom/interface/loncreateuser.pm 2003/06/20 14:37:26 1.56
+++ loncom/interface/loncreateuser.pm 2003/07/19 00:51:05 1.63
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.56 2003/06/20 14:37:26 www Exp $
+# $Id: loncreateuser.pm,v 1.63 2003/07/19 00:51:05 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,28 +25,6 @@
#
# http://www.lon-capa.org/
#
-# (Create a course
-# (My Desk
-#
-# (Internal Server Error Handler
-#
-# (Login Screen
-# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,
-# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer)
-#
-# YEAR=2001
-# 3/1/1 Gerd Kortemeyer)
-#
-# 3/1 Gerd Kortemeyer)
-#
-# 2/14 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
-# April Guy Albertelli
-# 05/10,10/16 Gerd Kortemeyer
-# 02/11/02 Matthew Hall
-#
-# $Id: loncreateuser.pm,v 1.56 2003/06/20 14:37:26 www Exp $
###
package Apache::loncreateuser;
@@ -83,6 +61,18 @@ BEGIN {
}
+# ======================================================= Existing Custom Roles
+
+sub my_custom_roles {
+ my %returnhash=();
+ my %rolehash=&Apache::lonnet::dump('roles');
+ foreach (keys %rolehash) {
+ if ($_=~/^rolesdef\_(\w+)$/) {
+ $returnhash{$1}=$1;
+ }
+ }
+ return %returnhash;
+}
# ==================================================== Figure out author access
@@ -107,6 +97,9 @@ sub print_username_entry_form {
my $selscript=&Apache::loncommon::studentbrowser_javascript();
my $sellink=&Apache::loncommon::selectstudent_link
('crtuser','ccuname','ccdomain');
+ my %existingroles=&my_custom_roles();
+ my $choice=&Apache::loncommon::select_form('make new role','rolename',
+ ('make new role' => 'Generate new role ...',%existingroles));
$r->print(<<"ENDDOCUMENT");
<html>
<head>
@@ -116,15 +109,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: $choice <input type="text" size="15" name="newrolename" /><br />
+<input name="customeditor" type="submit" value="Custom Role Editor" />
</body>
</html>
ENDDOCUMENT
@@ -136,6 +133,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) =
@@ -237,7 +242,7 @@ ENDNEWUSER
$dochead
<h1>Change User Privileges</h1>
$forminfo
-<h2>User "$ccuname" in domain $ccdomain </h2>
+<h2>User "$ccuname" in domain "$ccdomain"</h2>
ENDCHANGEUSER
# Get the users information
my %userenv = &Apache::lonnet::get('environment',
@@ -286,12 +291,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.(' 'x8).
+ &Apache::loncommon::syllabuswrapper('Syllabus',$coursedir,$coursedom);
} else {
$carea='Unavailable course: '.$area;
}
@@ -306,8 +314,8 @@ END
}
# 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;
}
@@ -339,7 +347,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)) {
@@ -824,6 +832,168 @@ END
$r->print('</body></html>');
}
+# ========================================================== Custom Role Editor
+
+sub custom_role_editor {
+ my $r=shift;
+ my $rolename=$ENV{'form.rolename'};
+
+ if ($rolename eq 'make new role') {
+ $rolename=$ENV{'form.newrolename'};
+ }
+
+ $rolename=~s/[^A-Za-z0-9]//gs;
+
+ unless ($rolename) {
+ &print_username_entry_form($r);
+ return;
+ }
+
+ $r->print(&Apache::loncommon::bodytag(
+ 'Create Users, Change User Privileges').'<h2>');
+ my $syspriv='';
+ my $dompriv='';
+ my $coursepriv='';
+ my ($rdummy,$roledef)=
+ &Apache::lonnet::get('roles',["rolesdef_$rolename"]);
+# ------------------------------------------------------- Does this role exist?
+ if (($rdummy ne 'con_lost') && ($roledef ne '')) {
+ $r->print('Existing Role "');
+# ------------------------------------------------- Get current role privileges
+ ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
+ } else {
+ $r->print('New Role "');
+ $roledef='';
+ }
+ $r->print($rolename.'"</h2>');
+# ------------------------------------------------------- What can be assigned?
+ my %full=();
+ my %courselevel=();
+ my %courselevelcurrent=();
+ foreach (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
+ my ($priv,$restrict)=split(/\&/,$_);
+ unless ($restrict) { $restrict='F'; }
+ $courselevel{$priv}=$restrict;
+ if ($coursepriv=~/\:$priv/) {
+ $courselevelcurrent{$priv}=1;
+ }
+ $full{$priv}=1;
+ }
+ my %domainlevel=();
+ my %domainlevelcurrent=();
+ foreach (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
+ my ($priv,$restrict)=split(/\&/,$_);
+ unless ($restrict) { $restrict='F'; }
+ $domainlevel{$priv}=$restrict;
+ if ($dompriv=~/\:$priv/) {
+ $domainlevelcurrent{$priv}=1;
+ }
+ $full{$priv}=1;
+ }
+ my %systemlevel=();
+ my %systemlevelcurrent=();
+ foreach (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+ my ($priv,$restrict)=split(/\&/,$_);
+ unless ($restrict) { $restrict='F'; }
+ $systemlevel{$priv}=$restrict;
+ if ($syspriv=~/\:$priv/) {
+ $systemlevelcurrent{$priv}=1;
+ }
+ $full{$priv}=1;
+ }
+ $r->print(<<ENDCCF);
+<form method="post">
+<input type="hidden" name="phase" value="set_custom_roles" />
+<input type="hidden" name="rolename" value="$rolename" />
+<table border="2">
+<tr><th>Privilege</th><th>Course Level</th><th>Domain Level</th>
+<th>System Level</th></tr>
+ENDCCF
+ foreach (sort keys %full) {
+ $r->print('<tr><td>'.&Apache::lonnet::plaintext($_).'</td><td>'.
+ ($courselevel{$_}?'<input type="checkbox" name="'.$_.':c" '.
+ ($courselevelcurrent{$_}?'checked="1"':'').' />':' ').
+ '</td><td>'.
+ ($domainlevel{$_}?'<input type="checkbox" name="'.$_.':d" '.
+ ($domainlevelcurrent{$_}?'checked="1"':'').' />':' ').
+ '</td><td>'.
+ ($systemlevel{$_}?'<input type="checkbox" name="'.$_.':s" '.
+ ($systemlevelcurrent{$_}?'checked="1"':'').' />':' ').
+ '</td></tr>');
+ }
+ $r->print(
+ '<table><input type="submit" value="Define Role" /></form></body></html>');
+}
+
+# ---------------------------------------------------------- Call to definerole
+sub set_custom_role {
+ my $r=shift;
+
+ my $rolename=$ENV{'form.rolename'};
+
+ $rolename=~s/[^A-Za-z0-9]//gs;
+
+ unless ($rolename) {
+ &print_username_entry_form($r);
+ return;
+ }
+
+ $r->print(&Apache::loncommon::bodytag(
+ 'Create Users, Change User Privileges').'<h2>');
+ my ($rdummy,$roledef)=
+ &Apache::lonnet::get('roles',["rolesdef_$rolename"]);
+# ------------------------------------------------------- Does this role exist?
+ if (($rdummy ne 'con_lost') && ($roledef ne '')) {
+ $r->print('Existing Role "');
+ } else {
+ $r->print('New Role "');
+ $roledef='';
+ }
+ $r->print($rolename.'"</h2>');
+# ------------------------------------------------------- What can be assigned?
+ my $sysrole='';
+ my $domrole='';
+ my $courole='';
+
+ foreach (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
+ my ($priv,$restrict)=split(/\&/,$_);
+ unless ($restrict) { $restrict=''; }
+ if ($ENV{'form.'.$priv.':c'}) {
+ $courole.=':'.$_;
+ }
+ }
+
+ foreach (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
+ my ($priv,$restrict)=split(/\&/,$_);
+ unless ($restrict) { $restrict=''; }
+ if ($ENV{'form.'.$priv.':d'}) {
+ $domrole.=':'.$_;
+ }
+ }
+
+ foreach (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+ my ($priv,$restrict)=split(/\&/,$_);
+ unless ($restrict) { $restrict=''; }
+ if ($ENV{'form.'.$priv.':s'}) {
+ $sysrole.=':'.$_;
+ }
+ }
+ $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>');
+}
+
# ================================================================ Main Handler
sub handler {
my $r = shift;
@@ -849,6 +1019,10 @@ 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);
+ } elsif ($ENV{'form.phase'} eq 'set_custom_roles') {
+ &set_custom_role($r);
}
} else {
$ENV{'user.error.msg'}=
@@ -862,6 +1036,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=$_;
@@ -870,8 +1048,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($_);
@@ -901,6 +1079,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