--- loncom/interface/loncreateuser.pm 2005/09/01 19:27:35 1.108 +++ loncom/interface/loncreateuser.pm 2006/11/23 01:41:37 1.139 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.108 2005/09/01 19:27:35 albertel Exp $ +# $Id: loncreateuser.pm,v 1.139 2006/11/23 01:41:37 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,16 +116,32 @@ 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 = '

'.$lt{'disk'}.'

'. + ' Mb'; + return $output; +} + # =================================================================== 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 +156,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 - -The LearningOnline Network with CAPA -$selscript - -$bodytag +$start_page

$lt{siur}$helpsiur

@@ -167,17 +182,42 @@ $lt{'nr'}: $choice ENDCUSTOM } - $r->print(''); + $r->print(&Apache::loncommon::end_page()); +} + + +sub user_modification_js { + my ($pjump_def,$dc_setcourse_code,$nondc_setsection_code,$groupslist)=@_; + + return < + + 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 + + +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); @@ -195,15 +235,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 $loaditem; - if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) { + 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\./($match_domain)/$-) { 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 +276,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 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 0)) { 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(); @@ -272,37 +358,46 @@ sub print_user_modification_page { } return -1; } -ENDSCRIPT - } - my $html=&Apache::lonxml::xmlbegin(); - my $dochead =<<"ENDDOCHEAD"; -$html - -The LearningOnline Network with CAPA - - -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"; @@ -373,11 +486,11 @@ ENDFORMINFO my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain); my %incdomains; my %inccourses; - foreach (values(%Apache::lonnet::hostdom)) { - $incdomains{$_}=1; + foreach my $item (values(%Apache::lonnet::hostdom)) { + $incdomains{$item}=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; } } @@ -399,10 +512,15 @@ 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(<$lt{'cnu'} $forminfo

$lt{'nu'} "$ccuname" $lt{'id'} $ccdomain

