--- loncom/interface/loncreateuser.pm 2006/11/22 21:55:53 1.136 +++ loncom/interface/loncreateuser.pm 2007/08/31 17:58:47 1.182 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.136 2006/11/22 21:55:53 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.182 2007/08/31 17:58:47 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -65,8 +65,7 @@ use Apache::lonnet; use Apache::loncommon; use Apache::lonlocal; use Apache::longroup; -use lib '/home/httpd/lib/perl/'; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); my $loginscript; # piece of javascript used in two separate instances my $generalrule; @@ -122,60 +121,137 @@ sub portfolio_quota { my ($ccuname,$ccdomain) = @_; my %lt = &Apache::lonlocal::texthash( 'disk' => "Disk space allocated to user's portfolio files", + 'cuqu' => "Current quota", + 'cust' => "Custom quota", + 'defa' => "Default", + 'chqu' => "Change quota", ); - my $output = '

'.$lt{'disk'}.'

'. + my ($currquota,$quotatype,$inststatus,$defquota) = + &Apache::loncommon::get_user_quota($ccuname,$ccdomain); + my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($ccdomain); + my ($longinsttype,$showquota,$custom_on,$custom_off,$defaultinfo); + if ($inststatus ne '') { + if ($usertypes->{$inststatus} ne '') { + $longinsttype = $usertypes->{$inststatus}; + } + } + $custom_on = ' '; + $custom_off = ' checked="checked" '; + my $quota_javascript = <<"END_SCRIPT"; + +END_SCRIPT + if ($quotatype eq 'custom') { + $custom_on = $custom_off; + $custom_off = ' '; + $showquota = $currquota; + if ($longinsttype eq '') { + $defaultinfo = &mt('For this user, the default quota would be [_1] + Mb.',$defquota); + } else { + $defaultinfo = &mt("For this user, the default quota would be [_1] + Mb, as determined by the user's institutional + affiliation ([_2]).",$defquota,$longinsttype); + } + } else { + if ($longinsttype eq '') { + $defaultinfo = &mt('For this user, the default quota is [_1] + Mb.',$defquota); + } else { + $defaultinfo = &mt("For this user, the default quota of [_1] + Mb, is determined by the user's institutional + affiliation ([_2]).",$defquota,$longinsttype); + } + } + my $output = $quota_javascript. + '

'.$lt{'disk'}.'

