--- loncom/interface/loncreateuser.pm 2005/04/07 06:56:23 1.101
+++ loncom/interface/loncreateuser.pm 2006/05/09 17:21:13 1.116
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.101 2005/04/07 06:56:23 albertel Exp $
+# $Id: loncreateuser.pm,v 1.116 2006/05/09 17:21:13 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -108,23 +108,23 @@ sub my_custom_roles {
sub authorpriv {
my ($auname,$audom)=@_;
- if (($auname ne $env{'user.name'}) ||
- (($audom ne $env{'user.domain'}) &&
- ($audom ne $env{'request.role.domain'}))) { return ''; }
- unless (&Apache::lonnet::allowed('cca',$audom)) { return ''; }
+ unless ((&Apache::lonnet::allowed('cca',$audom.'/'.$auname))
+ || (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; }
return 1;
}
# =================================================================== 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();
@@ -139,15 +139,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>
@@ -158,14 +154,121 @@ $lt{'dom'}:</td><td>$domform</td></tr>
</table>
<input name="userrole" type="submit" value="$lt{usrr}" />
</form>
+ENDDOCUMENT
+ if (&Apache::lonnet::allowed('mcr','/')) {
+ $r->print(<<ENDCUSTOM);
<form action="/adm/createuser" method="post" name="docustom">
<input type="hidden" name="phase" value="selected_custom_edit">
<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>
-ENDDOCUMENT
+</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
+
+ 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);
+ var role = match[1];
+ if (role == 'cc') {
+ alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");
+ }
+ else {
+ var sections = '';
+ var numsec = 0;
+ var sections;
+ for (var j=0; j<document.cu.elements[i].length; j++) {
+ if (document.cu.elements[i].options[j].selected == true ) {
+ if (document.cu.elements[i].options[j].value != "") {
+ if (numsec == 0) {
+ if (document.cu.elements[i].options[j].value != "") {
+ sections = document.cu.elements[i].options[j].value;
+ numsec ++;
+ }
+ }
+ else {
+ sections = sections + "," + document.cu.elements[i].options[j].value
+ numsec ++;
+ }
+ }
+ }
+ }
+ 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;
+ }
+ var newseclist = document.cu.elements[i+1].value;
+ var newsecs = new Array();
+ if (newseclist != null && newseclist != "") {
+ newsecs = newseclist.split(/,/g);
+ numsec = numsec + newsecs.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.")
+ return;
+ }
+ else {
+ 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;
+ }
+ for (var k=0; k<groups.length; k++) {
+ if (newsecs[j] == groups[k]) {
+ alert("'"+newsecs[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>
+END
}
# =================================================================== Phase two
@@ -198,10 +301,19 @@ 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::loncommon::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=''";
$dc_setcourse_code = <<"ENDSCRIPT";
function setCourse() {
var course = document.cu.dccourse.value;
@@ -213,6 +325,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) {
@@ -234,13 +347,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 = "";
@@ -271,31 +399,11 @@ 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();
- }
-
+ } 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);
@@ -331,10 +439,10 @@ $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;
if (newsecs != null && newsecs != "") {
@@ -342,10 +450,23 @@ $html
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 {
+ else {
+ 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;
}
}
@@ -354,11 +475,14 @@ $html
}
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">
@@ -400,7 +524,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>
@@ -441,7 +565,7 @@ ENDNEWUSER
'gen' => "generation"
);
$r->print(<<ENDCHANGEUSER);
-$dochead
+$start_page
<h1>$lt{'cup'}</h1>
$forminfo
<h2>$lt{'usr'} "$ccuname" $lt{'id'} "$ccdomain"</h2>
@@ -544,7 +668,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;
@@ -574,7 +698,7 @@ END
$class='Domain';
}
}
- if ($role_code eq 'ca') {
+ if (($role_code eq 'ca') || ($role_code eq 'aa')) {
$area=~/\/(\w+)\/(\w+)/;
if (&authorpriv($2,$1)) {
$allowed=1;
@@ -663,7 +787,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
);
@@ -778,6 +902,7 @@ ENDOTHERAUTHS
'sta' => "Start",
'end' => "End",
'cau' => "Co-Author",
+ 'caa' => "Assistant Co-Author",
'ssd' => "Set Start Date",
'sed' => "Set End Date"
);
@@ -796,6 +921,17 @@ ENDOTHERAUTHS
<a href=
"javascript:pjump('date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset')">$lt{'sed'}</a></td>
</tr>
+<tr>
+<td><input type=checkbox name="act_$cudom\_$cuname\_aa" /></td>
+<td>$lt{'caa'}</td>
+<td>$cudom\_$cuname</td>
+<td><input type=hidden name="start_$cudom\_$cuname\_aa" value='' />
+<a href=
+"javascript:pjump('date_start','Start Date Assistant Co-Author',document.cu.start_$cudom\_$cuname\_aa.value,'start_$cudom\_$cuname\_aa','cu.pres','dateset')">$lt{'ssd'}</a></td>
+<td><input type=hidden name="end_$cudom\_$cuname\_aa" value='' />
+<a href=
+"javascript:pjump('date_end','End Date Assistant Co-Author',document.cu.end_$cudom\_$cuname\_aa.value,'end_$cudom\_$cuname\_aa','cu.pres','dateset')">$lt{'sed'}</a></td>
+</tr>
</table>
ENDCOAUTH
}
@@ -840,7 +976,6 @@ ENDDROW
#
# Course level
#
- my $num_sections;
if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
$r->print(&course_level_dc($1));
@@ -849,7 +984,7 @@ ENDDROW
$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
@@ -859,22 +994,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);
@@ -990,7 +1119,7 @@ ENDMODIFYUSERHEAD
&Apache::lonnet::modifyuserauth(
$env{'form.ccdomain'},$env{'form.ccuname'},
$amode,$genpwd));
- $r->print('<br>'.&mt('Home server').': '.&Apache::lonnet::homeserver
+ $r->print('<br />'.&mt('Home server').': '.&Apache::lonnet::homeserver
($env{'form.ccuname'},$env{'form.ccdomain'}));
} else {
# Okay, this is a non-fatal error.
@@ -1088,7 +1217,7 @@ END
# Revoke standard role
$r->print(&mt('Revoking').' '.$2.' in '.$1.': <b>'.
&Apache::lonnet::revokerole($env{'form.ccdomain'},
- $env{'form.ccuname'},$1,$2).'</b><br>');
+ $env{'form.ccuname'},$1,$2).'</b><br />');
if ($2 eq 'st') {
$1=~/^\/(\w+)\/(\w+)/;
my $cid=$1.'_'.$2;
@@ -1099,22 +1228,23 @@ END
&Apache::lonnet::escape($env{'form.ccuname'}.':'.
$env{'form.ccdomain'}).'='.
&Apache::lonnet::escape($now.':'),
- $env{'course.'.$cid.'.home'}).'</b><br>');
+ $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>');
+ '</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>');
+ $env{'form.ccuname'},$1,$2,$now,0,1).'<br />');
if ($2 eq 'st') {
$1=~/^\/(\w+)\/(\w+)/;
my $cid=$1.'_'.$2;
@@ -1125,13 +1255,23 @@ END
&Apache::lonnet::escape($env{'form.ccuname'}.':'.
$env{'form.ccdomain'}).'='.
&Apache::lonnet::escape($now.':'),
- $env{'course.'.$cid.'.home'}).'</b><br>');
+ $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;
@@ -1151,11 +1291,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'};
@@ -1178,8 +1327,15 @@ END
if ($num_sections == 0) {
$r->print(&commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end));
} else {
- foreach (sort {$a cmp $b} keys %sections) {
- my $securl = $url.'/'.$_;
+ my %curr_groups =
+ &Apache::loncommon::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(&commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
}
}
@@ -1201,10 +1357,17 @@ END
if ($num_sections == 0) {
$r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
} else {
+ my %curr_groups =
+ &Apache::loncommon::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));
} else {
@@ -1245,13 +1408,22 @@ END
}
}
} else {
- $r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$_.'</tt></p><br>');
+ $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('</body></html>');
+ $r->print('<p><a href="/adm/createuser">Create/Modify Another User</a></p>');
+ $r->print(&Apache::loncommon::end_page());
}
sub commit_customrole {
@@ -1261,7 +1433,7 @@ sub commit_customrole {
($end?', ending '.localtime($end):'').': <b>'.
&Apache::lonnet::assigncustomrole(
$udom,$uname,$url,$three,$four,$five,$end,$start).
- '</b><br>';
+ '</b><br />';
return $output;
}
@@ -1286,7 +1458,7 @@ sub commit_standardrole {
($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
&Apache::lonnet::assignrole(
$udom,$uname,$url,$three,$end,$start).
- '</b><br>';
+ '</b><br />';
}
return $output;
}
@@ -1332,7 +1504,7 @@ sub commit_studentrole {
}
} 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";
+ $result = "error: incomplete course id\n";
}
return $result;
}
@@ -1387,14 +1559,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
@@ -1466,12 +1638,13 @@ ENDCCF
'</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'};
@@ -1482,10 +1655,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').' "');
@@ -1535,7 +1708,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
@@ -1552,7 +1726,7 @@ sub handler {
(&Apache::lonnet::allowed('cin',$env{'request.course.id'})) ||
(&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) ||
(&Apache::lonnet::allowed('cep',$env{'request.course.id'})) ||
- (&Apache::lonnet::allowed('cca',$env{'request.role.domain'})) ||
+ (&authorpriv($env{'user.name'},$env{'request.role.domain'})) ||
(&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -1592,7 +1766,7 @@ sub course_level_table {
'act' => "Activate",
'rol' => "Role",
'ext' => "Extent",
- 'grs' => "Group/Section",
+ 'grs' => "Section",
'sta' => "Start",
'end' => "End"
);
@@ -1608,11 +1782,11 @@ sub course_level_table {
$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') {
@@ -1625,8 +1799,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 />'.
@@ -1666,8 +1840,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 />'.
@@ -1706,10 +1880,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".
@@ -1717,7 +1891,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";
@@ -1741,7 +1915,7 @@ sub course_level_dc {
'crl' => "Course Level",
'crt' => "Course Title",
'rol' => "Role",
- 'grs' => "Group/Section",
+ 'grs' => "Section",
'exs' => "Existing sections",
'new' => "Define new section",
'sta' => "Start",
@@ -1770,7 +1944,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=''>