--- loncom/interface/loncreateuser.pm 2005/06/23 21:56:12 1.106
+++ loncom/interface/loncreateuser.pm 2006/08/31 02:19:50 1.125.2.6
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.106 2005/06/23 21:56:12 www Exp $
+# $Id: loncreateuser.pm,v 1.125.2.6 2006/08/31 02:19:50 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -64,6 +64,9 @@ use Apache::Constants qw(:common :http);
use Apache::lonnet;
use Apache::loncommon;
use Apache::lonlocal;
+use Apache::longroup;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
my $loginscript; # piece of javascript used in two separate instances
my $generalrule;
@@ -116,13 +119,15 @@ sub authorpriv {
# =================================================================== Phase one
sub print_username_entry_form {
- my $r=shift;
+ my ($r) = @_;
my $defdom=$env{'request.role.domain'};
my @domains = &Apache::loncommon::get_domains();
my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
- my $html=&Apache::lonxml::xmlbegin();
- my $bodytag =&Apache::loncommon::bodytag('Create Users, Change User Privileges').&Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface');
my $selscript=&Apache::loncommon::studentbrowser_javascript();
+ my $start_page =
+ &Apache::loncommon::start_page('Create Users, Change User Privileges',
+ $selscript);
+
my $sellink=&Apache::loncommon::selectstudent_link
('crtuser','ccuname','ccdomain');
my %existingroles=&my_custom_roles();
@@ -137,15 +142,11 @@ sub print_username_entry_form {
'nr' => "Name of Role",
'cre' => "Custom Role Editor"
);
+ my $help = &Apache::loncommon::help_open_menu(undef,undef,282,'Instructor Interface');
my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
$r->print(<<"ENDDOCUMENT");
-$html
-<head>
-<title>The LearningOnline Network with CAPA</title>
-$selscript
-</head>
-$bodytag
+$start_page
<form action="/adm/createuser" method="post" name="crtuser">
<input type="hidden" name="phase" value="get_user_info">
<h2>$lt{siur}$helpsiur</h2>
@@ -164,10 +165,38 @@ ENDDOCUMENT
<h2>$lt{'ecrp'}$helpecpr</h2>
$lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br />
<input name="customeditor" type="submit" value="$lt{'cre'}" />
-</body>
-</html>
+</form>
ENDCUSTOM
- }
+ }
+ $r->print(&Apache::loncommon::end_page());
+}
+
+
+sub user_modification_js {
+ my ($pjump_def,$dc_setcourse_code,$nondc_setsection_code,$groupslist)=@_;
+
+ return <<END;
+<script type="text/javascript" language="Javascript">
+
+ function pclose() {
+ parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
+ "height=350,width=350,scrollbars=no,menubar=no");
+ parmwin.close();
+ }
+
+ $pjump_def
+ $dc_setcourse_code
+
+ function dateset() {
+ eval("document.cu."+document.cu.pres_marker.value+
+ ".value=document.cu.pres_value.value");
+ pclose();
+ }
+
+ $nondc_setsection_code
+
+</script>
+END
}
# =================================================================== Phase two
@@ -200,10 +229,31 @@ sub print_user_modification_page {
$ccdomain=~s/\W//g;
my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
my $dc_setcourse_code = '';
- my $loaditem;
+ my $nondc_setsection_code = '';
+
+ my %loaditem;
+
+ my $groupslist;
+ my %curr_groups = &Apache::longroup::coursegroups();
+ if (%curr_groups) {
+ $groupslist = join('","',sort(keys(%curr_groups)));
+ $groupslist = '"'.$groupslist.'"';
+ }
+
if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
my $dcdom = $1;
- $loaditem = qq|OnLoad="document.cu.coursedesc.value=''"|;
+ $loaditem{'onload'} = "document.cu.coursedesc.value='';";
+ my @rolevals = ('st','ta','ep','in','cc');
+ my (@crsroles,@grproles);
+ for (my $i=0; $i<@rolevals; $i++) {
+ $crsroles[$i]=&Apache::lonnet::plaintext($rolevals[$i],'Course');
+ $grproles[$i]=&Apache::lonnet::plaintext($rolevals[$i],'Group');
+ }
+ my $rolevalslist = join('","',@rolevals);
+ my $crsrolenameslist = join('","',@crsroles);
+ my $grprolenameslist = join('","',@grproles);
+ my $pickcrsfirst = '<--'.&mt('Pick course first');
+ my $pickgrpfirst = '<--'.&mt('Pick group first');
$dc_setcourse_code = <<"ENDSCRIPT";
function setCourse() {
var course = document.cu.dccourse.value;
@@ -215,6 +265,7 @@ sub print_user_modification_page {
var userrole = document.cu.role.options[document.cu.role.selectedIndex].value
var section="";
var numsections = 0;
+ var newsecs = new Array();
for (var i=0; i<document.cu.currsec.length; i++) {
if (document.cu.currsec.options[i].selected == true ) {
if (document.cu.currsec.options[i].value != "" && document.cu.currsec.options[i].value != null) {
@@ -236,13 +287,28 @@ sub print_user_modification_page {
else {
section = section + "," + document.cu.newsec.value
}
- var numsplit = document.cu.newsec.value.split(/,/g);
- numsections = numsections + numsplit.length;
+ newsecs = document.cu.newsec.value.split(/,/g);
+ numsections = numsections + newsecs.length;
}
if ((userrole == 'st') && (numsections > 1)) {
alert("In each course, each user may only have one student role at a time. You had selected "+numsections+" sections.\\nPlease modify your selections so they include no more than one section.")
return;
}
+ for (var j=0; j<newsecs.length; j++) {
+ if ((newsecs[j] == 'all') || (newsecs[j] == 'none')) {
+ alert("'"+newsecs[j]+"' may not be used as the name for a section, as it is a reserved word.\\nPlease choose a different section name.");
+ return;
+ }
+ if (document.cu.groups.value != '') {
+ var groups = document.cu.groups.value.split(/,/g);
+ for (var k=0; k<groups.length; k++) {
+ if (newsecs[j] == groups[k]) {
+ alert("'"+newsecs[j]+"' may not be used as the name for a section, as it is the name of a course group.\\nSection names and group names must be distinct. Please choose a different section name.");
+ return;
+ }
+ }
+ }
+ }
if ((userrole == 'cc') && (numsections > 0)) {
alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");
section = "";
@@ -254,11 +320,11 @@ sub print_user_modification_page {
}
else {
var coursename = "_$dcdom"+"_"+course+"_"+userrole
- document.cu.elements[numcourse].name = "act"+coursename
- document.cu.elements[numcourse+4].name = "sec"+coursename
- document.cu.elements[numcourse+4].value = section
- document.cu.elements[numcourse+5].name = "start"+coursename
- document.cu.elements[numcourse+6].name = "end"+coursename
+ document.cu.act.name = "act"+coursename
+ document.cu.sec.value = section
+ document.cu.sec.name = "sec"+coursename
+ document.cu.start.name = "start"+coursename
+ document.cu.end.name = "end"+coursename
}
}
document.cu.submit();
@@ -272,37 +338,46 @@ sub print_user_modification_page {
}
return -1;
}
-ENDSCRIPT
- }
- my $html=&Apache::lonxml::xmlbegin();
- my $dochead =<<"ENDDOCHEAD";
-$html
-<head>
-<title>The LearningOnline Network with CAPA</title>
-<script type="text/javascript" language="Javascript">
- function pclose() {
- parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
- "height=350,width=350,scrollbars=no,menubar=no");
- parmwin.close();
- }
-
- $pjump_def
- $dc_setcourse_code
-
- function dateset() {
- eval("document.cu."+document.cu.pres_marker.value+
- ".value=document.cu.pres_value.value");
- pclose();
+ function setType() {
+ var crstype = 'Course'
+ rolevals = new Array("$rolevalslist");
+ if (crstype == 'Group') {
+ if (document.cu.currsec.options[0].text == "$pickcrsfirst") {
+ document.cu.currsec.options[0].text = "$pickgrpfirst";
+ }
+ grprolenames = new Array("$grprolenameslist");
+ for (var i=0; i<rolevals.length; i++) {
+ if (document.cu.role.selectedIndex == i) {
+ document.cu.role.options[i] = new Option(grprolenames[i],rolevals[i],true,false);
+ } else {
+ document.cu.role.options[i] = new Option(grprolenames[i],rolevals[i],false,false);
+ }
+ }
+ } else {
+ if (document.cu.currsec.options[0].text == "$pickgrpfirst") {
+ document.cu.currsec.options[0].text = "$pickcrsfirst";
+ }
+ crsrolenames = new Array("$crsrolenameslist");
+ for (var i=0; i<rolevals.length; i++) {
+ if (document.cu.role.selectedIndex == i) {
+ document.cu.role.options[i] = new Option(crsrolenames[i],rolevals[i],true,false);
+ } else {
+ document.cu.role.options[i] = new Option(crsrolenames[i],rolevals[i],false,false);
+ }
+ }
+ }
}
-
+ENDSCRIPT
+ } else {
+ $nondc_setsection_code = <<"ENDSECCODE";
function setSections() {
var re1 = /^currsec_/;
+ var groups = new Array($groupslist);
for (var i=0;i<document.cu.elements.length;i++) {
var str = document.cu.elements[i].name;
var checkcurr = str.match(re1);
if (checkcurr != null) {
- var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
if (document.cu.elements[i-1].checked == true) {
var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
match = re2.exec(str);
@@ -333,34 +408,52 @@ $html
if (numsec > 0) {
if (document.cu.elements[i+1].value != "" && document.cu.elements[i+1].value != null) {
sections = sections + "," + document.cu.elements[i+1].value;
- }
+ }
}
else {
- sections = document.cu.elements[i+1].value;
+ sections = document.cu.elements[i+1].value;
}
var newsecs = document.cu.elements[i+1].value;
+ var numsplit;
if (newsecs != null && newsecs != "") {
- var numsplit = newsecs.split(/,/g);
+ numsplit = newsecs.split(/,/g);
numsec = numsec + numsplit.length;
}
+
if ((role == 'st') && (numsec > 1)) {
- alert("In each course, each user may only have one student role at a time. You had selected "+numsec+" sections.\\nPlease modify your selections so they include no more than one section.")
+ alert("In each course, each user may only have one student role at a time. You had selected "+numsec+" sections.\\nPlease modify your selections so they include no more than one section.")
return;
}
- else {
- document.cu.elements[i+2].value = sections;
+ else if (numsplit != null) {
+ for (var j=0; j<numsplit.length; j++) {
+ if ((numsplit[j] == 'all') ||
+ (numsplit[j] == 'none')) {
+ alert("'"+numsplit[j]+"' may not be used as the name for a section, as it is a reserved word.\\nPlease choose a different section name.");
+ return;
+ }
+ for (var k=0; k<groups.length; k++) {
+ if (numsplit[j] == groups[k]) {
+ alert("'"+numsplit[j]+"' may not be used as a section name, as it is the name of a course group.\\nSection names and group names must be distinct. Please choose a different section name.");
+ return;
+ }
+ }
+ }
}
+ document.cu.elements[i+2].value = sections;
}
}
}
}
document.cu.submit();
}
-</script>
-</head>
-ENDDOCHEAD
- $r->print(&Apache::loncommon::bodytag(
- 'Create Users, Change User Privileges',undef,$loaditem));
+ENDSECCODE
+ }
+ my $js = &user_modification_js($pjump_def,$dc_setcourse_code,
+ $nondc_setsection_code,$groupslist);
+ my $start_page =
+ &Apache::loncommon::start_page('Create Users, Change User Privileges',
+ $js,{'add_entries' => \%loaditem,});
+
my $forminfo =<<"ENDFORMINFO";
<form action="/adm/createuser" method="post" name="cu">
<input type="hidden" name="phase" value="update_user_data">
@@ -402,7 +495,7 @@ ENDFORMINFO
my $genhelp=&Apache::loncommon::help_open_topic('Generation');
&initialize_authen_forms();
$r->print(<<ENDNEWUSER);
-$dochead
+$start_page
<h1>$lt{'cnu'}</h1>
$forminfo
<h2>$lt{'nu'} "$ccuname" $lt{'id'} $ccdomain</h2>
@@ -443,7 +536,7 @@ ENDNEWUSER
'gen' => "generation"
);
$r->print(<<ENDCHANGEUSER);
-$dochead
+$start_page
<h1>$lt{'cup'}</h1>
$forminfo
<h2>$lt{'usr'} "$ccuname" $lt{'id'} "$ccdomain"</h2>
@@ -511,7 +604,7 @@ END
if ($area =~ /^\/(\w+)\/(\d\w+)/ ) {
$class='Course';
my ($coursedom,$coursedir) = ($1,$2);
- $sortkey.="\0$1";
+ $sortkey.="\0$coursedom";
# $1.'_'.$2 is the course id (eg. 103_12345abcef103l3).
my %coursedata=
&Apache::lonnet::coursedescription($1.'_'.$2);
@@ -521,10 +614,12 @@ END
'<br />'.&mt('Domain').': '.$coursedom.(' 'x8).
&Apache::loncommon::syllabuswrapper('Syllabus',$coursedir,$coursedom);
$sortkey.="\0".$coursedata{'description'};
+ $class=$coursedata{'type'};
} else {
$carea=&mt('Unavailable course').': '.$area;
$sortkey.="\0".&mt('Unavailable course').': '.$area;
}
+ $sortkey.="\0$coursedir";
$inccourses{$1.'_'.$2}=1;
if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) ||
(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
@@ -546,7 +641,7 @@ END
$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;
+ $carea.='<br />Section: '.$3;
$sortkey.="\0$3";
}
$area=$carea;
@@ -612,7 +707,7 @@ END
}
my $plaintext='';
unless ($croletitle) {
- $plaintext=&Apache::lonnet::plaintext($role_code);
+ $plaintext=&Apache::lonnet::plaintext($role_code,$class)
} else {
$plaintext=
"Customrole '$croletitle' defined by $croleuname\@$croleudom";
@@ -632,7 +727,7 @@ END
} # end of foreach (table building loop)
my $rolesdisplay = 0;
my %output = ();
- foreach my $type ('Construction Space','Course','Domain','System','Unknown') {
+ foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
$output{$type} = '';
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) {
@@ -654,7 +749,7 @@ END
<tr><th>$lt{'rev'}</th><th>$lt{'ren'}</th><th>$lt{'del'}</th><th>$lt{'rol'}</th><th>$lt{'e
xt'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th>
END
- foreach my $type ('Construction Space','Course','Domain','System','Unknown') {
+ foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
if ($output{$type}) {
$r->print($output{$type}."\n");
}
@@ -665,7 +760,7 @@ END
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
if ($currentauth=~/^krb(4|5):/) {
$currentauth=~/^krb(4|5):(.*)/;
- my $krbdefdom=$1;
+ my $krbdefdom=$2;
my %param = ( formname => 'document.cu',
kerb_def_dom => $krbdefdom
);
@@ -852,18 +947,17 @@ ENDDROW
$r->print($domaintext);
}
#
-# Course level
+# Course and group levels
#
- my $num_sections;
if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
- $r->print(&course_level_dc($1));
+ $r->print(&course_level_dc($1,'Course'));
$r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()">'."\n");
} else {
$r->print(&course_level_table(%inccourses));
$r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setSections()">'."\n");
}
- $r->print("</form></body></html>");
+ $r->print("</form>".&Apache::loncommon::end_page());
}
# ================================================================= Phase Three
@@ -873,22 +967,16 @@ sub update_user_data {
$env{'form.ccdomain'});
# Error messages
my $error = '<font color="#ff0000">'.&mt('Error').':</font>';
- my $end = '</body></html>';
- # Print header
- my $html=&Apache::lonxml::xmlbegin();
- $r->print(<<ENDTHREEHEAD);
-$html
-<head>
-<title>The LearningOnline Network with CAPA</title>
-</head>
-ENDTHREEHEAD
+ my $end = &Apache::loncommon::end_page();
+
my $title;
if (exists($env{'form.makeuser'})) {
$title='Set Privileges for New User';
} else {
$title='Modify User Privileges';
}
- $r->print(&Apache::loncommon::bodytag($title));
+ $r->print(&Apache::loncommon::start_page($title));
+ my %disallowed;
# Check Inputs
if (! $env{'form.ccuname'} ) {
$r->print($error.&mt('No login name specified').'.'.$end);
@@ -1110,22 +1198,23 @@ END
&Apache::lonnet::critical('put:'.
$env{'course.'.$cid.'.domain'}.':'.
$env{'course.'.$cid.'.num'}.':classlist:'.
- &Apache::lonnet::escape($env{'form.ccuname'}.':'.
+ &escape($env{'form.ccuname'}.':'.
$env{'form.ccdomain'}).'='.
- &Apache::lonnet::escape($now.':'),
+ &escape($now.':'),
$env{'course.'.$cid.'.home'}).'</b><br />');
}
}
if ($_=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
# Revoke custom role
- $r->print(&mt('Revoking custom role').
+ $r->print(&mt('Revoking custom role:').
' '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'.
&Apache::lonnet::revokecustomrole($env{'form.ccdomain'},
$env{'form.ccuname'},$1,$2,$3,$4).
'</b><br />');
}
} elsif ($_=~/^form\.del/) {
- if ($_=~/^form\.del\:([^\_]+)\_([^\_]+)$/) {
+ if ($_=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
+# Delete standard role
$r->print(&mt('Deleting').' '.$2.' in '.$1.': '.
&Apache::lonnet::assignrole($env{'form.ccdomain'},
$env{'form.ccuname'},$1,$2,$now,0,1).'<br />');
@@ -1136,23 +1225,33 @@ END
&Apache::lonnet::critical('put:'.
$env{'course.'.$cid.'.domain'}.':'.
$env{'course.'.$cid.'.num'}.':classlist:'.
- &Apache::lonnet::escape($env{'form.ccuname'}.':'.
+ &escape($env{'form.ccuname'}.':'.
$env{'form.ccdomain'}).'='.
- &Apache::lonnet::escape($now.':'),
+ &escape($now.':'),
$env{'course.'.$cid.'.home'}).'</b><br />');
}
- }
+ }
+ if ($_=~/^form\.del\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
+ my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
+# Delete custom role
+ $r->print(&mt('Deleting custom role [_1] by [_2]@[_3] in [_4]',
+ $rolename,$rnam,$rdom,$url).': <b>'.
+ &Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
+ $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
+ 0,1).'</b><br />');
+ }
} elsif ($_=~/^form\.ren/) {
my $udom = $env{'form.ccdomain'};
my $uname = $env{'form.ccuname'};
- if ($_=~/^form\.ren\:([^\_]+)\_([^\_]+)$/) {
+# Re-enable standard role
+ if ($_=~/^form\.ren\:([^\_]+)\_([^\_\.]+)$/) {
my $url = $1;
my $role = $2;
my $logmsg;
my $output;
if ($role eq 'st') {
if ($url =~ m-^/(\w+)/(\w+)/?(\w*)$-) {
- my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3);
+ my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3);
if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) {
$output = "Error: $result\n";
} else {
@@ -1165,11 +1264,20 @@ END
} else {
my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'},
$env{'form.ccuname'},$url,$role,0,$now);
- $output = &mt('Re-Enabling [_1] in [_2]: [_3]',
+ $output = &mt('Re-enabling [_1] in [_2]: <b>[_3]</b>',
$role,$url,$result).'<br />';
}
$r->print($output);
- }
+ }
+# Re-enable custom role
+ if ($_=~/^form\.ren\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
+ my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
+ my $result = &Apache::lonnet::assigncustomrole(
+ $env{'form.ccdomain'}, $env{'form.ccuname'},
+ $url,$rdom,$rnam,$rolename,0,$now);
+ $r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : <b>[_5]</b>',
+ $rolename,$rnam,$rdom,$url,$result).'<br />');
+ }
} elsif ($_=~/^form\.act/) {
my $udom = $env{'form.ccdomain'};
my $uname = $env{'form.ccuname'};
@@ -1190,11 +1298,18 @@ END
my %sections = ();
my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$5);
if ($num_sections == 0) {
- $r->print(&commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end));
+ $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end));
} else {
- foreach (sort {$a cmp $b} keys %sections) {
- my $securl = $url.'/'.$_;
- $r->print(&commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
+ my %curr_groups =
+ &Apache::longroup::coursegroups($one,$two);
+ foreach my $sec (sort {$a cmp $b} keys %sections) {
+ if (($sec eq 'none') || ($sec eq 'all') ||
+ exists($curr_groups{$sec})) {
+ $disallowed{$sec} = $url;
+ next;
+ }
+ my $securl = $url.'/'.$sec;
+ $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
}
}
} elsif ($_=~/^form\.act\_([^\_]+)\_(\w+)\_([^\_]+)$/) {
@@ -1213,20 +1328,27 @@ END
my %sections = ();
my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two.'_'.$three},\%sections,$three);
if ($num_sections == 0) {
- $r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
+ $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
} else {
+ my %curr_groups =
+ &Apache::longroup::coursegroups($one,$two);
my $emptysec = 0;
foreach my $sec (sort {$a cmp $b} keys %sections) {
$sec =~ s/\W//g;
- if ($sec ne '') {
+ if ($sec ne '') {
+ if (($sec eq 'none') || ($sec eq 'all') ||
+ exists($curr_groups{$sec})) {
+ $disallowed{$sec} = $url;
+ next;
+ }
my $securl = $url.'/'.$sec;
- $r->print(&commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec));
+ $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec));
} else {
$emptysec = 1;
}
}
if ($emptysec) {
- $r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
+ $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
}
}
} elsif ($_=~/^form\.act\_([^\_]+)\_([^\_]+)$/) {
@@ -1243,113 +1365,38 @@ END
my %sections = ();
my $num_sections = &build_roles($env{'form.sec_'.$1.'_'.$2},\%sections,$2);
if ($num_sections == 0) {
- $r->print(&commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));
+ $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));
} else {
my $emptysec = 0;
foreach my $sec (sort {$a cmp $b} keys %sections) {
if ($sec ne '') {
my $securl = $url.'/'.$sec;
- $r->print(&commit_standardrole($udom,$uname,$securl,$2,$start,$end,$1,undef,$sec));
+ $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$2,$start,$end,$1,undef,$sec));
} else {
$emptysec = 1;
}
}
if ($emptysec) {
- $r->print(&commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));
+ $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));
}
}
} else {
$r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$_.'</tt></p><br />');
}
- }
+ foreach my $key (sort(keys(%disallowed))) {
+ if (($key eq 'none') || ($key eq 'all')) {
+ $r->print('<p>'.&mt('[_1] may not be used as the name for a section, as it is a reserved word.',$key));
+ } else {
+ $r->print('<p>'.&mt('[_1] may not be used as the name for a section, as it is the name of a course group.',$key));
+ }
+ $r->print(' '.&mt('Please <a href="javascript:history.go(-1)">go back</a> and choose a different section name.').'</p><br />');
+ }
+ }
} # End of foreach (keys(%env))
# Flush the course logs so reverse user roles immediately updated
&Apache::lonnet::flushcourselogs();
$r->print('<p><a href="/adm/createuser">Create/Modify Another User</a></p>');
- $r->print('</body></html>');
-}
-
-sub commit_customrole {
- my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_;
- my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url.
- ($start?', '.&mt('starting').' '.localtime($start):'').
- ($end?', ending '.localtime($end):'').': <b>'.
- &Apache::lonnet::assigncustomrole(
- $udom,$uname,$url,$three,$four,$five,$end,$start).
- '</b><br />';
- return $output;
-}
-
-sub commit_standardrole {
- my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
- my $output;
- my $logmsg;
- if ($three eq 'st') {
- my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec);
- if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) {
- $output = "Error: $result\n";
- } else {
- $output = &mt('Assigning').' '.$three.' in '.$url.
- ($start?', '.&mt('starting').' '.localtime($start):'').
- ($end?', '.&mt('ending').' '.localtime($end):'').
- ': <b>'.$result.'</b><br />'.
- &mt('Add to classlist').': <b>ok</b><br />';
- }
- } else {
- $output = &mt('Assigning').' '.$three.' in '.$url.
- ($start?', '.&mt('starting').' '.localtime($start):'').
- ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
- &Apache::lonnet::assignrole(
- $udom,$uname,$url,$three,$end,$start).
- '</b><br />';
- }
- return $output;
-}
-
-sub commit_studentrole {
- my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
- my $linefeed = '<br />'."\n";
- my $result;
- if (defined($one) && defined($two)) {
- my $cid=$one.'_'.$two;
- my $oldsec=&Apache::lonnet::getsection($udom,$uname,$cid);
- my $secchange = 0;
- my $expire_role_result;
- my $modify_section_result;
- unless ($oldsec eq '-1') {
- unless ($sec eq $oldsec) {
- $secchange = 1;
- my $uurl='/'.$cid;
- $uurl=~s/\_/\//g;
- if ($oldsec) {
- $uurl.='/'.$oldsec;
- }
- $expire_role_result = &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',time);
- $result = $expire_role_result;
- }
- }
- if (($expire_role_result eq 'ok') || ($secchange == 0)) {
- $modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid);
- if ($modify_section_result =~ /^ok/) {
- if ($secchange == 1) {
- $$logmsg .= "Section for $uname switched from old section: $oldsec to new section: $sec".$linefeed;
- } elsif ($oldsec eq '-1') {
- $$logmsg .= "New student role for $uname in section $sec in course $cid".$linefeed;
- } else {
- $$logmsg .= "Student $uname assigned to unchanged section $sec in course $cid".$linefeed;
- }
- } else {
- $$logmsg .= "Error when attempting section change for $uname from old section $oldsec to new section: $sec in course $cid -error: $modify_section_result".$linefeed;
- }
- $result = $modify_section_result;
- } elsif ($secchange == 1) {
- $$logmsg .= "Error when attempting to expire role for $uname in old section $oldsec in course $cid -error: $expire_role_result".$linefeed;
- }
- } else {
- $$logmsg .= "Incomplete course id defined. Addition of user $uname from domain $udom to course $one\_$two, section $sec not completed.$linefeed";
- $result = "Error: incomplete course id\n";
- }
- return $result;
+ $r->print(&Apache::loncommon::end_page());
}
sub build_roles {
@@ -1381,7 +1428,7 @@ sub build_roles {
$num_sections ++;
}
}
-
+
return $num_sections;
}
@@ -1402,14 +1449,14 @@ sub custom_role_editor {
return;
}
- $r->print(&Apache::loncommon::bodytag(
- 'Create Users, Change User Privileges').'<h2>');
+ $r->print(&Apache::loncommon::start_page('Custom Role Editor'));
my $syspriv='';
my $dompriv='';
my $coursepriv='';
my ($rdummy,$roledef)=
&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
# ------------------------------------------------------- Does this role exist?
+ $r->print('<h2>');
if (($rdummy ne 'con_lost') && ($roledef ne '')) {
$r->print(&mt('Existing Role').' "');
# ------------------------------------------------- Get current role privileges
@@ -1468,25 +1515,27 @@ sub custom_role_editor {
<tr><th>$lt{'prv'}</th><th>$lt{'crl'}</th><th>$lt{'dml'}</th>
<th>$lt{'ssl'}</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"':'').' />':' ').
+ foreach my $priv (sort keys %full) {
+ my $privtext = &Apache::lonnet::plaintext($priv);
+ $r->print('<tr><td>'.$privtext.'</td><td>'.
+ ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.':c" '.
+ ($courselevelcurrent{$priv}?'checked="1"':'').' />':' ').
'</td><td>'.
- ($domainlevel{$_}?'<input type="checkbox" name="'.$_.':d" '.
- ($domainlevelcurrent{$_}?'checked="1"':'').' />':' ').
+ ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.':d" '.
+ ($domainlevelcurrent{$priv}?'checked="1"':'').' />':' ').
'</td><td>'.
- ($systemlevel{$_}?'<input type="checkbox" name="'.$_.':s" '.
- ($systemlevelcurrent{$_}?'checked="1"':'').' />':' ').
+ ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.':s" '.
+ ($systemlevelcurrent{$priv}?'checked="1"':'').' />':' ').
'</td></tr>');
}
$r->print(
- '<table><input type="submit" value="'.&mt('Define Role').'" /></form></body></html>');
+ '<table><input type="submit" value="'.&mt('Define Role').'" /></form>'.
+ &Apache::loncommon::end_page());
}
# ---------------------------------------------------------- Call to definerole
sub set_custom_role {
- my $r=shift;
+ my ($r) = @_;
my $rolename=$env{'form.rolename'};
@@ -1497,10 +1546,10 @@ sub set_custom_role {
return;
}
- $r->print(&Apache::loncommon::bodytag(
- 'Create Users, Change User Privileges').'<h2>');
+ $r->print(&Apache::loncommon::start_page('Save Custom Role').'<h2>');
my ($rdummy,$roledef)=
- &Apache::lonnet::get('roles',["rolesdef_$rolename"]);
+ &Apache::lonnet::get('roles',["rolesdef_$rolename"]);
+
# ------------------------------------------------------- Does this role exist?
if (($rdummy ne 'con_lost') && ($roledef ne '')) {
$r->print(&mt('Existing Role').' "');
@@ -1550,7 +1599,8 @@ sub set_custom_role {
$env{'user.name'},
$rolename));
}
- $r->print('</body></html>');
+ $r->print('<p><a href="/adm/createuser">Create another role, or Create/Modify a user.</a></p>');
+ $r->print(&Apache::loncommon::end_page());
}
# ================================================================ Main Handler
@@ -1607,7 +1657,7 @@ sub course_level_table {
'act' => "Activate",
'rol' => "Role",
'ext' => "Extent",
- 'grs' => "Group/Section",
+ 'grs' => "Section",
'sta' => "Start",
'end' => "End"
);
@@ -1618,19 +1668,20 @@ sub course_level_table {
$thiscourse=~s:_:/:g;
my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
my $area=$coursedata{'description'};
+ my $type=$coursedata{'type'};
if (!defined($area)) { $area=&mt('Unavailable course').': '.$_; }
my $bgcol=$thiscourse;
$bgcol=~s/[^7-9a-e]//g;
$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
my ($domain,$cnum)=split(/\//,$thiscourse);
- my %sections_count = ();
- my $num_sections = 0;
+ my %sections_count;
if (defined($env{'request.course.id'})) {
if ($env{'request.course.id'} eq $domain.'_'.$cnum) {
- $num_sections = &Apache::loncommon::get_sections($domain,$cnum,\%sections_count);
+ %sections_count =
+ &Apache::loncommon::get_sections($domain,$cnum);
}
}
- foreach ('st','ta','ep','ad','in','cc') {
+ foreach ('st','ta','ep','in','cc') {
if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {
my $plrole=&Apache::lonnet::plaintext($_);
$table .= <<ENDEXTENT;
@@ -1640,8 +1691,8 @@ sub course_level_table {
<td>$area<br />Domain: $domain</td>
ENDEXTENT
if ($_ ne 'cc') {
- if ($num_sections > 0) {
- my $currsec = &course_sections($num_sections,\%sections_count,$protectedcourse.'_'.$_);
+ if (%sections_count) {
+ my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$_);
$table .=
'<td><table border="0" cellspacing="0" cellpadding="0">'.
'<tr><td valign="top">'.$lt{'exs'}.'<br />'.
@@ -1681,8 +1732,8 @@ ENDTIMEENTRY
<td>$plrole</td>
<td>$area</td>
END
- if ($num_sections > 0) {
- my $currsec = &course_sections($num_sections,\%sections_count,$customrole);
+ if (%sections_count) {
+ my $currsec = &course_sections(\%sections_count,$customrole);
$table.=
'<td><table border="0" cellspacing="0" cellpadding="0">'.
'<tr><td valign="top">'.$lt{'exs'}.'<br />'.
@@ -1721,10 +1772,10 @@ ENDTABLE
}
sub course_sections {
- my ($num_sections,$sections_count,$role) = @_;
+ my ($sections_count,$role) = @_;
my $output = '';
my @sections = (sort {$a <=> $b} keys %{$sections_count});
- if ($num_sections == 1) {
+ if (scalar(@sections) == 1) {
$output = '<select name="currsec_'.$role.'" >'."\n".
' <option value="">Select</option>'."\n".
' <option value="">No section</option>'."\n".
@@ -1732,7 +1783,7 @@ sub course_sections {
} else {
$output = '<select name="currsec_'.$role.'" ';
my $multiple = 4;
- if ($num_sections <4) { $multiple = $num_sections; }
+ if (scalar(@sections) < 4) { $multiple = scalar(@sections); }
$output .= '"multiple" size="'.$multiple.'">'."\n";
foreach (@sections) {
$output .= '<option value="'.$_.'">'.$_."</option>\n";
@@ -1749,14 +1800,12 @@ sub course_level_dc {
'<input type="hidden" name="origdom" value="'.$dcdom.'" />'.
'<input type="hidden" name="dccourse" value="" />';
my $courseform='<b>'.&Apache::loncommon::selectcourse_link
- ('cu','dccourse','dcdomain','coursedesc').'</b>';
-
- my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,$dcdom);
+ ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>';
+ my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom);
my %lt=&Apache::lonlocal::texthash(
- 'crl' => "Course Level",
- 'crt' => "Course Title",
+ 'typ' => "Type",
'rol' => "Role",
- 'grs' => "Group/Section",
+ 'grs' => "Section",
'exs' => "Existing sections",
'new' => "Define new section",
'sta' => "Start",
@@ -1764,11 +1813,11 @@ sub course_level_dc {
'ssd' => "Set Start Date",
'sed' => "Set End Date"
);
- my $header = '<h4>'.$lt{'crl'}.'</h4>'.
+ my $header = '<h4>'.&mt('Course Level').'</h4>'.
'<table border="2"><tr><th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th></tr>';
- my $otheritems = '<tr><td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'".'cu'."'".','."'".'dccourse'."'".','."'".'dcdomain'."'".','."'".'coursedesc'."',''".')" /></td>'.
+ my $otheritems = '<tr><td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',".')" /></td>'."\n".
'<td><select name="role">'."\n";
- foreach ('st','ta','ep','ad','in','cc') {
+ foreach ('st','ta','ep','in','cc') {
my $plrole=&Apache::lonnet::plaintext($_);
$otheritems .= ' <option value="'.$_.'">'.$plrole;
}
@@ -1785,7 +1834,8 @@ sub course_level_dc {
' <option value=""><--'.&mt('Pick course first').'</select></td>'.
'<td> </td>'.
'<td valign="top"> <b>'.$lt{'new'}.'</b><br />'.
- '<input type="text" name="newsec" value="" /></td>'.
+ '<input type="text" name="newsec" value="" />'.
+ '<input type="hidden" name="groups" value="" /></td>'.
'</tr></table></td>';
$otheritems .= <<ENDTIMEENTRY;
<td><input type=hidden name="start" value=''>