@@ -431,6 +549,8 @@ $lt{'hs'}: + $r->print(<<"END"); + END } else { - $r->print(''.$userenv{$_}.''); + $r->print(''.$userenv{$item}.''); } } - $r->print(< - -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) { @@ -502,16 +619,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_username)} ) { $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 +637,12 @@ END '
'.&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))) { @@ -542,18 +660,15 @@ 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+)/) { - $carea.='
Section/Group: '.$3; + if ($area=~m{^/($match_domain)/($match_username)/(\w+)}) { + $carea.='
Section: '.$3; $sortkey.="\0$3"; } $area=$carea; } 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; @@ -577,16 +692,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.=''; + $row.= ''; my $active=1; $active=0 if (($role_end_time) && ($now>$role_end_time)); if (($active) && ($allowed)) { @@ -612,7 +726,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"; @@ -623,7 +737,7 @@ END : ' ' ). ''.($role_end_time ?localtime($role_end_time) : ' ' ) - ."\n"; + .""; $sortrole{$sortkey}=$envkey; $roletext{$envkey}=$row; $roleclass{$envkey}=$class; @@ -632,34 +746,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} = "". - "".&mt($type)."". + $output{$type} = ''. + "".&mt($type)."". $output{$type}; $rolesdisplay = 1; } } if ($rolesdisplay == 1) { - $r->print(<print('
-

$lt{'rer'}

- - -END - foreach my $type ('Construction Space','Course','Domain','System','Unknown') { +

'.$lt{'rer'}.'

'. +&Apache::loncommon::start_data_table("LC_createuser"). +&Apache::loncommon::start_data_table_header_row(). +''. +&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('
$lt{'rev'}$lt{'ren'}$lt{'del'}$lt{'rol'}$lt{'e -xt'}$lt{'sta'}$lt{'end'}'.$lt{'rev'}.''.$lt{'ren'}.''.$lt{'del'}. +''.$lt{'rol'}.''.$lt{'ext'}. +''.$lt{'sta'}.''.$lt{'end'}.'
'); + $r->print(&Apache::loncommon::end_data_table()); } } # End of unless my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); @@ -677,7 +796,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", @@ -700,7 +819,7 @@ $lt{'uuas'} ($currentauth). $lt{'sldb'}.

$authformloc

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", @@ -709,9 +828,6 @@ ENDBADAUTH ); $r->print(< - $lt{'err'}: $lt{'uuas'} ($currentauth). $lt{'adcs'}.
@@ -742,7 +858,7 @@ ENDBADAUTH "

$authformint

$authformfsys

"; } $authformcurrent.=' (will override current values)
'; - 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", @@ -760,6 +876,23 @@ $loginscript

$lt{'enld'}

$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(< +

$lt{'ccld'}

+$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 @@ -784,34 +917,38 @@ ENDOTHERAUTHS 'ssd' => "Set Start Date", 'sed' => "Set End Date" ); - $r->print(<$lt{'cs'} - - - - - - -'. + ''. + ''."\n". + &Apache::loncommon::end_data_table_header_row()."\n". + &Apache::loncommon::start_data_table_row()."\n". + ' + + + + - - - - - - -'."\n". + &Apache::loncommon::end_data_table_row()."\n". + &Apache::loncommon::start_data_table_row()."\n". +' + + + - + - -
$lt{'act'}$lt{'rol'}$lt{'ext'}$lt{'sta'}$lt{'end'}
$lt{'cau'}$cudom\_$cuname + $r->print('

'.$lt{'cs'}.'

'."\n". + &Apache::loncommon::start_data_table()."\n". + &Apache::loncommon::start_data_table_header_row()."\n". + '		'.$lt{'act'}.''.$lt{'rol'}.''.$lt{'ext'}.''.$lt{'sta'}.''.$lt{'end'}.' + + '.$lt{'cau'}.''.$cudom.'_'.$cuname.' + '.$lt{'ssd'}.' $lt{'ssd'} -$lt{'sed'}
$lt{'caa'}$cudom\_$cuname +"javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.''.$lt{'caa'}.''.$cudom.'_'.$cuname.' $lt{'ssd'} +"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'}.' $lt{'sed'}
-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'}.''."\n". + &Apache::loncommon::end_data_table_row()."\n". + &Apache::loncommon::end_data_table()); } # # Domain level @@ -819,51 +956,52 @@ ENDCOAUTH my $num_domain_level = 0; my $domaintext = '

'.&mt('Domain Level').'

'. - ''. - ''; - 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(). + ''. + ''. + &Apache::loncommon::end_data_table_header_row(); + foreach my $thisdomain ( sort( keys(%incdomains))) { + 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"; - - - - - + + + - + - -ENDDROW +"javascript:pjump('."'date_end','End Date $plrole',document.cu.end_$thisdomain\_$role.value,'end_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'sed'}.''. +&Apache::loncommon::end_data_table_row(); } } } - $domaintext.='
'.&mt('Activate').''.&mt('Role').''.&mt('Extent').''.&mt('Start').''.&mt('End').'
'.&mt('Activate').''.&mt('Role').''. + &mt('Extent').''.&mt('Start').''.&mt('End').'
$plrole$thisdomain + $domaintext .= +&Apache::loncommon::start_data_table_row(). +''.$plrole.''.$thisdomain.' $lt{'ssd'} +"javascript:pjump('."'date_start','Start Date $plrole',document.cu.start_$thisdomain\_$role.value,'start_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'ssd'}.' $lt{'sed'}
'; + $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('
'."\n"); } else { $r->print(&course_level_table(%inccourses)); $r->print('
'."\n"); } - $r->print(""); + $r->print("".&Apache::loncommon::end_page()); } # ================================================================= Phase Three @@ -873,28 +1011,23 @@ sub update_user_data { $env{'form.ccdomain'}); # Error messages my $error = ''.&mt('Error').':'; - my $end = ''; - # Print header - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA - -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); 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); @@ -904,9 +1037,10 @@ ENDTHREEHEAD $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; } @@ -1015,24 +1149,42 @@ 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 = &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'}; @@ -1048,6 +1200,7 @@ ENDMODIFYUSERHEAD 'mddl' => "middle", 'lst' => "last", 'gen' => "generation", + 'disk' => "disk space allocated to portfolio files", 'prvs' => "Previous", 'chto' => "Changed To" ); @@ -1058,17 +1211,21 @@ ENDMODIFYUSERHEAD $lt{'frst'} $lt{'mddl'} $lt{'lst'} - $lt{'gen'} + $lt{'gen'} + $lt{'disk'} $lt{'prvs'} $userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} - $userenv{'generation'} + $userenv{'generation'} + $oldportfolioquota + $lt{'chto'} $env{'form.cfirstname'} $env{'form.cmiddlename'} $env{'form.clastname'} - $env{'form.cgeneration'} + $env{'form.cgeneration'} + $env{'form.portfolioquota'} Mb END } else { # error occurred @@ -1077,82 +1234,105 @@ END $env{'form.ccdomain'}.""); } } 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");

$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"

$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'}

$lt{'gen'}: $userenv{'generation'}

END + if ($putresult eq 'ok') { + if ($oldportfolioquota ne $env{'form.portfolioquota'}) { + $r->print('

'.$lt{'disk'}.': '.$env{'form.portfolioquota'}.' Mb

'); + } + } } } ## my $now=time; $r->print('

'.&mt('Modifying Roles').'

'); - 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.': '. &Apache::lonnet::revokerole($env{'form.ccdomain'}, $env{'form.ccuname'},$1,$2).'
'); if ($2 eq 'st') { - $1=~/^\/(\w+)\/(\w+)/; + $1=~m{^/($match_domain)/($match_username)}; my $cid=$1.'_'.$2; $r->print(&mt('Drop from classlist').': '. &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'}).'
'); } } - 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.': '. + $r->print(&mt('Revoking custom role:'). + ' '.$4.' by '.$3.':'.$2.' in '.$1.': '. &Apache::lonnet::revokecustomrole($env{'form.ccdomain'}, $env{'form.ccuname'},$1,$2,$3,$4). '
'); } - } 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).'
'); if ($2 eq 'st') { - $1=~/^\/(\w+)\/(\w+)/; + $1=~m{^/($match_domain)/($match_username)}; my $cid=$1.'_'.$2; $r->print(&mt('Drop from classlist').': '. &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'}).'
'); } - } - } 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).': '. + &Apache::lonnet::assigncustomrole($env{'form.ccdomain'}, + $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now, + 0,1).'
'); + } + } 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_username)/?(\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 { @@ -1165,15 +1345,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]: [_3]', $role,$url,$result).'
'; } $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] : [_5]', + $rolename,$rnam,$rdom,$url,$result).'
'); + } + } 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_username)\_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; @@ -1190,14 +1379,21 @@ 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+)\_([^\_]+)$/) { + } elsif ($key=~/^form\.act\_($match_domain)\_($match_username)\_([^\_]+)$/) { # 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); @@ -1213,23 +1409,30 @@ 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\_([^\_]+)\_([^\_]+)$/) { + } 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} ? @@ -1243,113 +1446,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('

