--- loncom/interface/loncreateuser.pm 2006/05/08 21:40:20 1.113 +++ loncom/interface/loncreateuser.pm 2007/03/12 17:06:59 1.148 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.113 2006/05/08 21:40:20 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.148 2007/03/12 17:06:59 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 qw(:DEFAULT :match); my $loginscript; # piece of javascript used in two separate instances my $generalrule; @@ -96,8 +99,8 @@ sub initialize_authen_forms { sub my_custom_roles { my %returnhash=(); my %rolehash=&Apache::lonnet::dump('roles'); - foreach (keys %rolehash) { - if ($_=~/^rolesdef\_(\w+)$/) { + foreach my $key (keys %rolehash) { + if ($key=~/^rolesdef\_(\w+)$/) { $returnhash{$1}=$1; } } @@ -113,12 +116,25 @@ sub authorpriv { return 1; } +# ==================================================== + +sub portfolio_quota { + my ($ccuname,$ccdomain) = @_; + my %lt = &Apache::lonlocal::texthash( + 'disk' => "Disk space allocated to user's portfolio files", + ); + my $output = '<h3>'.$lt{'disk'}.'</h3>'. + '<input type="text" name="portfolioquota" size ="5" value="'. + &Apache::loncommon::get_user_quota($ccuname,$ccdomain). + '" /> Mb'; + return $output; +} + # =================================================================== Phase one sub print_username_entry_form { my ($r) = @_; my $defdom=$env{'request.role.domain'}; - my @domains = &Apache::loncommon::get_domains(); my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain'); my $selscript=&Apache::loncommon::studentbrowser_javascript(); my $start_page = @@ -139,7 +155,7 @@ 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 $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"); @@ -192,80 +208,6 @@ sub user_modification_js { $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 newsecs = document.cu.elements[i+1].value; - if (newsecs != null && newsecs != "") { - var 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.") - return; - } - 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; - } - } - } - } - } - document.cu.submit(); - } </script> END } @@ -273,11 +215,8 @@ END # =================================================================== Phase two sub print_user_modification_page { my $r=shift; - my $ccuname=$env{'form.ccuname'}; - my $ccdomain=$env{'form.ccdomain'}; - - $ccuname=~s/\W//g; - $ccdomain=~s/\W//g; + my $ccuname =&LONCAPA::clean_username($env{'form.ccuname'}); + my $ccdomain=&LONCAPA::clean_domain($env{'form.ccdomain'}); unless (($ccuname) && ($ccdomain)) { &print_username_entry_form($r); @@ -295,27 +234,36 @@ sub print_user_modification_page { ); $loginscript = &Apache::loncommon::authform_header(%param); $authformkrb = &Apache::loncommon::authform_kerberos(%param); - - $ccuname=~s/\W//g; - $ccdomain=~s/\W//g; + + $ccuname =&LONCAPA::clean_username($ccuname); + $ccdomain=&LONCAPA::clean_domain($ccdomain); my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition(); my $dc_setcourse_code = ''; - my $nondc_setsection_code = ''; + my $nondc_setsection_code = ''; + my %loaditem; - my (%curr_groups,$groupslist,$numgroups); - if (exists($env{'request.course.id'})) { - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - $numgroups = &Apache::loncommon::coursegroups(\%curr_groups,$cdom, - $cnum); - } - if ($numgroups > 0) { + + 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+)/$-) { + + if ($env{'request.role'} =~ m-^dc\./($match_domain)/$-) { my $dcdom = $1; - $loaditem{'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; @@ -327,6 +275,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) { @@ -348,23 +297,23 @@ 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<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."); + 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 (numsplit[j] == groups[k]) { - alert("'"+numsplit[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."); + 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; } } @@ -374,18 +323,27 @@ sub print_user_modification_page { alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections."); section = ""; } + var coursename = "_$dcdom"+"_"+course+"_"+userrole var numcourse = getIndex(document.cu.dccourse); if (numcourse == "-1") { alert("There was a problem with your course selection"); return } - 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 + else { + document.cu.elements[numcourse].name = "act"+coursename; + var numnewsec = getIndex(document.cu.newsec); + if (numnewsec != "-1") { + document.cu.elements[numnewsec].name = "sec"+coursename; + document.cu.elements[numnewsec].value = section; + } + var numstart = getIndex(document.cu.start); + if (numstart != "-1") { + document.cu.elements[numstart].name = "start"+coursename; + } + var numend = getIndex(document.cu.end); + if (numend != "-1") { + document.cu.elements[numend].name = "end"+coursename + } } } document.cu.submit(); @@ -409,7 +367,6 @@ ENDSCRIPT 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); @@ -446,15 +403,17 @@ ENDSCRIPT 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.") return; } - else { + else if (numsplit != null) { for (var j=0; j<numsplit.length; j++) { if ((numsplit[j] == 'all') || (numsplit[j] == 'none')) { @@ -468,8 +427,8 @@ ENDSCRIPT } } } - document.cu.elements[i+2].value = sections; } + document.cu.elements[i+2].value = sections; } } } @@ -494,13 +453,9 @@ ENDSECCODE <input type="hidden" name="pres_marker" value="" > ENDFORMINFO my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain); - my %incdomains; my %inccourses; - foreach (values(%Apache::lonnet::hostdom)) { - $incdomains{$_}=1; - } - foreach (keys(%env)) { - if ($_=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) { + foreach my $key (keys(%env)) { + if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) { $inccourses{$1.'_'.$2}=1; } } @@ -522,6 +477,11 @@ ENDFORMINFO 'hs' => "Home Server", 'lg' => "Login Data" ); + my $portfolioform; + if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) { + # Current user has quota modification privileges + $portfolioform = &portfolio_quota($ccuname,$ccdomain); + } my $genhelp=&Apache::loncommon::help_open_topic('Generation'); &initialize_authen_forms(); $r->print(<<ENDNEWUSER); @@ -554,6 +514,8 @@ $lt{'hs'}: <select name="hserver" size=" <p>$authformint </p> <p>$authformfsys</p> <p>$authformloc </p> +<hr /> +$portfolioform ENDNEWUSER } else { # user already exists my %lt=&Apache::lonlocal::texthash( @@ -573,30 +535,27 @@ $forminfo ENDCHANGEUSER # Get the users information my %userenv = &Apache::lonnet::get('environment', - ['firstname','middlename','lastname','generation'], - $ccdomain,$ccuname); + ['firstname','middlename','lastname','generation', + 'portfolioquota'],$ccdomain,$ccuname); my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname); - $r->print(<<END); -<hr /> -<table border="2"> -<tr> -<th>$lt{'fn'}</th><th>$lt{'mn'}</th><th>$lt{'ln'}</th><th>$lt{'gen'}</th> -</tr> -<tr> -END - foreach ('firstname','middlename','lastname','generation') { + $r->print(' +<hr />'. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). +'<th>'.$lt{'fn'}.'</th><th>'.$lt{'mn'}.'</th><th>'.$lt{'ln'}.'</th><th>'.$lt{'gen'}.'</th>'. + &Apache::loncommon::end_data_table_header_row(). + &Apache::loncommon::start_data_table_row()); + foreach my $item ('firstname','middlename','lastname','generation') { if (&Apache::lonnet::allowed('mau',$ccdomain)) { - $r->print(<<"END"); -<td><input type="text" name="c$_" value="$userenv{$_}" size="15" /></td> + $r->print(<<"END"); +<td><input type="text" name="c$item" value="$userenv{$item}" size="15" /></td> END } else { - $r->print('<td>'.$userenv{$_}.'</td>'); + $r->print('<td>'.$userenv{$item}.'</td>'); } } - $r->print(<<END); -</tr> -</table> -END + $r->print(&Apache::loncommon::end_data_table_row(). + &Apache::loncommon::end_data_table()); # Build up table of user roles to allow revocation of a role. my ($tmp) = keys(%rolesdump); unless ($tmp =~ /^(con_lost|error)/i) { @@ -625,16 +584,15 @@ END 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'; + ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$}); my $allowed=0; my $delallowed=0; my $sortkey=$role_code; my $class='Unknown'; - if ($area =~ /^\/(\w+)\/(\d\w+)/ ) { + if ($area =~ m{^/($match_domain)/($match_courseid)} ) { $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); @@ -644,10 +602,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))) { @@ -665,10 +625,7 @@ END } } # Compute the background color based on $area - $bgcol=$1.'_'.$2; - $bgcol=~s/[^7-9a-e]//g; - $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6); - if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) { + if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) { $carea.='<br />Section: '.$3; $sortkey.="\0$3"; } @@ -676,7 +633,7 @@ END } else { $sortkey.="\0".$area; # Determine if current user is able to revoke privileges - if ($area=~ /^\/(\w+)\//) { + if ($area=~m{^/($match_domain)/}) { if ((&Apache::lonnet::allowed('c'.$role_code,$1)) || (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) { $allowed=1; @@ -700,16 +657,15 @@ END } } if (($role_code eq 'ca') || ($role_code eq 'aa')) { - $area=~/\/(\w+)\/(\w+)/; + $area=~m{/($match_domain)/($match_username)}; if (&authorpriv($2,$1)) { $allowed=1; } else { $allowed=0; } } - $bgcol='77FF77'; my $row = ''; - $row.='<tr bgcolor="#'.$bgcol.'"><td>'; + $row.= '<td>'; my $active=1; $active=0 if (($role_end_time) && ($now>$role_end_time)); if (($active) && ($allowed)) { @@ -735,7 +691,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"; @@ -746,7 +702,7 @@ END : ' ' ). '</td><td>'.($role_end_time ?localtime($role_end_time) : ' ' ) - ."</td></tr>\n"; + ."</td>"; $sortrole{$sortkey}=$envkey; $roletext{$envkey}=$row; $roleclass{$envkey}=$class; @@ -755,34 +711,39 @@ 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}}) ) { - $output{$type}.=$roletext{$sortrole{$which}}; + $output{$type}.= + &Apache::loncommon::start_data_table_row(). + $roletext{$sortrole{$which}}. + &Apache::loncommon::end_data_table_row(); } } unless($output{$type} eq '') { - $output{$type} = "<tr bgcolor='#BBffBB'>". - "<td align='center' colspan='7'>".&mt($type)."</td>". + $output{$type} = '<tr class="LC_info_row">'. + "<td align='center' colspan='7'>".&mt($type)."</td></tr>". $output{$type}; $rolesdisplay = 1; } } if ($rolesdisplay == 1) { - $r->print(<<END); + $r->print(' <hr /> -<h3>$lt{'rer'}</h3> -<table> -<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') { +<h3>'.$lt{'rer'}.'</h3>'. +&Apache::loncommon::start_data_table("LC_createuser"). +&Apache::loncommon::start_data_table_header_row(). +'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}. +'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}. +'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'. +&Apache::loncommon::end_data_table_header_row()); + foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') { if ($output{$type}) { $r->print($output{$type}."\n"); } } - $r->print('</table>'); + $r->print(&Apache::loncommon::end_data_table()); } } # End of unless my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); @@ -800,7 +761,7 @@ END $currentauth=~/^internal:/ or $currentauth=~/^localauth:/ ) { # bad authentication scheme - if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) { + if (&Apache::lonnet::allowed('mau',$ccdomain)) { &initialize_authen_forms(); my %lt=&Apache::lonlocal::texthash( 'err' => "ERROR", @@ -823,7 +784,7 @@ $lt{'uuas'} ($currentauth). $lt{'sldb'}. <p>$authformloc</p> ENDBADAUTH } else { - # This user is not allowed to modify the users + # This user is not allowed to modify the user's # authentication scheme, so just notify them of the problem my %lt=&Apache::lonlocal::texthash( 'err' => "ERROR", @@ -832,9 +793,6 @@ ENDBADAUTH ); $r->print(<<ENDBADAUTH); <hr /> -<script type="text/javascript" language="Javascript"> -$loginscript -</script> <font color="#ff0000"> $lt{'err'}: </font> $lt{'uuas'} ($currentauth). $lt{'adcs'}. <hr /> @@ -865,7 +823,7 @@ ENDBADAUTH "<p>$authformint</p><p>$authformfsys</p>"; } $authformcurrent.=' <i>(will override current values)</i><br />'; - if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) { + if (&Apache::lonnet::allowed('mau',$ccdomain)) { # Current user has login modification privileges my %lt=&Apache::lonlocal::texthash( 'ccld' => "Change Current Login Data", @@ -883,6 +841,23 @@ $loginscript <h3>$lt{'enld'}</h3> $authform_other ENDOTHERAUTHS + } else { + if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) { + my %lt=&Apache::lonlocal::texthash( + 'ccld' => "Change Current Login Data", + 'yodo' => "You do not have privileges to modify the authentication configuration for this user.", + 'ifch' => "If a change is required, contact a domain coordinator for the domain", + ); + $r->print(<<ENDNOPRIV); +<hr /> +<h3>$lt{'ccld'}</h3> +$lt{'yodo'} $lt{'ifch'}: $ccdomain +ENDNOPRIV + } + } + if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) { + # Current user has quota modification privileges + $r->print(&portfolio_quota($ccuname,$ccdomain)); } } ## End of "check for bad authentication type" logic } ## End of new user/old user logic @@ -907,34 +882,38 @@ ENDOTHERAUTHS 'ssd' => "Set Start Date", 'sed' => "Set End Date" ); - $r->print(<<ENDCOAUTH); -<h4>$lt{'cs'}</h4> -<table border=2><tr><th>$lt{'act'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th> -<th>$lt{'sta'}</th><th>$lt{'end'}</th></tr> -<tr> -<td><input type=checkbox name="act_$cudom\_$cuname\_ca" /></td> -<td>$lt{'cau'}</td> -<td>$cudom\_$cuname</td> -<td><input type=hidden name="start_$cudom\_$cuname\_ca" value='' /> + $r->print('<h4>'.$lt{'cs'}.'</h4>'."\n". + &Apache::loncommon::start_data_table()."\n". + &Apache::loncommon::start_data_table_header_row()."\n". + '<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th>'. + '<th>'.$lt{'ext'}.'</th><th>'.$lt{'sta'}.'</th>'. + '<th>'.$lt{'end'}.'</th>'."\n". + &Apache::loncommon::end_data_table_header_row()."\n". + &Apache::loncommon::start_data_table_row()."\n". + '<td> + <input type=checkbox name="act_'.$cudom.'_'.$cuname.'_ca" /> + </td> + <td>'.$lt{'cau'}.'</td> + <td>'.$cudom.'_'.$cuname.'</td> + <td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_ca" value="" /> + <a href= +"javascript:pjump('."'date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td> +<td><input type=hidden name="end_'.$cudom.'_'.$cuname.'_ca" value="" /> <a href= -"javascript:pjump('date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset')">$lt{'ssd'}</a></td> -<td><input type=hidden name="end_$cudom\_$cuname\_ca" value='' /> -<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='' /> +"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>'."\n". + &Apache::loncommon::end_data_table_row()."\n". + &Apache::loncommon::start_data_table_row()."\n". +'<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='' /> +"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 +"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>'."\n". + &Apache::loncommon::end_data_table_row()."\n". + &Apache::loncommon::end_data_table()); } # # Domain level @@ -942,45 +921,46 @@ ENDCOAUTH my $num_domain_level = 0; my $domaintext = '<h4>'.&mt('Domain Level').'</h4>'. - '<table border=2><tr><th>'.&mt('Activate').'</th><th>'.&mt('Role').'</th><th>'.&mt('Extent').'</th>'. - '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>'; - foreach ( sort( keys(%incdomains))) { - my $thisdomain=$_; - foreach ('dc','li','dg','au','sc') { - if (&Apache::lonnet::allowed('c'.$_,$thisdomain)) { - my $plrole=&Apache::lonnet::plaintext($_); + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + '<th>'.&mt('Activate').'</th><th>'.&mt('Role').'</th><th>'. + &mt('Extent').'</th>'. + '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'. + &Apache::loncommon::end_data_table_header_row(); + foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) { + foreach my $role ('dc','li','dg','au','sc') { + if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) { + my $plrole=&Apache::lonnet::plaintext($role); my %lt=&Apache::lonlocal::texthash( 'ssd' => "Set Start Date", 'sed' => "Set End Date" ); $num_domain_level ++; - $domaintext .= <<"ENDDROW"; -<tr> -<td><input type=checkbox name="act_$thisdomain\_$_"></td> -<td>$plrole</td> -<td>$thisdomain</td> -<td><input type=hidden name="start_$thisdomain\_$_" value=''> + $domaintext .= +&Apache::loncommon::start_data_table_row(). +'<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'"></td> +<td>'.$plrole.'</td> +<td>'.$thisdomain.'</td> +<td><input type=hidden name="start_'.$thisdomain.'_'.$role.'" value=""> <a href= -"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$thisdomain\_$_.value,'start_$thisdomain\_$_','cu.pres','dateset')">$lt{'ssd'}</a></td> -<td><input type=hidden name="end_$thisdomain\_$_" value=''> +"javascript:pjump('."'date_start','Start Date $plrole',document.cu.start_$thisdomain\_$role.value,'start_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td> +<td><input type=hidden name="end_'.$thisdomain.'_'.$role.'" value=""> <a href= -"javascript:pjump('date_end','End Date $plrole',document.cu.end_$thisdomain\_$_.value,'end_$thisdomain\_$_','cu.pres','dateset')">$lt{'sed'}</a></td> -</tr> -ENDDROW +"javascript:pjump('."'date_end','End Date $plrole',document.cu.end_$thisdomain\_$role.value,'end_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'. +&Apache::loncommon::end_data_table_row(); } } } - $domaintext.='</table>'; + $domaintext.= &Apache::loncommon::end_data_table(); if ($num_domain_level > 0) { $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)); + if ($env{'request.role'} =~ m{^dc\./($match_domain)/$}) { + $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)); @@ -1011,7 +991,8 @@ sub update_user_data { $r->print($error.&mt('No login name specified').'.'.$end); return; } - if ( $env{'form.ccuname'} =~/\W/) { + if ( $env{'form.ccuname'} ne + &LONCAPA::clean_username($env{'form.ccuname'}) ) { $r->print($error.&mt('Invalid login name').'. '. &mt('Only letters, numbers, and underscores are valid').'.'. $end); @@ -1021,9 +1002,10 @@ sub update_user_data { $r->print($error.&mt('No domain specified').'.'.$end); return; } - if ( $env{'form.ccdomain'} =~/\W/) { + if ( $env{'form.ccdomain'} ne + &LONCAPA::clean_domain($env{'form.ccdomain'}) ) { $r->print($error.&mt ('Invalid domain name').'. '. - &mt('Only letters, numbers, and underscores are valid').'.'. + &mt('Only letters, numbers, periods, dashes, and underscores are valid').'.'. $end); return; } @@ -1082,8 +1064,8 @@ ENDNEWUSERHEAD if (lc($desiredhost) eq 'default') { $desiredhost = undef; } else { - my %home_servers = &Apache::loncommon::get_library_servers - ($env{'form.ccdomain'}); + my %home_servers = + &Apache::lonnet::get_servers($env{'form.ccdomain'},'library'); if (! exists($home_servers{$desiredhost})) { $r->print($error.&mt('Invalid home server specified')); return; @@ -1100,7 +1082,7 @@ ENDNEWUSERHEAD my $home = &Apache::lonnet::homeserver($env{'form.ccuname'}, $env{'form.ccdomain'}); $r->print('<br />'.&mt('Home server').': '.$home.' '. - $Apache::lonnet::libserv{$home}); + &Apache::lonnet::hostname($home)); } elsif (($env{'form.login'} ne 'nochange') && ($env{'form.login'} ne '' )) { # Modify user privileges @@ -1132,24 +1114,43 @@ ENDMODIFYUSERHEAD if (! $env{'form.makeuser'} ) { # Check for need to change my %userenv = &Apache::lonnet::get - ('environment',['firstname','middlename','lastname','generation'], - $env{'form.ccdomain'},$env{'form.ccuname'}); + ('environment',['firstname','middlename','lastname','generation', + 'portfolioquota'],$env{'form.ccdomain'},$env{'form.ccuname'}); my ($tmp) = keys(%userenv); if ($tmp =~ /^(con_lost|error)/i) { %userenv = (); } # Check to see if we need to change user information - foreach ('firstname','middlename','lastname','generation') { + foreach my $item ('firstname','middlename','lastname','generation') { # Strip leading and trailing whitespace - $env{'form.c'.$_} =~ s/(\s+$|^\s+)//g; + $env{'form.c'.$item} =~ s/(\s+$|^\s+)//g; + } + my ($quotachanged,$namechanged,$oldportfolioquota); + my %changeHash; + if (exists($userenv{'portfolioquota'})) { + $oldportfolioquota = $userenv{'portfolioquota'}; + if (exists($env{'form.portfolioquota'})) { + if ($env{'form.portfolioquota'} ne $userenv{'portfolioquota'}) { + if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) { + # Current user has quota modification privileges + $quotachanged = 1; + $changeHash{'portfolioquota'} = $env{'form.portfolioquota'}; + } + } + } + } else { + $oldportfolioquota = + &Apache::loncommon::default_quota($env{'form.ccdomain'}); } if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}) && ($env{'form.cfirstname'} ne $userenv{'firstname'} || $env{'form.cmiddlename'} ne $userenv{'middlename'} || $env{'form.clastname'} ne $userenv{'lastname'} || $env{'form.cgeneration'} ne $userenv{'generation'} )) { + $namechanged = 1; + } + if ($namechanged) { # Make the change - my %changeHash; $changeHash{'firstname'} = $env{'form.cfirstname'}; $changeHash{'middlename'} = $env{'form.cmiddlename'}; $changeHash{'lastname'} = $env{'form.clastname'}; @@ -1165,6 +1166,7 @@ ENDMODIFYUSERHEAD 'mddl' => "middle", 'lst' => "last", 'gen' => "generation", + 'disk' => "disk space allocated to portfolio files", 'prvs' => "Previous", 'chto' => "Changed To" ); @@ -1175,17 +1177,21 @@ ENDMODIFYUSERHEAD <th>$lt{'frst'}</th> <th>$lt{'mddl'}</th> <th>$lt{'lst'}</th> - <th>$lt{'gen'}</th></tr> + <th>$lt{'gen'}</th> + <th>$lt{'disk'}<th></tr> <tr><td>$lt{'prvs'}</td> <td>$userenv{'firstname'} </td> <td>$userenv{'middlename'} </td> <td>$userenv{'lastname'} </td> - <td>$userenv{'generation'} </td></tr> + <td>$userenv{'generation'} </td> + <td>$oldportfolioquota</td> +</tr> <tr><td>$lt{'chto'}</td> <td>$env{'form.cfirstname'} </td> <td>$env{'form.cmiddlename'} </td> <td>$env{'form.clastname'} </td> - <td>$env{'form.cgeneration'} </td></tr> + <td>$env{'form.cgeneration'} </td> + <td>$env{'form.portfolioquota'} Mb</td></tr> </table> END } else { # error occurred @@ -1194,83 +1200,105 @@ END $env{'form.ccdomain'}."</h2>"); } } else { # End of if ($env ... ) logic + my $putresult; + if ($quotachanged) { + $putresult = &Apache::lonnet::put + ('environment',\%changeHash, + $env{'form.ccdomain'},$env{'form.ccuname'}); + } # They did not want to change the users name but we can # still tell them what the name is my %lt=&Apache::lonlocal::texthash( 'usr' => "User", 'id' => "in domain", - 'gen' => "Generation" + 'gen' => "Generation", + 'disk' => "Disk space allocated to user's portfolio files", ); - $r->print(<<"END"); + $r->print(<<"END"); <h2>$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h2> <h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4> <h4>$lt{'gen'}: $userenv{'generation'}</h4> END + if ($putresult eq 'ok') { + if ($oldportfolioquota ne $env{'form.portfolioquota'}) { + $r->print('<h4>'.$lt{'disk'}.': '.$env{'form.portfolioquota'}.' Mb</h4>'); + } + } } } ## - my %curr_groups; my $now=time; $r->print('<h3>'.&mt('Modifying Roles').'</h3>'); - foreach (keys (%env)) { - next if (! $env{$_}); + foreach my $key (keys (%env)) { + next if (! $env{$key}); # Revoke roles - if ($_=~/^form\.rev/) { - if ($_=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) { + if ($key=~/^form\.rev/) { + if ($key=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) { # Revoke standard role $r->print(&mt('Revoking').' '.$2.' in '.$1.': <b>'. &Apache::lonnet::revokerole($env{'form.ccdomain'}, $env{'form.ccuname'},$1,$2).'</b><br />'); if ($2 eq 'st') { - $1=~/^\/(\w+)\/(\w+)/; + $1=~m{^/($match_domain)/($match_courseid)}; my $cid=$1.'_'.$2; $r->print(&mt('Drop from classlist').': <b>'. &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+)$/) { + if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) { # Revoke custom role $r->print(&mt('Revoking custom role:'). - ' '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'. + ' '.$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\:([^\_]+)\_([^\_]+)$/) { + } elsif ($key=~/^form\.del/) { + if ($key=~/^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 />'); if ($2 eq 'st') { - $1=~/^\/(\w+)\/(\w+)/; + $1=~m{^/($match_domain)/($match_courseid)}; my $cid=$1.'_'.$2; $r->print(&mt('Drop from classlist').': <b>'. &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 />'); } - } - } elsif ($_=~/^form\.ren/) { + } + if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\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 ($key=~/^form\.ren/) { my $udom = $env{'form.ccdomain'}; my $uname = $env{'form.ccuname'}; - if ($_=~/^form\.ren\:([^\_]+)\_([^\_]+)$/) { +# Re-enable standard role + if ($key=~/^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); + if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) { + 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 { @@ -1283,15 +1311,24 @@ 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); } - } elsif ($_=~/^form\.act/) { +# Re-enable custom role + if ($key=~m{^form\.ren\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\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 ($key=~/^form\.act/) { my $udom = $env{'form.ccdomain'}; my $uname = $env{'form.ccuname'}; - if ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) { + if ($key=~/^form\.act\_($match_domain)\_($match_courseid)\_cr_cr_($match_domain)_($match_username)_([^\_]+)$/) { # Activate a custom role my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5); my $url='/'.$one.'/'.$two; @@ -1308,10 +1345,10 @@ 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 { - my $numgrp=&Apache::loncommon::coursegroups(\%curr_groups, - $one,$two); + 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})) { @@ -1319,10 +1356,10 @@ END next; } my $securl = $url.'/'.$sec; - $r->print(&commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end)); + $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end)); } } - } elsif ($_=~/^form\.act\_([^\_]+)\_(\w+)\_([^\_]+)$/) { + } elsif ($key=~/^form\.act\_($match_domain)\_($match_name)\_([^\_]+)$/) { # Activate roles for sections with 3 id numbers # set start, end times, and the url for the class my ($one,$two,$three)=($1,$2,$3); @@ -1338,10 +1375,10 @@ 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 $numgrp=&Apache::loncommon::coursegroups(\%curr_groups, - $one,$two); + my %curr_groups = + &Apache::longroup::coursegroups($one,$two); my $emptysec = 0; foreach my $sec (sort {$a cmp $b} keys %sections) { $sec =~ s/\W//g; @@ -1352,16 +1389,16 @@ END 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\_([^\_]+)\_([^\_]+)$/) { + } elsif ($key=~/^form\.act\_([^\_]+)\_([^\_]+)$/) { # Activate roles for sections with two id numbers # set start, end times, and the url for the class my $start = ( $env{'form.start_'.$1.'_'.$2} ? @@ -1375,23 +1412,23 @@ 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 />'); + $r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$key.'</tt></p><br />'); } foreach my $key (sort(keys(%disallowed))) { if (($key eq 'none') || ($key eq 'all')) { @@ -1409,89 +1446,6 @@ END $r->print(&Apache::loncommon::end_page()); } -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; -} - sub build_roles { my ($sectionstr,$sections,$role) = @_; my $num_sections = 0; @@ -1521,7 +1475,7 @@ sub build_roles { $num_sections ++; } } - + return $num_sections; } @@ -1563,8 +1517,8 @@ sub custom_role_editor { my %full=(); my %courselevel=(); my %courselevelcurrent=(); - foreach (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { - my ($priv,$restrict)=split(/\&/,$_); + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { + my ($priv,$restrict)=split(/\&/,$item); unless ($restrict) { $restrict='F'; } $courselevel{$priv}=$restrict; if ($coursepriv=~/\:$priv/) { @@ -1574,8 +1528,8 @@ sub custom_role_editor { } my %domainlevel=(); my %domainlevelcurrent=(); - foreach (split(/\:/,$Apache::lonnet::pr{'cr:d'})) { - my ($priv,$restrict)=split(/\&/,$_); + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) { + my ($priv,$restrict)=split(/\&/,$item); unless ($restrict) { $restrict='F'; } $domainlevel{$priv}=$restrict; if ($dompriv=~/\:$priv/) { @@ -1585,8 +1539,8 @@ sub custom_role_editor { } my %systemlevel=(); my %systemlevelcurrent=(); - foreach (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { - my ($priv,$restrict)=split(/\&/,$_); + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { + my ($priv,$restrict)=split(/\&/,$item); unless ($restrict) { $restrict='F'; } $systemlevel{$priv}=$restrict; if ($syspriv=~/\:$priv/) { @@ -1604,24 +1558,29 @@ sub custom_role_editor { <form method="post"> <input type="hidden" name="phase" value="set_custom_roles" /> <input type="hidden" name="rolename" value="$rolename" /> -<table border="2"> -<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"':'').' />':' '). + $r->print(&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). +'<th>'.$lt{'prv'}.'</th><th>'.$lt{'crl'}.'</th><th>'.$lt{'dml'}. +'</th><th>'.$lt{'ssl'}.'</th>'. + &Apache::loncommon::end_data_table_header_row()); + foreach my $priv (sort keys %full) { + my $privtext = &Apache::lonnet::plaintext($priv); + $r->print(&Apache::loncommon::start_data_table_row(). + '<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"':'').' />':' '). - '</td></tr>'); + ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.':s" '. + ($systemlevelcurrent{$priv}?'checked="1"':'').' />':' '). + '</td>'. + &Apache::loncommon::end_data_table_row()); } - $r->print( - '<table><input type="submit" value="'.&mt('Define Role').'" /></form>'. + $r->print(&Apache::loncommon::end_data_table(). + '<input type="submit" value="'.&mt('Define Role').'" /></form>'. &Apache::loncommon::end_page()); } @@ -1655,27 +1614,27 @@ sub set_custom_role { my $domrole=''; my $courole=''; - foreach (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { - my ($priv,$restrict)=split(/\&/,$_); + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { + my ($priv,$restrict)=split(/\&/,$item); unless ($restrict) { $restrict=''; } if ($env{'form.'.$priv.':c'}) { - $courole.=':'.$_; + $courole.=':'.$item; } } - foreach (split(/\:/,$Apache::lonnet::pr{'cr:d'})) { - my ($priv,$restrict)=split(/\&/,$_); + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) { + my ($priv,$restrict)=split(/\&/,$item); unless ($restrict) { $restrict=''; } if ($env{'form.'.$priv.':d'}) { - $domrole.=':'.$_; + $domrole.=':'.$item; } } - foreach (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { - my ($priv,$restrict)=split(/\&/,$_); + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { + my ($priv,$restrict)=split(/\&/,$item); unless ($restrict) { $restrict=''; } if ($env{'form.'.$priv.':s'}) { - $sysrole.=':'.$_; + $sysrole.=':'.$item; } } $r->print('<br />Defining Role: '. @@ -1754,77 +1713,71 @@ sub course_level_table { 'end' => "End" ); - foreach (sort( keys(%inccourses))) { - my $thiscourse=$_; - my $protectedcourse=$_; + foreach my $protectedcourse (sort( keys(%inccourses))) { + my $thiscourse=$protectedcourse; $thiscourse=~s:_:/:g; my %coursedata=&Apache::lonnet::coursedescription($thiscourse); my $area=$coursedata{'description'}; - 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 $type=$coursedata{'type'}; + if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; } 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') { - if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) { - my $plrole=&Apache::lonnet::plaintext($_); - $table .= <<ENDEXTENT; -<tr bgcolor="#$bgcol"> -<td><input type="checkbox" name="act_$protectedcourse\_$_"></td> -<td>$plrole</td> -<td>$area<br />Domain: $domain</td> -ENDEXTENT - if ($_ ne 'cc') { - if ($num_sections > 0) { - my $currsec = &course_sections($num_sections,\%sections_count,$protectedcourse.'_'.$_); + foreach my $role ('st','ta','ep','in','cc') { + if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) { + my $plrole=&Apache::lonnet::plaintext($role); + $table .= &Apache::loncommon::start_data_table_row(). +'<td><input type="checkbox" name="act_'.$protectedcourse.'_'.$role.'"></td> +<td>'.$plrole.'</td> +<td>'.$area.'<br />Domain: '.$domain.'</td>'."\n"; + if ($role ne 'cc') { + if (%sections_count) { + my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$role); $table .= - '<td><table border="0" cellspacing="0" cellpadding="0">'. - '<tr><td valign="top">'.$lt{'exs'}.'<br />'. + '<td><table class="LC_createuser">'. + '<tr class="LC_section_row"> + <td valign="top">'.$lt{'exs'}.'<br />'. $currsec.'</td>'. '<td> </td>'. '<td valign="top"> '.$lt{'new'}.'<br />'. - '<input type="text" name="newsec_'.$protectedcourse.'_'.$_.'" value="" /></td>'. + '<input type="text" name="newsec_'.$protectedcourse.'_'.$role.'" value="" /></td>'. '<input type="hidden" '. - 'name="sec_'.$protectedcourse.'_'.$_.'"></td>'. + 'name="sec_'.$protectedcourse.'_'.$role.'"></td>'. '</tr></table></td>'; } else { $table .= '<td><input type="text" size="10" '. - 'name="sec_'.$protectedcourse.'_'.$_.'"></td>'; + 'name="sec_'.$protectedcourse.'_'.$role.'"></td>'; } } else { $table .= '<td> </td>'; } $table .= <<ENDTIMEENTRY; -<td><input type=hidden name="start_$protectedcourse\_$_" value=''> +<td><input type=hidden name="start_$protectedcourse\_$role" value=''> <a href= -"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">$lt{'ssd'}</a></td> -<td><input type=hidden name="end_$protectedcourse\_$_" value=''> +"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt{'ssd'}</a></td> +<td><input type=hidden name="end_$protectedcourse\_$role" value=''> <a href= -"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">$lt{'sed'}</a></td> +"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt{'sed'}</a></td> ENDTIMEENTRY - $table.= "</tr>\n"; + $table.= &Apache::loncommon::end_data_table_row(); } } - foreach (sort keys %customroles) { + foreach my $cust (sort keys %customroles) { if (&Apache::lonnet::allowed('ccr',$thiscourse)) { - my $plrole=$_; + my $plrole=$cust; my $customrole=$protectedcourse.'_cr_cr_'.$env{'user.domain'}. '_'.$env{'user.name'}.'_'.$plrole; - $table .= <<END; -<tr bgcolor="#$bgcol"> -<td><input type="checkbox" name="act_$customrole"></td> -<td>$plrole</td> -<td>$area</td> -END - if ($num_sections > 0) { - my $currsec = &course_sections($num_sections,\%sections_count,$customrole); + $table .= &Apache::loncommon::start_data_table_row(). +'<td><input type="checkbox" name="act_'.$customrole.'"></td> +<td>'.$plrole.'</td> +<td>'.$area.'</td>'."\n"; + 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 />'. @@ -1845,28 +1798,33 @@ END "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">$lt{'ssd'}</a></td> <td><input type=hidden name="end_$customrole" value=''> <a href= -"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td></tr> +"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td> ENDENTRY + $table .= &Apache::loncommon::end_data_table_row(); } } } return '' if ($table eq ''); # return nothing if there is nothing # in the table - my $result = <<ENDTABLE; -<h4>$lt{'crl'}</h4> -<table border=2><tr><th>$lt{'act'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th> -<th>$lt{'grs'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th></tr> -$table -</table> -ENDTABLE + my $result = ' +<h4>'.$lt{'crl'}.'</h4>'. +&Apache::loncommon::start_data_table(). +&Apache::loncommon::start_data_table_header_row(). +'<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.'</th> +<th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'. +&Apache::loncommon::end_data_table_header_row(). +&Apache::loncommon::start_data_table_row(). +$table. +&Apache::loncommon::end_data_table_row(). +&Apache::loncommon::end_data_table(); return $result; } 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". @@ -1874,10 +1832,10 @@ sub course_sections { } else { $output = '<select name="currsec_'.$role.'" '; my $multiple = 4; - if ($num_sections <4) { $multiple = $num_sections; } - $output .= '"multiple" size="'.$multiple.'">'."\n"; - foreach (@sections) { - $output .= '<option value="'.$_.'">'.$_."</option>\n"; + if (scalar(@sections) < 4) { $multiple = scalar(@sections); } + $output .= 'multiple="multiple" size="'.$multiple.'">'."\n"; + foreach my $sec (@sections) { + $output .= '<option value="'.$sec.'">'.$sec."</option>\n"; } } $output .= '</select>'; @@ -1891,12 +1849,9 @@ 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,'currsec','cu'); my %lt=&Apache::lonlocal::texthash( - 'crl' => "Course Level", - 'crt' => "Course Title", 'rol' => "Role", 'grs' => "Section", 'exs' => "Existing sections", @@ -1906,19 +1861,23 @@ sub course_level_dc { 'ssd' => "Set Start Date", 'sed' => "Set End Date" ); - my $header = '<h4>'.$lt{'crl'}.'</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 $header = '<h4>'.&mt('Course Level').'</h4>'. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + '<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'. + &Apache::loncommon::end_data_table_header_row(); + my $otheritems = &Apache::loncommon::start_data_table_row()."\n". + '<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') { - my $plrole=&Apache::lonnet::plaintext($_); - $otheritems .= ' <option value="'.$_.'">'.$plrole; + foreach my $role ('st','ta','ep','in','cc') { + my $plrole=&Apache::lonnet::plaintext($role); + $otheritems .= ' <option value="'.$role.'">'.$plrole; } if ( keys %customroles > 0) { - foreach (sort keys %customroles) { + foreach my $cust (sort keys %customroles) { my $custrole='cr_cr_'.$env{'user.domain'}. - '_'.$env{'user.name'}.'_'.$_; - $otheritems .= ' <option value="'.$custrole.'">'.$_; + '_'.$env{'user.name'}.'_'.$cust; + $otheritems .= ' <option value="'.$custrole.'">'.$cust; } } $otheritems .= '</select></td><td>'. @@ -1938,7 +1897,8 @@ sub course_level_dc { <a href= "javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td> ENDTIMEENTRY - $otheritems .= "</tr></table>\n"; + $otheritems .= &Apache::loncommon::end_data_table_row(). + &Apache::loncommon::end_data_table()."\n"; return $cb_jscript.$header.$hiddenitems.$otheritems; }