version 1.181, 2007/08/31 12:33:32
|
version 1.184, 2007/09/12 23:26:25
|
Line 1359 sub update_user_data {
|
Line 1359 sub update_user_data {
|
($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cstid'}, |
($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cstid'}, |
$amode,$genpwd,$env{'form.cfirst'}, |
$amode,$genpwd,$env{'form.cfirst'}, |
$env{'form.cmiddle'},$env{'form.clast'},$env{'form.cgen'}, |
$env{'form.cmiddle'},$env{'form.clast'},$env{'form.cgen'}, |
undef,$desiredhost |
undef,$desiredhost,$env{'form.cemail'} |
); |
); |
$r->print(&mt('Generating user').': '.$result); |
$r->print(&mt('Generating user').': '.$result); |
my $home = &Apache::lonnet::homeserver($env{'form.ccuname'}, |
my $home = &Apache::lonnet::homeserver($env{'form.ccuname'}, |
Line 2214 sub user_search_result {
|
Line 2214 sub user_search_result {
|
my %inst_matches; |
my %inst_matches; |
my %srch_results; |
my %srch_results; |
my ($response,$currstate,$forcenewuser,$dirsrchres); |
my ($response,$currstate,$forcenewuser,$dirsrchres); |
$srch->{'srchterm'} =~ s/^\s+//; |
$srch->{'srchterm'} =~ s/\s+/ /g; |
$srch->{'srchterm'} =~ s/\s+$//; |
|
|
|
if ($srch->{'srchby'} !~ /^(uname|lastname|lastfirst)$/) { |
if ($srch->{'srchby'} !~ /^(uname|lastname|lastfirst)$/) { |
$response = &mt('Invalid search.'); |
$response = &mt('Invalid search.'); |
} |
} |
Line 2229 sub user_search_result {
|
Line 2227 sub user_search_result {
|
if ($srch->{'srchterm'} eq '') { |
if ($srch->{'srchterm'} eq '') { |
$response = &mt('You must enter a search term.'); |
$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->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'instd')) { |
if (($srch->{'srchdomain'} eq '') || |
if (($srch->{'srchdomain'} eq '') || |
! (&Apache::lonnet::domain($srch->{'srchdomain'}))) { |
! (&Apache::lonnet::domain($srch->{'srchdomain'}))) { |
Line 2568 sub build_search_response {
|
Line 2569 sub build_search_response {
|
} |
} |
} |
} |
if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $env{'request.role.domain'})) { |
if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $env{'request.role.domain'})) { |
$response .= '<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 '<span class=\"LC_cusr_emph\">Make new user if no match found</span>' to '<b>Yes</b>'").'</li><li>'.&mt('Provide the proposed username').'</li><li>'.&mt('Search').'</li></ul><br />'; |
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 />'; |
} |
} |
} |
} |
} |
} |