'.&mt('ERROR').': '.&mt('Unknown command').' '.$_.'


'); + $r->print('

'.&mt('ERROR').': '.&mt('Unknown command').' '.$key.'


'); } - } + foreach my $key (sort(keys(%disallowed))) { + if (($key eq 'none') || ($key eq 'all')) { + $r->print('

'.&mt('[_1] may not be used as the name for a section, as it is a reserved word.',$key)); + } else { + $r->print('

'.&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 go back and choose a different section name.').'


'); + } + } } # End of foreach (keys(%env)) # Flush the course logs so reverse user roles immediately updated &Apache::lonnet::flushcourselogs(); $r->print('

Create/Modify Another User

'); - $r->print(''); -} - -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):'').': '. - &Apache::lonnet::assigncustomrole( - $udom,$uname,$url,$three,$four,$five,$end,$start). - '
'; - 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):''). - ': '.$result.'
'. - &mt('Add to classlist').': ok
'; - } - } else { - $output = &mt('Assigning').' '.$three.' in '.$url. - ($start?', '.&mt('starting').' '.localtime($start):''). - ($end?', '.&mt('ending').' '.localtime($end):'').': '. - &Apache::lonnet::assignrole( - $udom,$uname,$url,$three,$end,$start). - '
'; - } - return $output; -} - -sub commit_studentrole { - my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_; - my $linefeed = '
'."\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 +1509,7 @@ sub build_roles { $num_sections ++; } } - + return $num_sections; } @@ -1402,14 +1530,14 @@ sub custom_role_editor { return; } - $r->print(&Apache::loncommon::bodytag( - 'Create Users, Change User Privileges').'

'); + $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('

