[LON-CAPA-cvs] cvs: loncom /interface domainprefs.pm
raeburn
raeburn at source.lon-capa.org
Wed Feb 5 18:46:02 EST 2020
raeburn Wed Feb 5 23:46:02 2020 EDT
Modified files:
/loncom/interface domainprefs.pm
Log:
- Fix display of changes to domain configuration for passwords.
- Improve readability of "Resetting Forgotten Password" and
"Course Owner Changing Student Passwords" sections, where a domain has
more than a couple of institutional types.
-------------- next part --------------
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.368 loncom/interface/domainprefs.pm:1.369
--- loncom/interface/domainprefs.pm:1.368 Tue Oct 15 03:26:00 2019
+++ loncom/interface/domainprefs.pm Wed Feb 5 23:46:01 2020
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.368 2019/10/15 03:26:00 raeburn Exp $
+# $Id: domainprefs.pm,v 1.369 2020/02/05 23:46:01 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -831,6 +831,7 @@
if ($numheaders > 1) {
my $colspan = '';
my $rightcolspan = '';
+ my $leftnobr = '';
if (($action eq 'rolecolors') || ($action eq 'defaults') ||
($action eq 'directorysrch') ||
(($action eq 'login') && ($numheaders < 4))) {
@@ -839,12 +840,15 @@
if ($action eq 'usersessions') {
$rightcolspan = ' colspan="3"';
}
+ if ($action eq 'passwords') {
+ $leftnobr = ' LC_nobreak';
+ }
$output .= '
<tr>
<td>
<table class="LC_nested">
<tr class="LC_info_row">
- <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
+ <td class="LC_left_item'.$leftnobr.'"'.$colspan.'>'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
<td class="LC_right_item"'.$rightcolspan.'>'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
</tr>';
$rowtotal ++;
@@ -889,6 +893,7 @@
($action eq 'usersessions') || ($action eq 'coursecategories') ||
($action eq 'trust') || ($action eq 'contacts') ||
($action eq 'privacy') || ($action eq 'passwords')) {
+ my $leftnobr = ' LC_nobreak';
if ($action eq 'coursecategories') {
$output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal);
$colspan = ' colspan="2"';
@@ -956,7 +961,7 @@
<td>
<table class="LC_nested">
<tr class="LC_info_row">
- <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
+ <td class="LC_left_item'.$leftnobr.'"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'."\n";
if ($action eq 'passwords') {
$output .= $item->{'print'}->('bottom',$dom,$confname,$settings,\$rowtotal);
@@ -6056,7 +6061,7 @@
$datatable .= '<span class="LC_nobreak"><label>'.
'<input type="checkbox" name="passwords_case_sensitive" value="'.
$item.'"'.$checkedcase.' />'.$usertypes->{$item}.'</label>'.
- '<span> ';
+ '</span> ';
}
}
my $checkedcase;
@@ -6160,7 +6165,7 @@
&mt('(If you use the same account ... reset a password from this page.)').'</span><br /><br />'.
&mt('Include custom text:');
if ($customurl) {
- my $link = &Apache::loncommon::modal_link($customurl,&mt('Custom text file'),600,500,
+ my $link = &Apache::loncommon::modal_link($customurl,&mt('custom text'),600,500,
undef,undef,undef,undef,'background-color:#ffffff');
$datatable .= '<span class="LC_nobreak"> '.$link.
'<label><input type="checkbox" name="passwords_custom_del"'.
@@ -6387,7 +6392,7 @@
$datatable .= '<span class="LC_nobreak"><label>'.
'<input type="checkbox" name="passwords_crsowner_'.$item.'" value="'.
$type.'"'.$checked.' />'.$usertypes->{$type}.'</label>'.
- '<span> ';
+ '</span> ';
}
}
my $checked;
@@ -14836,9 +14841,11 @@
$resulttext .= '<li>'.&mt('CAPTCHA validation set to use: original CAPTCHA').'</li>';
} elsif ($confighash{'passwords'}{'captcha'} eq 'recaptcha') {
$resulttext .= '<li>'.&mt('CAPTCHA validation set to use: reCAPTCHA').' '.
- &mt('version: [_1]',$confighash{'passwords'}{'recaptchaversion'}).'<br />'.
- &mt('Public key: [_1]',$confighash{'passwords'}{'recaptchapub'}).'</br>'.
- &mt('Private key: [_1]',$confighash{'passwords'}{'recaptchapriv'}).'</li>';
+ &mt('version: [_1]',$confighash{'passwords'}{'recaptchaversion'}).'<br />';
+ if (ref($confighash{'passwords'}{'recaptchakeys'}) eq 'HASH') {
+ $resulttext .= &mt('Public key: [_1]',$confighash{'passwords'}{'recaptchakeys'}{'public'}).'</br>'.
+ &mt('Private key: [_1]',$confighash{'passwords'}{'recaptchakeys'}{'private'}).'</li>';
+ }
} else {
$resulttext .= '<li>'.&mt('No CAPTCHA validation').'</li>';
}
@@ -14917,8 +14924,9 @@
}
if ($confighash{'passwords'}{'resetcustom'}) {
my $customlink = &Apache::loncommon::modal_link($confighash{'passwords'}{'resetcustom'},
- $titles{custom},600,500);
- $resulttext .= '<li>'.&mt('Preamble to "Forgot Password" form includes [_1]',$customlink).'</li>';
+ &mt('custom text'),600,500,undef,undef,
+ undef,undef,'background-color:#ffffff');
+ $resulttext .= '<li>'.&mt('Preamble to "Forgot Password" form includes: [_1]',$customlink).'</li>';
} else {
$resulttext .= '<li>'.&mt('No custom text included in preamble to "Forgot Password" form').'</li>';
}
@@ -16103,13 +16111,17 @@
}
sub process_captcha {
- my ($container,$changes,$newsettings,$current) = @_;
- return unless ((ref($changes) eq 'HASH') && (ref($newsettings) eq 'HASH') || (ref($current) eq 'HASH'));
+ my ($container,$changes,$newsettings,$currsettings) = @_;
+ return unless ((ref($changes) eq 'HASH') && (ref($newsettings) eq 'HASH'));
$newsettings->{'captcha'} = $env{'form.'.$container.'_captcha'};
unless ($newsettings->{'captcha'} eq 'recaptcha' || $newsettings->{'captcha'} eq 'notused') {
$newsettings->{'captcha'} = 'original';
}
- if ($current->{'captcha'} ne $newsettings->{'captcha'}) {
+ my %current;
+ if (ref($currsettings) eq 'HASH') {
+ %current = %{$currsettings};
+ }
+ if ($current{'captcha'} ne $newsettings->{'captcha'}) {
if ($container eq 'cancreate') {
if (ref($changes->{'cancreate'}) eq 'ARRAY') {
push(@{$changes->{'cancreate'}},'captcha');
@@ -16139,9 +16151,9 @@
}
$newsettings->{'recaptchaversion'} = $newversion;
}
- if (ref($current->{'recaptchakeys'}) eq 'HASH') {
- $currpub = $current->{'recaptchakeys'}{'public'};
- $currpriv = $current->{'recaptchakeys'}{'private'};
+ if (ref($current{'recaptchakeys'}) eq 'HASH') {
+ $currpub = $current{'recaptchakeys'}{'public'};
+ $currpriv = $current{'recaptchakeys'}{'private'};
unless ($newsettings->{'captcha'} eq 'recaptcha') {
$newsettings->{'recaptchakeys'} = {
public => '',
@@ -16149,8 +16161,8 @@
}
}
}
- if ($current->{'captcha'} eq 'recaptcha') {
- $currversion = $current->{'recaptchaversion'};
+ if ($current{'captcha'} eq 'recaptcha') {
+ $currversion = $current{'recaptchaversion'};
if ($currversion ne '2') {
$currversion = 1;
}
More information about the LON-CAPA-cvs
mailing list