--- loncom/interface/loncreateuser.pm 2005/04/07 06:56:23 1.101 +++ loncom/interface/loncreateuser.pm 2006/04/10 19:59:53 1.112 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.101 2005/04/07 06:56:23 albertel Exp $ +# $Id: loncreateuser.pm,v 1.112 2006/04/10 19:59:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -108,23 +108,23 @@ sub my_custom_roles { sub authorpriv { my ($auname,$audom)=@_; - if (($auname ne $env{'user.name'}) || - (($audom ne $env{'user.domain'}) && - ($audom ne $env{'request.role.domain'}))) { return ''; } - unless (&Apache::lonnet::allowed('cca',$audom)) { return ''; } + unless ((&Apache::lonnet::allowed('cca',$audom.'/'.$auname)) + || (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; } return 1; } # =================================================================== Phase one sub print_username_entry_form { - my $r=shift; + my ($r) = @_; my $defdom=$env{'request.role.domain'}; my @domains = &Apache::loncommon::get_domains(); my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain'); - my $html=&Apache::lonxml::xmlbegin(); - my $bodytag =&Apache::loncommon::bodytag('Create Users, Change User Privileges').&Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface'); my $selscript=&Apache::loncommon::studentbrowser_javascript(); + my $start_page = + &Apache::loncommon::start_page('Create Users, Change User Privileges', + $selscript); + my $sellink=&Apache::loncommon::selectstudent_link ('crtuser','ccuname','ccdomain'); my %existingroles=&my_custom_roles(); @@ -139,15 +139,11 @@ sub print_username_entry_form { 'nr' => "Name of Role", 'cre' => "Custom Role Editor" ); + my $help = &Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface'); my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges'); my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles'); $r->print(<<"ENDDOCUMENT"); -$html - -The LearningOnline Network with CAPA -$selscript - -$bodytag +$start_page

$lt{siur}$helpsiur

