--- loncom/interface/loncreateuser.pm 2007/09/19 06:24:26 1.187 +++ loncom/interface/loncreateuser.pm 2007/12/07 23:09:30 1.204 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.187 2007/09/19 06:24:26 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.204 2007/12/07 23:09:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -65,6 +65,7 @@ use Apache::lonnet; use Apache::loncommon; use Apache::lonlocal; use Apache::longroup; +use Apache::lonuserutils; use LONCAPA qw(:DEFAULT :match); my $loginscript; # piece of javascript used in two separate instances @@ -82,8 +83,14 @@ sub initialize_authen_forms { kerb_def_dom => $krbdefdom, domain => $dom, ); + my %abv_auth = &auth_abbrev(); if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix):$/) { - $param{'curr_authtype'} = $curr_authtype; + my $long_auth = $1; + my %abv_auth = &auth_abbrev(); + $param{'curr_authtype'} = $abv_auth{$long_auth}; + if ($long_auth =~ /^krb(4|5)$/) { + $param{'curr_kerb_ver'} = $1; + } } # no longer static due to configurable kerberos defaults # $loginscript = &Apache::loncommon::authform_header(%param); @@ -95,18 +102,14 @@ sub initialize_authen_forms { $authformloc = &Apache::loncommon::authform_local(%param); } - -# ======================================================= Existing Custom Roles - -sub my_custom_roles { - my %returnhash=(); - my %rolehash=&Apache::lonnet::dump('roles'); - foreach my $key (keys %rolehash) { - if ($key=~/^rolesdef\_(\w+)$/) { - $returnhash{$1}=$1; - } - } - return %returnhash; +sub auth_abbrev { + my %abv_auth = ( + krb4 => 'krb', + internal => 'int', + localuth => 'loc', + unix => 'fsys', + ); + return %abv_auth; } # ==================================================== Figure out author access @@ -178,8 +181,13 @@ END_SCRIPT } my $output = $quota_javascript. '

'.$lt{'disk'}.'