'. + $lt{'cuqu'}.': '.$currquota.' Mb.  '. + $defaultinfo.'
'.$lt{'chqu'}. + ':  '. + '  '. ' Mb'; + $showquota.'" onfocus="javascript:quota_changes('."'quota'".')" '. + '/> Mb'; return $output; } # =================================================================== Phase one sub print_username_entry_form { - my ($r) = @_; + my ($r,$response,$srch,$forcenewuser) = @_; my $defdom=$env{'request.role.domain'}; - my @domains = &Apache::loncommon::get_domains(); - my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain'); - my $selscript=&Apache::loncommon::studentbrowser_javascript(); + my $formtoset = 'crtuser'; + if (exists($env{'form.startrolename'})) { + $formtoset = 'docustom'; + $env{'form.rolename'} = $env{'form.startrolename'}; + } + + my ($jsback,$elements) = &crumb_utilities(); + + my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n". + ''."\n"; + + my %loaditems = ( + 'onload' => "javascript:setFormElements(document.$formtoset)", + ); my $start_page = &Apache::loncommon::start_page('Create Users, Change User Privileges', - $selscript); + $jscript,{'add_entries' => \%loaditems,}); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:backPage(document.crtuser)", + text=>"User modify/custom role edit", + faq=>282,bug=>'Instructor Interface',}); - my $sellink=&Apache::loncommon::selectstudent_link - ('crtuser','ccuname','ccdomain'); + my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management'); my %existingroles=&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( - 'siur' => "Set Individual User Roles", + 'srch' => "User Search", + or => "or", + 'siur' => "Set Individual User Roles", 'usr' => "Username", 'dom' => "Domain", - 'usrr' => "User Roles", 'ecrp' => "Edit Custom Role Privileges", 'nr' => "Name of Role", - 'cre' => "Custom Role Editor" + 'cre' => "Custom Role Editor", + 'mod' => "to add/modify roles", ); 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"); + my $sellink=&Apache::loncommon::selectstudent_link('crtuser','srchterm','srchdomain'); + if ($sellink) { + $sellink = "$lt{'or'} ".$sellink; + } + $r->print(" $start_page -
- +$crumbs

$lt{siur}$helpsiur

- - -
$lt{usr}: -$sellink
-$lt{'dom'}:$domform
- -
-ENDDOCUMENT - if (&Apache::lonnet::allowed('mcr','/')) { - $r->print(<$lt{'srch'} $sellink $lt{'mod'} +$response"); + $r->print(&entry_form($defdom,$srch,$forcenewuser)); + if (&Apache::lonnet::allowed('mcr','/')) { + $r->print(< - +

$lt{'ecrp'}$helpecpr

$lt{'nr'}: $choice
@@ -185,6 +261,21 @@ ENDCUSTOM $r->print(&Apache::loncommon::end_page()); } +sub entry_form { + my ($dom,$srch,$forcenewuser) = @_; + my $userpicker = + &Apache::loncommon::user_picker($dom,$srch,$forcenewuser, + 'document.crtuser'); + my $srchbutton = &mt('Search'); + my $output = <<"ENDDOCUMENT"; +
+ +$userpicker + +
+ENDDOCUMENT + return $output; +} sub user_modification_js { my ($pjump_def,$dc_setcourse_code,$nondc_setsection_code,$groupslist)=@_; @@ -214,19 +305,128 @@ END } # =================================================================== Phase two -sub print_user_modification_page { - my $r=shift; - my $ccuname=$env{'form.ccuname'}; - my $ccdomain=$env{'form.ccdomain'}; +sub print_user_selection_page { + my ($r,$response,$srch,$srch_results,$context,$srcharray) = @_; + my @fields = ('username','domain','lastname','firstname','permanentemail'); + my $sortby = $env{'form.sortby'}; + + if (!grep(/^\Q$sortby\E$/,@fields)) { + $sortby = 'lastname'; + } + + my ($jsback,$elements) = &crumb_utilities(); + + my $jscript = (< +function pickuser(uname,udom) { + document.usersrchform.seluname.value=uname; + document.usersrchform.seludom.value=udom; + document.usersrchform.phase.value="userpicked"; + document.usersrchform.submit(); +} + +$jsback + +ENDSCRIPT + + my %lt=&Apache::lonlocal::texthash( + 'usrch' => "User Search to add/modify roles", + 'stusrch' => "User Search to enroll student", + 'usel' => "Select a user to add/modify roles", + 'stusel' => "Select a user to enroll as a student", + 'username' => "username", + 'domain' => "domain", + 'lastname' => "last name", + 'firstname' => "first name", + 'permanentemail' => "permanent e-mail", + ); + if ($context eq 'createuser') { + $r->print(&Apache::loncommon::start_page('Create Users, Change User Privileges',$jscript)); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:backPage(document.usersrchform,'','')", + text=>"User modify/custom role edit", + faq=>282,bug=>'Instructor Interface',}, + {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')", + text=>"Select User", + faq=>282,bug=>'Instructor Interface',}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); + $r->print("$lt{'usrch'}
"); + $r->print(&entry_form($srch->{'srchdomain'},$srch)); + $r->print('

'.$lt{'usel'}.'

'); + } else { + $r->print($jscript."$lt{'stusrch'}
"); + $r->print(&Apache::londropadd::single_user_entry_form($srch->{'srchdomain'},$srch)); + $r->print('

'.$lt{'stusel'}.'

'); + } + $r->print('
'. + &Apache::loncommon::start_data_table()."\n". + &Apache::loncommon::start_data_table_header_row()."\n". + ' '."\n"); + foreach my $field (@fields) { + $r->print(' '. + $lt{$field}.''."\n"); + } + $r->print(&Apache::loncommon::end_data_table_header_row()); + + my @sorted_users = sort { + lc($srch_results->{$a}->{$sortby}) cmp lc($srch_results->{$b}->{$sortby}) + || + lc($srch_results->{$a}->{lastname}) cmp lc($srch_results->{$b}->{lastname}) + || + lc($srch_results->{$a}->{firstname}) cmp lc($srch_results->{$b}->{firstname}) + || + lc($a) cmp lc($b) + } (keys(%$srch_results)); + + foreach my $user (@sorted_users) { + my ($uname,$udom) = split(/:/,$user); + $r->print(&Apache::loncommon::start_data_table_row(). + ''. + ''.$uname.''. + ''.$udom.''); + foreach my $field ('lastname','firstname','permanentemail') { + $r->print(''.$srch_results->{$user}->{$field}.''); + } + $r->print(&Apache::loncommon::end_data_table_row()); + } + $r->print(&Apache::loncommon::end_data_table().'

'); + if (ref($srcharray) eq 'ARRAY') { + foreach my $item (@{$srcharray}) { + $r->print(''."\n"); + } + } + $r->print(' '."\n". + ' '."\n". + ' '."\n". + ' '."\n". + ' '."\n"); + $r->print($response); + if ($context eq 'createuser') { + $r->print('
'.&Apache::loncommon::end_page()); + } else { + $r->print(''."\n". + ''."\n"); + } +} - $ccuname=~s/\W//g; - $ccdomain=~s/\W//g; +sub print_user_query_page { + my ($r,$caller) = @_; +# FIXME - this is for a network-wide name search (similar to catalog search) +# To use frames with similar behavior to catalog/portfolio search. +# To be implemented. + return; +} +sub print_user_modification_page { + my ($r,$ccuname,$ccdomain,$srch,$response) = @_; unless (($ccuname) && ($ccdomain)) { &print_username_entry_form($r); return; } - + if ($response) { + $response = '
'.$response + } my $defdom=$env{'request.role.domain'}; my ($krbdef,$krbdefdom) = @@ -235,12 +435,10 @@ sub print_user_modification_page { my %param = ( formname => 'document.cu', kerb_def_dom => $krbdefdom, kerb_def_auth => $krbdef - ); + ); $loginscript = &Apache::loncommon::authform_header(%param); $authformkrb = &Apache::loncommon::authform_kerberos(%param); - $ccuname=~s/\W//g; - $ccdomain=~s/\W//g; my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition(); my $dc_setcourse_code = ''; my $nondc_setsection_code = ''; @@ -254,7 +452,7 @@ sub print_user_modification_page { $groupslist = '"'.$groupslist.'"'; } - if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) { + if ($env{'request.role'} =~ m-^dc\./($match_domain)/$-) { my $dcdom = $1; $loaditem{'onload'} = "document.cu.coursedesc.value='';"; my @rolevals = ('st','ta','ep','in','cc'); @@ -361,36 +559,6 @@ sub print_user_modification_page { } return -1; } - - function setType() { - var crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value; - rolevals = new Array("$rolevalslist"); - if (crstype == 'Group') { - if (document.cu.currsec.options[0].text == "$pickcrsfirst") { - document.cu.currsec.options[0].text = "$pickgrpfirst"; - } - grprolenames = new Array("$grprolenameslist"); - for (var i=0; i'."\n".$jsback."\n".''; + my $start_page = &Apache::loncommon::start_page('Create Users, Change User Privileges', $js,{'add_entries' => \%loaditem,}); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:backPage(document.cu)", + text=>"User modify/custom role edit", + faq=>282,bug=>'Instructor Interface',}); + + if ($env{'form.phase'} eq 'userpicked') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:backPage(document.cu,'get_user_info','select')", + text=>"Select a user", + faq=>282,bug=>'Instructor Interface',}); + } + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:backPage(document.cu,'$env{'form.phase'}','modify')", + text=>"Set user role", + faq=>282,bug=>'Instructor Interface',}); + my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management'); my $forminfo =<<"ENDFORMINFO";
- - - - - - + + + + + + ENDFORMINFO my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain); - my %incdomains; my %inccourses; - foreach my $item (values(%Apache::lonnet::hostdom)) { - $incdomains{$item}=1; - } foreach my $key (keys(%env)) { - if ($key=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) { + if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) { $inccourses{$1.'_'.$2}=1; } } if ($uhome eq 'no_host') { + my $newuser; + my $instsrch = { + srchin => 'instd', + srchby => 'uname', + srchtype => 'exact', + }; + if ($env{'form.phase'} eq 'userpicked') { + $instsrch->{'srchterm'} = $env{'form.seluname'}; + $instsrch->{'srchdomain'} = $env{'form.seludom'}; + } else { + $instsrch->{'srchterm'} = $ccuname; + $instsrch->{'srchdomain'} = $ccdomain, + } + if (($instsrch->{'srchterm'} ne '') && ($instsrch->{'srchdomain'} ne '')) { + $newuser = $instsrch->{'srchterm'}.':'.$instsrch->{'srchdomain'}; + } + my (%dirsrch_results,%inst_results,$dirsrchres); + if ($newuser) { + if (&directorysrch_check($instsrch) eq 'ok') { + ($dirsrchres,%dirsrch_results) = &Apache::lonnet::inst_directory_query($instsrch); + if ($dirsrchres eq 'ok') { + if (ref($dirsrch_results{$newuser}) eq 'HASH') { + %inst_results = %{$dirsrch_results{$newuser}}; + } + } + } + } my $home_server_list= ''."\n". &Apache::loncommon::home_server_option_list($ccdomain); @@ -511,6 +723,7 @@ ENDFORMINFO 'mn' => "Middle Name", 'ln' => "Last Name", 'gen' => "Generation", + 'mail' => "Permanent e-mail address", 'idsn' => "ID/Student Number", 'hs' => "Home Server", 'lg' => "Login Data" @@ -524,7 +737,9 @@ ENDFORMINFO &initialize_authen_forms(); $r->print(<$lt{'cnu'} +$response $forminfo

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

'."\n"; + + $r->print(&Apache::loncommon::start_page($title,$jscript)); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:backPage(document.userupdate)", + text=>"User modify/custom role edit", + faq=>282,bug=>'Instructor Interface',}); + if ($env{'form.prevphase'} eq 'userpicked') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:backPage(document.userupdate,'get_user_info','select')", + text=>"Select a user", + faq=>282,bug=>'Instructor Interface',}); + } + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:backPage(document.userupdate,'$env{'form.prevphase'}','modify')", + text=>"Set user role", + faq=>282,bug=>'Instructor Interface',}, + {href=>"/adm/createuser", + text=>"Result", + faq=>282,bug=>'Instructor Interface',}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); + 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').'.'. + &mt('Only letters, numbers, periods, dashes, @, and underscores are valid').'.'. $end); return; } @@ -1039,9 +1287,10 @@ sub update_user_data { $r->print($error.&mt('No domain specified').'.'.$end); return; } - if ( $env{'form.ccdomain'} =~/\W/) { + if ( $env{'form.ccdomain'} ne + &LONCAPA::clean_domain($env{'form.ccdomain'}) ) { $r->print($error.&mt ('Invalid domain name').'. '. - &mt('Only letters, numbers, and underscores are valid').'.'. + &mt('Only letters, numbers, periods, dashes, and underscores are valid').'.'. $end); return; } @@ -1081,15 +1330,13 @@ sub update_user_data { $r->print($error.&mt('Invalid login mode or password').$end); return; } + + + $r->print('

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

'); + if ($env{'form.makeuser'}) { - # Create a new user - my %lt=&Apache::lonlocal::texthash( - 'cru' => "Creating user", - 'id' => "in domain" - ); - $r->print(<$lt{'cru'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}" -ENDNEWUSERHEAD + $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); @@ -1100,8 +1347,8 @@ ENDNEWUSERHEAD if (lc($desiredhost) eq 'default') { $desiredhost = undef; } else { - my %home_servers = &Apache::loncommon::get_library_servers - ($env{'form.ccdomain'}); + my %home_servers = + &Apache::lonnet::get_servers($env{'form.ccdomain'},'library'); if (! exists($home_servers{$desiredhost})) { $r->print($error.&mt('Invalid home server specified')); return; @@ -1118,17 +1365,10 @@ ENDNEWUSERHEAD my $home = &Apache::lonnet::homeserver($env{'form.ccuname'}, $env{'form.ccdomain'}); $r->print('
'.&mt('Home server').': '.$home.' '. - $Apache::lonnet::libserv{$home}); + &Apache::lonnet::hostname($home)); } elsif (($env{'form.login'} ne 'nochange') && ($env{'form.login'} ne '' )) { # Modify user privileges - my %lt=&Apache::lonlocal::texthash( - 'usr' => "User", - 'id' => "in domain" - ); - $r->print(<$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}" -ENDMODIFYUSERHEAD if (! $amode || ! $genpwd) { $r->print($error.'Invalid login mode or password'.$end); return; @@ -1151,37 +1391,73 @@ ENDMODIFYUSERHEAD # Check for need to change my %userenv = &Apache::lonnet::get ('environment',['firstname','middlename','lastname','generation', - 'portfolioquota'],$env{'form.ccdomain'},$env{'form.ccuname'}); + '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') { + foreach my $item ('firstname','middlename','lastname','generation','permanentemail') { # Strip leading and trailing whitespace $env{'form.c'.$item} =~ s/(\s+$|^\s+)//g; } - my ($quotachanged,$namechanged,$oldportfolioquota); + my ($quotachanged,$namechanged,$oldportfolioquota,$newportfolioquota, + $inststatus,$isdefault,$defquotatext); + my ($defquota,$settingstatus) = + &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus); my %changeHash; - if (exists($userenv{'portfolioquota'})) { + if ($userenv{'portfolioquota'} ne '') { $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'}; - } + if ($env{'form.customquota'} == 1) { + if ($env{'form.portfolioquota'} eq '') { + $newportfolioquota = 0; + } else { + $newportfolioquota = $env{'form.portfolioquota'}; + $newportfolioquota =~ s/[^\d\.]//g; } + if ($newportfolioquota != $userenv{'portfolioquota'}) { + $quotachanged = "a_admin($newportfolioquota,\%changeHash); + } + } else { + $quotachanged = "a_admin('',\%changeHash); + $newportfolioquota = $defquota; + $isdefault = 1; } } else { - $oldportfolioquota = &default_quota($env{'form.ccdomain'}); + $oldportfolioquota = $defquota; + if ($env{'form.customquota'} == 1) { + if ($env{'form.portfolioquota'} eq '') { + $newportfolioquota = 0; + } else { + $newportfolioquota = $env{'form.portfolioquota'}; + $newportfolioquota =~ s/[^\d\.]//g; + } + $quotachanged = "a_admin($newportfolioquota,\%changeHash); + } else { + $newportfolioquota = $defquota; + $isdefault = 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 (&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.cgeneration'} ne $userenv{'generation'} || + $env{'form.cpermanentemail'} ne $userenv{'permanentemail'} )) { $namechanged = 1; } if ($namechanged) { @@ -1190,6 +1466,7 @@ ENDMODIFYUSERHEAD $changeHash{'middlename'} = $env{'form.cmiddlename'}; $changeHash{'lastname'} = $env{'form.clastname'}; $changeHash{'generation'} = $env{'form.cgeneration'}; + $changeHash{'permanentemail'} = $env{'form.cpermanentemail'}; my $putresult = &Apache::lonnet::put ('environment',\%changeHash, $env{'form.ccdomain'},$env{'form.ccuname'}); @@ -1201,6 +1478,7 @@ ENDMODIFYUSERHEAD 'mddl' => "middle", 'lst' => "last", 'gen' => "generation", + 'mail' => "permanent e-mail", 'disk' => "disk space allocated to portfolio files", 'prvs' => "Previous", 'chto' => "Changed To" @@ -1213,22 +1491,33 @@ ENDMODIFYUSERHEAD $lt{'mddl'} $lt{'lst'} $lt{'gen'} - $lt{'disk'} + $lt{'mail'} + $lt{'disk'} $lt{'prvs'} $userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'} - $oldportfolioquota + $userenv{'permanentemail'} + $oldportfolioquota Mb $lt{'chto'} $env{'form.cfirstname'} $env{'form.cmiddlename'} $env{'form.clastname'} $env{'form.cgeneration'} - $env{'form.portfolioquota'} Mb + $env{'form.cpermanentemail'} + $newportfolioquota Mb $defquotatext END + if (($env{'form.ccdomain'} eq $env{'user.domain'}) && + ($env{'form.ccuname'} eq $env{'user.name'})) { + my %newenvhash; + foreach my $key (keys(%changeHash)) { + $newenvhash{'environment.'.$key} = $changeHash{$key}; + } + &Apache::lonnet::appenv(%newenvhash); + } } else { # error occurred $r->print("

".&mt('Unable to successfully change environment for')." ". $env{'form.ccuname'}." ".&mt('in domain')." ". @@ -1244,19 +1533,18 @@ END # 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", + 'mail' => "Permanent e-mail", 'disk' => "Disk space allocated to user's portfolio files", ); $r->print(<<"END"); -

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

-

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

-

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

+

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

+

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

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

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

'); + if ($oldportfolioquota != $newportfolioquota) { + $r->print('

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

'); + &Apache::lonnet::appenv('environment.portfolioquota' => $changeHash{'portfolioquota'}); } } } @@ -1270,26 +1558,23 @@ END 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+)/; - my $cid=$1.'_'.$2; - $r->print(&mt('Drop from classlist').': '. - &Apache::lonnet::critical('put:'. - $env{'course.'.$cid.'.domain'}.':'. - $env{'course.'.$cid.'.num'}.':classlist:'. - &escape($env{'form.ccuname'}.':'. - $env{'form.ccdomain'}).'='. - &escape($now.':'), - $env{'course.'.$cid.'.home'}).'
'); + my ($scope,$role) = ($1,$2); + my $result = + &Apache::lonnet::revokerole($env{'form.ccdomain'}, + $env{'form.ccuname'}, + $scope,$role); + $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); + $r->print($result); } } - if ($key=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) { + 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.': '. + ' '.$4.' by '.$3.':'.$2.' in '.$1.': '. &Apache::lonnet::revokecustomrole($env{'form.ccdomain'}, $env{'form.ccuname'},$1,$2,$3,$4). '
'); @@ -1297,26 +1582,23 @@ END } 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+)/; - my $cid=$1.'_'.$2; - $r->print(&mt('Drop from classlist').': '. - &Apache::lonnet::critical('put:'. - $env{'course.'.$cid.'.domain'}.':'. - $env{'course.'.$cid.'.num'}.':classlist:'. - &escape($env{'form.ccuname'}.':'. - $env{'form.ccdomain'}).'='. - &escape($now.':'), - $env{'course.'.$cid.'.home'}).'
'); + my ($scope,$role) = ($1,$2); + my $result = + &Apache::lonnet::assignrole($env{'form.ccdomain'}, + $env{'form.ccuname'}, + $scope,$role,$now,0,1); + $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); + $r->print($result); } } - if ($key=~/^form\.del\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) { + 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]', + $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, @@ -1332,7 +1614,7 @@ END my $logmsg; my $output; if ($role eq 'st') { - if ($url =~ m-^/(\w+)/(\w+)/?(\w*)$-) { + if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) { my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3); if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) { $output = "Error: $result\n"; @@ -1352,7 +1634,7 @@ END $r->print($output); } # Re-enable custom role - if ($key=~/^form\.ren\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) { + 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'}, @@ -1363,7 +1645,7 @@ END } elsif ($key=~/^form\.act/) { my $udom = $env{'form.ccdomain'}; my $uname = $env{'form.ccuname'}; - if ($key=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) { + if ($key=~/^form\.act\_($match_domain)\_($match_courseid)\_cr_cr_($match_domain)_($match_username)_([^\_]+)$/) { # Activate a custom role my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5); my $url='/'.$one.'/'.$two; @@ -1394,7 +1676,7 @@ END $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end)); } } - } elsif ($key=~/^form\.act\_([^\_]+)\_(\w+)\_([^\_]+)$/) { + } elsif ($key=~/^form\.act\_($match_domain)\_($match_name)\_([^\_]+)$/) { # Activate roles for sections with 3 id numbers # set start, end times, and the url for the class my ($one,$two,$three)=($1,$2,$3); @@ -1477,10 +1759,57 @@ END } # 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('

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

'); + $r->print(''."\n"); + foreach my $item ('srchby','srchin','srchtype','srchterm','srchdomain','ccuname','ccdomain') { + $r->print(''."\n"); + } + 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 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 quota_admin { + my ($setquota,$changeHash) = @_; + my $quotachanged; + if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) { + # Current user has quota modification privileges + $quotachanged = 1; + $changeHash->{'portfolioquota'} = $setquota; + } + return $quotachanged; +} + sub build_roles { my ($sectionstr,$sections,$role) = @_; my $num_sections = 0; @@ -1493,7 +1822,7 @@ sub build_roles { } else { foreach my $sec (@secnums) { $sec =~ ~s/\W//g; - unless ($sec eq "") { + if (!($sec eq "")) { if (exists($$sections{$sec})) { $$sections{$sec} ++; } else { @@ -1517,7 +1846,7 @@ sub build_roles { # ========================================================== Custom Role Editor sub custom_role_editor { - my $r=shift; + my ($r) = @_; my $rolename=$env{'form.rolename'}; if ($rolename eq 'make new role') { @@ -1526,35 +1855,35 @@ sub custom_role_editor { $rolename=~s/[^A-Za-z0-9]//gs; - unless ($rolename) { + if (!$rolename) { &print_username_entry_form($r); return; } - - $r->print(&Apache::loncommon::start_page('Custom Role Editor')); +# ------------------------------------------------------- What can be assigned? + my %full=(); + my %courselevel=(); + my %courselevelcurrent=(); my $syspriv=''; my $dompriv=''; my $coursepriv=''; + my $body_top; + my ($disp_dummy,$disp_roles) = &Apache::lonnet::get('roles',["st"]); my ($rdummy,$roledef)= &Apache::lonnet::get('roles',["rolesdef_$rolename"]); # ------------------------------------------------------- Does this role exist? - $r->print('

'); + $body_top .= '

'; if (($rdummy ne 'con_lost') && ($roledef ne '')) { - $r->print(&mt('Existing Role').' "'); + $body_top .= &mt('Existing Role').' "'; # ------------------------------------------------- Get current role privileges ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef); } else { - $r->print(&mt('New Role').' "'); + $body_top .= &mt('New Role').' "'; $roledef=''; } - $r->print($rolename.'"

'); -# ------------------------------------------------------- What can be assigned? - my %full=(); - my %courselevel=(); - my %courselevelcurrent=(); + $body_top .= $rolename.'"'; foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { my ($priv,$restrict)=split(/\&/,$item); - unless ($restrict) { $restrict='F'; } + if (!$restrict) { $restrict='F'; } $courselevel{$priv}=$restrict; if ($coursepriv=~/\:$priv/) { $courselevelcurrent{$priv}=1; @@ -1565,7 +1894,7 @@ sub custom_role_editor { my %domainlevelcurrent=(); foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) { my ($priv,$restrict)=split(/\&/,$item); - unless ($restrict) { $restrict='F'; } + if (!$restrict) { $restrict='F'; } $domainlevel{$priv}=$restrict; if ($dompriv=~/\:$priv/) { $domainlevelcurrent{$priv}=1; @@ -1576,21 +1905,45 @@ sub custom_role_editor { my %systemlevelcurrent=(); foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { my ($priv,$restrict)=split(/\&/,$item); - unless ($restrict) { $restrict='F'; } + if (!$restrict) { $restrict='F'; } $systemlevel{$priv}=$restrict; if ($syspriv=~/\:$priv/) { $systemlevelcurrent{$priv}=1; } $full{$priv}=1; } + my ($jsback,$elements) = &crumb_utilities(); + my $button_code = "\n"; + my $head_script = "\n"; + $head_script .= ''."\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", + faq=>282,bug=>'Instructor Interface',}, + {href=>"javascript:backPage(document.form1,'','')", + text=>"Edit custom role", + faq=>282,bug=>'Instructor Interface',}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); + + $r->print($body_top); my %lt=&Apache::lonlocal::texthash( 'prv' => "Privilege", 'crl' => "Course Level", 'dml' => "Domain Level", - 'ssl' => "System Level" - ); + 'ssl' => "System Level"); + $r->print('Select a Template
'); + $r->print('
'); + $r->print($button_code); + $r->print('
'); $r->print(< +
ENDCCF @@ -1603,22 +1956,96 @@ ENDCCF my $privtext = &Apache::lonnet::plaintext($priv); $r->print(&Apache::loncommon::start_data_table_row(). ''.$privtext.''. - ($courselevel{$priv}?'':' '). ''. - ($domainlevel{$priv}?'':' '). ''. - ($systemlevel{$priv}?'':' '). ''. &Apache::loncommon::end_data_table_row()); } $r->print(&Apache::loncommon::end_data_table(). + ''."\n".''."\n". + ''."\n". '
'. &Apache::loncommon::end_page()); } - +# -------------------------------------------------------- +sub make_script_template { + my ($role) = @_; + my %full_c=(); + my %full_d=(); + my %full_s=(); + my $return_script; + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { + my ($priv,$restrict)=split(/\&/,$item); + $full_c{$priv}=1; + } + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) { + my ($priv,$restrict)=split(/\&/,$item); + $full_d{$priv}=1; + } + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { + my ($priv,$restrict)=split(/\&/,$item); + $full_s{$priv}=1; + } + $return_script .= 'function set_'.$role.'() {'."\n"; + my @temp = split(/:/,$Apache::lonnet::pr{$role.':c'}); + my %role_c; + foreach my $priv (@temp) { + my ($priv_item, $dummy) = split(/\&/,$priv); + $role_c{$priv_item} = 1; + } + foreach my $priv_item (keys(%full_c)) { + my ($priv, $dummy) = split(/\&/,$priv_item); + if (exists($role_c{$priv})) { + $return_script .= "document.form1.$priv"."_c.checked = true;\n"; + } else { + $return_script .= "document.form1.$priv"."_c.checked = false;\n"; + } + } + my %role_d; + @temp = split(/:/,$Apache::lonnet::pr{$role.':d'}); + foreach my $priv(@temp) { + my ($priv_item, $dummy) = split(/\&/,$priv); + $role_d{$priv_item} = 1; + } + foreach my $priv_item (keys(%full_d)) { + my ($priv, $dummy) = split(/\&/,$priv_item); + if (exists($role_d{$priv})) { + $return_script .= "document.form1.$priv"."_d.checked = true;\n"; + } else { + $return_script .= "document.form1.$priv"."_d.checked = false;\n"; + } + } + my %role_s; + @temp = split(/:/,$Apache::lonnet::pr{$role.':s'}); + foreach my $priv(@temp) { + my ($priv_item, $dummy) = split(/\&/,$priv); + $role_s{$priv_item} = 1; + } + foreach my $priv_item (keys(%full_s)) { + my ($priv, $dummy) = split(/\&/,$priv_item); + if (exists($role_s{$priv})) { + $return_script .= "document.form1.$priv"."_s.checked = true;\n"; + } else { + $return_script .= "document.form1.$priv"."_s.checked = false;\n"; + } + } + $return_script .= '}'."\n"; + return ($return_script); +} +# ---------------------------------------------------------- +sub make_button_code { + my ($role) = @_; + my $label = &Apache::lonnet::plaintext($role); + my $button_code = ''; + return ($button_code); +} # ---------------------------------------------------------- Call to definerole sub set_custom_role { my ($r) = @_; @@ -1627,16 +2054,32 @@ sub set_custom_role { $rolename=~s/[^A-Za-z0-9]//gs; - unless ($rolename) { + if (!$rolename) { &print_username_entry_form($r); return; } - $r->print(&Apache::loncommon::start_page('Save Custom Role').'

'); + 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", + faq=>282,bug=>'Instructor Interface',}, + {href=>"javascript:backPage(document.customresult,'selected_custom_edit','')", + text=>"Edit custom role", + faq=>282,bug=>'Instructor Interface',}, + {href=>"javascript:backPage(document.customresult,'set_custom_roles','')", + text=>"Result", + faq=>282,bug=>'Instructor Interface',}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); + 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').' "'); } else { @@ -1651,24 +2094,24 @@ sub set_custom_role { foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { my ($priv,$restrict)=split(/\&/,$item); - unless ($restrict) { $restrict=''; } - if ($env{'form.'.$priv.':c'}) { + if (!$restrict) { $restrict=''; } + if ($env{'form.'.$priv.'_c'}) { $courole.=':'.$item; } } foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) { my ($priv,$restrict)=split(/\&/,$item); - unless ($restrict) { $restrict=''; } - if ($env{'form.'.$priv.':d'}) { + if (!$restrict) { $restrict=''; } + if ($env{'form.'.$priv.'_d'}) { $domrole.=':'.$item; } } foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { my ($priv,$restrict)=split(/\&/,$item); - unless ($restrict) { $restrict=''; } - if ($env{'form.'.$priv.':s'}) { + if (!$restrict) { $restrict=''; } + if ($env{'form.'.$priv.'_s'}) { $sysrole.=':'.$item; } } @@ -1685,7 +2128,8 @@ sub set_custom_role { $env{'user.name'}, $rolename)); } - $r->print('

Create another role, or Create/Modify a user.

'); + $r->print('

Create another role, or Create/Modify a user.

'); + $r->print(&Apache::lonhtmlcommon::echo_form_input([]).'
'); $r->print(&Apache::loncommon::end_page()); } @@ -1707,17 +2151,53 @@ sub handler { (&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - unless ($env{'form.phase'}) { - &print_username_entry_form($r); - } - if ($env{'form.phase'} eq 'get_user_info') { - &print_user_modification_page($r); + &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'}= @@ -1725,9 +2205,421 @@ sub handler { return HTTP_NOT_ACCEPTABLE; } return OK; -} +} #-------------------------------------------------- functions for &phase_two +sub user_search_result { + my ($srch) = @_; + my %allhomes; + my %inst_matches; + my %srch_results; + my ($response,$currstate,$forcenewuser,$dirsrchres); + $srch->{'srchterm'} =~ s/^\s+//; + $srch->{'srchterm'} =~ s/\s+$//; + + if ($srch->{'srchby'} !~ /^(uname|lastname|lastfirst)$/) { + $response = &mt('Invalid search.'); + } + if ($srch->{'srchin'} !~ /^(crs|dom|alc|instd)$/) { + $response = &mt('Invalid search.'); + } + if ($srch->{'srchtype'} !~ /^(exact|contains|begins)$/) { + $response = &mt('Invalid search.'); + } + if ($srch->{'srchterm'} eq '') { + $response = &mt('You must enter a search term.'); + } + if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'instd')) { + if (($srch->{'srchdomain'} eq '') || + ! (&Apache::lonnet::domain($srch->{'srchdomain'}))) { + $response = &mt('You must specify a valid domain when searching in a domain or institutional directory.') + } + } + if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'crs') || + ($srch->{'srchin'} eq 'alc')) { + if ($srch->{'srchby'} eq 'uname') { + if ($srch->{'srchterm'} !~ /^$match_username$/) { + $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @'); + } + } + } + if ($response ne '') { + $response = ''.$response.''; + } + if ($srch->{'srchin'} eq 'instd') { + my $instd_chk = &directorysrch_check($srch); + if ($instd_chk ne 'ok') { + $response = ''.$instd_chk.''. + '
'.&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').'

