--- loncom/interface/loncreateuser.pm 2004/02/26 19:43:13 1.79 +++ loncom/interface/loncreateuser.pm 2004/07/03 20:45:23 1.84 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.79 2004/02/26 19:43:13 albertel Exp $ +# $Id: loncreateuser.pm,v 1.84 2004/07/03 20:45:23 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -123,10 +123,7 @@ sub print_username_entry_form { my $defdom=$ENV{'request.role.domain'}; my @domains = &Apache::loncommon::get_domains(); my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain'); - my $bodytag =&Apache::loncommon::bodytag( - 'Create Users, Change User Privileges'). - &Apache::loncommon::help_open_faq(282). - &Apache::loncommon::help_open_bug('Instructor Interface'); + 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 $sellink=&Apache::loncommon::selectstudent_link ('crtuser','ccuname','ccdomain'); @@ -345,6 +342,7 @@ END 'rer' => "Revoke Existing Roles", 'rev' => "Revoke", 'del' => "Delete", + 'ren' => "Re-Enable", 'rol' => "Role", 'ext' => "Extent", 'sta' => "Start", @@ -354,7 +352,7 @@ END

$lt{'rer'}

- + END my (%roletext,%sortrole,%roleclass); foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]); @@ -466,6 +464,12 @@ END } } $row.='
$lt{'rev'}$lt{'del'}$lt{'rol'}$lt{'ext'}$lt{'sta'}$lt{'end'}
$lt{'rev'}$lt{'ren'}$lt{'del'}$lt{'rol'}$lt{'ext'}$lt{'sta'}$lt{'end'}'; + if ($allowed && !$active) { + $row.= ''; + } else { + $row.=' '; + } + $row.=''; if ($delallowed) { $row.= ''; } else { @@ -619,7 +623,7 @@ ENDOTHERAUTHS 'rol' => "Role", 'ext' => "Extent", 'sta' => "Start", - 'end' => "End". + 'end' => "End", 'cau' => "Co-Author", 'ssd' => "Set Start Date", 'sed' => "Set End Date" @@ -629,13 +633,13 @@ ENDOTHERAUTHS - + - - @@ -957,12 +961,34 @@ END $ENV{'course.'.$cid.'.home'}).'
'); } } + } elsif ($_=~/^form\.ren/) { + if ($_=~/^form\.ren\:([^\_]+)\_([^\_]+)$/) { + my $result=&Apache::lonnet::assignrole($ENV{'form.ccdomain'}, + $ENV{'form.ccuname'},$1,$2,0,$now); + $r->print(&mt('Re-Enabling [_1] in [_2]: [_3]', + $2,$1,$result).'
'); + if ($2 eq 'st') { + $1=~/^\/(\w+)\/(\w+)/; + my $cid=$1.'_'.$2; + $r->print(&mt('Add to classlist').': '. + &Apache::lonnet::critical( + 'put:'.$ENV{'course.'.$cid.'.domain'}.':'. + $ENV{'course.'.$cid.'.num'}.':classlist:'. + &Apache::lonnet::escape( + $ENV{'form.ccuname'}.':'. + $ENV{'form.ccdomain'} ).'='. + &Apache::lonnet::escape(':'.$now), + $ENV{'course.'.$cid.'.home'}) + .'
'); + } + } } elsif ($_=~/^form\.act/) { - if -($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) { + if ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) { # Activate a custom role - my $url='/'.$1.'/'.$2; - my $full=$1.'_'.$2.'_cr_cr_'.$3.'_'.$4.'_'.$5; + my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5); + my $url='/'.$one.'/'.$two; + my $full=$one.'_'.$two.'_cr_cr_'.$three.'_'.$four.'_'.$five; + $ENV{'form.sec_'.$full}=~s/\W//g; if ($ENV{'form.sec_'.$full}) { $url.='/'.$ENV{'form.sec_'.$full}; } @@ -974,38 +1000,39 @@ END $ENV{'form.end_'.$full} : 0 ); - $r->print(&mt('Assigning custom role').' "'.$5.'" by '.$4.'@'.$3.' in '.$url. + $r->print(&mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url. ($start?', '.&mt('starting').' '.localtime($start):''). ($end?', ending '.localtime($end):'').': '. &Apache::lonnet::assigncustomrole( - $ENV{'form.ccdomain'},$ENV{'form.ccuname'},$url,$3,$4,$5,$end,$start). + $ENV{'form.ccdomain'},$ENV{'form.ccuname'},$url,$three,$four,$five,$end,$start). '
'); } elsif ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_([^\_]+)$/) { # Activate roles for sections with 3 id numbers # set start, end times, and the url for the class - - my $start = ( $ENV{'form.start_'.$1.'_'.$2.'_'.$3} ? - $ENV{'form.start_'.$1.'_'.$2.'_'.$3} : + my ($one,$two,$three)=($1,$2,$3); + my $start = ( $ENV{'form.start_'.$one.'_'.$two.'_'.$three} ? + $ENV{'form.start_'.$one.'_'.$two.'_'.$three} : $now ); - my $end = ( $ENV{'form.end_'.$1.'_'.$2.'_'.$3} ? - $ENV{'form.end_'.$1.'_'.$2.'_'.$3} : + my $end = ( $ENV{'form.end_'.$one.'_'.$two.'_'.$three} ? + $ENV{'form.end_'.$one.'_'.$two.'_'.$three} : 0 ); - my $url='/'.$1.'/'.$2; - if ($ENV{'form.sec_'.$1.'_'.$2.'_'.$3}) { - $url.='/'.$ENV{'form.sec_'.$1.'_'.$2.'_'.$3}; + my $url='/'.$one.'/'.$two; + $ENV{'form.sec_'.$one.'_'.$two.'_'.$three}=~s/\W//g; + if ($ENV{'form.sec_'.$one.'_'.$two.'_'.$three}) { + $url.='/'.$ENV{'form.sec_'.$one.'_'.$two.'_'.$three}; } # Assign the role and report it - $r->print(&mt('Assigning').' '.$3.' in '.$url. + $r->print(&mt('Assigning').' '.$three.' in '.$url. ($start?', '.&mt('starting').' '.localtime($start):''). ($end?', '.&mt('ending').' '.localtime($end):'').': '. &Apache::lonnet::assignrole( $ENV{'form.ccdomain'},$ENV{'form.ccuname'}, - $url,$3,$end,$start). + $url,$three,$end,$start). '
'); # Handle students differently - if ($3 eq 'st') { + if ($three eq 'st') { $url=~/^\/(\w+)\/(\w+)/; - my $cid=$1.'_'.$2; + my $cid=$one.'_'.$two; $r->print(&mt('Add to classlist').': '. &Apache::lonnet::critical( 'put:'.$ENV{'course.'.$cid.'.domain'}.':'. @@ -1269,6 +1296,7 @@ sub course_level_table { my $bgcol=$thiscourse; $bgcol=~s/[^7-9a-e]//g; $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6); + my ($domain)=split(/\//,$thiscourse); foreach ('st','ta','ep','ad','in','cc') { if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) { my $plrole=&Apache::lonnet::plaintext($_); @@ -1276,7 +1304,7 @@ sub course_level_table { - + ENDEXTENT if ($_ ne 'cc') { $table .= <
$lt{'act'}$lt{'rol'}$lt{'ext'} $lt{'sta'}$lt{'end'}
$lt{'cau'} $cudom\_$cuname + $lt{'ssd'} + $lt{'sed'}
$plrole$area$area
Domain: $domain