'. - $lt{'cuqu'}.': '.$currquota.' Mb.  '. - $defaultinfo.'
'.$lt{'chqu'}. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_row(). + ''.$lt{'cuqu'}.': '.$currquota.' Mb.  '. + $defaultinfo.''. + &Apache::loncommon::end_data_table_row(). + &Apache::loncommon::start_data_table_row(). + ''.$lt{'chqu'}. ': '. + &Apache::loncommon::end_data_table_row(). + &Apache::loncommon::end_data_table(); return $output; } @@ -215,21 +225,25 @@ sub print_username_entry_form { 'onload' => "javascript:setFormElements(document.$formtoset)", ); my $start_page = - &Apache::loncommon::start_page('Create Users, Change User Privileges', + &Apache::loncommon::start_page('User Management', $jscript,{'add_entries' => \%loaditems,}); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage(document.crtuser)", - text=>"User modify/custom role edit", - faq=>282,bug=>'Instructor Interface',}); - + if ($env{'form.action'} eq 'singleuser') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:backPage(document.crtuser)", + text=>"Single user search", + faq=>282,bug=>'Instructor Interface',}); + } elsif ($env{'form.action'} eq 'custom') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:backPage(document.crtuser)", + text=>"Pick custom role",}); + } my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management'); - my %existingroles=&my_custom_roles(); + my %existingroles=&Apache::lonuserutils::my_custom_roles(); my $choice=&Apache::loncommon::select_form('make new role','rolename', ('make new role' => 'Generate new role ...',%existingroles)); my %lt=&Apache::lonlocal::texthash( 'srch' => "User Search", or => "or", - 'siur' => "Set Individual User Roles", 'usr' => "Username", 'dom' => "Domain", 'ecrp' => "Edit Custom Role Privileges", @@ -244,22 +258,24 @@ sub print_username_entry_form { if ($sellink) { $sellink = "$lt{'or'} ".$sellink; } - $r->print(" -$start_page -$crumbs -

$lt{siur}$helpsiur

-

$lt{'srch'} $sellink $lt{'mod'}

+ $r->print($start_page."\n".$crumbs); + if ($env{'form.action'} eq 'singleuser') { + $r->print(" +

$lt{'srch'} $sellink $lt{'mod'}$helpsiur

$response"); - $r->print(&entry_form($defdom,$srch,$forcenewuser)); - if (&Apache::lonnet::allowed('mcr','/')) { - $r->print(<print(&entry_form($defdom,$srch,$forcenewuser)); + } elsif ($env{'form.action'} eq 'custom') { + if (&Apache::lonnet::allowed('mcr','/')) { + $r->print(< + -

$lt{'ecrp'}$helpecpr

+

$lt{'ecrp'}$helpecpr

$lt{'nr'}: $choice
ENDCUSTOM + } } $r->print(&Apache::loncommon::end_page()); } @@ -272,6 +288,7 @@ sub entry_form { my $srchbutton = &mt('Search'); my $output = <<"ENDDOCUMENT";
+ $userpicker @@ -309,7 +326,7 @@ END # =================================================================== Phase two sub print_user_selection_page { - my ($r,$response,$srch,$srch_results,$context,$srcharray) = @_; + my ($r,$response,$srch,$srch_results,$operation,$srcharray) = @_; my @fields = ('username','domain','lastname','firstname','permanentemail'); my $sortby = $env{'form.sortby'}; @@ -343,11 +360,11 @@ ENDSCRIPT 'firstname' => "first name", 'permanentemail' => "permanent e-mail", ); - if ($context eq 'createuser') { - $r->print(&Apache::loncommon::start_page('Create Users, Change User Privileges',$jscript)); + if ($operation eq 'createuser') { + $r->print(&Apache::loncommon::start_page('User Management',$jscript)); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:backPage(document.usersrchform,'','')", - text=>"User modify/custom role edit", + text=>"Create/modify user", faq=>282,bug=>'Instructor Interface',}, {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')", text=>"Select User", @@ -403,9 +420,10 @@ ENDSCRIPT ' '."\n". ' '."\n". ' '."\n". - ' '."\n"); + ' '."\n". + ' '."\n"); $r->print($response); - if ($context eq 'createuser') { + if ($operation eq 'createuser') { $r->print('
'.&Apache::loncommon::end_page()); } else { $r->print(''."\n". @@ -422,32 +440,52 @@ sub print_user_query_page { } sub print_user_modification_page { - my ($r,$ccuname,$ccdomain,$srch,$response) = @_; + my ($r,$ccuname,$ccdomain,$srch,$response,$context) = @_; if (($ccuname eq '') || ($ccdomain eq '')) { my $usermsg = &mt('No username and/or domain provided.'); &print_username_entry_form($r,$usermsg); return; } - my ($curr_authtype,$instsrch,$rulematch,$rules,%inst_results); + my %abv_auth = &auth_abbrev(); + my ($curr_authtype,%rulematch,%inst_results,$curr_kerb_ver,$newuser, + %alerts,%curr_rules,%got_rules); my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain); if ($uhome eq 'no_host') { - $instsrch = - { - srchin => 'instd', - srchby => 'uname', - srchtype => 'exact', - srchterm => $ccuname, - srchdomain => $ccdomain, - }; - (my $usercheckmsg,$rulematch,$rules,%inst_results) = - &Apache::loncommon::username_rule_check($instsrch,'new'); - if ($usercheckmsg) { - &print_username_entry_form($r,$usercheckmsg); - return; + $newuser = 1; + my $checkhash; + my $checks = { 'username' => 1 }; + $checkhash->{$ccuname.':'.$ccdomain} = { 'newuser' => $newuser }; + &Apache::loncommon::user_rule_check($checkhash,$checks, + \%alerts,\%rulematch,\%inst_results,\%curr_rules,\%got_rules); + if (ref($alerts{'username'}) eq 'HASH') { + if (ref($alerts{'username'}{$ccdomain}) eq 'HASH') { + my $domdesc = + &Apache::lonnet::domain($ccdomain,'description'); + if ($alerts{'username'}{$ccdomain}{$ccuname}) { + my $userchkmsg; + if (ref($curr_rules{$ccdomain}) eq 'HASH') { + $userchkmsg = + &Apache::loncommon::instrule_disallow_msg('username', + $domdesc,1). + &Apache::loncommon::user_rule_formats($ccdomain, + $domdesc,$curr_rules{$ccdomain}{'username'}, + 'username'); + } + &print_username_entry_form($r,$userchkmsg); + return; + } + } } } else { - $curr_authtype = + $newuser = 0; + my $currentauth = &Apache::lonnet::queryauthenticate($ccuname,$ccdomain); + if ($currentauth =~ /^(krb4|krb5|unix|internal|localauth):/) { + $curr_authtype = $abv_auth{$1}; + if ($currentauth =~ /^krb(4|5)/) { + $curr_kerb_ver = $1; + } + } } if ($response) { $response = '
'.$response @@ -461,6 +499,7 @@ sub print_user_modification_page { kerb_def_dom => $krbdefdom, kerb_def_auth => $krbdef, curr_authtype => $curr_authtype, + curr_kerb_ver => $curr_kerb_ver, domain => $ccdomain, ); $loginscript = &Apache::loncommon::authform_header(%param); @@ -588,97 +627,30 @@ sub print_user_modification_page { } ENDSCRIPT } else { - $nondc_setsection_code = <<"ENDSECCODE"; - function setSections() { - var re1 = /^currsec_/; - var groups = new Array($groupslist); - 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; - var numsplit; - if (newsecs != null && newsecs != "") { - 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 if (numsplit != null) { - for (var j=0; j'."\n".$jsback."\n".''; - + ''; my $start_page = - &Apache::loncommon::start_page('Create Users, Change User Privileges', + &Apache::loncommon::start_page('User Management', $js,{'add_entries' => \%loaditem,}); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:backPage(document.cu)", - text=>"User modify/custom role edit", + text=>"Create/modify user", faq=>282,bug=>'Instructor Interface',}); if ($env{'form.phase'} eq 'userpicked') { @@ -695,9 +667,9 @@ ENDSECCODE my $forminfo =<<"ENDFORMINFO";
- - - + + + @@ -709,72 +681,32 @@ ENDFORMINFO } } if ($uhome eq 'no_host') { - my %lt=&Apache::lonlocal::texthash( - 'cnu' => "Create New User", - 'nu' => "New User", - 'ind' => "in domain", - 'pd' => "Personal Data", - 'firstname' => "First Name", - 'middlename' => "Middle Name", - 'lastname' => "Last Name", - 'generation' => "Generation", - 'permanentemail' => "Permanent e-mail address", - 'id' => "ID/Student Number", - 'hs' => "Home Server", - 'lg' => "Login Data" - ); - my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); - my %textboxsize = ( - firstname => '15', - middlename => '15', - lastname => '15', - generation => '5', - permanentemail => '25', - id => '15', - ); - my %element = ( - firstname => 'cfirst', - middlename => 'cmiddle', - lastname => 'clast', - generation => 'cgen', - permanentemail => 'cemail', - id => 'cstid', - ); my $portfolioform; if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) { # Current user has quota modification privileges - $portfolioform = &portfolio_quota($ccuname,$ccdomain); + $portfolioform = '
'.&portfolio_quota($ccuname,$ccdomain); } - my $genhelp=&Apache::loncommon::help_open_topic('Generation'); &initialize_authen_forms($ccdomain); + my %lt=&Apache::lonlocal::texthash( + 'cnu' => 'Create New User', + 'ind' => 'in domain', + 'lg' => 'Login Data', + 'hs' => "Home Server", + ); $r->print(<$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain -

$lt{'pd'}

-

+

$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain

ENDTITLE - $r->print(&Apache::lonhtmlcommon::start_pick_box()); - foreach my $item (@userinfo) { - my $rowtitle = $lt{$item}; - if ($item eq 'generation') { - $rowtitle = $genhelp.$rowtitle; - } - $r->print(&Apache::lonhtmlcommon::row_title($rowtitle,undef,'LC_oddrow_value')."\n"); - if ($inst_results{$item} ne '') { - $r->print(''.$inst_results{$item}); - } else { - $r->print(''); - } - $r->print(&Apache::lonhtmlcommon::row_closure(1)); - } - $r->print(&Apache::lonhtmlcommon::end_pick_box()); + $r->print('
'. + &personal_data_display($ccuname,$ccdomain,$newuser, + %inst_results)); my ($home_server_pick,$numlib) = &Apache::loncommon::home_server_form_item($ccdomain,'hserver', 'default','hide'); @@ -786,16 +718,20 @@ $lt{'hs'}: $home_server_pick } else { $r->print($home_server_pick); } - $r->print("
\n".'

'.$lt{'lg'}.'

'); + $r->print('
'."\n".'

'. + $lt{'lg'}.'

'); my ($fixedauth,$varauth,$authmsg); - if ($rulematch) { + if (ref($rulematch{$ccuname.':'.$ccdomain}) eq 'HASH') { + my $matchedrule = $rulematch{$ccuname.':'.$ccdomain}{'username'}; + my ($rules,$ruleorder) = + &Apache::lonnet::inst_userrules($ccdomain,'username'); if (ref($rules) eq 'HASH') { - if (ref($rules->{$rulematch}) eq 'HASH') { - my $authtype = $rules->{$rulematch}{'authtype'}; + if (ref($rules->{$matchedrule}) eq 'HASH') { + my $authtype = $rules->{$matchedrule}{'authtype'}; if ($authtype !~ /^(krb4|krb5|int|fsys|loc)$/) { - $r->print(&set_login($ccdomain)); + $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc)); } else { - my $authparm = $rules->{$rulematch}{'authparm'}; + my $authparm = $rules->{$matchedrule}{'authparm'}; if ($authtype =~ /^krb(4|5)$/) { my $ver = $1; if ($authparm ne '') { @@ -804,12 +740,12 @@ $lt{'hs'}: $home_server_pick KERB - $authmsg = $rules->{$rulematch}{'authmsg'}; + $authmsg = $rules->{$matchedrule}{'authmsg'}; } } else { $fixedauth = ''."\n"; - if ($rules->{$rulematch}{'authparmfixed'}) { + if ($rules->{$matchedrule}{'authparmfixed'}) { $fixedauth .= ''."\n"; } else { @@ -819,7 +755,7 @@ KERB } } } else { - $r->print(&set_login($ccdomain)); + $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc)); } } if ($authmsg) { @@ -830,21 +766,16 @@ $varauth ENDAUTH } } else { - $r->print(&set_login($ccdomain)); + $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc)); } $r->print(< -$portfolioform + $portfolioform +
ENDPORT } else { # user already exists my %lt=&Apache::lonlocal::texthash( - 'cup' => "Change User Privileges for", + 'cup' => "Modify existing user: ", 'id' => "in domain", - 'fn' => "first name", - 'mn' => "middle name", - 'ln' => "last name", - 'gen' => "generation", - 'email' => "permanent e-mail", ); $r->print(<$lt{'cup'} "$ccuname" $lt{'id'} "$ccdomain" ENDCHANGEUSER - # Get the users information - my %userenv = - &Apache::lonnet::get('environment', - ['firstname','middlename','lastname','generation', - 'permanentemail','portfolioquota'],$ccdomain,$ccuname); - my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname); - $r->print(' -
'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). -''.$lt{'fn'}.''.$lt{'mn'}.''.$lt{'ln'}.''.$lt{'gen'}.''.$lt{'email'}.''. - &Apache::loncommon::end_data_table_header_row(). - &Apache::loncommon::start_data_table_row()); - foreach my $item ('firstname','middlename','lastname','generation','permanentemail') { - if (&Apache::lonnet::allowed('mau',$ccdomain)) { - $r->print(<<"END"); - -END - } else { - $r->print(''.$userenv{$item}.''); - } + $r->print('
'. + &personal_data_display($ccuname,$ccdomain,$newuser, + %inst_results)); + if ($context eq 'domain') { + $r->print(&Apache::lonuserutils::forceid_change($context)); + } + $r->print('
'); + my $user_auth_text = + &user_authentication($ccuname,$ccdomain,$krbdefdom,\%abv_auth); + my $user_quota_text; + if (&Apache::lonnet::allowed('mpq',$ccdomain)) { + # Current user has quota modification privileges + $user_quota_text = &portfolio_quota($ccuname,$ccdomain); + } elsif (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) { + # Get the user's portfolio information + my %portq = &Apache::lonnet::get('environment',['portfolioquota'], + $ccdomain,$ccuname); + + my %lt=&Apache::lonlocal::texthash( + 'dska' => "Disk space allocated to user's portfolio files", + 'youd' => "You do not have privileges to modify the portfolio quota for this user.", + 'ichr' => "If a change is required, contact a domain coordinator for the domain", + ); + $user_quota_text = <$lt{'dska'} +$lt{'youd'} $lt{'ichr'}: $ccdomain +ENDNOPORTPRIV + } + if ($user_auth_text ne '') { + $r->print('
'.$user_auth_text); + if ($user_quota_text ne '') { + $r->print($user_quota_text); + } + $r->print('
'); + + } elsif ($user_quota_text ne '') { + $r->print('
'.$user_quota_text.'
'); } - $r->print(&Apache::loncommon::end_data_table_row(). - &Apache::loncommon::end_data_table()); + $r->print('
'); + my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname); # Build up table of user roles to allow revocation of a role. my ($tmp) = keys(%rolesdump); unless ($tmp =~ /^(con_lost|error)/i) { my $now=time; my %lt=&Apache::lonlocal::texthash( - 'rer' => "Revoke Existing Roles", + 'rer' => "Existing Roles", 'rev' => "Revoke", 'del' => "Delete", 'ren' => "Re-Enable", @@ -1014,7 +961,7 @@ END $plaintext=&Apache::lonnet::plaintext($role_code,$class) } else { $plaintext= - "Customrole '$croletitle' defined by $croleuname\@$croleudom"; + "Customrole '$croletitle'
defined by $croleuname\@$croleudom"; } $row.= ''.$plaintext. ''.$area. @@ -1050,7 +997,6 @@ END } if ($rolesdisplay == 1) { $r->print(' -

'.$lt{'rer'}.'

'. &Apache::loncommon::start_data_table("LC_createuser"). &Apache::loncommon::start_data_table_header_row(). @@ -1066,121 +1012,16 @@ END $r->print(&Apache::loncommon::end_data_table()); } } # End of unless - my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); - if ($currentauth=~/^krb(4|5):/) { - $currentauth=~/^krb(4|5):(.*)/; - my $krbdefdom=$2; - my %param = ( formname => 'document.cu', - kerb_def_dom => $krbdefdom, - domain => $ccdomain, - curr_authtype => $currentauth, - ); - $loginscript = &Apache::loncommon::authform_header(%param); - } - # Check for a bad authentication type - if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) { - # bad authentication scheme - if (&Apache::lonnet::allowed('mau',$ccdomain)) { - &initialize_authen_forms($ccdomain); - my %lt=&Apache::lonlocal::texthash( - 'err' => "ERROR", - 'uuas' => "This user has an unrecognized authentication scheme", - 'sldb' => "Please specify login data below", - 'ld' => "Login Data" - ); - my $choices = &set_login($ccdomain); - $r->print(< - -$lt{'err'}: -$lt{'uuas'} ($currentauth). $lt{'sldb'}. -

$lt{'ld'}

-$choices -ENDBADAUTH - } else { - # 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", - 'uuas' => "This user has an unrecognized authentication scheme", - 'adcs' => "Please alert a domain coordinator of this situation" - ); - $r->print(< - $lt{'err'}: -$lt{'uuas'} ($currentauth). $lt{'adcs'}. -
-ENDBADAUTH - } - } else { # Authentication type is valid - my $authformcurrent=''; - my $authform_other=''; - &initialize_authen_forms($ccdomain,$currentauth); - my ($authformcurrent,$authform_other,$can_modify) = - &modify_login_block($ccdomain,$currentauth); - if (&Apache::lonnet::allowed('mau',$ccdomain)) { - # Current user has login modification privileges - my %lt=&Apache::lonlocal::texthash( - 'ccld' => "Change Current Login Data", - 'enld' => "Enter New Login Data" - ); - $r->print(< - -

$lt{'ccld'}

-

$authformnop -ENDOTHERAUTHS - if ($can_modify) { - $r->print('

'.$authformcurrent.'

'); - } else { - $r->print(' ('.$authformcurrent.')

'); - } - if ($authform_other ne '') { - $r->print('

'.$lt{'enld'}.'

'."\n". - $authform_other); - } - } 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 - } - } - } ## End of "check for bad authentication type" logic - if (&Apache::lonnet::allowed('mpq',$ccdomain)) { - # Current user has quota modification privileges - $r->print(&portfolio_quota($ccuname,$ccdomain)); - } elsif (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) { - my %lt=&Apache::lonlocal::texthash( - 'dska' => "Disk space allocated to user's portfolio files", - 'youd' => "You do not have privileges to modify the portfolio quota for this user.", - 'ichr' => "If a change is required, contact a domain coordinator for the domain", - ); - $r->print(< -

$lt{'dska'}

-$lt{'youd'} $lt{'ichr'}: $ccdomain -ENDNOPORTPRIV - } } ## End of new user/old user logic - $r->print('

'.&mt('Add Roles').'

'); + my $addrolesdisplay = 0; + $r->print('

'.&mt('Add Roles').'

'); # # Co-Author # if (&authorpriv($env{'user.name'},$env{'request.role.domain'}) && ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain)) { # No sense in assigning co-author role to yourself + $addrolesdisplay = 1; my $cuname=$env{'user.name'}; my $cudom=$env{'request.role.domain'}; my %lt=&Apache::lonlocal::texthash( @@ -1227,6 +1068,15 @@ ENDNOPORTPRIV "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()); + } elsif ($env{'request.role'} =~ /^au\./) { + if (!(&authorpriv($env{'user.name'},$env{'request.role.domain'}))) { + $r->print(''. + &mt('You do not have privileges to assign co-author roles.'). + ''); + } elsif (($env{'user.name'} eq $ccuname) && + ($env{'user.domain'} eq $ccdomain)) { + $r->print(&mt('Assigning yourself a co-author or assistant co-author role in your own author area in Construction Space is not permitted')); + } } # # Domain level @@ -1267,40 +1117,138 @@ ENDNOPORTPRIV $domaintext.= &Apache::loncommon::end_data_table(); if ($num_domain_level > 0) { $r->print($domaintext); + $addrolesdisplay = 1; } # -# Course and group levels +# Course level # if ($env{'request.role'} =~ m{^dc\./($match_domain)/$}) { $r->print(&course_level_dc($1,'Course')); - $r->print('
'."\n"); + $r->print('
'."\n"); + } elsif ($env{'request.role'} =~ m{^au\./($match_domain)/$}) { + if ($addrolesdisplay) { + $r->print('
print(' onClick="verify_message(this.form)" \>'."\n"); + } else { + $r->print('onClick="this.form.submit()" \>'."\n"); + } + } else { + $r->print('
'. + &mt('Back to previous page').''); + } } else { $r->print(&course_level_table(%inccourses)); - $r->print('
'."\n"); + $r->print('
'."\n"); } - $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate'])); + $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain'])); $r->print(''); $r->print(''); $r->print("".&Apache::loncommon::end_page()); } -sub set_login { - my ($dom) = @_; - my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom); - my $response; - my ($authnum,%can_assign) = - &Apache::loncommon::get_assignable_auth($dom); - if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { - $response .= "