'; + } + } + if ($response ne '') { + return ($currstate,$response); + } + if ($srch->{'srchby'} eq 'uname') { + if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'crs')) { + if ($env{'form.forcenew'}) { + if ($srch->{'srchdomain'} ne $env{'request.role.domain'}) { + my $uhome=&Apache::lonnet::homeserver($srch->{'srchterm'},$srch->{'srchdomain'}); + if ($uhome eq 'no_host') { + my $domdesc = &Apache::lonnet::domain($env{'request.role.domain'},'description'); + my $showdom = &display_domain_info($env{'request.role.domain'}); + $response = &mt('New users can only be created in the domain to which your current role belongs - [_1].',$showdom); + } else { + $currstate = 'modify'; + } + } else { + $currstate = 'modify'; + } + } else { + if ($srch->{'srchin'} eq 'dom') { + if ($srch->{'srchtype'} eq 'exact') { + my $uhome=&Apache::lonnet::homeserver($srch->{'srchterm'},$srch->{'srchdomain'}); + if ($uhome eq 'no_host') { + ($currstate,$response,$forcenewuser) = + &build_search_response($srch,%srch_results); + } else { + $currstate = 'modify'; + } + } else { + %srch_results = &Apache::lonnet::usersearch($srch); + ($currstate,$response,$forcenewuser) = + &build_search_response($srch,%srch_results); + } + } else { + my $courseusers = &get_courseusers(); + if ($srch->{'srchtype'} eq 'exact') { + if (exists($courseusers->{$srch->{'srchterm'}.':'.$srch->{'srchdomain'}})) { + $currstate = 'modify'; + } else { + ($currstate,$response,$forcenewuser) = + &build_search_response($srch,%srch_results); + } + } else { + foreach my $user (keys(%$courseusers)) { + my ($cuname,$cudomain) = split(/:/,$user); + if ($cudomain eq $srch->{'srchdomain'}) { + my $matched = 0; + if ($srch->{'srchtype'} eq 'begins') { + if ($cuname =~ /^\Q$srch->{'srchterm'}\E/i) { + $matched = 1; + } + } else { + if ($cuname =~ /\Q$srch->{'srchterm'}\E/i) { + $matched = 1; + } + } + if ($matched) { + $srch_results{$user} = + {&Apache::lonnet::get('environment', + ['firstname', + 'lastname', + 'permanentemail'])}; + } + } + } + ($currstate,$response,$forcenewuser) = + &build_search_response($srch,%srch_results); + } + } + } + } elsif ($srch->{'srchin'} eq 'alc') { + $currstate = 'query'; + } elsif ($srch->{'srchin'} eq 'instd') { + ($dirsrchres,%srch_results) = &Apache::lonnet::inst_directory_query($srch); + if ($dirsrchres eq 'ok') { + ($currstate,$response,$forcenewuser) = + &build_search_response($srch,%srch_results); + } else { + my $showdom = &display_domain_info($srch->{'srchdomain'}); + $response = ''. + &mt('Institutional directory search is not available in domain: [_1]',$showdom). + '
'. + &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). + '