@@ -158,14 +154,103 @@ $lt{'dom'}:$domform
+ENDDOCUMENT + if (&Apache::lonnet::allowed('mcr','/')) { + $r->print(<

$lt{'ecrp'}$helpecpr

$lt{'nr'}: $choice
- - -ENDDOCUMENT + +ENDCUSTOM + } + $r->print(&Apache::loncommon::end_page()); +} + + +sub user_modification_js { + my ($pjump_def, $dc_setcourse_code)=@_; + 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(); + } + + function setSections() { + var re1 = /^currsec_/; + for (var i=0;i 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 { + document.cu.elements[i+2].value = sections; + } + } + } + } + } + document.cu.submit(); + } + +END } # =================================================================== Phase two @@ -198,10 +283,10 @@ sub print_user_modification_page { $ccdomain=~s/\W//g; my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition(); my $dc_setcourse_code = ''; - my $loaditem; + my %loaditem; if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) { my $dcdom = $1; - $loaditem = qq|OnLoad="document.cu.coursedesc.value=''"|; + $loaditem{'onload'} = "document.cu.coursedesc.value=''"; $dc_setcourse_code = <<"ENDSCRIPT"; function setCourse() { var course = document.cu.dccourse.value; @@ -272,93 +357,12 @@ sub print_user_modification_page { } 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)); my $forminfo =<<"ENDFORMINFO";
@@ -400,7 +404,7 @@ ENDFORMINFO my $genhelp=&Apache::loncommon::help_open_topic('Generation'); &initialize_authen_forms(); $r->print(<$lt{'cnu'} $forminfo

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

@@ -441,7 +445,7 @@ ENDNEWUSER 'gen' => "generation" ); $r->print(<$lt{'cup'} $forminfo

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

@@ -544,7 +548,7 @@ END $bgcol=~s/[^7-9a-e]//g; $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6); if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) { - $carea.='
Section/Group: '.$3; + $carea.='
Section/Group: '.$3; $sortkey.="\0$3"; } $area=$carea; @@ -574,7 +578,7 @@ END $class='Domain'; } } - if ($role_code eq 'ca') { + if (($role_code eq 'ca') || ($role_code eq 'aa')) { $area=~/\/(\w+)\/(\w+)/; if (&authorpriv($2,$1)) { $allowed=1; @@ -663,7 +667,7 @@ END my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); if ($currentauth=~/^krb(4|5):/) { $currentauth=~/^krb(4|5):(.*)/; - my $krbdefdom=$1; + my $krbdefdom=$2; my %param = ( formname => 'document.cu', kerb_def_dom => $krbdefdom ); @@ -778,6 +782,7 @@ ENDOTHERAUTHS 'sta' => "Start", 'end' => "End", 'cau' => "Co-Author", + 'caa' => "Assistant Co-Author", 'ssd' => "Set Start Date", 'sed' => "Set End Date" ); @@ -796,6 +801,17 @@ ENDOTHERAUTHS $lt{'sed'} + + +$lt{'caa'} +$cudom\_$cuname + +$lt{'ssd'} + +$lt{'sed'} + ENDCOAUTH } @@ -849,7 +865,7 @@ ENDDROW $r->print(&course_level_table(%inccourses)); $r->print('
'."\n"); } - $r->print(""); + $r->print("".&Apache::loncommon::end_page()); } # ================================================================= Phase Three @@ -859,22 +875,15 @@ 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)); # Check Inputs if (! $env{'form.ccuname'} ) { $r->print($error.&mt('No login name specified').'.'.$end); @@ -990,7 +999,7 @@ ENDMODIFYUSERHEAD &Apache::lonnet::modifyuserauth( $env{'form.ccdomain'},$env{'form.ccuname'}, $amode,$genpwd)); - $r->print('
'.&mt('Home server').': '.&Apache::lonnet::homeserver + $r->print('
'.&mt('Home server').': '.&Apache::lonnet::homeserver ($env{'form.ccuname'},$env{'form.ccdomain'})); } else { # Okay, this is a non-fatal error. @@ -1088,7 +1097,7 @@ END # Revoke standard role $r->print(&mt('Revoking').' '.$2.' in '.$1.': '. &Apache::lonnet::revokerole($env{'form.ccdomain'}, - $env{'form.ccuname'},$1,$2).'
'); + $env{'form.ccuname'},$1,$2).'
'); if ($2 eq 'st') { $1=~/^\/(\w+)\/(\w+)/; my $cid=$1.'_'.$2; @@ -1099,7 +1108,7 @@ END &Apache::lonnet::escape($env{'form.ccuname'}.':'. $env{'form.ccdomain'}).'='. &Apache::lonnet::escape($now.':'), - $env{'course.'.$cid.'.home'}).'
'); + $env{'course.'.$cid.'.home'}).'
'); } } if ($_=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) { @@ -1108,13 +1117,13 @@ END ' '.$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\:([^\_]+)\_([^\_]+)$/) { $r->print(&mt('Deleting').' '.$2.' in '.$1.': '. &Apache::lonnet::assignrole($env{'form.ccdomain'}, - $env{'form.ccuname'},$1,$2,$now,0,1).'
'); + $env{'form.ccuname'},$1,$2,$now,0,1).'
'); if ($2 eq 'st') { $1=~/^\/(\w+)\/(\w+)/; my $cid=$1.'_'.$2; @@ -1125,7 +1134,7 @@ END &Apache::lonnet::escape($env{'form.ccuname'}.':'. $env{'form.ccdomain'}).'='. &Apache::lonnet::escape($now.':'), - $env{'course.'.$cid.'.home'}).'
'); + $env{'course.'.$cid.'.home'}).'
'); } } } elsif ($_=~/^form\.ren/) { @@ -1245,13 +1254,14 @@ END } } } else { - $r->print('

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


'); + $r->print('

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


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

Create/Modify Another User

'); + $r->print(&Apache::loncommon::end_page()); } sub commit_customrole { @@ -1261,7 +1271,7 @@ sub commit_customrole { ($end?', ending '.localtime($end):'').': '. &Apache::lonnet::assigncustomrole( $udom,$uname,$url,$three,$four,$five,$end,$start). - '
'; + '
'; return $output; } @@ -1286,7 +1296,7 @@ sub commit_standardrole { ($end?', '.&mt('ending').' '.localtime($end):'').': '. &Apache::lonnet::assignrole( $udom,$uname,$url,$three,$end,$start). - '
'; + '
'; } return $output; } @@ -1387,14 +1397,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 @@ -1466,12 +1476,13 @@ ENDCCF ''); } $r->print( - ''); + '
'. + &Apache::loncommon::end_page()); } # ---------------------------------------------------------- Call to definerole sub set_custom_role { - my $r=shift; + my ($r) = @_; my $rolename=$env{'form.rolename'}; @@ -1482,10 +1493,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').' "'); @@ -1535,7 +1546,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 @@ -1552,7 +1564,7 @@ sub handler { (&Apache::lonnet::allowed('cin',$env{'request.course.id'})) || (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) || (&Apache::lonnet::allowed('cep',$env{'request.course.id'})) || - (&Apache::lonnet::allowed('cca',$env{'request.role.domain'})) || + (&authorpriv($env{'user.name'},$env{'request.role.domain'})) || (&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header;