$authformkrb

\n"; - } - if ($can_assign{'int'}) { - $response .= "

$authformint

\n" - } - if ($can_assign{'loc'}) { - $response .= "

$authformloc

\n"; +sub user_authentication { + my ($ccuname,$ccdomain,$krbdefdom,$abv_auth) = @_; + my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); + my ($loginscript,$outcome); + if ($currentauth=~/^(krb)(4|5):(.*)/) { + my $long_auth = $1.$2; + my $curr_kerb_ver = $2; + my $krbdefdom=$3; + my $curr_authtype = $abv_auth->{$long_auth}; + my %param = ( formname => 'document.cu', + kerb_def_dom => $krbdefdom, + domain => $ccdomain, + curr_authtype => $curr_authtype, + curr_kerb_ver => $curr_kerb_ver, + ); + $loginscript = &Apache::loncommon::authform_header(%param); } - return $response; + # Check for a bad authentication type + if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) { + # bad authentication scheme + my %lt=&Apache::lonlocal::texthash( + 'err' => "ERROR", + 'uuas' => "This user has an unrecognized authentication scheme", + 'adcs' => "Please alert a domain coordinator of this situation", + 'sldb' => "Please specify login data below", + 'ld' => "Login Data" + ); + if (&Apache::lonnet::allowed('mau',$ccdomain)) { + &initialize_authen_forms($ccdomain); + my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc); + $outcome = < +$loginscript + +$lt{'err'}: +$lt{'uuas'} ($currentauth). $lt{'sldb'}. +

$lt{'ld'}