'; + } + } + } else { + if ($srch->{'srchin'} eq 'dom') { + %srch_results = &Apache::lonnet::usersearch($srch); + ($currstate,$response,$forcenewuser) = + &build_search_response($srch,%srch_results); + } elsif ($srch->{'srchin'} eq 'crs') { + my $courseusers = &get_courseusers(); + foreach my $user (keys(%$courseusers)) { + my ($uname,$udom) = split(/:/,$user); + my %names = &Apache::loncommon::getnames($uname,$udom); + my %emails = &Apache::loncommon::getemails($uname,$udom); + if ($srch->{'srchby'} eq 'lastname') { + if ((($srch->{'srchtype'} eq 'exact') && + ($names{'lastname'} eq $srch->{'srchterm'})) || + (($srch->{'srchtype'} eq 'begins') && + ($names{'lastname'} =~ /^\Q$srch->{'srchterm'}\E/i)) || + (($srch->{'srchtype'} eq 'contains') && + ($names{'lastname'} =~ /\Q$srch->{'srchterm'}\E/i))) { + $srch_results{$user} = {firstname => $names{'firstname'}, + lastname => $names{'lastname'}, + permanentemail => $emails{'permanentemail'}, + }; + } + } elsif ($srch->{'srchby'} eq 'lastfirst') { + my ($srchlast,$srchfirst) = split(/,/,$srch->{'srchterm'}); + $srchlast =~ s/\s+$//; + $srchfirst =~ s/^\s+//; + if ($srch->{'srchtype'} eq 'exact') { + if (($names{'lastname'} eq $srchlast) && + ($names{'firstname'} eq $srchfirst)) { + $srch_results{$user} = {firstname => $names{'firstname'}, + lastname => $names{'lastname'}, + permanentemail => $emails{'permanentemail'}, + + }; + } + } elsif ($srch->{'srchtype'} eq 'begins') { + if (($names{'lastname'} =~ /^\Q$srchlast\E/i) && + ($names{'firstname'} =~ /^\Q$srchfirst\E/i)) { + $srch_results{$user} = {firstname => $names{'firstname'}, + lastname => $names{'lastname'}, + permanentemail => $emails{'permanentemail'}, + }; + } + } else { + if (($names{'lastname'} =~ /\Q$srchlast\E/i) && + ($names{'firstname'} =~ /\Q$srchfirst\E/i)) { + $srch_results{$user} = {firstname => $names{'firstname'}, + lastname => $names{'lastname'}, + permanentemail => $emails{'permanentemail'}, + }; + } + } + } + } + ($currstate,$response,$forcenewuser) = + &build_search_response($srch,%srch_results); + } elsif ($srch->{'srchin'} eq 'alc') { + $currstate = 'query'; + } elsif ($srch->{'srchin'} eq 'instd') { + ($dirsrchres,%srch_results) = &Apache::lonnet::inst_directory_query($srch); + if ($dirsrchres eq 'ok') { + ($currstate,$response,$forcenewuser) = + &build_search_response($srch,%srch_results); + } else { + my $showdom = &display_domain_info($srch->{'srchdomain'}); $response = ''. + &mt('Institutional directory search is not available in domain: [_1]',$showdom). + '
'. + &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). + '

