--- loncom/interface/loncreateuser.pm 2007/08/14 16:53:15 1.171 +++ loncom/interface/loncreateuser.pm 2007/09/19 06:24:26 1.187 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.171 2007/08/14 16:53:15 albertel Exp $ +# $Id: loncreateuser.pm,v 1.187 2007/09/19 06:24:26 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -68,7 +68,6 @@ use Apache::longroup; use LONCAPA qw(:DEFAULT :match); my $loginscript; # piece of javascript used in two separate instances -my $generalrule; my $authformnop; my $authformkrb; my $authformint; @@ -76,14 +75,18 @@ my $authformfsys; my $authformloc; sub initialize_authen_forms { + my ($dom,$curr_authtype) = @_; my ($krbdefdom)=( $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/); $krbdefdom= uc($krbdefdom); my %param = ( formname => 'document.cu', - kerb_def_dom => $krbdefdom - ); + kerb_def_dom => $krbdefdom, + domain => $dom, + ); + if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix):$/) { + $param{'curr_authtype'} = $curr_authtype; + } # no longer static due to configurable kerberos defaults # $loginscript = &Apache::loncommon::authform_header(%param); - $generalrule = &Apache::loncommon::authform_authorwarning(%param); $authformnop = &Apache::loncommon::authform_nochange(%param); # no longer static due to configurable kerberos defaults # $authformkrb = &Apache::loncommon::authform_kerberos(%param); @@ -216,7 +219,7 @@ sub print_username_entry_form { $jscript,{'add_entries' => \%loaditems,}); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:backPage(document.crtuser)", - text=>"User modify/custom role", + text=>"User modify/custom role edit", faq=>282,bug=>'Instructor Interface',}); my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management'); @@ -264,13 +267,14 @@ ENDCUSTOM sub entry_form { my ($dom,$srch,$forcenewuser) = @_; my $userpicker = - &Apache::loncommon::user_picker($dom,$srch,$forcenewuser); + &Apache::loncommon::user_picker($dom,$srch,$forcenewuser, + 'document.crtuser'); my $srchbutton = &mt('Search'); my $output = <<"ENDDOCUMENT"; <form action="/adm/createuser" method="post" name="crtuser"> <input type="hidden" name="phase" value="get_user_info" /> $userpicker -<input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry()" /> +<input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry(document.crtuser)" /> </form> ENDDOCUMENT return $output; @@ -305,7 +309,7 @@ END # =================================================================== Phase two sub print_user_selection_page { - my ($r,$response,$srch,$srch_results) = @_; + my ($r,$response,$srch,$srch_results,$context,$srcharray) = @_; my @fields = ('username','domain','lastname','firstname','permanentemail'); my $sortby = $env{'form.sortby'}; @@ -329,25 +333,34 @@ $jsback ENDSCRIPT my %lt=&Apache::lonlocal::texthash( - 'srch' => "User Search to add/modify roles of", + '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", ); - $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("<b>$lt{'srch'}</b><br />"); - $r->print(&entry_form($srch->{'srchdomain'},$srch)); - $r->print('<h3>'.&mt('Select a user to add/modify roles of').'</h3>'); + 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("<b>$lt{'usrch'}</b><br />"); + $r->print(&entry_form($srch->{'srchdomain'},$srch)); + $r->print('<h3>'.$lt{'usel'}.'</h3>'); + } else { + $r->print($jscript."<b>$lt{'stusrch'}</b><br />"); + $r->print(&Apache::londropadd::single_user_entry_form($srch->{'srchdomain'},$srch)); + $r->print('</form><h3>'.$lt{'stusel'}.'</h3>'); + } $r->print('<form name="usersrchform" method="post">'. &Apache::loncommon::start_data_table()."\n". &Apache::loncommon::start_data_table_header_row()."\n". @@ -381,19 +394,27 @@ ENDSCRIPT $r->print(&Apache::loncommon::end_data_table_row()); } $r->print(&Apache::loncommon::end_data_table().'<br /><br />'); - $r->print(&Apache::lonhtmlcommon::echo_form_input(['sortby','seluname','seludom','state','phase'])); + if (ref($srcharray) eq 'ARRAY') { + foreach my $item (@{$srcharray}) { + $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n"); + } + } $r->print(' <input type="hidden" name="sortby" value="'.$sortby.'" />'."\n". ' <input type="hidden" name="seluname" value="" />'."\n". ' <input type="hidden" name="seludom" value="" />'."\n". - ' <input type="hidden" name="state" value="select" />'."\n". - ' <input type="hidden" name="phase" value="get_user_info" />'."\n". - '</form>'); + ' <input type="hidden" name="currstate" value="select" />'."\n". + ' <input type="hidden" name="phase" value="get_user_info" />'."\n"); $r->print($response); - $r->print(&Apache::loncommon::end_page()); + if ($context eq 'createuser') { + $r->print('</form>'.&Apache::loncommon::end_page()); + } else { + $r->print('<input type="hidden" name="action" value="enrollstudent" />'."\n". + '<input type="hidden" name="state" value="gotusername" />'."\n"); + } } sub print_user_query_page { - my ($r) = @_; + 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. @@ -402,10 +423,32 @@ sub print_user_query_page { sub print_user_modification_page { my ($r,$ccuname,$ccdomain,$srch,$response) = @_; - unless (($ccuname) && ($ccdomain)) { - &print_username_entry_form($r); + 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 $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; + } + } else { + $curr_authtype = + &Apache::lonnet::queryauthenticate($ccuname,$ccdomain); + } if ($response) { $response = '<br />'.$response } @@ -416,7 +459,9 @@ sub print_user_modification_page { my %param = ( formname => 'document.cu', kerb_def_dom => $krbdefdom, - kerb_def_auth => $krbdef + kerb_def_auth => $krbdef, + curr_authtype => $curr_authtype, + domain => $ccdomain, ); $loginscript = &Apache::loncommon::authform_header(%param); $authformkrb = &Apache::loncommon::authform_kerberos(%param); @@ -657,7 +702,6 @@ ENDSECCODE <input type="hidden" name="pres_type" value="" /> <input type="hidden" name="pres_marker" value="" /> ENDFORMINFO - my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain); my %inccourses; foreach my $key (keys(%env)) { if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) { @@ -665,97 +709,136 @@ ENDFORMINFO } } 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); - if ($newuser) { - if (&directorysrch_check($instsrch) eq 'ok') { - %dirsrch_results = &Apache::lonnet::inst_directory_query($instsrch); - if (ref($dirsrch_results{$newuser}) eq 'HASH') { - %inst_results = %{$dirsrch_results{$newuser}}; - } - } - } - my $home_server_list= - '<option value="default" selected>default</option>'."\n". - &Apache::loncommon::home_server_option_list($ccdomain); - my %lt=&Apache::lonlocal::texthash( - 'cnu' => "Create New User", - 'nu' => "New User", - 'id' => "in domain", - 'pd' => "Personal Data", - 'fn' => "First Name", - 'mn' => "Middle Name", - 'ln' => "Last Name", - 'gen' => "Generation", - 'mail' => "Permanent e-mail address", - 'idsn' => "ID/Student Number", - 'hs' => "Home Server", - 'lg' => "Login Data" + '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); } my $genhelp=&Apache::loncommon::help_open_topic('Generation'); - &initialize_authen_forms(); - $r->print(<<ENDNEWUSER); + &initialize_authen_forms($ccdomain); + $r->print(<<ENDTITLE); $start_page $crumbs -<h1>$lt{'cnu'}</h1> $response $forminfo -<h2>$lt{'nu'} "$ccuname" $lt{'id'} $ccdomain</h2> +<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain</h2> <script type="text/javascript" language="Javascript"> $loginscript </script> <input type='hidden' name='makeuser' value='1' /> <h3>$lt{'pd'}</h3> <p> -<table> -<tr><td>$lt{'fn'} </td> - <td><input type="text" name="cfirst" size="15" value="$inst_results{'firstname'}" /></td></tr> -<tr><td>$lt{'mn'} </td> - <td><input type="text" name="cmiddle" size="15" value="$inst_results{'middlename'}" /></td></tr> -<tr><td>$lt{'ln'} </td> - <td><input type="text" name="clast" size="15" value="$inst_results{'lastname'}" /></td></tr> -<tr><td>$lt{'gen'}$genhelp</td> - <td><input type="text" name="cgen" size="5" value="$inst_results{'generation'}" /></td></tr> -<tr><td>$lt{'mail'}</td> - <td><input type="text" name="cemail" size="20" value="$inst_results{'permanentemail'}" /></td></tr> -</table> -$lt{'idsn'} <input type="text" name="cstid" size="15" value="$inst_results{'id'}" /></p> -$lt{'hs'}: <select name="hserver" size="1"> $home_server_list </select> -<hr /> -<h3>$lt{'lg'}</h3> -<p>$generalrule </p> -<p>$authformkrb </p> -<p>$authformint </p> -<p>$authformfsys</p> -<p>$authformloc </p> +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('<input type="hidden" name="'.$element{$item}.'" value="'.$inst_results{$item}.'" />'.$inst_results{$item}); + } else { + $r->print('<input type="text" name="'.$element{$item}.'" size="'.$textboxsize{$item}.'" value="" />'); + } + $r->print(&Apache::lonhtmlcommon::row_closure(1)); + } + $r->print(&Apache::lonhtmlcommon::end_pick_box()); + my ($home_server_pick,$numlib) = + &Apache::loncommon::home_server_form_item($ccdomain,'hserver', + 'default','hide'); + if ($numlib > 1) { + $r->print(" +<br /> +$lt{'hs'}: $home_server_pick +<br />"); + } else { + $r->print($home_server_pick); + } + $r->print("<hr />\n".'<h3>'.$lt{'lg'}.'</h3>'); + my ($fixedauth,$varauth,$authmsg); + if ($rulematch) { + if (ref($rules) eq 'HASH') { + if (ref($rules->{$rulematch}) eq 'HASH') { + my $authtype = $rules->{$rulematch}{'authtype'}; + if ($authtype !~ /^(krb4|krb5|int|fsys|loc)$/) { + $r->print(&set_login($ccdomain)); + } else { + my $authparm = $rules->{$rulematch}{'authparm'}; + if ($authtype =~ /^krb(4|5)$/) { + my $ver = $1; + if ($authparm ne '') { + $fixedauth = <<"KERB"; +<input type="hidden" name="login" value="krb" /> +<input type="hidden" name="krbver" value="$ver" /> +<input type="hidden" name="krbarg" value="$authparm" /> +KERB + $authmsg = $rules->{$rulematch}{'authmsg'}; + } + } else { + $fixedauth = +'<input type="hidden" name="login" value="'.$authtype.'" />'."\n"; + if ($rules->{$rulematch}{'authparmfixed'}) { + $fixedauth .= +'<input type="hidden" name="'.$authtype.'arg" value="'.$authparm.'" />'."\n"; + } else { + $varauth = +'<input type="text" name="'.$authtype.'arg" value="" />'."\n"; + } + } + } + } else { + $r->print(&set_login($ccdomain)); + } + } + if ($authmsg) { + $r->print(<<ENDAUTH); +$fixedauth +$authmsg +$varauth +ENDAUTH + } + } else { + $r->print(&set_login($ccdomain)); + } + $r->print(<<ENDPORT); <hr /> $portfolioform -ENDNEWUSER +ENDPORT } else { # user already exists my %lt=&Apache::lonlocal::texthash( - 'cup' => "Change User Privileges", - 'usr' => "User", + 'cup' => "Change User Privileges for", 'id' => "in domain", 'fn' => "first name", 'mn' => "middle name", @@ -766,9 +849,8 @@ ENDNEWUSER $r->print(<<ENDCHANGEUSER); $start_page $crumbs -<h1>$lt{'cup'}</h1> $forminfo -<h2>$lt{'usr'} "$ccuname" $lt{'id'} "$ccdomain"</h2> +<h2>$lt{'cup'} "$ccuname" $lt{'id'} "$ccdomain"</h2> ENDCHANGEUSER # Get the users information my %userenv = @@ -783,7 +865,7 @@ ENDCHANGEUSER '<th>'.$lt{'fn'}.'</th><th>'.$lt{'mn'}.'</th><th>'.$lt{'ln'}.'</th><th>'.$lt{'gen'}.'</th><th>'.$lt{'email'}.'</th>'. &Apache::loncommon::end_data_table_header_row(). &Apache::loncommon::start_data_table_row()); - foreach my $item ('firstname','middlename','lastname','generation','permenanentemail') { + foreach my $item ('firstname','middlename','lastname','generation','permanentemail') { if (&Apache::lonnet::allowed('mau',$ccdomain)) { $r->print(<<"END"); <td><input type="text" name="c$item" value="$userenv{$item}" size="15" /></td> @@ -989,24 +1071,24 @@ END $currentauth=~/^krb(4|5):(.*)/; my $krbdefdom=$2; my %param = ( formname => 'document.cu', - kerb_def_dom => $krbdefdom + kerb_def_dom => $krbdefdom, + domain => $ccdomain, + curr_authtype => $currentauth, ); $loginscript = &Apache::loncommon::authform_header(%param); } # Check for a bad authentication type - unless ($currentauth=~/^krb(4|5):/ or - $currentauth=~/^unix:/ or - $currentauth=~/^internal:/ or - $currentauth=~/^localauth:/ - ) { # bad authentication scheme + if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) { + # bad authentication scheme if (&Apache::lonnet::allowed('mau',$ccdomain)) { - &initialize_authen_forms(); + &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(<<ENDBADAUTH); <hr /> <script type="text/javascript" language="Javascript"> @@ -1015,11 +1097,7 @@ $loginscript <font color='#ff0000'>$lt{'err'}:</font> $lt{'uuas'} ($currentauth). $lt{'sldb'}. <h3>$lt{'ld'}</h3> -<p>$generalrule</p> -<p>$authformkrb</p> -<p>$authformint</p> -<p>$authformfsys</p> -<p>$authformloc</p> +$choices ENDBADAUTH } else { # This user is not allowed to modify the user's @@ -1039,28 +1117,9 @@ ENDBADAUTH } else { # Authentication type is valid my $authformcurrent=''; my $authform_other=''; - &initialize_authen_forms(); - if ($currentauth=~/^krb(4|5):/) { - $authformcurrent=$authformkrb; - $authform_other="<p>$authformint</p>\n". - "<p>$authformfsys</p><p>$authformloc</p>"; - } - elsif ($currentauth=~/^internal:/) { - $authformcurrent=$authformint; - $authform_other="<p>$authformkrb</p>". - "<p>$authformfsys</p><p>$authformloc</p>"; - } - elsif ($currentauth=~/^unix:/) { - $authformcurrent=$authformfsys; - $authform_other="<p>$authformkrb</p>". - "<p>$authformint</p><p>$authformloc;</p>"; - } - elsif ($currentauth=~/^localauth:/) { - $authformcurrent=$authformloc; - $authform_other="<p>$authformkrb</p>". - "<p>$authformint</p><p>$authformfsys</p>"; - } - $authformcurrent.=' <i>(will override current values)</i><br />'; + &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( @@ -1073,12 +1132,17 @@ ENDBADAUTH $loginscript </script> <h3>$lt{'ccld'}</h3> -<p>$generalrule</p> -<p>$authformnop</p> -<p>$authformcurrent</p> -<h3>$lt{'enld'}</h3> -$authform_other +<p>$authformnop ENDOTHERAUTHS + if ($can_modify) { + $r->print('</p><p>'.$authformcurrent.'</p>'); + } else { + $r->print(' ('.$authformcurrent.')</p>'); + } + if ($authform_other ne '') { + $r->print('<h3>'.$lt{'enld'}.'</h3>'."\n". + $authform_other); + } } else { if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) { my %lt=&Apache::lonlocal::texthash( @@ -1093,11 +1157,22 @@ $lt{'yodo'} $lt{'ifch'}: $ccdomain ENDNOPRIV } } - if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) { - # Current user has quota modification privileges - $r->print(&portfolio_quota($ccuname,$ccdomain)); - } } ## End of "check for bad authentication type" logic + 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(<<ENDNOPORTPRIV); +<hr /> +<h3>$lt{'dska'}</h3> +$lt{'youd'} $lt{'ichr'}: $ccdomain +ENDNOPORTPRIV + } } ## End of new user/old user logic $r->print('<hr /><h3>'.&mt('Add Roles').'</h3>'); # @@ -1204,12 +1279,92 @@ ENDNOPRIV $r->print(&course_level_table(%inccourses)); $r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setSections()" />'."\n"); } - $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','state'])); - $r->print('<input type="hidden" name="state" value="" />'); + $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate'])); + $r->print('<input type="hidden" name="currstate" value="" />'); $r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />'); $r->print("</form>".&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 .= "<p>$authformkrb </p>\n"; + } + if ($can_assign{'int'}) { + $response .= "<p>$authformint </p>\n" + } + if ($can_assign{'loc'}) { + $response .= "<p>$authformloc </p>\n"; + } + return $response; +} + +sub modify_login_block { + my ($dom,$currentauth) = @_; + my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom); + my ($authnum,%can_assign) = + &Apache::loncommon::get_assignable_auth($dom); + my ($authformcurrent,$authform_other,$show_override_msg); + if ($currentauth=~/^krb(4|5):/) { + $authformcurrent=$authformkrb; + if ($can_assign{'int'}) { + $authform_other = "<p>$authformint </p>\n" + } + if ($can_assign{'loc'}) { + $authform_other .= "<p>$authformloc </p>\n"; + } + if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { + $show_override_msg = 1; + } + } elsif ($currentauth=~/^internal:/) { + $authformcurrent=$authformint; + if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { + $authform_other = "<p>$authformkrb </p>\n" + } + if ($can_assign{'loc'}) { + $authform_other .= "<p>$authformloc </p>\n"; + } + if ($can_assign{'int'}) { + $show_override_msg = 1; + } + } elsif ($currentauth=~/^unix:/) { + $authformcurrent=$authformfsys; + if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { + $authform_other = "<p>$authformkrb </p>\n" + } + if ($can_assign{'int'}) { + $authform_other .= "<p>$authformint </p>\n" + } + if ($can_assign{'loc'}) { + $authform_other .= "<p>$authformloc </p>\n"; + } + if ($can_assign{'fsys'}) { + $show_override_msg = 1; + } + } elsif ($currentauth=~/^localauth:/) { + $authformcurrent=$authformloc; + if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { + $authform_other = "<p>$authformkrb </p>\n" + } + if ($can_assign{'int'}) { + $authform_other .= "<p>$authformint </p>\n" + } + if ($can_assign{'loc'}) { + $show_override_msg = 1; + } + } + if ($show_override_msg) { + $authformcurrent.= ' <span class="LC_cusr_emph">'. + &mt('will override current values'). + '</span><br />'; + } + return ($authformcurrent,$authform_other,$show_override_msg); +} + # ================================================================= Phase Three sub update_user_data { my ($r) = @_; @@ -1339,7 +1494,7 @@ sub update_user_data { ($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 + undef,$desiredhost,$env{'form.cemail'} ); $r->print(&mt('Generating user').': '.$result); my $home = &Apache::lonnet::homeserver($env{'form.ccuname'}, @@ -1446,7 +1601,7 @@ sub update_user_data { $changeHash{'middlename'} = $env{'form.cmiddlename'}; $changeHash{'lastname'} = $env{'form.clastname'}; $changeHash{'generation'} = $env{'form.cgeneration'}; - $changeHash{'permanentemail'} = $env{'form.permanentemail'}; + $changeHash{'permanentemail'} = $env{'form.cpermanentemail'}; my $putresult = &Apache::lonnet::put ('environment',\%changeHash, $env{'form.ccdomain'},$env{'form.ccuname'}); @@ -1471,7 +1626,8 @@ sub update_user_data { <th>$lt{'mddl'}</th> <th>$lt{'lst'}</th> <th>$lt{'gen'}</th> - <th>$lt{'disk'}<th></tr> + <th>$lt{'mail'}</th> + <th>$lt{'disk'}</th></tr> <tr><td>$lt{'prvs'}</td> <td>$userenv{'firstname'} </td> <td>$userenv{'middlename'} </td> @@ -1749,7 +1905,7 @@ END } } $r->print('<input type="hidden" name="phase" value="" />'."\n". - '<input type ="hidden" name="state" value="" />'."\n". + '<input type ="hidden" name="currstate" value="" />'."\n". '</form>'); $r->print(&Apache::loncommon::end_page()); } @@ -1948,7 +2104,7 @@ ENDCCF } $r->print(&Apache::loncommon::end_data_table(). '<input type="hidden" name="startrolename" value="'.$env{'form.rolename'}. - '" />'."\n".'<input type="hidden" name="state" value="" />'."\n". + '" />'."\n".'<input type="hidden" name="currstate" value="" />'."\n". '<input type="reset" value="'.&mt("Reset").'" />'."\n". '<input type="submit" value="'.&mt('Define Role').'" /></form>'. &Apache::loncommon::end_page()); @@ -2141,11 +2297,11 @@ sub handler { $srch->{$item} = $env{'form.'.$item}; } if ($env{'form.phase'} eq 'get_user_info') { - my ($state,$response,$forcenewuser,$results) = + my ($currstate,$response,$forcenewuser,$results) = &user_search_result($srch); - if ($state eq 'select') { - &print_user_selection_page($r,$response,$srch,$results); - } elsif ($state eq 'modify') { + 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')) { @@ -2159,8 +2315,8 @@ sub handler { $ccdomain=&LONCAPA::clean_domain($ccdomain); &print_user_modification_page($r,$ccuname,$ccdomain,$srch, $response); - } elsif ($state eq 'query') { - &print_user_query_page($r); + } elsif ($currstate eq 'query') { + &print_user_query_page($r,'createuser'); } else { &print_username_entry_form($r,$response,$srch,$forcenewuser); } @@ -2192,20 +2348,23 @@ sub user_search_result { my %allhomes; my %inst_matches; my %srch_results; - my ($response,$state,$forcenewuser); - - if ($srch->{'srchby'} !~ /^(uname|lastname|lastfirst)$/) { + my ($response,$currstate,$forcenewuser,$dirsrchres); + $srch->{'srchterm'} =~ s/\s+/ /g; + 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)$/) { + if ($srch->{'srchtype'} !~ /^(exact|contains|begins)$/) { $response = &mt('Invalid search.'); } if ($srch->{'srchterm'} eq '') { $response = &mt('You must enter a search term.'); } + if ($srch->{'srchterm'} =~ /^\s+$/) { + $response = &mt('Your search term must contain more than just spaces.'); + } if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'instd')) { if (($srch->{'srchdomain'} eq '') || ! (&Apache::lonnet::domain($srch->{'srchdomain'}))) { @@ -2214,18 +2373,24 @@ sub user_search_result { } if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'crs') || ($srch->{'srchin'} eq 'alc')) { - if ($srch->{'srchterm'} !~ /^$match_username$/) { - $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @'); + 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 = '<span class="LC_warning">'.$response.'</span>'; + } if ($srch->{'srchin'} eq 'instd') { my $instd_chk = &directorysrch_check($srch); if ($instd_chk ne 'ok') { - $response = $instd_chk; + $response = '<span class="LC_warning">'.$instd_chk.'</span>'. + '<br />'.&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').'<br /><br />'; } } if ($response ne '') { - return ($state,'<span class="LC_warning">'.$response.'</span>'); + return ($currstate,$response); } if ($srch->{'srchby'} eq 'uname') { if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'crs')) { @@ -2234,42 +2399,53 @@ sub user_search_result { my $uhome=&Apache::lonnet::homeserver($srch->{'srchterm'},$srch->{'srchdomain'}); if ($uhome eq 'no_host') { my $domdesc = &Apache::lonnet::domain($env{'request.role.domain'},'description'); - $response = &mt('New users can only be created in the domain to which you current role belongs - [_1].',$env{'request.role.domain'}.' ('.$domdesc.')'); + 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 { - $state = 'modify'; + $currstate = 'modify'; } } else { - $state = 'modify'; + $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') { - ($state,$response,$forcenewuser) = + ($currstate,$response,$forcenewuser) = &build_search_response($srch,%srch_results); } else { - $state = 'modify'; + $currstate = 'modify'; } } else { %srch_results = &Apache::lonnet::usersearch($srch); - ($state,$response,$forcenewuser) = + ($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'}})) { - $state = 'modify'; + $currstate = 'modify'; } else { - ($state,$response,$forcenewuser) = + ($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'}) { - if ($cuname =~ /\Q$srch->{'srchterm'}\E/i) { + 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', @@ -2278,22 +2454,31 @@ sub user_search_result { } } } - ($state,$response,$forcenewuser) = + ($currstate,$response,$forcenewuser) = &build_search_response($srch,%srch_results); } } } } elsif ($srch->{'srchin'} eq 'alc') { - $state = 'query'; + $currstate = 'query'; } elsif ($srch->{'srchin'} eq 'instd') { - %srch_results = &Apache::lonnet::inst_directory_query($srch); - ($state,$response,$forcenewuser) = - &build_search_response($srch,%srch_results); + ($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 = '<span class="LC_warning">'. + &mt('Institutional directory search is not available in domain: [_1]',$showdom). + '</span><br />'. + &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). + '<br /><br />'; + } } } else { if ($srch->{'srchin'} eq 'dom') { %srch_results = &Apache::lonnet::usersearch($srch); - ($state,$response,$forcenewuser) = + ($currstate,$response,$forcenewuser) = &build_search_response($srch,%srch_results); } elsif ($srch->{'srchin'} eq 'crs') { my $courseusers = &get_courseusers(); @@ -2304,6 +2489,8 @@ sub user_search_result { 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'}, @@ -2313,6 +2500,8 @@ sub user_search_result { } } 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)) { @@ -2322,7 +2511,15 @@ sub user_search_result { }; } - } elsif ($srch->{'srchtype'} eq 'contains') { + } 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'}, @@ -2333,17 +2530,25 @@ sub user_search_result { } } } - ($state,$response,$forcenewuser) = + ($currstate,$response,$forcenewuser) = &build_search_response($srch,%srch_results); } elsif ($srch->{'srchin'} eq 'alc') { - $state = 'query'; + $currstate = 'query'; } elsif ($srch->{'srchin'} eq 'instd') { - %srch_results = &Apache::lonnet::inst_directory_query($srch); - ($state,$response,$forcenewuser) = - &build_search_response($srch,%srch_results); + ($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 = '<span class="LC_warning">'. + &mt('Institutional directory search is not available in domain: [_1]',$showdom). + '</span><br />'. + &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). + '<br /><br />'; + } } } - return ($state,$response,$forcenewuser,\%srch_results); + return ($currstate,$response,$forcenewuser,\%srch_results); } sub directorysrch_check { @@ -2352,13 +2557,14 @@ sub directorysrch_check { 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 unavailable in domain: [_1]',$srch->{'srchdomain'}); + 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('Insitutional directory search in domain: [_1] is only allowed for users with a current role in the domain.',$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) { @@ -2379,41 +2585,50 @@ sub directorysrch_check { push (@longtypes,$insttypes->{$item}); } my $insttype_str = join(', ',@longtypes); - return &mt('Directory search in domain: [_1] is unavailable to your user type: ',$srch->{'srchdomain'}).$insttype_str; + 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('Directory search has not been configured for domain: [_1]',$srch->{'srchdomain'}); + 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 => 'is contained in', - exact => 'as exact match to' + 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('Directory search in domain: [_1] is not available for searching by [_2]',$srch->{'srchdomain'},$longtext{$srch->{'srchby'}}); + return &mt('Institutional directory search in domain: [_1] is not available for searching by "[_2]"',$showdom,$longtext{$srch->{'srchby'}}); } } else { - return &mt('Directory search in domain: [_1] is not available.', $srch->{'srchdomain'}); + return &mt('Institutional directory search in domain: [_1] is not available.', $showdom); } } if ($can_search) { - if (($dom_inst_srch{'directorysrch'}{'searchtypes'} eq 'specify') || - ($dom_inst_srch{'directorysrch'}{'searchtypes'} eq $srch->{'srchtype'})) { - return 'ok'; - } else { - return &mt('Directory search in domain [_1] is not available for the requested search type: [_2]',$srch->{'srchdomain'},$longtext{$srch->{'srchtype'}}); + 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(); @@ -2430,32 +2645,41 @@ sub get_courseusers { sub build_search_response { my ($srch,%srch_results) = @_; - my ($state,$response,$forcenewuser); + my ($currstate,$response,$forcenewuser); my %names = ( 'uname' => 'username', 'lastname' => 'last name', 'lastfirst' => 'last name, first name', 'crs' => 'this course', - 'dom' => 'this domain', - 'instd' => "your institution's directory", + 'dom' => 'LON-CAPA domain: ', + 'instd' => 'the institutional directory for domain: ', ); my %single = ( + begins => 'A match', contains => 'A match', - exact => 'An exact match', + exact => 'An exact match', ); my %nomatch = ( + begins => 'No match', contains => 'No match', - exact => 'No exact match', + exact => 'No exact match', ); if (keys(%srch_results) > 1) { - $state = 'select'; + $currstate = 'select'; } else { if (keys(%srch_results) == 1) { - $state = 'modify'; - $response = &mt("$single{$srch->{'srchtype'}} was found for this $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'}); + $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 = '<span class="LC_warning">'.&mt("$nomatch{$srch->{'srchtype'}} found for this $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'}).'</span>'; + $response = '<span class="LC_warning">'.&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 .= '</span>'; if ($srch->{'srchin'} ne 'alc') { $forcenewuser = 1; my $cansrchinst = 0; @@ -2467,27 +2691,43 @@ sub build_search_response { } } } - if (($srch->{'srchby'} eq 'lastfirst') || - ($srch->{'srchby'} eq 'lastname')) { - if ($srch->{'srchin'} eq 'crs') { - $response .= '<br />'.&mt('You may want to broaden your search to the whole domain.'); - } elsif ($srch->{'srchin'} eq 'dom') { - if ($cansrchinst) { - $response .= '<br />'.&mt('You may want to broaden your search to a search of the institutional directory for this domain.'); - } + if ((($srch->{'srchby'} eq 'lastfirst') || + ($srch->{'srchby'} eq 'lastname')) && + ($srch->{'srchin'} eq 'dom')) { + if ($cansrchinst) { + $response .= '<br />'.&mt('You may want to broaden your search to a search of the institutional directory for the domain.'); } } + if ($srch->{'srchin'} eq 'crs') { + $response .= '<br />'.&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 .= '<br /><br />'.&mt("<b>To add a new user</b> (you can only create new users in your current role's domain - <span class=\"LC_cusr_emph\">[_1]</span>):",$env{'request.role.domain'}).'<ul><li>'.&mt("Set 'Domain/institution to search' to: <span class=\"LC_cusr_emph\">[_1]</span>",$showdom).'<li>'.&mt("Set 'Search criteria' to: <span class=\"LC_cusr_emph\">'username is ...... in selected LON-CAPA domain'").'</span></li><li>'.&mt('Provide the proposed username').'</li><li>'.&mt('Search').'</li></ul><br />'; } } } - return ($state,$response,$forcenewuser); + 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 .= ' <span class="LC_cusr_emph">('.$domdesc.')</span>'; + } + } + return $output; } sub crumb_utilities { my %elements = ( crtuser => { srchterm => 'text', - srchin => 'radio', + srchin => 'selectbox', srchby => 'selectbox', srchtype => 'selectbox', srchdomain => 'selectbox', @@ -2496,12 +2736,19 @@ sub crumb_utilities { 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.state.value = prevstate; + formname.currstate.value = prevstate; formname.submit(); } |;