+$choices +ENDBADAUTH + } else { + # This user is not allowed to modify the user's + # authentication scheme, so just notify them of the problem + $outcome = < $lt{'err'}: +$lt{'uuas'} ($currentauth). $lt{'adcs'}. +
 +ENDBADAUTH + } + } else { # Authentication type is valid + &initialize_authen_forms($ccdomain,$currentauth); + my $authformnop_row; + if (&Apache::lonnet::allowed('mau',$ccdomain)) { + $authformnop_row = &Apache::loncommon::start_data_table_row(); + } + my ($authformcurrent,$authform_other,$can_modify) = + &modify_login_block($ccdomain,$currentauth); + if (&Apache::lonnet::allowed('mau',$ccdomain)) { + # Current user has login modification privileges + my %lt=&Apache::lonlocal::texthash ( + 'ld' => "Login Data", + 'ccld' => "Change Current Login Data", + 'enld' => "Enter New Login Data" + ); + $outcome = + ''."\n". + '

'.$lt{'ld'}.'

'. + &Apache::loncommon::start_data_table(). + $authformnop_row. + ''.$authformnop; + if ($can_modify) { + $outcome .= ''."\n". + &Apache::loncommon::end_data_table_row(). + &Apache::loncommon::start_data_table_row(). + ''.$authformcurrent.''. + &Apache::loncommon::end_data_table_row()."\n"; + } else { + $outcome .= ' ('.$authformcurrent.')'. + &Apache::loncommon::end_data_table_row()."\n"; + } + if ($authform_other ne '') { + $outcome .= $authform_other; + } + $outcome .= &Apache::loncommon::end_data_table_row(). + &Apache::loncommon::end_data_table(); + } 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", + ); + $outcome .= <$lt{'ccld'} +$lt{'yodo'} $lt{'ifch'}: $ccdomain +ENDNOPRIV + } + } + } ## End of "check for bad authentication type" logic + return $outcome; } sub modify_login_block { @@ -1312,10 +1260,14 @@ sub modify_login_block { if ($currentauth=~/^krb(4|5):/) { $authformcurrent=$authformkrb; if ($can_assign{'int'}) { - $authform_other = "

$authformint

\n" + $authform_other = &Apache::loncommon::start_data_table_row(). + ''.$authformint.''. + &Apache::loncommon::end_data_table_row()."\n" } if ($can_assign{'loc'}) { - $authform_other .= "

$authformloc

\n"; + $authform_other .= &Apache::loncommon::start_data_table_row(). + ''.$authformloc.''. + &Apache::loncommon::end_data_table_row()."\n"; } if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { $show_override_msg = 1; @@ -1323,10 +1275,14 @@ sub modify_login_block { } elsif ($currentauth=~/^internal:/) { $authformcurrent=$authformint; if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { - $authform_other = "

$authformkrb

\n" + $authform_other = &Apache::loncommon::start_data_table_row(). + ''.$authformkrb.''. + &Apache::loncommon::end_data_table_row()."\n"; } if ($can_assign{'loc'}) { - $authform_other .= "

$authformloc

\n"; + $authform_other .= &Apache::loncommon::start_data_table_row(). + ''.$authformloc.''. + &Apache::loncommon::end_data_table_row()."\n"; } if ($can_assign{'int'}) { $show_override_msg = 1; @@ -1334,13 +1290,19 @@ sub modify_login_block { } elsif ($currentauth=~/^unix:/) { $authformcurrent=$authformfsys; if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { - $authform_other = "

$authformkrb

\n" + $authform_other = &Apache::loncommon::start_data_table_row(). + ''.$authformkrb.''. + &Apache::loncommon::end_data_table_row()."\n"; } if ($can_assign{'int'}) { - $authform_other .= "

$authformint

\n" + $authform_other .= &Apache::loncommon::start_data_table_row(). + ''.$authformint.''. + &Apache::loncommon::end_data_table_row()."\n" } if ($can_assign{'loc'}) { - $authform_other .= "

$authformloc

\n"; + $authform_other .= &Apache::loncommon::start_data_table_row(). + ''.$authformloc.''. + &Apache::loncommon::end_data_table_row()."\n"; } if ($can_assign{'fsys'}) { $show_override_msg = 1; @@ -1348,10 +1310,14 @@ sub modify_login_block { } elsif ($currentauth=~/^localauth:/) { $authformcurrent=$authformloc; if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { - $authform_other = "

$authformkrb

\n" + $authform_other = &Apache::loncommon::start_data_table_row(). + ''.$authformkrb.''. + &Apache::loncommon::end_data_table_row()."\n"; } if ($can_assign{'int'}) { - $authform_other .= "

$authformint

\n" + $authform_other .= &Apache::loncommon::start_data_table_row(). + ''.$authformint.''. + &Apache::loncommon::end_data_table_row()."\n" } if ($can_assign{'loc'}) { $show_override_msg = 1; @@ -1365,15 +1331,74 @@ sub modify_login_block { return ($authformcurrent,$authform_other,$show_override_msg); } +sub personal_data_display { + my ($ccuname,$ccdomain,$newuser,%inst_results) = @_; + my ($output,%userenv); + if (!$newuser) { + # Get the users information + %userenv = &Apache::lonnet::get('environment', + ['firstname','middlename','lastname','generation', + 'permanentemail','id'],$ccdomain,$ccuname); + } + my %lt=&Apache::lonlocal::texthash( + 'pd' => "Personal Data", + 'firstname' => "First Name", + 'middlename' => "Middle Name", + 'lastname' => "Last Name", + 'generation' => "Generation", + 'permanentemail' => "Permanent e-mail address", + 'id' => "ID/Student Number", + 'lg' => "Login Data" + ); + my @userinfo = ('firstname','middlename','lastname','generation', + 'permanentemail','id'); + my %textboxsize = ( + firstname => '15', + middlename => '15', + lastname => '15', + generation => '5', + permanentemail => '25', + id => '15', + ); + my $genhelp=&Apache::loncommon::help_open_topic('Generation'); + $output = '

'.$lt{'pd'}.'

'. + &Apache::lonhtmlcommon::start_pick_box(); + foreach my $item (@userinfo) { + my $rowtitle = $lt{$item}; + if ($item eq 'generation') { + $rowtitle = $genhelp.$rowtitle; + } + $output .= &Apache::lonhtmlcommon::row_title($rowtitle,undef,'LC_oddrow_value')."\n"; + if ($newuser) { + if ($inst_results{$item} ne '') { + $output .= ''.$inst_results{$item}; + } else { + $output .= ''; + } + } else { + if (&Apache::lonnet::allowed('mau',$ccdomain)) { + $output .= ''; + } else { + $output .= $userenv{$item}; + } + } + $output .= &Apache::lonhtmlcommon::row_closure(1); + } + $output .= &Apache::lonhtmlcommon::end_pick_box(); + return $output; +} + # ================================================================= Phase Three sub update_user_data { my ($r) = @_; my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'}, $env{'form.ccdomain'}); # Error messages - my $error = ''.&mt('Error').':'; - my $end = &Apache::loncommon::end_page(); - + my $error = ''.&mt('Error').': '; + my $end = '

'; + my $rtnlink = ''. + &mt('Return to previous page').''.&Apache::loncommon::end_page(); my $title; if (exists($env{'form.makeuser'})) { $title='Set Privileges for New User'; @@ -1388,7 +1413,7 @@ sub update_user_data { $r->print(&Apache::loncommon::start_page($title,$jscript)); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:backPage(document.userupdate)", - text=>"User modify/custom role edit", + text=>"Create/modify user", faq=>282,bug=>'Instructor Interface',}); if ($env{'form.prevphase'} eq 'userpicked') { &Apache::lonhtmlcommon::add_breadcrumb @@ -1406,27 +1431,28 @@ sub update_user_data { $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); my %disallowed; + $r->print(&update_result_form($uhome)); # Check Inputs if (! $env{'form.ccuname'} ) { - $r->print($error.&mt('No login name specified').'.'.$end); + $r->print($error.&mt('No login name specified').'.'.$end.$rtnlink); return; } if ( $env{'form.ccuname'} ne &LONCAPA::clean_username($env{'form.ccuname'}) ) { $r->print($error.&mt('Invalid login name').'. '. &mt('Only letters, numbers, periods, dashes, @, and underscores are valid').'.'. - $end); + $end.$rtnlink); return; } if (! $env{'form.ccdomain'} ) { - $r->print($error.&mt('No domain specified').'.'.$end); + $r->print($error.&mt('No domain specified').'.'.$end.$rtnlink); return; } if ( $env{'form.ccdomain'} ne &LONCAPA::clean_domain($env{'form.ccdomain'}) ) { $r->print($error.&mt ('Invalid domain name').'. '. &mt('Only letters, numbers, periods, dashes, and underscores are valid').'.'. - $end); + $end.$rtnlink); return; } if (! exists($env{'form.makeuser'})) { @@ -1462,19 +1488,19 @@ sub update_user_data { # If they are creating a new user but have not specified login # information this will be caught below. } else { - $r->print($error.&mt('Invalid login mode or password').$end); + $r->print($error.&mt('Invalid login mode or password').$end.$rtnlink); return; } - $r->print('

'.&mt('User [_1] in domain [_2]', - $env{'form.ccuname'}, $env{'form.ccdomain'}).'

'); - + $r->print('

'.&mt('User [_1] in domain [_2]', + $env{'form.ccuname'}, $env{'form.ccdomain'}).'

'); + my (%alerts,%rulematch,%inst_results,%curr_rules); if ($env{'form.makeuser'}) { $r->print('

'.&mt('Creating new account.').'

