--- loncom/interface/domainprefs.pm 2025/01/14 13:20:29 1.447.2.4 +++ loncom/interface/domainprefs.pm 2025/03/15 01:07:42 1.447.2.6 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.447.2.4 2025/01/14 13:20:29 raeburn Exp $ +# $Id: domainprefs.pm,v 1.447.2.6 2025/03/15 01:07:42 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -5371,42 +5371,6 @@ sub print_ltitools { return $datatable; } -sub ltitools_names { - my %lt = &Apache::lonlocal::texthash( - 'title' => 'Title', - 'version' => 'Version', - 'msgtype' => 'Message Type', - 'sigmethod' => 'Signature Method', - 'url' => 'URL', - 'key' => 'Key', - 'lifetime' => 'Nonce lifetime (s)', - 'secret' => 'Secret', - 'icon' => 'Icon', - 'user' => 'User', - 'fullname' => 'Full Name', - 'firstname' => 'First Name', - 'lastname' => 'Last Name', - 'email' => 'E-mail', - 'roles' => 'Role', - 'window' => 'Window', - 'tab' => 'Tab', - 'iframe' => 'iFrame', - 'height' => 'Height', - 'width' => 'Width', - 'linktext' => 'Default Link Text', - 'explanation' => 'Default Explanation', - 'passback' => 'Tool can return grades:', - 'roster' => 'Tool can retrieve roster:', - 'crstarget' => 'Display target', - 'crslabel' => 'Course label', - 'crstitle' => 'Course title', - 'crslinktext' => 'Link Text', - 'crsexplanation' => 'Explanation', - 'crsappend' => 'Provider URL', - ); - return %lt; -} - sub secrets_form { my ($dom,$context,$encrypt,$privkeys,$rowtotal) = @_; my @ids=&Apache::lonnet::current_machine_ids(); @@ -7937,7 +7901,6 @@ sub print_passwords { min => 'Minimum password length', max => 'Maximum password length', chars => 'Required characters', - expire => 'Password expiration (days)', numsaved => 'Number of previous passwords to save and disallow reuse', ); if ($position eq 'top') { @@ -8264,7 +8227,7 @@ sub print_passwords { sub password_rules { my ($prefix,$itemcountref,$settings) = @_; - my ($min,$max,%chars,$expire,$numsaved,$numinrow); + my ($min,$max,%chars,$numsaved,$numinrow); my %titles; if ($prefix eq 'passwords') { %titles = &Apache::lonlocal::texthash ( @@ -8296,9 +8259,6 @@ sub password_rules { map { $chars{$_} = 1; } (@{$settings->{chars}}); } if ($prefix eq 'passwords') { - if ($settings->{expire}) { - $expire = $settings->{expire}; - } if ($settings->{numsaved}) { $numsaved = $settings->{numsaved}; } @@ -8360,17 +8320,8 @@ sub password_rules { $datatable .=''; $itemcount ++; if ($prefix eq 'passwords') { - $titles{'expire'} = &mt('Password expiration (days)'); $titles{'numsaved'} = &mt('Number of previous passwords to save and disallow reuse'); $css_class = $itemcount%2?' class="LC_odd_row"':''; - $datatable .= ''.$titles{'expire'}.''. - ''. - ''. - ' '.&mt('(Leave blank for no expiration)').''. - ''; - $itemcount ++; - $css_class = $itemcount%2?' class="LC_odd_row"':''; $datatable .= ''.$titles{'numsaved'}.''. ''. ' 'Minimum password length', max => 'Maximum password length', chars => 'Required characters', - expire => 'Password expiration (days)', numsaved => 'Number of previous passwords to save', reset => 'Resetting Forgotten Password', intauth => 'Encryption of Stored Passwords (Internal Auth)', @@ -18474,7 +18410,7 @@ sub modify_passwords { $resulttext .= '
  • '.&mt('[_1] set to "[_2]"',$titles{$key.'_'.$item},$value).'
  • '; } } elsif ($key eq 'rules') { - foreach my $rule ('min','max','expire','numsaved') { + foreach my $rule ('min','max','numsaved') { if ($confighash{'passwords'}{$rule} eq '') { if ($rule eq 'min') { $resulttext .= '
  • '.&mt('[_1] not set.',$titles{$rule}); @@ -18569,7 +18505,7 @@ sub password_rule_changes { (ref($changes) eq 'HASH')); my (@rules,%staticdefaults); if ($prefix eq 'passwords') { - @rules = ('min','max','expire','numsaved'); + @rules = ('min','max','numsaved'); } elsif (($prefix eq 'ltisecrets') || ($prefix eq 'toolsecrets')) { @rules = ('min','max'); } @@ -18577,12 +18513,7 @@ sub password_rule_changes { foreach my $rule (@rules) { $env{'form.'.$prefix.'_'.$rule} =~ s/^\s+|\s+$//g; my $ruleok; - if ($rule eq 'expire') { - if (($env{'form.'.$prefix.'_'.$rule} =~ /^\d+(|\.\d*)$/) && - ($env{'form.'.$prefix.'_'.$rule} ne '0')) { - $ruleok = 1; - } - } elsif ($rule eq 'min') { + if ($rule eq 'min') { if ($env{'form.'.$prefix.'_'.$rule} =~ /^\d+$/) { if ($env{'form.'.$prefix.'_'.$rule} >= $staticdefaults{$rule}) { $ruleok = 1;