--- loncom/interface/loncreateuser.pm 2006/11/22 16:06:28 1.135 +++ loncom/interface/loncreateuser.pm 2007/08/02 01:04:41 1.167 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.135 2006/11/22 16:06:28 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.167 2007/08/02 01:04:41 albertel 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 = '<h3>'.$lt{'disk'}.'</h3>'. + 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"; +<script type="text/javascript"> +function quota_changes(caller) { + if (caller == "custom") { + if (document.cu.customquota[0].checked) { + document.cu.portfolioquota.value = ""; + } + } + if (caller == "quota") { + document.cu.customquota[1].checked = true; + } +} +</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. + '<h3>'.$lt{'disk'}.'</h3>'. + $lt{'cuqu'}.': '.$currquota.' Mb. '. + $defaultinfo.'<br /><span class="LC_nobreak">'.$lt{'chqu'}. + ': <label>'. + '<input type="radio" name="customquota" value="0" '. + $custom_off.' onchange="javascript:quota_changes('."'custom'".')" + />'.$lt{'defa'}.' ('.$defquota.' Mb).</label> '. + ' <label><input type="radio" name="customquota" value="1" '. + $custom_on.' onchange="javascript:quota_changes('."'custom'".')" />'. + $lt{'cust'}.':</label> '. '<input type="text" name="portfolioquota" size ="5" value="'. - &Apache::loncommon::get_user_quota($ccuname,$ccdomain). - '" /> 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". + '<script type="text/javascript">'."\n". + &Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset}). + '</script>'."\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", + 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 -<form action="/adm/createuser" method="post" name="crtuser"> -<input type="hidden" name="phase" value="get_user_info"> +$crumbs <h2>$lt{siur}$helpsiur</h2> -<table> -<tr><td>$lt{usr}:</td><td><input type="text" size="15" name="ccuname"> -</td><td rowspan="2">$sellink</td></tr><tr><td> -$lt{'dom'}:</td><td>$domform</td></tr> -</table> -<input name="userrole" type="submit" value="$lt{usrr}" /> -</form> -ENDDOCUMENT - if (&Apache::lonnet::allowed('mcr','/')) { - $r->print(<<ENDCUSTOM); +<h3>$lt{'srch'} $sellink $lt{'mod'}</h3> +$response"); + $r->print(&entry_form($defdom,$srch,$forcenewuser)); + if (&Apache::lonnet::allowed('mcr','/')) { + $r->print(<<ENDCUSTOM); <form action="/adm/createuser" method="post" name="docustom"> -<input type="hidden" name="phase" value="selected_custom_edit"> +<input type="hidden" name="phase" value="selected_custom_edit" /> <h2>$lt{'ecrp'}$helpecpr</h2> $lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br /> <input name="customeditor" type="submit" value="$lt{'cre'}" /> @@ -185,6 +261,20 @@ ENDCUSTOM $r->print(&Apache::loncommon::end_page()); } +sub entry_form { + my ($dom,$srch,$forcenewuser) = @_; + my $userpicker = + &Apache::loncommon::user_picker($dom,$srch,$forcenewuser); + 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()" /> +</form> +ENDDOCUMENT + return $output; +} sub user_modification_js { my ($pjump_def,$dc_setcourse_code,$nondc_setsection_code,$groupslist)=@_; @@ -214,19 +304,111 @@ 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) = @_; + 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 = (<<ENDSCRIPT); +<script type="text/javascript"> +function pickuser(uname,udom) { + document.usersrchform.seluname.value=uname; + document.usersrchform.seludom.value=udom; + document.usersrchform.phase.value="userpicked"; + document.usersrchform.submit(); +} - $ccuname=~s/\W//g; - $ccdomain=~s/\W//g; +$jsback +</script> +ENDSCRIPT + + my %lt=&Apache::lonlocal::texthash( + 'srch' => "User Search to add/modify roles of", + '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>'); + $r->print('<form name="usersrchform" method="post">'. + &Apache::loncommon::start_data_table()."\n". + &Apache::loncommon::start_data_table_header_row()."\n". + ' <th> </th>'."\n"); + foreach my $field (@fields) { + $r->print(' <th><a href="javascript:document.usersrchform.sortby.value='. + "'".$field."'".';document.usersrchform.submit();">'. + $lt{$field}.'</a></th>'."\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(). + '<td><input type="button" name="seluser" value="'.&mt('Select').'" onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".')" /></td>'. + '<td><tt>'.$uname.'</tt></td>'. + '<td><tt>'.$udom.'</tt></td>'); + foreach my $field ('lastname','firstname','permanentemail') { + $r->print('<td>'.$srch_results->{$user}->{$field}.'</td>'); + } + $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'])); + $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>'); + $r->print($response); + $r->print(&Apache::loncommon::end_page()); +} +sub print_user_query_page { + my ($r) = @_; +# 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 = '<br />'.$response + } my $defdom=$env{'request.role.domain'}; my ($krbdef,$krbdefdom) = @@ -235,12 +417,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 +434,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 +541,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<rolevals.length; i++) { - if (document.cu.role.selectedIndex == i) { - document.cu.role.options[i] = new Option(grprolenames[i],rolevals[i],true,false); - } else { - document.cu.role.options[i] = new Option(grprolenames[i],rolevals[i],false,false); - } - } - } else { - if (document.cu.currsec.options[0].text == "$pickgrpfirst") { - document.cu.currsec.options[0].text = "$pickcrsfirst"; - } - crsrolenames = new Array("$crsrolenameslist"); - for (var i=0; i<rolevals.length; i++) { - if (document.cu.role.selectedIndex == i) { - document.cu.role.options[i] = new Option(crsrolenames[i],rolevals[i],true,false); - } else { - document.cu.role.options[i] = new Option(crsrolenames[i],rolevals[i],false,false); - } - } - } - } ENDSCRIPT } else { $nondc_setsection_code = <<"ENDSECCODE"; @@ -402,9 +552,8 @@ ENDSCRIPT var checkcurr = str.match(re1); if (checkcurr != null) { if (document.cu.elements[i-1].checked == true) { - var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/; - match = re2.exec(str); - var role = match[1]; + var match = str.split('_'); + var role = match[3]; if (role == 'cc') { alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections."); } @@ -473,31 +622,74 @@ ENDSECCODE } my $js = &user_modification_js($pjump_def,$dc_setcourse_code, $nondc_setsection_code,$groupslist); + + my ($jsback,$elements) = &crumb_utilities(); + + $js .= "\n". + '<script type="text/javascript">'."\n".$jsback."\n".'</script>'; + 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"; <form action="/adm/createuser" method="post" name="cu"> -<input type="hidden" name="phase" value="update_user_data"> -<input type="hidden" name="ccuname" value="$ccuname"> -<input type="hidden" name="ccdomain" value="$ccdomain"> -<input type="hidden" name="pres_value" value="" > -<input type="hidden" name="pres_type" value="" > -<input type="hidden" name="pres_marker" value="" > +<input type="hidden" name="phase" value="update_user_data" /> +<input type="hidden" name="ccuname" value="$ccuname" /> +<input type="hidden" name="ccdomain" value="$ccdomain" /> +<input type="hidden" name="pres_value" value="" /> +<input type="hidden" name="pres_type" value="" /> +<input type="hidden" name="pres_marker" value="" /> 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); + 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); @@ -511,6 +703,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 +717,9 @@ ENDFORMINFO &initialize_authen_forms(); $r->print(<<ENDNEWUSER); $start_page +$crumbs <h1>$lt{'cnu'}</h1> +$response $forminfo <h2>$lt{'nu'} "$ccuname" $lt{'id'} $ccdomain</h2> <script type="text/javascript" language="Javascript"> @@ -535,15 +730,17 @@ $loginscript <p> <table> <tr><td>$lt{'fn'} </td> - <td><input type='text' name='cfirst' size='15' /></td></tr> + <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' /></td></tr> + <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' /></td></tr> + <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' /></td></tr> + <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' /></p> +$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> @@ -563,27 +760,30 @@ ENDNEWUSER 'fn' => "first name", 'mn' => "middle name", 'ln' => "last name", - 'gen' => "generation" + 'gen' => "generation", + 'email' => "permanent e-mail", ); $r->print(<<ENDCHANGEUSER); $start_page +$crumbs <h1>$lt{'cup'}</h1> $forminfo <h2>$lt{'usr'} "$ccuname" $lt{'id'} "$ccdomain"</h2> ENDCHANGEUSER # Get the users information - my %userenv = &Apache::lonnet::get('environment', - ['firstname','middlename','lastname','generation', - 'portfolioquota'],$ccdomain,$ccuname); + my %userenv = + &Apache::lonnet::get('environment', + ['firstname','middlename','lastname','generation', + 'permanentemail','portfolioquota'],$ccdomain,$ccuname); my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname); $r->print(' <hr />'. &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). -'<th>'.$lt{'fn'}.'</th><th>'.$lt{'mn'}.'</th><th>'.$lt{'ln'}.'</th><th>'.$lt{'gen'}.'</th>'. +'<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') { + foreach my $item ('firstname','middlename','lastname','generation','permenanentemail') { if (&Apache::lonnet::allowed('mau',$ccdomain)) { $r->print(<<"END"); <td><input type="text" name="c$item" value="$userenv{$item}" size="15" /></td> @@ -622,13 +822,12 @@ END split(/_/,$role); # Is this a custom role? Get role owner and title. my ($croleudom,$croleuname,$croletitle)= - ($role_code=~/^cr\/(\w+)\/(\w+)\/(\w+)$/); - my $bgcol='ffffff'; + ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$}); my $allowed=0; my $delallowed=0; my $sortkey=$role_code; my $class='Unknown'; - if ($area =~ /^\/(\w+)\/(\d\w+)/ ) { + if ($area =~ m{^/($match_domain)/($match_courseid)} ) { $class='Course'; my ($coursedom,$coursedir) = ($1,$2); $sortkey.="\0$coursedom"; @@ -664,10 +863,7 @@ END } } # Compute the background color based on $area - $bgcol=$1.'_'.$2; - $bgcol=~s/[^7-9a-e]//g; - $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6); - if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) { + if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) { $carea.='<br />Section: '.$3; $sortkey.="\0$3"; } @@ -675,7 +871,7 @@ END } else { $sortkey.="\0".$area; # Determine if current user is able to revoke privileges - if ($area=~ /^\/(\w+)\//) { + if ($area=~m{^/($match_domain)/}) { if ((&Apache::lonnet::allowed('c'.$role_code,$1)) || (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) { $allowed=1; @@ -699,20 +895,19 @@ END } } if (($role_code eq 'ca') || ($role_code eq 'aa')) { - $area=~/\/(\w+)\/(\w+)/; + $area=~m{/($match_domain)/($match_username)}; if (&authorpriv($2,$1)) { $allowed=1; } else { $allowed=0; } } - $bgcol='77FF77'; my $row = ''; - $row.='<tr bgcolor="#'.$bgcol.'"><td>'; + $row.= '<td>'; my $active=1; $active=0 if (($role_end_time) && ($now>$role_end_time)); if (($active) && ($allowed)) { - $row.= '<input type="checkbox" name="rev:'.$thisrole.'">'; + $row.= '<input type="checkbox" name="rev:'.$thisrole.'" />'; } else { if ($active) { $row.=' '; @@ -722,18 +917,18 @@ END } $row.='</td><td>'; if ($allowed && !$active) { - $row.= '<input type="checkbox" name="ren:'.$thisrole.'">'; + $row.= '<input type="checkbox" name="ren:'.$thisrole.'" />'; } else { $row.=' '; } $row.='</td><td>'; if ($delallowed) { - $row.= '<input type="checkbox" name="del:'.$thisrole.'">'; + $row.= '<input type="checkbox" name="del:'.$thisrole.'" />'; } else { $row.=' '; } my $plaintext=''; - unless ($croletitle) { + if (!$croletitle) { $plaintext=&Apache::lonnet::plaintext($role_code,$class) } else { $plaintext= @@ -745,7 +940,7 @@ END : ' ' ). '</td><td>'.($role_end_time ?localtime($role_end_time) : ' ' ) - ."</td></tr>\n"; + ."</td>"; $sortrole{$sortkey}=$envkey; $roletext{$envkey}=$row; $roleclass{$envkey}=$class; @@ -758,30 +953,35 @@ END $output{$type} = ''; foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { - $output{$type}.=$roletext{$sortrole{$which}}; + $output{$type}.= + &Apache::loncommon::start_data_table_row(). + $roletext{$sortrole{$which}}. + &Apache::loncommon::end_data_table_row(); } } unless($output{$type} eq '') { - $output{$type} = "<tr bgcolor='#BBffBB'>". - "<td align='center' colspan='7'>".&mt($type)."</td>". + $output{$type} = '<tr class="LC_info_row">'. + "<td align='center' colspan='7'>".&mt($type)."</td></tr>". $output{$type}; $rolesdisplay = 1; } } if ($rolesdisplay == 1) { - $r->print(<<END); + $r->print(' <hr /> -<h3>$lt{'rer'}</h3> -<table> -<tr><th>$lt{'rev'}</th><th>$lt{'ren'}</th><th>$lt{'del'}</th><th>$lt{'rol'}</th><th>$lt{'e -xt'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th> -END +<h3>'.$lt{'rer'}.'</h3>'. +&Apache::loncommon::start_data_table("LC_createuser"). +&Apache::loncommon::start_data_table_header_row(). +'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}. +'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}. +'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'. +&Apache::loncommon::end_data_table_header_row()); foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') { if ($output{$type}) { $r->print($output{$type}."\n"); } } - $r->print('</table>'); + $r->print(&Apache::loncommon::end_data_table()); } } # End of unless my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); @@ -965,7 +1165,7 @@ ENDNOPRIV &mt('Extent').'</th>'. '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'. &Apache::loncommon::end_data_table_header_row(); - foreach my $thisdomain ( sort( keys(%incdomains))) { + foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) { foreach my $role ('dc','li','dg','au','sc') { if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) { my $plrole=&Apache::lonnet::plaintext($role); @@ -976,13 +1176,13 @@ ENDNOPRIV $num_domain_level ++; $domaintext .= &Apache::loncommon::start_data_table_row(). -'<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'"></td> +'<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'" /></td> <td>'.$plrole.'</td> <td>'.$thisdomain.'</td> -<td><input type=hidden name="start_'.$thisdomain.'_'.$role.'" value=""> +<td><input type=hidden name="start_'.$thisdomain.'_'.$role.'" value="" /> <a href= "javascript:pjump('."'date_start','Start Date $plrole',document.cu.start_$thisdomain\_$role.value,'start_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td> -<td><input type=hidden name="end_'.$thisdomain.'_'.$role.'" value=""> +<td><input type=hidden name="end_'.$thisdomain.'_'.$role.'" value="" /> <a href= "javascript:pjump('."'date_end','End Date $plrole',document.cu.end_$thisdomain\_$role.value,'end_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'. &Apache::loncommon::end_data_table_row(); @@ -997,19 +1197,22 @@ ENDNOPRIV # Course and group levels # - if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) { + if ($env{'request.role'} =~ m{^dc\./($match_domain)/$}) { $r->print(&course_level_dc($1,'Course')); - $r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()">'."\n"); + $r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()" />'."\n"); } else { $r->print(&course_level_table(%inccourses)); - $r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setSections()">'."\n"); + $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('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />'); $r->print("</form>".&Apache::loncommon::end_page()); } # ================================================================= Phase Three sub update_user_data { - my $r=shift; + my ($r) = @_; my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'}, $env{'form.ccdomain'}); # Error messages @@ -1022,16 +1225,41 @@ sub update_user_data { } else { $title='Modify User Privileges'; } - $r->print(&Apache::loncommon::start_page($title)); + + my ($jsback,$elements) = &crumb_utilities(); + my $jscript = '<script type="text/javascript">'."\n". + $jsback."\n".'</script>'."\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 +1267,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 +1310,13 @@ sub update_user_data { $r->print($error.&mt('Invalid login mode or password').$end); return; } + + + $r->print('<h2>'.&mt('User [_1] in domain [_2]', + $env{'form.ccuname'}, $env{'form.ccdomain'}).'</h2>'); + if ($env{'form.makeuser'}) { - # Create a new user - my %lt=&Apache::lonlocal::texthash( - 'cru' => "Creating user", - 'id' => "in domain" - ); - $r->print(<<ENDNEWUSERHEAD); -<h3>$lt{'cru'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h3> -ENDNEWUSERHEAD + $r->print('<h3>'.&mt('Creating new account.').'</h3>'); # Check for the authentication mode and password if (! $amode || ! $genpwd) { $r->print($error.&mt('Invalid login mode or password').$end); @@ -1100,8 +1327,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 +1345,10 @@ ENDNEWUSERHEAD my $home = &Apache::lonnet::homeserver($env{'form.ccuname'}, $env{'form.ccdomain'}); $r->print('<br />'.&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(<<ENDMODIFYUSERHEAD); -<h2>$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h2> -ENDMODIFYUSERHEAD if (! $amode || ! $genpwd) { $r->print($error.'Invalid login mode or password'.$end); return; @@ -1151,37 +1371,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 +1446,7 @@ ENDMODIFYUSERHEAD $changeHash{'middlename'} = $env{'form.cmiddlename'}; $changeHash{'lastname'} = $env{'form.clastname'}; $changeHash{'generation'} = $env{'form.cgeneration'}; + $changeHash{'permanentemail'} = $env{'form.permanentemail'}; my $putresult = &Apache::lonnet::put ('environment',\%changeHash, $env{'form.ccdomain'},$env{'form.ccuname'}); @@ -1201,6 +1458,7 @@ ENDMODIFYUSERHEAD 'mddl' => "middle", 'lst' => "last", 'gen' => "generation", + 'mail' => "permanent e-mail", 'disk' => "disk space allocated to portfolio files", 'prvs' => "Previous", 'chto' => "Changed To" @@ -1219,16 +1477,26 @@ ENDMODIFYUSERHEAD <td>$userenv{'middlename'} </td> <td>$userenv{'lastname'} </td> <td>$userenv{'generation'} </td> - <td>$oldportfolioquota</td> + <td>$userenv{'permanentemail'} </td> + <td>$oldportfolioquota Mb</td> </tr> <tr><td>$lt{'chto'}</td> <td>$env{'form.cfirstname'} </td> <td>$env{'form.cmiddlename'} </td> <td>$env{'form.clastname'} </td> <td>$env{'form.cgeneration'} </td> - <td>$env{'form.portfolioquota'} Mb</td></tr> + <td>$env{'form.cpermanentemail'} </td> + <td>$newportfolioquota Mb $defquotatext </td></tr> </table> 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("<h2>".&mt('Unable to successfully change environment for')." ". $env{'form.ccuname'}." ".&mt('in domain')." ". @@ -1244,19 +1512,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"); -<h2>$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h2> -<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4> -<h4>$lt{'gen'}: $userenv{'generation'}</h4> +<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}</h4> +<h4>$lt{'mail'}: $userenv{'permanentemail'}</h4> END if ($putresult eq 'ok') { - if ($oldportfolioquota ne $env{'form.portfolioquota'}) { - $r->print('<h4>'.$lt{'disk'}.': '.$env{'form.portfolioquota'}.' Mb</h4>'); + if ($oldportfolioquota != $newportfolioquota) { + $r->print('<h4>'.$lt{'disk'}.': '.$newportfolioquota.' Mb '. + $defquotatext.'</h4>'); + &Apache::lonnet::appenv('environment.portfolioquota' => $changeHash{'portfolioquota'}); } } } @@ -1274,22 +1541,22 @@ END &Apache::lonnet::revokerole($env{'form.ccdomain'}, $env{'form.ccuname'},$1,$2).'</b><br />'); if ($2 eq 'st') { - $1=~/^\/(\w+)\/(\w+)/; + $1=~m{^/($match_domain)/($match_courseid)}; my $cid=$1.'_'.$2; - $r->print(&mt('Drop from classlist').': <b>'. - &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'}).'</b><br />'); + my $user = $env{'form.ccuname'}.':'.$env{'form.ccdomain'}; + my $result = + &Apache::lonnet::cput('classlist', + { $user => $now }, + $env{'course.'.$cid.'.domain'}, + $env{'course.'.$cid.'.num'}); + $r->print(&mt('Drop from classlist: [_1]', + '<b>'.$result.'</b>').'<br />'); } } - if ($key=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) { + if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) { # Revoke custom role $r->print(&mt('Revoking custom role:'). - ' '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'. + ' '.$4.' by '.$3.':'.$2.' in '.$1.': <b>'. &Apache::lonnet::revokecustomrole($env{'form.ccdomain'}, $env{'form.ccuname'},$1,$2,$3,$4). '</b><br />'); @@ -1301,19 +1568,19 @@ END &Apache::lonnet::assignrole($env{'form.ccdomain'}, $env{'form.ccuname'},$1,$2,$now,0,1).'<br />'); if ($2 eq 'st') { - $1=~/^\/(\w+)\/(\w+)/; + $1=~m{^/($match_domain)/($match_courseid)}; my $cid=$1.'_'.$2; - $r->print(&mt('Drop from classlist').': <b>'. - &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'}).'</b><br />'); + my $user = $env{'form.ccuname'}.':'.$env{'form.ccdomain'}; + my $result = + &Apache::lonnet::cput('classlist', + { $user => $now }, + $env{'course.'.$cid.'.domain'}, + $env{'course.'.$cid.'.num'}); + $r->print(&mt('Drop from classlist: [_1]', + '<b>'.$result.'</b>').'<br />'); } } - 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]', @@ -1332,7 +1599,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 +1619,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 +1630,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 +1661,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 +1744,33 @@ END } # End of foreach (keys(%env)) # Flush the course logs so reverse user roles immediately updated &Apache::lonnet::flushcourselogs(); - $r->print('<p><a href="/adm/createuser">Create/Modify Another User</a></p>'); + $r->print('<p><a href="/adm/createuser">'.&mt('Create/Modify Another User').'</a></p>'); + $r->print('<form name="userupdate" method="post" />'."\n"); + foreach my $item ('srchby','srchin','srchtype','srchterm','srchdomain','ccuname','ccdomain') { + $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n"); + } + foreach my $item ('sortby','seluname','seludom') { + if (exists($env{'form.'.$item})) { + $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n"); + } + } + $r->print('<input type="hidden" name="phase" value="" />'."\n". + '<input type ="hidden" name="state" value="" />'."\n". + '</form>'); $r->print(&Apache::loncommon::end_page()); } +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 +1783,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 +1807,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 +1816,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('<h2>'); + $body_top .= '<h2>'; 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.'"</h2>'); -# ------------------------------------------------------- What can be assigned? - my %full=(); - my %courselevel=(); - my %courselevelcurrent=(); + $body_top .= $rolename.'"</h2>'; 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 +1855,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 +1866,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 .= '<script type="text/javascript">'."\n"; + my @template_roles = ("cc","in","ta","ep","st"); + foreach my $role (@template_roles) { + $head_script .= &make_script_template($role); + $button_code .= &make_button_code($role); + } + $head_script .= "\n".$jsback."\n".'</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<br />'); + $r->print('<form action="">'); + $r->print($button_code); + $r->print('</form>'); $r->print(<<ENDCCF); -<form method="post"> +<form name="form1" method="post"> <input type="hidden" name="phase" value="set_custom_roles" /> <input type="hidden" name="rolename" value="$rolename" /> ENDCCF @@ -1603,22 +1917,96 @@ ENDCCF my $privtext = &Apache::lonnet::plaintext($priv); $r->print(&Apache::loncommon::start_data_table_row(). '<td>'.$privtext.'</td><td>'. - ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.':c" '. + ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c" '. ($courselevelcurrent{$priv}?'checked="1"':'').' />':' '). '</td><td>'. - ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.':d" '. + ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d" '. ($domainlevelcurrent{$priv}?'checked="1"':'').' />':' '). '</td><td>'. - ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.':s" '. + ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s" '. ($systemlevelcurrent{$priv}?'checked="1"':'').' />':' '). '</td>'. &Apache::loncommon::end_data_table_row()); } $r->print(&Apache::loncommon::end_data_table(). + '<input type="hidden" name="startrolename" value="'.$env{'form.rolename'}. + '" />'."\n".'<input type="hidden" name="state" value="" />'."\n". + '<input type="reset" value="'.&mt("Reset").'" />'."\n". '<input type="submit" value="'.&mt('Define Role').'" /></form>'. &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 = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />'; + return ($button_code); +} # ---------------------------------------------------------- Call to definerole sub set_custom_role { my ($r) = @_; @@ -1627,16 +2015,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').'<h2>'); + my ($jsback,$elements) = &crumb_utilities(); + my $jscript = '<script type="text/javascript">'.$jsback."\n".'</script>'; + + $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('<h2>'); if (($rdummy ne 'con_lost') && ($roledef ne '')) { $r->print(&mt('Existing Role').' "'); } else { @@ -1651,24 +2055,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 +2089,8 @@ sub set_custom_role { $env{'user.name'}, $rolename)); } - $r->print('<p><a href="/adm/createuser">Create another role, or Create/Modify a user.</a></p>'); + $r->print('<p><a href="/adm/createuser">Create another role, or Create/Modify a user.</a></p><form name="customresult" method="post">'); + $r->print(&Apache::lonhtmlcommon::echo_form_input([]).'</form>'); $r->print(&Apache::loncommon::end_page()); } @@ -1707,17 +2112,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 ($state,$response,$forcenewuser,$results) = + &user_search_result($srch); + if ($state eq 'select') { + &print_user_selection_page($r,$response,$srch,$results); + } elsif ($state 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 ($state eq 'query') { + &print_user_query_page($r); + } 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 +2166,331 @@ 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,$state,$forcenewuser); + + 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)$/) { + $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->{'srchterm'} !~ /^$match_username$/) { + $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @'); + } + } + if ($srch->{'srchin'} eq 'instd') { + my $instd_chk = &directorysrch_check($srch); + if ($instd_chk ne 'ok') { + $response = $instd_chk; + } + } + if ($response ne '') { + return ($state,'<span class="LC_warning">'.$response.'</span>'); + } + 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'); + $response = &mt('New users can only be created in the domain to which you current role belongs - [_1].',$env{'request.role.domain'}.' ('.$domdesc.')'); + } else { + $state = 'modify'; + } + } else { + $state = '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) = + &build_search_response($srch,%srch_results); + } else { + $state = 'modify'; + } + } else { + %srch_results = &Apache::lonnet::usersearch($srch); + ($state,$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'; + } else { + ($state,$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) { + $srch_results{$user} = + {&Apache::lonnet::get('environment', + ['firstname', + 'lastname', + 'permanentemail'])}; + } + } + } + ($state,$response,$forcenewuser) = + &build_search_response($srch,%srch_results); + } + } + } + } elsif ($srch->{'srchin'} eq 'alc') { + $state = 'query'; + } elsif ($srch->{'srchin'} eq 'instd') { + %srch_results = &Apache::lonnet::inst_directory_query($srch); + ($state,$response,$forcenewuser) = + &build_search_response($srch,%srch_results); + } + } else { + if ($srch->{'srchin'} eq 'dom') { + %srch_results = &Apache::lonnet::usersearch($srch); + ($state,$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 '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'}); + 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 'contains') { + 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'}, + }; + } + } + } + } + ($state,$response,$forcenewuser) = + &build_search_response($srch,%srch_results); + } elsif ($srch->{'srchin'} eq 'alc') { + $state = 'query'; + } elsif ($srch->{'srchin'} eq 'instd') { + %srch_results = &Apache::lonnet::inst_directory_query($srch); + ($state,$response,$forcenewuser) = + &build_search_response($srch,%srch_results); + } + } + return ($state,$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'}); + 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'}); + } + 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'}); + } + 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('Directory search in domain: [_1] is unavailable to your user type: ',$srch->{'srchdomain'}).$insttype_str; + } + } else { + $can_search = 1; + } + } else { + return &mt('Directory search has not been configured for domain: [_1]',$srch->{'srchdomain'}); + } + my %longtext = &Apache::lonlocal::texthash ( + uname => 'username', + lastfirst => 'last name, first name', + lastname => 'last name', + contains => 'is contained in', + exact => 'as exact match to' + ); + 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'}}); + } + } else { + return &mt('Directory search in domain: [_1] is not available.', $srch->{'srchdomain'}); + } + } + 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'}}); + } + } +} + + +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 ($state,$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", + ); + + my %single = ( + contains => 'A match', + exact => 'An exact match', + ); + my %nomatch = ( + contains => 'No match', + exact => 'No exact match', + ); + if (keys(%srch_results) > 1) { + $state = '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'}); + } else { + $response = '<span class="LC_warning">'.&mt("$nomatch{$srch->{'srchtype'}} found for this $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'}).'</span>'; + 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')) { + 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.'); + } + } + } + $response .= '<br />'.&mt("To add as a new user:").'<ul><li>'.&mt("Enter the proposed username in the <i>'Search for'</i> box").'</li><li>'.&mt("Set <i>'Make new user if no match found</i>' to <b>Yes</b>").'</li><li>'.&mt("Click <i>'Search'</i>").'</li></ul>'.&mt("Note: you can only create new users in the domain of your current role - [_1]",$env{'request.role.domain'}).'<br /><br />'; + } + } + } + return ($state,$response,$forcenewuser); +} + +sub crumb_utilities { + my %elements = ( + crtuser => { + srchterm => 'text', + srchin => 'selectbox', + srchby => 'selectbox', + srchtype => 'selectbox', + srchdomain => 'selectbox', + }, + docustom => { + rolename => 'selectbox', + newrolename => 'textbox', + }, + ); + + my $jsback .= qq| +function backPage(formname,prevphase,prevstate) { + formname.phase.value = prevphase; + formname.state.value = prevstate; + formname.submit(); +} +|; + return ($jsback,\%elements); +} + sub course_level_table { my (%inccourses) = @_; my $table = ''; @@ -1755,9 +2518,6 @@ sub course_level_table { my $area=$coursedata{'description'}; my $type=$coursedata{'type'}; if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; } - my $bgcol=$thiscourse; - $bgcol=~s/[^7-9a-e]//g; - $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6); my ($domain,$cnum)=split(/\//,$thiscourse); my %sections_count; if (defined($env{'request.course.id'})) { @@ -1769,41 +2529,40 @@ sub course_level_table { foreach my $role ('st','ta','ep','in','cc') { if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) { my $plrole=&Apache::lonnet::plaintext($role); - $table .= <<ENDEXTENT; -<tr bgcolor="#$bgcol"> -<td><input type="checkbox" name="act_$protectedcourse\_$role"></td> -<td>$plrole</td> -<td>$area<br />Domain: $domain</td> -ENDEXTENT + $table .= &Apache::loncommon::start_data_table_row(). +'<td><input type="checkbox" name="act_'.$protectedcourse.'_'.$role.'" /></td> +<td>'.$plrole.'</td> +<td>'.$area.'<br />Domain: '.$domain.'</td>'."\n"; if ($role ne 'cc') { if (%sections_count) { my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$role); $table .= - '<td><table border="0" cellspacing="0" cellpadding="0">'. - '<tr><td valign="top">'.$lt{'exs'}.'<br />'. + '<td><table class="LC_createuser">'. + '<tr class="LC_section_row"> + <td valign="top">'.$lt{'exs'}.'<br />'. $currsec.'</td>'. '<td> </td>'. '<td valign="top"> '.$lt{'new'}.'<br />'. - '<input type="text" name="newsec_'.$protectedcourse.'_'.$role.'" value="" /></td>'. + '<input type="text" name="newsec_'.$protectedcourse.'_'.$role.'" value="" />'. '<input type="hidden" '. - 'name="sec_'.$protectedcourse.'_'.$role.'"></td>'. + 'name="sec_'.$protectedcourse.'_'.$role.'" /></td>'. '</tr></table></td>'; } else { $table .= '<td><input type="text" size="10" '. - 'name="sec_'.$protectedcourse.'_'.$role.'"></td>'; + 'name="sec_'.$protectedcourse.'_'.$role.'" /></td>'; } } else { $table .= '<td> </td>'; } $table .= <<ENDTIMEENTRY; -<td><input type=hidden name="start_$protectedcourse\_$role" value=''> +<td><input type=hidden name="start_$protectedcourse\_$role" value='' /> <a href= "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt{'ssd'}</a></td> -<td><input type=hidden name="end_$protectedcourse\_$role" value=''> +<td><input type=hidden name="end_$protectedcourse\_$role" value='' /> <a href= "javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt{'sed'}</a></td> ENDTIMEENTRY - $table.= "</tr>\n"; + $table.= &Apache::loncommon::end_data_table_row(); } } foreach my $cust (sort keys %customroles) { @@ -1811,12 +2570,10 @@ ENDTIMEENTRY my $plrole=$cust; my $customrole=$protectedcourse.'_cr_cr_'.$env{'user.domain'}. '_'.$env{'user.name'}.'_'.$plrole; - $table .= <<END; -<tr bgcolor="#$bgcol"> -<td><input type="checkbox" name="act_$customrole"></td> -<td>$plrole</td> -<td>$area</td> -END + $table .= &Apache::loncommon::start_data_table_row(). +'<td><input type="checkbox" name="act_'.$customrole.'" /></td> +<td>'.$plrole.'</td> +<td>'.$area.'</td>'."\n"; if (%sections_count) { my $currsec = &course_sections(\%sections_count,$customrole); $table.= @@ -1827,32 +2584,35 @@ END '<td valign="top"> '.$lt{'new'}.'<br />'. '<input type="text" name="newsec_'.$customrole.'" value="" /></td>'. '<input type="hidden" '. - 'name="sec_'.$customrole.'"></td>'. + 'name="sec_'.$customrole.'" /></td>'. '</tr></table></td>'; } else { $table .= '<td><input type="text" size="10" '. - 'name="sec_'.$customrole.'"></td>'; + 'name="sec_'.$customrole.'" /></td>'; } $table .= <<ENDENTRY; -<td><input type=hidden name="start_$customrole" value=''> +<td><input type=hidden name="start_$customrole" value='' /> <a href= "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">$lt{'ssd'}</a></td> -<td><input type=hidden name="end_$customrole" value=''> +<td><input type=hidden name="end_$customrole" value='' /> <a href= -"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td></tr> +"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td> ENDENTRY + $table .= &Apache::loncommon::end_data_table_row(); } } } return '' if ($table eq ''); # return nothing if there is nothing # in the table - my $result = <<ENDTABLE; -<h4>$lt{'crl'}</h4> -<table border=2><tr><th>$lt{'act'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th> -<th>$lt{'grs'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th></tr> -$table -</table> -ENDTABLE + my $result = ' +<h4>'.$lt{'crl'}.'</h4>'. +&Apache::loncommon::start_data_table(). +&Apache::loncommon::start_data_table_header_row(). +'<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.'</th> +<th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'. +&Apache::loncommon::end_data_table_header_row(). +$table. +&Apache::loncommon::end_data_table(); return $result; } @@ -1869,7 +2629,7 @@ sub course_sections { $output = '<select name="currsec_'.$role.'" '; my $multiple = 4; if (scalar(@sections) < 4) { $multiple = scalar(@sections); } - $output .= '"multiple" size="'.$multiple.'">'."\n"; + $output .= 'multiple="multiple" size="'.$multiple.'">'."\n"; foreach my $sec (@sections) { $output .= '<option value="'.$sec.'">'.$sec."</option>\n"; } @@ -1888,7 +2648,6 @@ sub course_level_dc { ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>'; my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu'); my %lt=&Apache::lonlocal::texthash( - 'typ' => "Type", 'rol' => "Role", 'grs' => "Section", 'exs' => "Existing sections", @@ -1899,12 +2658,11 @@ sub course_level_dc { 'sed' => "Set End Date" ); my $header = '<h4>'.&mt('Course Level').'</h4>'. - '<table border="2"><tr><th>'.$lt{'typ'}.'</th><th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th></tr>'; - my $otheritems = '<tr><td><select name="crstype" onChange="javascript:setType();">'."\n". - ' <option value="">'.&mt('Please select')."\n". - ' <option value="Course">'.&mt('Course')."\n". - ' <option value="Non-standard course">'.&mt('Non-standard course')."\n". - '</select>'."\n". + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + '<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'. + &Apache::loncommon::end_data_table_header_row(); + my $otheritems = &Apache::loncommon::start_data_table_row()."\n". '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n". '<td><select name="role">'."\n"; foreach my $role ('st','ta','ep','in','cc') { @@ -1928,14 +2686,15 @@ sub course_level_dc { '<input type="hidden" name="groups" value="" /></td>'. '</tr></table></td>'; $otheritems .= <<ENDTIMEENTRY; -<td><input type=hidden name="start" value=''> +<td><input type=hidden name="start" value='' /> <a href= "javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td> -<td><input type=hidden name="end" value=''> +<td><input type=hidden name="end" value='' /> <a href= "javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td> ENDTIMEENTRY - $otheritems .= "</tr></table>\n"; + $otheritems .= &Apache::loncommon::end_data_table_row(). + &Apache::loncommon::end_data_table()."\n"; return $cb_jscript.$header.$hiddenitems.$otheritems; }