'); if (($rdummy ne 'con_lost') && ($roledef ne '')) { $r->print(&mt('Existing Role').' "'); # ------------------------------------------------- Get current role privileges @@ -1423,8 +1551,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/) { @@ -1434,8 +1562,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/) { @@ -1445,8 +1573,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/) { @@ -1464,29 +1592,35 @@ sub custom_role_editor {
- - - ENDCCF - foreach (sort keys %full) { - $r->print(''. + &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(). + ''); - } - $r->print( - '
$lt{'prv'}$lt{'crl'}$lt{'dml'}$lt{'ssl'}
'.&Apache::lonnet::plaintext($_).''. - ($courselevel{$_}?'':' '). + $r->print(&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). +''.$lt{'prv'}.''.$lt{'crl'}.''.$lt{'dml'}. +''.$lt{'ssl'}.''.$privtext.''. + ($courselevel{$priv}?'':' '). ''. - ($domainlevel{$_}?'':' '). + ($domainlevel{$priv}?'':' '). ''. - ($systemlevel{$_}?'':' '). - '
'); + ($systemlevel{$priv}?'':' '). + ''. + &Apache::loncommon::end_data_table_row()); + } + $r->print(&Apache::loncommon::end_data_table(). + ''. + &Apache::loncommon::end_page()); } # ---------------------------------------------------------- Call to definerole sub set_custom_role { - my $r=shift; + my ($r) = @_; my $rolename=$env{'form.rolename'}; @@ -1497,10 +1631,10 @@ sub set_custom_role { return; } - $r->print(&Apache::loncommon::bodytag( - 'Create Users, Change User Privileges').'

'); + $r->print(&Apache::loncommon::start_page('Save Custom Role').'

'); 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').' "'); @@ -1514,27 +1648,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('
Defining Role: '. @@ -1550,7 +1684,8 @@ sub set_custom_role { $env{'user.name'}, $rolename)); } - $r->print(''); + $r->print('

Create another role, or Create/Modify a user.

'); + $r->print(&Apache::loncommon::end_page()); } # ================================================================ Main Handler @@ -1607,82 +1742,76 @@ sub course_level_table { 'act' => "Activate", 'rol' => "Role", 'ext' => "Extent", - 'grs' => "Group/Section", + 'grs' => "Section", 'sta' => "Start", '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 - 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(). +' + +'."\n"; + if ($role ne 'cc') { + if (%sections_count) { + my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$role); $table .= - ''; $otheritems .= < @@ -1795,7 +1937,8 @@ sub course_level_dc { $lt{'sed'} ENDTIMEENTRY - $otheritems .= "
$plrole$area
Domain: $domain		'.$plrole.''.$area.'
Domain: '.$domain.'		'. - ''; } else { $table .= ''; + 'name="sec_'.$protectedcourse.'_'.$role.'">'; } } else { $table .= ''; } $table .= < + - + +"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt{'sed'} ENDTIMEENTRY - $table.= "\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 - if ($num_sections > 0) { - my $currsec = &course_sections($num_sections,\%sections_count,$customrole); + $table .= &Apache::loncommon::start_data_table_row(). +' + +'."\n"; + if (%sections_count) { + my $currsec = &course_sections(\%sections_count,$customrole); $table.= ' +'. +&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 = ''."\n"; - foreach (@sections) { - $output .= '\n"; + foreach my $sec (@sections) { + $output .= '\n"; } } $output .= ''; @@ -1749,14 +1883,12 @@ sub course_level_dc { ''. ''; my $courseform=''.&Apache::loncommon::selectcourse_link - ('cu','dccourse','dcdomain','coursedesc').''; - - my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,$dcdom); + ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').''; + my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu'); 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,19 +1896,28 @@ sub course_level_dc { 'ssd' => "Set Start Date", 'sed' => "Set End Date" ); - my $header = '

'.$lt{'crl'}.'

'. - '
'.$lt{'exs'}.'
'. + '		'. + ' + '. ''. ''. + ''. ''. + 'name="sec_'.$protectedcourse.'_'.$role.'">'. '
'.$lt{'exs'}.'
'. $currsec.'		   '.$lt{'new'}.'
'. - '
  $lt{'ssd'} +"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt{'ssd'} $lt{'sed'}
$plrole$area'.$plrole.''.$area.''. ' +"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'} ENDENTRY + $table .= &Apache::loncommon::end_data_table_row(); } } } return '' if ($table eq ''); # return nothing if there is nothing # in the table - my $result = <$lt{'crl'} -
'.$lt{'exs'}.'
'. @@ -1703,28 +1832,33 @@ END "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">$lt{'ssd'}		 $lt{'sed'}
- -$table -
$lt{'act'}$lt{'rol'}$lt{'ext'}$lt{'grs'}$lt{'sta'}$lt{'end'}
-ENDTABLE + my $result = ' +

'.$lt{'crl'}.'

'. +&Apache::loncommon::start_data_table(). +&Apache::loncommon::start_data_table_header_row(). +'		'.$lt{'act'}.''.$lt{'rol'}.''.$lt{'ext'}.''.$lt{'grs'}.''.$lt{'sta'}.''.$lt{'end'}.'
'; - my $otheritems = ''. + my $header = '

'.&mt('Course Level').'

'. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + ''. + &Apache::loncommon::end_data_table_header_row(); + my $otheritems = &Apache::loncommon::start_data_table_row(). + ''."\n". ''. ''. ''. + ''. + ''. '
'.$courseform.''.$lt{'rol'}.''.$lt{'grs'}.''.$lt{'sta'}.''.$lt{'end'}.'
'.$lt{'typ'}.''.$courseform.''.$lt{'rol'}.''.$lt{'grs'}.''.$lt{'sta'}.''.$lt{'end'}.''."\n". + ''. @@ -1785,7 +1926,8 @@ sub course_level_dc { '    '.$lt{'new'}.'
'. - '
\n"; + $otheritems .= &Apache::loncommon::end_data_table_row(). + &Apache::loncommon::end_data_table()."\n"; return $cb_jscript.$header.$hiddenitems.$otheritems; } 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.