'; + } + } + } + return ($currstate,$response,$forcenewuser,\%srch_results); +} + +sub directorysrch_check { + my ($srch) = @_; + my $can_search = 0; + my $response; + my %dom_inst_srch = &Apache::lonnet::get_dom('configuration', + ['directorysrch'],$srch->{'srchdomain'}); + my $showdom = &display_domain_info($srch->{'srchdomain'}); + if (ref($dom_inst_srch{'directorysrch'}) eq 'HASH') { + if (!$dom_inst_srch{'directorysrch'}{'available'}) { + return &mt('Institutional directory search is not available in domain: [_1]',$showdom); + } + if ($dom_inst_srch{'directorysrch'}{'localonly'}) { + if ($env{'request.role.domain'} ne $srch->{'srchdomain'}) { + return &mt('Institutional directory search in domain: [_1] is only allowed for users with a current role in the domain.',$showdom); + } + my @usertypes = split(/:/,$env{'environment.inststatus'}); + if (!@usertypes) { + push(@usertypes,'default'); + } + if (ref($dom_inst_srch{'directorysrch'}{'cansearch'}) eq 'ARRAY') { + foreach my $type (@usertypes) { + if (grep(/^\Q$type\E$/,@{$dom_inst_srch{'directorysrch'}{'cansearch'}})) { + $can_search = 1; + last; + } + } + } + if (!$can_search) { + my ($insttypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($srch->{'srchdomain'}); + my @longtypes; + foreach my $item (@usertypes) { + push (@longtypes,$insttypes->{$item}); + } + my $insttype_str = join(', ',@longtypes); + return &mt('Institutional directory search in domain: [_1] is not available to your user type: ',$showdom).$insttype_str; + } + } else { + $can_search = 1; + } + } else { + return &mt('Institutional directory search has not been configured for domain: [_1]',$showdom); + } + my %longtext = &Apache::lonlocal::texthash ( + uname => 'username', + lastfirst => 'last name, first name', + lastname => 'last name', + contains => 'contains', + exact => 'as exact match to', + begins => 'begins with', + ); + if ($can_search) { + if (ref($dom_inst_srch{'directorysrch'}{'searchby'}) eq 'ARRAY') { + if (!grep(/^\Q$srch->{'srchby'}\E$/,@{$dom_inst_srch{'directorysrch'}{'searchby'}})) { + return &mt('Institutional directory search in domain: [_1] is not available for searching by "[_2]"',$showdom,$longtext{$srch->{'srchby'}}); + } + } else { + return &mt('Institutional directory search in domain: [_1] is not available.', $showdom); + } + } + if ($can_search) { + if (ref($dom_inst_srch{'directorysrch'}{'searchtypes'}) eq 'ARRAY') { + if (grep(/^\Q$srch->{'srchtype'}\E/,@{$dom_inst_srch{'directorysrch'}{'searchtypes'}})) { + return 'ok'; + } else { + return &mt('Institutional directory search in domain [_1] is not available for the requested search type: "[_2]"',$showdom,$longtext{$srch->{'srchtype'}}); + } + } else { + if ((($dom_inst_srch{'directorysrch'}{'searchtypes'} eq 'specify') && + ($srch->{'srchtype'} eq 'exact' || $srch->{'srchtype'} eq 'contains')) || + ($dom_inst_srch{'directorysrch'}{'searchtypes'} eq $srch->{'srchtype'})) { + return 'ok'; + } else { + return &mt('Institutional directory search in domain [_1] is not available for the requested search type: "[_2]"',$showdom,$longtext{$srch->{'srchtype'}}); + } + } + } +} + + +sub get_courseusers { + my %advhash; + my $classlist = &Apache::loncoursedata::get_classlist(); + my %coursepersonnel=&Apache::lonnet::get_course_adv_roles(); + foreach my $role (sort(keys(%coursepersonnel))) { + foreach my $user (split(/\,/,$coursepersonnel{$role})) { + if (!exists($classlist->{$user})) { + $classlist->{$user} = []; + } + } + } + return $classlist; +} + +sub build_search_response { + my ($srch,%srch_results) = @_; + my ($currstate,$response,$forcenewuser); + my %names = ( + 'uname' => 'username', + 'lastname' => 'last name', + 'lastfirst' => 'last name, first name', + 'crs' => 'this course', + 'dom' => 'LON-CAPA domain: ', + 'instd' => 'the institutional directory for domain: ', + ); + + my %single = ( + begins => 'A match', + contains => 'A match', + exact => 'An exact match', + ); + my %nomatch = ( + begins => 'No match', + contains => 'No match', + exact => 'No exact match', + ); + if (keys(%srch_results) > 1) { + $currstate = 'select'; + } else { + if (keys(%srch_results) == 1) { + $currstate = 'modify'; + $response = &mt("$single{$srch->{'srchtype'}} was found for the $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'}); + if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') { + $response .= &display_domain_info($srch->{'srchdomain'}); + } + } else { + $response = ''.&mt("$nomatch{$srch->{'srchtype'}} found for the $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}",$srch->{'srchterm'}); + if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') { + $response .= &display_domain_info($srch->{'srchdomain'}); + } + $response .= ''; + if ($srch->{'srchin'} ne 'alc') { + $forcenewuser = 1; + my $cansrchinst = 0; + if ($srch->{'srchdomain'}) { + my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$srch->{'srchdomain'}); + if (ref($domconfig{'directorysrch'}) eq 'HASH') { + if ($domconfig{'directorysrch'}{'available'}) { + $cansrchinst = 1; + } + } + } + if ((($srch->{'srchby'} eq 'lastfirst') || + ($srch->{'srchby'} eq 'lastname')) && + ($srch->{'srchin'} eq 'dom')) { + if ($cansrchinst) { + $response .= '
'.&mt('You may want to broaden your search to a search of the institutional directory for the domain.'); + } + } + if ($srch->{'srchin'} eq 'crs') { + $response .= '
'.&mt('You may want to broaden your search to the selected LON-CAPA domain.'); + } + } + if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $env{'request.role.domain'})) { + my $showdom = &display_domain_info($env{'request.role.domain'}); + $response .= '

'.&mt("To add a new user (you can only create new users in your current role's domain - [_1]):",$env{'request.role.domain'}).'
  • '.&mt("Set 'Domain/institution to search' to: [_1]",$showdom).'
  • '.&mt("Set 'Search criteria' to: 'username is ...... in selected LON-CAPA domain'").'
  • '.&mt('Provide the proposed username').'
  • '.&mt('Search').'

'; + } + } + } + return ($currstate,$response,$forcenewuser); +} + +sub display_domain_info { + my ($dom) = @_; + my $output = $dom; + if ($dom ne '') { + my $domdesc = &Apache::lonnet::domain($dom,'description'); + if ($domdesc ne '') { + $output .= ' ('.$domdesc.')'; + } + } + return $output; +} + +sub crumb_utilities { + my %elements = ( + crtuser => { + srchterm => 'text', + srchin => 'selectbox', + srchby => 'selectbox', + srchtype => 'selectbox', + srchdomain => 'selectbox', + }, + docustom => { + rolename => 'selectbox', + newrolename => 'textbox', + }, + studentform => { + srchterm => 'text', + srchin => 'selectbox', + srchby => 'selectbox', + srchtype => 'selectbox', + srchdomain => 'selectbox', + }, + ); + + my $jsback .= qq| +function backPage(formname,prevphase,prevstate) { + formname.phase.value = prevphase; + formname.currstate.value = prevstate; + formname.submit(); +} +|; + return ($jsback,\%elements); +} + sub course_level_table { my (%inccourses) = @_; my $table = ''; @@ -1767,34 +2659,35 @@ sub course_level_table { if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) { my $plrole=&Apache::lonnet::plaintext($role); $table .= &Apache::loncommon::start_data_table_row(). -' +' '.$plrole.' '.$area.'
Domain: '.$domain.''."\n"; if ($role ne 'cc') { if (%sections_count) { my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$role); $table .= - ''. - ''; } else { $table .= ''; + 'name="sec_'.$protectedcourse.'_'.$role.'" />'; } } else { $table .= ''; } $table .= < + - ENDTIMEENTRY @@ -1807,7 +2700,7 @@ ENDTIMEENTRY my $customrole=$protectedcourse.'_cr_cr_'.$env{'user.domain'}. '_'.$env{'user.name'}.'_'.$plrole; $table .= &Apache::loncommon::start_data_table_row(). -' +''."\n"; if (%sections_count) { @@ -1820,17 +2713,17 @@ ENDTIMEENTRY ''. ''. + 'name="sec_'.$customrole.'" />'. '
'.$lt{'exs'}.'
'. + '		'. + ' + '. ''. ''. + ''. ''. + 'name="sec_'.$protectedcourse.'_'.$role.'" />'. '
'.$lt{'exs'}.'
'. $currsec.'		   '.$lt{'new'}.'
'. - '
  $lt{'ssd'} + $lt{'sed'} '.$plrole.' '.$area.' '.$lt{'new'}.'
'. '
'; } else { $table .= ''; + 'name="sec_'.$customrole.'" />'; } $table .= < + $lt{'ssd'} - + $lt{'sed'} ENDENTRY @@ -1847,9 +2740,7 @@ ENDENTRY ''.$lt{'act'}.''.$lt{'rol'}.''.$lt{'ext'}.' '.$lt{'grs'}.''.$lt{'sta'}.''.$lt{'end'}.''. &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; } @@ -1867,7 +2758,7 @@ sub course_sections { $output = ''."\n". - '