'); # Check for the authentication mode and password if (! $amode || ! $genpwd) { - $r->print($error.&mt('Invalid login mode or password').$end); + $r->print($error.&mt('Invalid login mode or password').$end.$rtnlink); return; } # Determine desired host @@ -1485,17 +1511,47 @@ sub update_user_data { my %home_servers = &Apache::lonnet::get_servers($env{'form.ccdomain'},'library'); if (! exists($home_servers{$desiredhost})) { - $r->print($error.&mt('Invalid home server specified')); + $r->print($error.&mt('Invalid home server specified').$end.$rtnlink); return; } } + # Check ID format + my %checkhash; + my %checks = ('id' => 1); + %{$checkhash{$env{'form.ccuname'}.':'.$env{'form.ccdomain'}}} = ( + 'newuser' => 1, + 'id' => $env{'form.cid'}, + ); + if ($env{'form.cid'} ne '') { + &Apache::loncommon::user_rule_check(\%checkhash,\%checks,\%alerts, + \%rulematch,\%inst_results,\%curr_rules); + if (ref($alerts{'id'}) eq 'HASH') { + if (ref($alerts{'id'}{$env{'form.ccdomain'}}) eq 'HASH') { + my $domdesc = + &Apache::lonnet::domain($env{'form.ccdomain'},'description'); + if ($alerts{'id'}{$env{'form.ccdomain'}}{$env{'form.cid'}}) { + my $userchkmsg; + if (ref($curr_rules{$env{'form.ccdomain'}}) eq 'HASH') { + $userchkmsg = + &Apache::loncommon::instrule_disallow_msg('id', + $domdesc,1). + &Apache::loncommon::user_rule_formats($env{'form.ccdomain'}, + $domdesc,$curr_rules{$env{'form.ccdomain'}}{'id'},'id'); + } + $r->print($error.&mt('Invalid ID format').$end. + $userchkmsg.$rtnlink); + return; + } + } + } + } # Call modifyuser my $result = &Apache::lonnet::modifyuser - ($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cstid'}, - $amode,$genpwd,$env{'form.cfirst'}, - $env{'form.cmiddle'},$env{'form.clast'},$env{'form.cgen'}, - undef,$desiredhost,$env{'form.cemail'} - ); + ($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cid'}, + $amode,$genpwd,$env{'form.cfirstname'}, + $env{'form.cmiddlename'},$env{'form.clastname'}, + $env{'form.cgeneration'},undef,$desiredhost, + $env{'form.cpermanentemail'}); $r->print(&mt('Generating user').': '.$result); my $home = &Apache::lonnet::homeserver($env{'form.ccuname'}, $env{'form.ccdomain'}); @@ -1505,7 +1561,7 @@ sub update_user_data { ($env{'form.login'} ne '' )) { # Modify user privileges if (! $amode || ! $genpwd) { - $r->print($error.'Invalid login mode or password'.$end); + $r->print($error.'Invalid login mode or password'.$end.$rtnlink); return; } # Only allow authentification modification if the person has authority @@ -1518,7 +1574,7 @@ sub update_user_data { ($env{'form.ccuname'},$env{'form.ccdomain'})); } else { # Okay, this is a non-fatal error. - $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.'); + $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.'.$end); } } ## @@ -1526,22 +1582,53 @@ sub update_user_data { # Check for need to change my %userenv = &Apache::lonnet::get ('environment',['firstname','middlename','lastname','generation', - 'permanentemail','portfolioquota','inststatus'], + 'id','permanentemail','portfolioquota','inststatus'], $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 my $item ('firstname','middlename','lastname','generation','permanentemail') { + foreach my $item ('firstname','middlename','lastname','generation','permanentemail','id') { # Strip leading and trailing whitespace - $env{'form.c'.$item} =~ s/(\s+$|^\s+)//g; + $env{'form.c'.$item} =~ s/(\s+$|^\s+)//g; + } + # Check to see if we can change the ID/student number + my $forceid = $env{'form.forceid'}; + my $recurseid = $env{'form.recurseid'}; + my $newuser = 0; + my (%alerts,%rulematch,%idinst_results,%curr_rules,%got_rules); + my %uidhash = &Apache::lonnet::idrget($env{'form.ccdomain'}, + $env{'form.ccuname'}); + if (($uidhash{$env{'form.ccuname'}}) && + ($uidhash{$env{'form.ccuname'}}!~/error\:/) && + (!$forceid)) { + if ($env{'form.cid'} ne $uidhash{$env{'form.ccuname'}}) { + $env{'form.cid'} = $userenv{'id'}; + } + } + if ($env{'form.cid'} ne $userenv{'id'}) { + my $checkhash; + my $checks = { 'id' => 1 }; + $checkhash->{$env{'form.ccuname'}.':'.$env{'form.ccdomain'}} = + { 'newuser' => $newuser, + 'id' => $env{'form.cid'}, + }; + &Apache::loncommon::user_rule_check($checkhash,$checks, + \%alerts,\%rulematch,\%idinst_results,\%curr_rules,\%got_rules); + if (ref($alerts{'id'}) eq 'HASH') { + if (ref($alerts{'id'}{$env{'form.ccdomain'}}) eq 'HASH') { + $env{'form.cid'} = $userenv{'id'}; + } + } } my ($quotachanged,$namechanged,$oldportfolioquota,$newportfolioquota, - $inststatus,$isdefault,$defquotatext); + $inststatus,$oldisdefault,$newisdefault,$olddefquotatext, + $newdefquotatext); my ($defquota,$settingstatus) = &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus); my %changeHash; + $changeHash{'portfolioquota'} = $userenv{'portfolioquota'}; if ($userenv{'portfolioquota'} ne '') { $oldportfolioquota = $userenv{'portfolioquota'}; if ($env{'form.customquota'} == 1) { @@ -1551,15 +1638,16 @@ sub update_user_data { $newportfolioquota = $env{'form.portfolioquota'}; $newportfolioquota =~ s/[^\d\.]//g; } - if ($newportfolioquota != $userenv{'portfolioquota'}) { + if ($newportfolioquota != $oldportfolioquota) { $quotachanged = "a_admin($newportfolioquota,\%changeHash); } } else { $quotachanged = "a_admin('',\%changeHash); $newportfolioquota = $defquota; - $isdefault = 1; + $newisdefault = 1; } } else { + $oldisdefault = 1; $oldportfolioquota = $defquota; if ($env{'form.customquota'} == 1) { if ($env{'form.portfolioquota'} eq '') { @@ -1571,41 +1659,48 @@ sub update_user_data { $quotachanged = "a_admin($newportfolioquota,\%changeHash); } else { $newportfolioquota = $defquota; - $isdefault = 1; + $newisdefault = 1; } } - if ($isdefault) { - if ($settingstatus eq '') { - $defquotatext = &mt('(default)'); - } else { - my ($usertypes,$order) = - &Apache::lonnet::retrieve_inst_usertypes($env{'form.ccdomain'}); - if ($usertypes->{$settingstatus} eq '') { - $defquotatext = &mt('(default)'); - } else { - $defquotatext = &mt('(default for [_1])',$usertypes->{$settingstatus}); - } - } + if ($oldisdefault) { + $olddefquotatext = &get_defaultquota_text($settingstatus); + } + if ($newisdefault) { + $newdefquotatext = &get_defaultquota_text($settingstatus); } 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'} || + $env{'form.cid'} ne $userenv{'id'} || $env{'form.cpermanentemail'} ne $userenv{'permanentemail'} )) { $namechanged = 1; } - if ($namechanged) { - # Make the change + if ($namechanged || $quotachanged) { $changeHash{'firstname'} = $env{'form.cfirstname'}; $changeHash{'middlename'} = $env{'form.cmiddlename'}; $changeHash{'lastname'} = $env{'form.clastname'}; $changeHash{'generation'} = $env{'form.cgeneration'}; + $changeHash{'id'} = $env{'form.cid'}; $changeHash{'permanentemail'} = $env{'form.cpermanentemail'}; - my $putresult = &Apache::lonnet::put - ('environment',\%changeHash, - $env{'form.ccdomain'},$env{'form.ccuname'}); - if ($putresult eq 'ok') { + my ($quotachgresult,$namechgresult); + if ($quotachanged) { + $quotachgresult = + &Apache::lonnet::put('environment',\%changeHash, + $env{'form.ccdomain'},$env{'form.ccuname'}); + } + if ($namechanged) { + # Make the change + $namechgresult = + &Apache::lonnet::modifyuser($env{'form.ccdomain'}, + $env{'form.ccuname'},$changeHash{'id'},undef,undef, + $changeHash{'firstname'},$changeHash{'middlename'}, + $changeHash{'lastname'},$changeHash{'generation'}, + $changeHash{'id'},undef,$changeHash{'permanentemail'}); + } + if (($namechanged && $namechgresult eq 'ok') || + ($quotachanged && $quotachgresult eq 'ok')) { # Tell the user we changed the name my %lt=&Apache::lonlocal::texthash( 'uic' => "User Information Changed", @@ -1613,38 +1708,70 @@ sub update_user_data { 'mddl' => "middle", 'lst' => "last", 'gen' => "generation", + 'id' => "ID/Student number", 'mail' => "permanent e-mail", 'disk' => "disk space allocated to portfolio files", 'prvs' => "Previous", 'chto' => "Changed To" ); + $r->print('

'.$lt{'uic'}.'

'. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row()); $r->print(<<"END"); - - - + + - - + +END + $r->print(&Apache::loncommon::end_data_table_header_row(). + &Apache::loncommon::start_data_table_row()); + $r->print(<<"END"); + + - - - + +END + $r->print(&Apache::loncommon::end_data_table_row(). + &Apache::loncommon::start_data_table_row()); + $r->print(<<"END"); + + - -
$lt{'uic'}
   $lt{'frst'} $lt{'mddl'} $lt{'lst'} $lt{'gen'}$lt{'id'} $lt{'mail'}$lt{'disk'}
$lt{'prvs'}$lt{'disk'}$lt{'prvs'} $userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'} $userenv{'id'} $userenv{'permanentemail'} $oldportfolioquota Mb
$lt{'chto'}$oldportfolioquota Mb $olddefquotatext $lt{'chto'} $env{'form.cfirstname'} $env{'form.cmiddlename'} $env{'form.clastname'} $env{'form.cgeneration'} $env{'form.cid'} $env{'form.cpermanentemail'} $newportfolioquota Mb $defquotatext
+ $newportfolioquota Mb $newdefquotatext END + $r->print(&Apache::loncommon::end_data_table_row(). + &Apache::loncommon::end_data_table()); + if ($env{'form.cid'} ne $userenv{'id'}) { + &Apache::lonnet::idput($env{'form.ccdomain'}, + ($env{'form.ccuname'} => $env{'form.cid'})); + if (($recurseid) && + (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) { + my %userupdate = ( + lastname => $env{'form.clasaname'}, + middlename => $env{'form.cmiddlename'}, + firstname => $env{'form.cfirstname'}, + generation => $env{'fora.cgeneration'}, + id => $env{'form.cid'}, + ); + my $idresult = + &Apache::lonuserutils::propagate_id_change( + $env{'form.ccuname'},$env{'form.ccdomain'}, + \%userupdate); + $r->print('
'.$idresult.'
'); + } + } if (($env{'form.ccdomain'} eq $env{'user.domain'}) && ($env{'form.ccuname'} eq $env{'user.name'})) { my %newenvhash; @@ -1654,41 +1781,36 @@ END &Apache::lonnet::appenv(%newenvhash); } } else { # error occurred - $r->print("

".&mt('Unable to successfully change environment for')." ". - $env{'form.ccuname'}." ".&mt('in domain')." ". - $env{'form.ccdomain'}."

"); + $r->print(''.&mt('Unable to successfully change environment for').' '. + $env{'form.ccuname'}.' '.&mt('in domain').' '. + $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 + # They did not want to change the users name or quota but we can + # still tell them what the name and quota are my %lt=&Apache::lonlocal::texthash( + 'id' => "ID/Student number", 'mail' => "Permanent e-mail", 'disk' => "Disk space allocated to user's portfolio files", ); $r->print(<<"END"); -

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

-

$lt{'mail'}: $userenv{'permanentemail'}

+

$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'} END - if ($putresult eq 'ok') { - if ($oldportfolioquota != $newportfolioquota) { - $r->print('

'.$lt{'disk'}.': '.$newportfolioquota.' Mb '. - $defquotatext.'

'); - &Apache::lonnet::appenv('environment.portfolioquota' => $changeHash{'portfolioquota'}); - } + if ($userenv{'permanentemail'} ne '') { + $r->print('
['.$lt{'mail'}.': '. + $userenv{'permanentemail'}.']'); } + $r->print('
['.$lt{'disk'}.': '.$oldportfolioquota.' Mb '. + $olddefquotatext.']'); } } ## my $now=time; + my $rolechanges = 0; $r->print('

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

'); foreach my $key (keys (%env)) { next if (! $env{$key}); + next if ($key eq 'form.action'); # Revoke roles if ($key=~/^form\.rev/) { if ($key=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) { @@ -1701,12 +1823,14 @@ END $r->print(&mt('Revoking [_1] in [_2]: [_3]', $role,$scope,''.$result.'').'
'); if ($role eq 'st') { - my $result = &classlist_drop($scope,$env{'form.ccuname'}, - $env{'form.ccdomain'},$now); + my $result = + &Apache::lonuserutils::classlist_drop($scope, + $env{'form.ccuname'},$env{'form.ccdomain'}, + $now); $r->print($result); } - } - if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$ }s) { + } + if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}s) { # Revoke custom role $r->print(&mt('Revoking custom role:'). ' '.$4.' by '.$3.':'.$2.' in '.$1.': '. @@ -1714,6 +1838,7 @@ END $env{'form.ccuname'},$1,$2,$3,$4). '
'); } + $rolechanges ++; } elsif ($key=~/^form\.del/) { if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) { # Delete standard role @@ -1725,8 +1850,10 @@ END $r->print(&mt('Deleting [_1] in [_2]: [_3]',$role,$scope, ''.$result.'').'
'); if ($role eq 'st') { - my $result = &classlist_drop($scope,$env{'form.ccuname'}, - $env{'form.ccdomain'},$now); + my $result = + &Apache::lonuserutils::classlist_drop($scope, + $env{'form.ccuname'},$env{'form.ccdomain'}, + $now); $r->print($result); } } @@ -1739,6 +1866,7 @@ END $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now, 0,1).'
'); } + $rolechanges ++; } elsif ($key=~/^form\.ren/) { my $udom = $env{'form.ccdomain'}; my $uname = $env{'form.ccuname'}; @@ -1777,6 +1905,7 @@ END $r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : [_5]', $rolename,$rnam,$rdom,$url,$result).'
'); } + $rolechanges ++; } elsif ($key=~/^form\.act/) { my $udom = $env{'form.ccdomain'}; my $uname = $env{'form.ccuname'}; @@ -1880,7 +2009,7 @@ END } } } else { - $r->print('

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


'); + $r->print('

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


'); } foreach my $key (sort(keys(%disallowed))) { if (($key eq 'none') || ($key eq 'all')) { @@ -1890,48 +2019,54 @@ END } $r->print(' '.&mt('Please go back and choose a different section name.').'


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

'.&mt('Create/Modify Another User').'

'); - $r->print('
'."\n"); - foreach my $item ('srchby','srchin','srchtype','srchterm','srchdomain','ccuname','ccdomain') { - $r->print(''."\n"); + if (!$rolechanges) { + $r->print(&mt('No roles to modify')); } - foreach my $item ('sortby','seluname','seludom') { - if (exists($env{'form.'.$item})) { - $r->print(''."\n"); - } - } - $r->print(''."\n". - ''."\n". - '
'); $r->print(&Apache::loncommon::end_page()); } -sub classlist_drop { - my ($scope,$uname,$udom,$now) = @_; - my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)}); - my $cid=$cdom.'_'.$cnum; - my $user = $uname.':'.$udom; - if (!&active_student_roles($cnum,$cdom,$uname,$udom)) { - my $result = - &Apache::lonnet::cput('classlist', - { $user => $now }, - $env{'course.'.$cid.'.domain'}, - $env{'course.'.$cid.'.num'}); - return &mt('Drop from classlist: [_1]', - ''.$result.'').'
'; +sub get_defaultquota_text { + my ($settingstatus) = @_; + my $defquotatext; + if ($settingstatus eq '') { + $defquotatext = &mt('(default)'); + } else { + my ($usertypes,$order) = + &Apache::lonnet::retrieve_inst_usertypes($env{'form.ccdomain'}); + if ($usertypes->{$settingstatus} eq '') { + $defquotatext = &mt('(default)'); + } else { + $defquotatext = &mt('(default for [_1])',$usertypes->{$settingstatus}); + } } + return $defquotatext; } -sub active_student_roles { - my ($cnum,$cdom,$uname,$udom) = @_; - my %roles = - &Apache::lonnet::get_my_roles($uname,$udom,'userroles', - ['future','active'],['st']); - return exists($roles{"$cnum:$cdom:st"}); +sub update_result_form { + my ($uhome) = @_; + my $outcome = + '
'."\n"; + foreach my $item ('srchby','srchin','srchtype','srchterm','srchdomain','ccuname','ccdomain') { + $outcome .= ''."\n"; + } + foreach my $item ('sortby','seluname','seludom') { + if (exists($env{'form.'.$item})) { + $outcome .= ''."\n"; + } + } + if ($uhome eq 'no_host') { + $outcome .= ''."\n"; + } + $outcome .= ''."\n". + ''."\n". + ''."\n". + '
'; + return $outcome; } sub quota_admin { @@ -1990,7 +2125,7 @@ sub custom_role_editor { $rolename=~s/[^A-Za-z0-9]//gs; - if (!$rolename) { + if (!$rolename || $env{'form.phase'} eq 'pickrole') { &print_username_entry_form($r); return; } @@ -2059,8 +2194,8 @@ sub custom_role_editor { $head_script .= "\n".$jsback."\n".''."\n"; $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script)); &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage(document.form1,'','')", - text=>"User modify/custom role edit", + ({href=>"javascript:backPage(document.form1,'pickrole','')", + text=>"Pick custom role", faq=>282,bug=>'Instructor Interface',}, {href=>"javascript:backPage(document.form1,'','')", text=>"Edit custom role", @@ -2103,6 +2238,7 @@ ENDCCF &Apache::loncommon::end_data_table_row()); } $r->print(&Apache::loncommon::end_data_table(). + ''. ''."\n".''."\n". ''."\n". @@ -2184,23 +2320,19 @@ sub make_button_code { # ---------------------------------------------------------- Call to definerole sub set_custom_role { my ($r) = @_; - my $rolename=$env{'form.rolename'}; - $rolename=~s/[^A-Za-z0-9]//gs; - if (!$rolename) { - &print_username_entry_form($r); + &custom_role_editor($r); return; } - my ($jsback,$elements) = &crumb_utilities(); my $jscript = ''; $r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript); &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage(document.customresult,'','')", - text=>"User modify/custom role edit", + ({href=>"javascript:backPage(document.customresult,'pickrole','')", + text=>"Pick custom role", faq=>282,bug=>'Instructor Interface',}, {href=>"javascript:backPage(document.customresult,'selected_custom_edit','')", text=>"Edit custom role", @@ -2214,14 +2346,14 @@ sub set_custom_role { &Apache::lonnet::get('roles',["rolesdef_$rolename"]); # ------------------------------------------------------- Does this role exist? - $r->print('

'); + $r->print('

'); if (($rdummy ne 'con_lost') && ($roledef ne '')) { $r->print(&mt('Existing Role').' "'); } else { $r->print(&mt('New Role').' "'); $roledef=''; } - $r->print($rolename.'"

'); + $r->print($rolename.'"'); # ------------------------------------------------------- What can be assigned? my $sysrole=''; my $domrole=''; @@ -2263,7 +2395,7 @@ sub set_custom_role { $env{'user.name'}, $rolename)); } - $r->print('

Create another role, or Create/Modify a user.

'); + $r->print('

'.&mt('Create or edit another custom role').'

'); $r->print(&Apache::lonhtmlcommon::echo_form_input([]).'
'); $r->print(&Apache::loncommon::end_page()); } @@ -2271,75 +2403,359 @@ sub set_custom_role { # ================================================================ Main Handler sub handler { my $r = shift; - if ($r->header_only) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK; } + my $context; + if ($env{'request.course.id'}) { + $context = 'course'; + } elsif ($env{'request.role'} =~ /^au\./) { + $context = 'construction_space'; + } else { + $context = 'domain'; + } + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['action','state','callingform','roletype','showrole','bulkaction']); + &Apache::lonhtmlcommon::clear_breadcrumbs(); + if ($env{'form.action'} ne 'dateselect') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createuser", + text=>"User Management"}); + } + my ($permission,$allowed) = &get_permission($context); + if (!$allowed) { + $env{'user.error.msg'}= + "/adm/createuser:cst:0:0:Cannot create/modify user data ". + "or view user status."; + return HTTP_NOT_ACCEPTABLE; + } + + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + + # Main switch on form.action and form.state, as appropriate + if (! exists($env{'form.action'})) { + $r->print(&header()); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); + $r->print(&print_main_menu($permission)); + $r->print(&Apache::loncommon::end_page()); + } elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) { + $r->print(&header()); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/createuser?action=upload&state=', + text=>"Upload Users List"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Upload Users List', + 'User_Management_Upload')); + $r->print('
'."\n"); + if (! exists($env{'form.state'})) { + &Apache::lonuserutils::print_first_users_upload_form($r,$context); + } elsif ($env{'form.state'} eq 'got_file') { + &Apache::lonuserutils::print_upload_manager_form($r,$context); + } elsif ($env{'form.state'} eq 'enrolling') { + if ($env{'form.datatoken'}) { + &Apache::lonuserutils::upfile_drop_add($r,$context); + } + } else { + &Apache::lonuserutils::print_first_users_upload_form($r,$context); + } + $r->print('
'.&Apache::loncommon::end_page()); + } elsif ($env{'form.action'} eq 'expire' && $permission->{'cusr'}) { + $r->print(&header()); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/createuser?action=expire', + text=>"Expire User Roles"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Expire User Roles', + 'User_Management_Drops')); + if (! exists($env{'form.state'})) { + &Apache::lonuserutils::print_expire_menu($r,$context); + } elsif ($env{'form.state'} eq 'done') { + &Apache::lonuserutils::expire_user_list($r,$context); + } else { + &Apache::lonuserutils::print_expire_menu($r,$context); + } + $r->print(&Apache::loncommon::end_page()); + } elsif ($env{'form.action'} eq 'singleuser' && $permission->{'cusr'}) { + my $phase = $env{'form.phase'}; + my @search = ('srchterm','srchby','srchin','srchtype','srchdomain'); + &Apache::loncreateuser::restore_prev_selections(); + my $srch; + foreach my $item (@search) { + $srch->{$item} = $env{'form.'.$item}; + } + + if (($phase eq 'get_user_info') || ($phase eq 'userpicked')) { + if ($env{'form.phase'} eq 'get_user_info') { + my ($currstate,$response,$forcenewuser,$results) = + &user_search_result($srch); + if ($env{'form.currstate'} eq 'modify') { + $currstate = $env{'form.currstate'}; + } + if ($currstate eq 'select') { + &print_user_selection_page($r,$response,$srch,$results, + 'createuser',\@search); + } elsif ($currstate eq 'modify') { + my ($ccuname,$ccdomain); + if (($srch->{'srchby'} eq 'uname') && + ($srch->{'srchtype'} eq 'exact')) { + $ccuname = $srch->{'srchterm'}; + $ccdomain= $srch->{'srchdomain'}; + } else { + my @matchedunames = keys(%{$results}); + ($ccuname,$ccdomain) = split(/:/,$matchedunames[0]); + } + $ccuname =&LONCAPA::clean_username($ccuname); + $ccdomain=&LONCAPA::clean_domain($ccdomain); + if ($env{'form.forcenewuser'}) { + $response = ''; + } + &print_user_modification_page($r,$ccuname,$ccdomain, + $srch,$response,$context); + } elsif ($currstate eq 'query') { + &print_user_query_page($r,'createuser'); + } else { + &print_username_entry_form($r,$response,$srch, + $forcenewuser); + } + } elsif ($env{'form.phase'} eq 'userpicked') { + my $ccuname = &LONCAPA::clean_username($env{'form.seluname'}); + my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'}); + &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'', + $context); + } + } elsif ($env{'form.phase'} eq 'update_user_data') { + &update_user_data($r); + } else { + &print_username_entry_form($r,undef,$srch); + } + } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) { + if ($env{'form.phase'} eq 'set_custom_roles') { + &set_custom_role($r); + } else { + &custom_role_editor($r); + } + } elsif ($env{'form.action'} eq 'listusers' && $permission->{'view'}) { + if ($env{'form.phase'} eq 'bulkchange') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'backPage(document.studentform)', + text=>"List Users"}); + my $setting = $env{'form.roletype'}; + my $choice = $env{'form.bulkaction'}; + $r->print(&header()); + $r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users", + 'User_Management_List')); + if ($permission->{'cusr'}) { + &Apache::lonuserutils::update_user_list($r,$context,$setting,$choice); + } + } else { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/createuser?action=listusers', + text=>"List Users"}); + my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles); + my $formname = 'studentform'; + if ($context eq 'domain' && $env{'form.roletype'} eq 'course') { + ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) = + &Apache::lonuserutils::courses_selector($env{'request.role.domain'}, + $formname); + $jscript .= &verify_user_display(); + my $js = &add_script($jscript).$cb_jscript; + my $loadcode = + &Apache::lonuserutils::course_selector_loadcode($formname); + if ($loadcode ne '') { + $r->print(&header($js,{'onload' => $loadcode,})); + } else { + $r->print(&header($js)); + } + } else { + $r->print(&header(&add_script(&verify_user_display()))); + } + $r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users", + 'User_Management_List')); + &Apache::lonuserutils::print_userlist($r,undef,$permission,$context, + $formname,$totcodes,$codetitles,$idlist,$idlist_titles); + $r->print(&Apache::loncommon::end_page()); + } + } elsif ($env{'form.action'} eq 'expire' && $permission->{'cusr'}) { + $r->print(&header()); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/createuser?action=drop', + text=>"Expire Users"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Expire User Roles', + 'User_Management_Drops')); + if (! exists($env{'form.state'})) { + &Apache::lonuserutils::print_expire_menu($r,$context); + } elsif ($env{'form.state'} eq 'done') { + &Apache::lonuserutiles::expire_user_list($r,$context); + } else { + &print_expire_menu($r,$context); + } + $r->print(&Apache::loncommon::end_page()); + } elsif ($env{'form.action'} eq 'dateselect') { + if ($permission->{'cusr'}) { + $r->print(&header(undef,undef,{'no_nav_bar' => 1}). + &Apache::lonuserutils::date_section_selector($context). + &Apache::loncommon::end_page()); + } else { + $r->print(&header(). + ''.&mt('You do not have permission to modify dates or sections for users').''. + &Apache::loncommon::end_page()); + } + } else { + $r->print(&header()); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); + $r->print(&print_main_menu($permission)); + $r->print(&Apache::loncommon::end_page()); + } + return OK; +} - if ((&Apache::lonnet::allowed('cta',$env{'request.course.id'})) || - (&Apache::lonnet::allowed('cin',$env{'request.course.id'})) || - (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) || - (&Apache::lonnet::allowed('cep',$env{'request.course.id'})) || - (&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; - &Apache::lonhtmlcommon::clear_breadcrumbs(); - - my $phase = $env{'form.phase'}; - my @search = ('srchterm','srchby','srchin','srchtype','srchdomain'); - - if (($phase eq 'get_user_info') || ($phase eq 'userpicked')) { - my $srch; - foreach my $item (@search) { - $srch->{$item} = $env{'form.'.$item}; - } - if ($env{'form.phase'} eq 'get_user_info') { - my ($currstate,$response,$forcenewuser,$results) = - &user_search_result($srch); - if ($currstate eq 'select') { - &print_user_selection_page($r,$response,$srch,$results,'createuser',\@search); - } elsif ($currstate eq 'modify') { - my ($ccuname,$ccdomain); - if (($srch->{'srchby'} eq 'uname') && - ($srch->{'srchtype'} eq 'exact')) { - $ccuname = $srch->{'srchterm'}; - $ccdomain= $srch->{'srchdomain'}; - } else { - my @matchedunames = keys(%{$results}); - ($ccuname,$ccdomain) = split(/:/,$matchedunames[0]); - } - $ccuname =&LONCAPA::clean_username($ccuname); - $ccdomain=&LONCAPA::clean_domain($ccdomain); - &print_user_modification_page($r,$ccuname,$ccdomain,$srch, - $response); - } elsif ($currstate eq 'query') { - &print_user_query_page($r,'createuser'); - } else { - &print_username_entry_form($r,$response,$srch,$forcenewuser); - } - } elsif ($env{'form.phase'} eq 'userpicked') { - my $ccuname = &LONCAPA::clean_username($env{'form.seluname'}); - my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'}); - &print_user_modification_page($r,$ccuname,$ccdomain,$srch); - } - } elsif ($env{'form.phase'} eq 'update_user_data') { - &update_user_data($r); - } elsif ($env{'form.phase'} eq 'selected_custom_edit') { - &custom_role_editor($r); - } elsif ($env{'form.phase'} eq 'set_custom_roles') { - &set_custom_role($r); - } else { - &print_username_entry_form($r); - } - } else { - $env{'user.error.msg'}= - "/adm/createuser:mau:0:0:Cannot modify user data"; - return HTTP_NOT_ACCEPTABLE; - } - return OK; +sub header { + my ($jscript,$loaditems,$args) = @_; + my $start_page; + if (ref($loaditems) eq 'HASH') { + $start_page=&Apache::loncommon::start_page('User Management',$jscript,{'add_entries' => $loaditems}); + } else { + $start_page=&Apache::loncommon::start_page('User Management',$jscript,$args); + } + return $start_page; +} + +sub add_script { + my ($js) = @_; + return ''; +} + +sub verify_user_display { + my $output = <<"END"; + +function display_update() { + document.studentform.action.value = 'listusers'; + document.studentform.phase.value = 'display'; + document.studentform.submit(); +} + +END + return $output; + +} + +############################################################### +############################################################### +# Menu Phase One +sub print_main_menu { + my ($permission) = @_; + my @menu = + ( + { text => 'Upload a File of Users to Modify/Create Users and/or Add roles', + help => 'User_Management_Upload', + action => 'upload', + permission => $permission->{'cusr'}, + }, + { text => 'Create User/Set User Roles for a single user', + help => 'User_Management_Single_User', + action => 'singleuser', + permission => $permission->{'cusr'}, + }, + { text => 'Display Lists of Users', + help => 'User_Management_List', + action => 'listusers', + permission => $permission->{'view'}, + }, +# { text => 'Expire User Roles', +# help => 'User_Management_Drops', +# action => 'expire', +# permission => $permission->{'cusr'}, +# }, + { text => 'Edit Custom Roles', + help => 'Custom_Role_Edit', + action => 'custom', + permission => $permission->{'custom'}, + }, + ); + my $menu_html = ''; + foreach my $menu_item (@menu) { + next if (! $menu_item->{'permission'}); + $menu_html.='

'; + $menu_html.=''; + if (exists($menu_item->{'url'})) { + $menu_html.=qq{}; + } else { + $menu_html.= + qq{}; + } + $menu_html.= &mt($menu_item->{'text'}).''; + if (exists($menu_item->{'help'})) { + $menu_html.= + &Apache::loncommon::help_open_topic($menu_item->{'help'}); + } + $menu_html.='

'; + } + return $menu_html; +} + +sub get_permission { + my ($context) = @_; + my %permission; + if ($context eq 'course') { + if ((&Apache::lonnet::allowed('cta',$env{'request.course.id'})) || + (&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('cst',$env{'request.course.id'}))) { + $permission{'cusr'} = 1; + $permission{'view'} = + &Apache::lonnet::allowed('vcl',$env{'request.course.id'}); + + } + if (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) { + $permission{'custom'} = 1; + } + if (&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) { + $permission{'view'} = 1; + if (!$permission{'view'}) { + my $scope = $env{'request.course.id'}.'/'.$env{'request.course.sec'}; + $permission{'view'} = &Apache::lonnet::allowed('vcl',$scope); + if ($permission{'view'}) { + $permission{'view_section'} = $env{'request.course.sec'}; + } + } + } + } elsif ($context eq 'construction_space') { + $permission{'cusr'} = &authorpriv($env{'user.name'},$env{'request.role.domain'}); + $permission{'view'} = $permission{'cusr'}; + } else { + if ((&Apache::lonnet::allowed('cad',$env{'request.role.domain'})) || + (&Apache::lonnet::allowed('cli',$env{'request.role.domain'})) || + (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) || + (&Apache::lonnet::allowed('csc',$env{'request.role.domain'})) || + (&Apache::lonnet::allowed('cdg',$env{'request.role.domain'})) || + (&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) { + $permission{'cusr'} = 1; + } + if (&Apache::lonnet::allowed('ccr',$env{'request.role.domain'})) { + $permission{'custom'} = 1; + } + $permission{'view'} = $permission{'cusr'}; + } + my $allowed = 0; + foreach my $perm (values(%permission)) { + if ($perm) { $allowed=1; last; } + } + return (\%permission,$allowed); +} + +sub restore_prev_selections { + my %saveable_parameters = ('srchby' => 'scalar', + 'srchin' => 'scalar', + 'srchtype' => 'scalar', + ); + &Apache::loncommon::store_settings('user','user_picker', + \%saveable_parameters); + &Apache::loncommon::restore_settings('user','user_picker', + \%saveable_parameters); } #-------------------------------------------------- functions for &phase_two @@ -2450,7 +2866,8 @@ sub user_search_result { {&Apache::lonnet::get('environment', ['firstname', 'lastname', - 'permanentemail'])}; + 'permanentemail'], + $cudomain,$cuname)}; } } } @@ -2760,7 +3177,7 @@ sub course_level_table { my $table = ''; # Custom Roles? - my %customroles=&my_custom_roles(); + my %customroles=&Apache::lonuserutils::my_custom_roles(); my %lt=&Apache::lonlocal::texthash( 'exs' => "Existing sections", 'new' => "Define new section", @@ -2799,7 +3216,9 @@ sub course_level_table { '.$area.'
Domain: '.$domain.''."\n"; if ($role ne 'cc') { if (%sections_count) { - my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$role); + my $currsec = + &Apache::lonuserutils::course_sections(\%sections_count, + $protectedcourse.'_'.$role); $table .= ''. ' @@ -2839,11 +3258,13 @@ ENDTIMEENTRY '."\n"; if (%sections_count) { - my $currsec = &course_sections(\%sections_count,$customrole); + my $currsec = + &Apache::lonuserutils::course_sections(\%sections_count, + $customrole); $table.= - '
'.$plrole.' '.$area.''. - ''. + '
'.$lt{'exs'}.'
'. - $currsec.'		'. + ''. ''. ''. @@ -2868,8 +3289,11 @@ ENDENTRY } return '' if ($table eq ''); # return nothing if there is nothing # in the table - my $result = ' -

'.$lt{'crl'}.'

'. + my $result; + if (!$env{'request.course.id'}) { + $result = '

'.$lt{'crl'}.'

'."\n"; + } + $result .= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). ' @@ -2880,31 +3304,9 @@ $table. return $result; } -sub course_sections { - my ($sections_count,$role) = @_; - my $output = ''; - my @sections = (sort {$a <=> $b} keys %{$sections_count}); - if (scalar(@sections) == 1) { - $output = ''."\n"; - foreach my $sec (@sections) { - $output .= '\n"; - } - } - $output .= ''; - return $output; -} - sub course_level_dc { my ($dcdom) = @_; - my %customroles=&my_custom_roles(); + my %customroles=&Apache::lonuserutils::my_custom_roles(); my $hiddenitems = ''. ''. '';
'. + $lt{'exs'}.'
'.$currsec.'		   '.$lt{'new'}.'
'. '		'.$lt{'act'}.''.$lt{'rol'}.''.$lt{'ext'}.'