version 1.200, 2019/05/11 21:34:01
|
version 1.202, 2019/08/25 02:42:56
|
Line 656 sub passwd_validation_js {
|
Line 656 sub passwd_validation_js {
|
my %passwdconf = &Apache::lonnet::get_passwdconf($domain); |
my %passwdconf = &Apache::lonnet::get_passwdconf($domain); |
my ($min,$max,@chars,$numrules,$intargjs,%alert); |
my ($min,$max,@chars,$numrules,$intargjs,%alert); |
$numrules = 0; |
$numrules = 0; |
|
$min = $Apache::lonnet::passwdmin; |
if (ref($passwdconf{'chars'}) eq 'ARRAY') { |
if (ref($passwdconf{'chars'}) eq 'ARRAY') { |
if ($passwdconf{'min'} =~ /^\d+$/) { |
if ($passwdconf{'min'} =~ /^\d+$/) { |
$min = $passwdconf{'min'}; |
if ($passwdconf{'min'} > $min) { |
|
$min = $passwdconf{'min'}; |
|
$numrules ++; |
|
} |
|
} else { |
$numrules ++; |
$numrules ++; |
} |
} |
if ($passwdconf{'max'} =~ /^\d+$/) { |
if ($passwdconf{'max'} =~ /^\d+$/) { |
Line 670 sub passwd_validation_js {
|
Line 675 sub passwd_validation_js {
|
$numrules ++; |
$numrules ++; |
} |
} |
} else { |
} else { |
$min = 7; |
|
$numrules ++; |
$numrules ++; |
} |
} |
if (($min ne '') || ($max ne '') || (@chars > 0)) { |
if (($min > 0) || ($max ne '') || (@chars > 0)) { |
my $alertmsg = &mt('Initial password did not satisfy requirement(s):').'\n\n'; |
my $alertmsg = &mt('Initial password did not satisfy requirement(s):').'\n\n'; |
if ($min) { |
if ($min) { |
$alert{'min'} = &mt('minimum [quant,_1,character]',$min).'\n'; |
$alert{'min'} = &mt('minimum [quant,_1,character]',$min).'\n'; |
Line 2433 sub build_user_record {
|
Line 2437 sub build_user_record {
|
|
|
sub courses_selector { |
sub courses_selector { |
my ($cdom,$formname) = @_; |
my ($cdom,$formname) = @_; |
my %coursecodes = (); |
|
my %codes = (); |
my %codes = (); |
my @codetitles = (); |
my @codetitles = (); |
my %cat_titles = (); |
my %cat_titles = (); |
Line 2446 sub courses_selector {
|
Line 2449 sub courses_selector {
|
my $jscript = ''; |
my $jscript = ''; |
|
|
my $totcodes = 0; |
my $totcodes = 0; |
$totcodes = |
my $instcats = &Apache::lonnet::get_dom_instcats($cdom); |
&Apache::courseclassifier::retrieve_instcodes(\%coursecodes, |
if (ref($instcats) eq 'HASH') { |
$cdom,$totcodes); |
if ((ref($instcats->{'codetitles'}) eq 'ARRAY') && (ref($instcats->{'codes'}) eq 'HASH') && |
if ($totcodes > 0) { |
(ref($instcats->{'cat_titles'}) eq 'HASH') && (ref($instcats->{'cat_order'}) eq 'HASH')) { |
$format_reply = |
%codes = %{$instcats->{'codes'}}; |
&Apache::lonnet::auto_instcode_format($caller,$cdom,\%coursecodes, |
@codetitles = @{$instcats->{'codetitles'}}; |
\%codes,\@codetitles,\%cat_titles,\%cat_order); |
%cat_titles = %{$instcats->{'cat_titles'}}; |
if ($format_reply eq 'ok') { |
%cat_order = %{$instcats->{'cat_order'}}; |
|
$totcodes = scalar(keys(%codes)); |
my $numtypes = @codetitles; |
my $numtypes = @codetitles; |
&Apache::courseclassifier::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles); |
&Apache::courseclassifier::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles); |
my ($scripttext,$longtitles) = &Apache::courseclassifier::javascript_definitions(\@codetitles,\%idlist,\%idlist_titles,\%idnums,\%cat_titles); |
my ($scripttext,$longtitles) = &Apache::courseclassifier::javascript_definitions(\@codetitles,\%idlist,\%idlist_titles,\%idnums,\%cat_titles); |
Line 4387 sub upfile_drop_add {
|
Line 4391 sub upfile_drop_add {
|
if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) { |
if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) { |
$genpwd=$env{'form.intarg'}; |
$genpwd=$env{'form.intarg'}; |
@genpwdfail = |
@genpwdfail = |
&Apache::loncommon::check_passwd_rules($domain,$genpwd); |
&Apache::loncommon::check_passwd_rules($domain,$genpwd); |
} |
} |
} elsif ($env{'form.login'} eq 'loc') { |
} elsif ($env{'form.login'} eq 'loc') { |
$amode='localauth'; |
$amode='localauth'; |