'.
@@ -6067,7 +3335,7 @@ sub print_coursedefaults {
my $currcanclone = 'none';
my $onclick;
my @cloneoptions = ('none','domain');
- my %clonetitles = &Apache::lonlocal::texthash (
+ my %clonetitles = (
none => 'No additional course requesters',
domain => "Any course requester in course's domain",
instcode => 'Course requests for official courses ...',
@@ -6093,7 +3361,7 @@ sub print_coursedefaults {
$currcanclone = $settings->{'canclone'};
}
}
- }
+ }
foreach my $option (@cloneoptions) {
my ($checked,$additional);
if ($currcanclone eq $option) {
@@ -6105,7 +3373,7 @@ sub print_coursedefaults {
if ($checked) {
$show = 'block';
}
- $additional = ''.
+ $additional = ''.
&mt('Institutional codes for new and cloned course have identical:').
'
';
foreach my $item (@code_order) {
@@ -6132,49 +3400,17 @@ sub print_coursedefaults {
$itemcount ++;
} else {
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- my ($currdefresponder,%defcredits,%curruploadquota,%currcoursequota,
- %deftimeout,%currmysql);
+ my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout);
my $currusecredits = 0;
my $postsubmitclient = 1;
- my $ltiauth = 0;
- my %domexttool;
- my %exttool;
my @types = ('official','unofficial','community','textbook');
if (ref($settings) eq 'HASH') {
- if ($settings->{'ltiauth'}) {
- $ltiauth = 1;
- }
- if (ref($settings->{'domexttool'}) eq 'HASH') {
- foreach my $type (@types) {
- if ($settings->{'domexttool'}->{$type}) {
- $domexttool{$type} = ' checked="checked"';
- }
- }
- } else {
- foreach my $type (@types) {
- if ($staticdefaults{'domexttool'}) {
- $domexttool{$type} = ' checked="checked"';
- }
- }
- }
- if (ref($settings->{'exttool'}) eq 'HASH') {
- foreach my $type (@types) {
- if ($settings->{'exttool'}->{$type}) {
- $exttool{$type} = ' checked="checked"';
- }
- }
- }
$currdefresponder = $settings->{'anonsurvey_threshold'};
if (ref($settings->{'uploadquota'}) eq 'HASH') {
foreach my $type (keys(%{$settings->{'uploadquota'}})) {
$curruploadquota{$type} = $settings->{'uploadquota'}{$type};
}
}
- if (ref($settings->{'coursequota'}) eq 'HASH') {
- foreach my $type (keys(%{$settings->{'coursequota'}})) {
- $currcoursequota{$type} = $settings->{'coursequota'}{$type};
- }
- }
if (ref($settings->{'coursecredits'}) eq 'HASH') {
foreach my $type (@types) {
next if ($type eq 'community');
@@ -6194,7 +3430,7 @@ sub print_coursedefaults {
foreach my $type (@types) {
if (ref($settings->{'postsubmit'}->{'timeout'}) eq 'HASH') {
if ($settings->{'postsubmit'}->{'timeout'}->{$type} =~ /^\d+$/) {
- $deftimeout{$type} = $settings->{'postsubmit'}->{'timeout'}->{$type};
+ $deftimeout{$type} = $settings->{'postsubmit'}->{'timeout'}->{$type};
} else {
$deftimeout{$type} = $staticdefaults{'postsubmit'};
}
@@ -6208,21 +3444,9 @@ sub print_coursedefaults {
$deftimeout{$type} = $staticdefaults{'postsubmit'};
}
}
- if (ref($settings->{'mysqltables'}) eq 'HASH') {
- foreach my $type (keys(%{$settings->{'mysqltables'}})) {
- $currmysql{$type} = $settings->{'mysqltables'}{$type};
- }
- } else {
- foreach my $type (@types) {
- $currmysql{$type} = $staticdefaults{'mysqltables'};
- }
- }
} else {
foreach my $type (@types) {
$deftimeout{$type} = $staticdefaults{'postsubmit'};
- if ($staticdefaults{'domexttool'}) {
- $domexttool{$type} = ' checked="checked"';
- }
}
}
if (!$currdefresponder) {
@@ -6234,9 +3458,6 @@ sub print_coursedefaults {
if ($curruploadquota{$type} eq '') {
$curruploadquota{$type} = $staticdefaults{'uploadquota'};
}
- if ($currcoursequota{$type} eq '') {
- $currcoursequota{$type} = $staticdefaults{'coursequota'};
- }
}
$datatable .=
''.
@@ -6260,19 +3481,6 @@ sub print_coursedefaults {
}
$datatable .= ' | '."\n";
$itemcount ++;
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= ''.
- $choices{'coursequota'}.
- ' | '.
- ''.
- ' | '."\n";
- $itemcount ++;
my $onclick = "toggleDisplay(this.form,'credits');";
my $display = 'none';
if ($currusecredits) {
@@ -6313,64 +3521,13 @@ sub print_coursedefaults {
$additional .= ''."\n";
%defaultchecked = ('postsubmit' => 'on');
@toggles = ('postsubmit');
- $current = {
- 'postsubmit' => $postsubmitclient,
- };
+ my $current = {
+ 'postsubmit' => $postsubmitclient,
+ };
($table,$itemcount) =
&radiobutton_prefs($current,\@toggles,\%defaultchecked,
\%choices,$itemcount,$onclick,$additional,'left');
$datatable .= $table;
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= ''.
- $choices{'mysqltables'}.
- ' | '.
- ''.
- ' | '."\n";
- $itemcount ++;
- %defaultchecked = ('ltiauth' => 'off');
- @toggles = ('ltiauth');
- $current = {
- 'ltiauth' => $ltiauth,
- };
- ($table,$itemcount) =
- &radiobutton_prefs($current,\@toggles,\%defaultchecked,
- \%choices,$itemcount,undef,undef,'left');
- $datatable .= $table;
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= ''.
- $choices{'domexttool'}.
- ' | '.
- ''.
- ' | '."\n";
- $itemcount ++;
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= ''.
- $choices{'exttool'}.
- ' | '.
- ''.
- ' | '."\n";
}
$$rowtotal += $itemcount;
return $datatable;
@@ -6564,7 +3721,7 @@ sub print_validation_rows {
' ';
}
} elsif ($item eq 'markup') {
- $datatable .= '';
}
@@ -6586,7 +3743,7 @@ sub print_validation_rows {
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
'validationdc',%currhash);
my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= '';
+ $datatable .= ' | ';
if ($numdc > 1) {
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)');
} else {
@@ -6601,770 +3758,6 @@ sub print_validation_rows {
return $datatable;
}
-sub print_passwords {
- my ($position,$dom,$confname,$settings,$rowtotal) = @_;
- my ($datatable,$css_class);
- my $itemcount = 0;
- my %titles = &Apache::lonlocal::texthash (
- captcha => '"Forgot Password" CAPTCHA validation',
- link => 'Reset link expiration (hours)',
- case => 'Case-sensitive usernames/e-mail',
- prelink => 'Information required (form 1)',
- postlink => 'Information required (form 2)',
- emailsrc => 'LON-CAPA e-mail address type(s)',
- customtext => 'Domain specific text (HTML)',
- intauth_cost => 'Encryption cost for bcrypt (positive integer)',
- intauth_check => 'Check bcrypt cost if authenticated',
- intauth_switch => 'Existing crypt-based switched to bcrypt on authentication',
- permanent => 'Permanent e-mail address',
- critical => 'Critical notification address',
- notify => 'Notification address',
- min => 'Minimum password length',
- max => 'Maximum password length',
- chars => 'Required characters',
- numsaved => 'Number of previous passwords to save and disallow reuse',
- );
- if ($position eq 'top') {
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- my $shownlinklife = 2;
- my $prelink = 'both';
- my (%casesens,%postlink,%emailsrc,$nostdtext,$customurl);
- if (ref($settings) eq 'HASH') {
- if ($settings->{resetlink} =~ /^\d+(|\.\d*)$/) {
- $shownlinklife = $settings->{resetlink};
- }
- if (ref($settings->{resetcase}) eq 'ARRAY') {
- map { $casesens{$_} = 1; } (@{$settings->{resetcase}});
- }
- if ($settings->{resetprelink} =~ /^(both|either)$/) {
- $prelink = $settings->{resetprelink};
- }
- if (ref($settings->{resetpostlink}) eq 'HASH') {
- %postlink = %{$settings->{resetpostlink}};
- }
- if (ref($settings->{resetemail}) eq 'ARRAY') {
- map { $emailsrc{$_} = 1; } (@{$settings->{resetemail}});
- }
- if ($settings->{resetremove}) {
- $nostdtext = 1;
- }
- if ($settings->{resetcustom}) {
- $customurl = $settings->{resetcustom};
- }
- } else {
- if (ref($types) eq 'ARRAY') {
- foreach my $item (@{$types}) {
- $casesens{$item} = 1;
- $postlink{$item} = ['username','email'];
- }
- }
- $casesens{'default'} = 1;
- $postlink{'default'} = ['username','email'];
- $prelink = 'both';
- %emailsrc = (
- permanent => 1,
- critical => 1,
- notify => 1,
- );
- }
- $datatable = &captcha_choice('passwords',$settings,$$rowtotal);
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= '| '.$titles{'link'}.' | '.
- ''.
- ' | ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'case'}.' | '.
- '';
- if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
- foreach my $item (@{$types}) {
- my $checkedcase;
- if ($casesens{$item}) {
- $checkedcase = ' checked="checked"';
- }
- $datatable .= ''.
- ' ';
- }
- }
- my $checkedcase;
- if ($casesens{'default'}) {
- $checkedcase = ' checked="checked"';
- }
- $datatable .= ' | ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- my %checkedpre = (
- both => ' checked="checked"',
- either => '',
- );
- if ($prelink eq 'either') {
- $checkedpre{either} = ' checked="checked"';
- $checkedpre{both} = '';
- }
- $datatable .= ''.$titles{'prelink'}.' | '.
- ''.
- ' '.
- ' | ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'postlink'}.' | '.
- '';
- my %postlinked;
- if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
- foreach my $item (@{$types}) {
- undef(%postlinked);
- $datatable .= '';
- }
- }
- if (ref($postlink{'default'}) eq 'ARRAY') {
- map { $postlinked{$_} = 1; } (@{$postlink{'default'}});
- }
- $datatable .= ' | ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'emailsrc'}.' | '.
- '';
- foreach my $type ('permanent','critical','notify') {
- my $checkedemail;
- if ($emailsrc{$type}) {
- $checkedemail = ' checked="checked"';
- }
- $datatable .= ''.
- ' ';
- }
- $datatable .= ' | ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- my $switchserver = &check_switchserver($dom,$confname);
- my ($showstd,$noshowstd);
- if ($nostdtext) {
- $noshowstd = ' checked="checked"';
- } else {
- $showstd = ' checked="checked"';
- }
- $datatable .= ''.$titles{'customtext'}.' | '.
- ''.
- &mt('Retain standard text:').
- ''.' '.
- '
'.
- ''.
- &mt('(If you use the same account ... reset a password from this page.)').'
'.
- &mt('Include custom text:');
- if ($customurl) {
- my $link = &Apache::loncommon::modal_link($customurl,&mt('custom text'),600,500,
- undef,undef,undef,undef,'background-color:#ffffff');
- $datatable .= ' '.$link.
- ''.
- ' '.&mt('Replace:').'';
- }
- if ($switchserver) {
- $datatable .= ' '.&mt('Upload to library server: [_1]',$switchserver).'';
- } else {
- $datatable .=' '.
- '';
- }
- $datatable .= ' | ';
- } elsif ($position eq 'middle') {
- my %domconf = &Apache::lonnet::get_dom('configuration',['defaults'],$dom);
- my @items = ('intauth_cost','intauth_check','intauth_switch');
- my %defaults;
- if (ref($domconf{'defaults'}) eq 'HASH') {
- %defaults = %{$domconf{'defaults'}};
- if ($defaults{'intauth_cost'} !~ /^\d+$/) {
- $defaults{'intauth_cost'} = 10;
- }
- if ($defaults{'intauth_check'} !~ /^(0|1|2)$/) {
- $defaults{'intauth_check'} = 0;
- }
- if ($defaults{'intauth_switch'} !~ /^(0|1|2)$/) {
- $defaults{'intauth_switch'} = 0;
- }
- } else {
- %defaults = (
- 'intauth_cost' => 10,
- 'intauth_check' => 0,
- 'intauth_switch' => 0,
- );
- }
- foreach my $item (@items) {
- if ($itemcount%2) {
- $css_class = '';
- } else {
- $css_class = ' class="LC_odd_row" ';
- }
- $datatable .= ''.
- ''.$titles{$item}.
- ' | ';
- if ($item eq 'intauth_switch') {
- my @options = (0,1,2);
- my %optiondesc = &Apache::lonlocal::texthash (
- 0 => 'No',
- 1 => 'Yes',
- 2 => 'Yes, and copy existing passwd file to passwd.bak file',
- );
- $datatable .= '';
- } elsif ($item eq 'intauth_check') {
- my @options = (0,1,2);
- my %optiondesc = &Apache::lonlocal::texthash (
- 0 => 'No',
- 1 => 'Yes, allow login then update passwd file using default cost (if higher)',
- 2 => 'Yes, disallow login if stored cost is less than domain default',
- );
- $datatable .= '';
- } else {
- $datatable .= '';
- }
- $datatable .= ' | ';
- $itemcount ++;
- }
- } elsif ($position eq 'lower') {
- $datatable .= &password_rules('passwords',\$itemcount,$settings);
- } else {
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- my %ownerchg = (
- by => {},
- for => {},
- );
- my %ownertitles = &Apache::lonlocal::texthash (
- by => 'Course owner status(es) allowed',
- for => 'Student status(es) allowed',
- );
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{crsownerchg}) eq 'HASH') {
- if (ref($settings->{crsownerchg}{'by'}) eq 'ARRAY') {
- map { $ownerchg{by}{$_} = 1; } (@{$settings->{crsownerchg}{'by'}});
- }
- if (ref($settings->{crsownerchg}{'for'}) eq 'ARRAY') {
- map { $ownerchg{for}{$_} = 1; } (@{$settings->{crsownerchg}{'for'}});
- }
- }
- }
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.
- ''.
- &mt('Requirements').''.
- '- '.&mt("Course 'type' is not a Community").'
'.
- '- '.&mt('User is Course Coordinator and also course owner').'
'.
- '- '.&mt("Student's only active roles are student role(s) in course(s) owned by this user").'
'.
- '- '.&mt('User, course, and student share same domain').'
'.
- ' '.
- ' | '.
- '';
- foreach my $item ('by','for') {
- $datatable .= '';
- }
- $datatable .= ' | ';
- }
- return $datatable;
-}
-
-sub password_rules {
- my ($prefix,$itemcountref,$settings) = @_;
- my ($min,$max,%chars,$numsaved,$numinrow);
- my %titles;
- if ($prefix eq 'passwords') {
- %titles = &Apache::lonlocal::texthash (
- min => 'Minimum password length',
- max => 'Maximum password length',
- chars => 'Required characters',
- );
- } elsif (($prefix eq 'ltisecrets') || ($prefix eq 'toolsecrets')) {
- %titles = &Apache::lonlocal::texthash (
- min => 'Minimum secret length',
- max => 'Maximum secret length',
- chars => 'Required characters',
- );
- }
- $min = $Apache::lonnet::passwdmin;
- my $datatable;
- my $itemcount;
- if (ref($itemcountref)) {
- $itemcount = $$itemcountref;
- }
- if (ref($settings) eq 'HASH') {
- if ($settings->{min}) {
- $min = $settings->{min};
- }
- if ($settings->{max}) {
- $max = $settings->{max};
- }
- if (ref($settings->{chars}) eq 'ARRAY') {
- map { $chars{$_} = 1; } (@{$settings->{chars}});
- }
- if ($prefix eq 'passwords') {
- if ($settings->{numsaved}) {
- $numsaved = $settings->{numsaved};
- }
- }
- }
- my %rulenames = &Apache::lonlocal::texthash(
- uc => 'At least one upper case letter',
- lc => 'At least one lower case letter',
- num => 'At least one number',
- spec => 'At least one non-alphanumeric',
- );
- my $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'min'}.' | '.
- ''.
- ''.
- ' '.&mt('(Enter an integer: 7 or larger)').''.
- ' | ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'max'}.' | '.
- ''.
- ''.
- ' '.&mt('(Leave blank for no maximum)').''.
- ' | ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'chars'}.'
'.
- ''.&mt('(Leave unchecked if not required)').
- ' | ';
- my $numinrow = 2;
- my @possrules = ('uc','lc','num','spec');
- $datatable .= ' | ';
- $itemcount ++;
- if ($prefix eq 'passwords') {
- $titles{'numsaved'} = &mt('Number of previous passwords to save and disallow reuse');
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'numsaved'}.' | '.
- ''.
- ''.
- ' '.&mt('(Leave blank to not save previous passwords)').''.
- ' | ';
- $itemcount ++;
- }
- if (ref($itemcountref)) {
- $$itemcountref += $itemcount;
- }
- return $datatable;
-}
-
-sub print_wafproxy {
- my ($position,$dom,$settings,$rowtotal) = @_;
- my $css_class;
- my $itemcount = 0;
- my $datatable;
- my %servers = &Apache::lonnet::internet_dom_servers($dom);
- my (%othercontrol,%otherdoms,%aliases,%saml,%values,$setdom,$showdom);
- my %lt = &wafproxy_titles();
- foreach my $server (sort(keys(%servers))) {
- my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server});
- next if ($serverhome eq '');
- my $serverdom;
- if ($serverhome ne $server) {
- $serverdom = &Apache::lonnet::host_domain($serverhome);
- if (($serverdom ne '') && (&Apache::lonnet::domain($serverdom) ne '')) {
- $othercontrol{$server} = $serverdom;
- }
- } else {
- $serverdom = &Apache::lonnet::host_domain($server);
- next if (($serverdom eq '') || (&Apache::lonnet::domain($serverdom) eq ''));
- if ($serverdom ne $dom) {
- $othercontrol{$server} = $serverdom;
- } else {
- $setdom = 1;
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{'alias'}) eq 'HASH') {
- $aliases{$dom} = $settings->{'alias'};
- if ($aliases{$dom} ne '') {
- $showdom = 1;
- }
- }
- if (ref($settings->{'saml'}) eq 'HASH') {
- $saml{$dom} = $settings->{'saml'};
- }
- }
- }
- }
- }
- if ($setdom) {
- %{$values{$dom}} = ();
- if (ref($settings) eq 'HASH') {
- foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') {
- $values{$dom}{$item} = $settings->{$item};
- }
- }
- }
- if (keys(%othercontrol)) {
- %otherdoms = reverse(%othercontrol);
- foreach my $domain (keys(%otherdoms)) {
- %{$values{$domain}} = ();
- my %config = &Apache::lonnet::get_dom('configuration',['wafproxy'],$domain);
- if (ref($config{'wafproxy'}) eq 'HASH') {
- $aliases{$domain} = $config{'wafproxy'}{'alias'};
- if (exists($config{'wafproxy'}{'saml'})) {
- $saml{$domain} = $config{'wafproxy'}{'saml'};
- }
- foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') {
- $values{$domain}{$item} = $config{'wafproxy'}{$item};
- }
- }
- }
- }
- if ($position eq 'top') {
- my %servers = &Apache::lonnet::internet_dom_servers($dom);
- my %aliasinfo;
- foreach my $server (sort(keys(%servers))) {
- $itemcount ++;
- my $dom_in_effect;
- my $aliasrows = ''.
- '| '.
- &mt('Hostname').': '.
- ''.
- &Apache::lonnet::hostname($server).' | | ';
- if ($othercontrol{$server}) {
- $dom_in_effect = $othercontrol{$server};
- my ($current,$forsaml);
- if (ref($aliases{$dom_in_effect}) eq 'HASH') {
- $current = $aliases{$dom_in_effect}{$server};
- }
- if (ref($saml{$dom_in_effect}) eq 'HASH') {
- if ($saml{$dom_in_effect}{$server}) {
- $forsaml = 1;
- }
- }
- $aliasrows .= ''.
- &mt('Alias').': ';
- if ($current) {
- $aliasrows .= $current;
- if ($forsaml) {
- $aliasrows .= ' ('.&mt('also for SSO Auth').')';
- }
- } else {
- $aliasrows .= &mt('None');
- }
- $aliasrows .= ' ('.
- &mt('controlled by domain: [_1]',
- ''.$dom_in_effect.'').') | ';
- } else {
- $dom_in_effect = $dom;
- my ($current,$samlon,$samloff);
- $samloff = ' checked="checked"';
- if (ref($aliases{$dom}) eq 'HASH') {
- if ($aliases{$dom}{$server}) {
- $current = $aliases{$dom}{$server};
- }
- }
- if (ref($saml{$dom}) eq 'HASH') {
- if ($saml{$dom}{$server}) {
- $samlon = $samloff;
- undef($samloff);
- }
- }
- $aliasrows .= ''.
- &mt('Alias').': '.
- ''.
- (' 'x2).''.
- &mt('Alias used for SSO Auth').': '.
- ' | ';
- }
- $aliasrows .= ' ';
- $aliasinfo{$dom_in_effect} .= $aliasrows;
- }
- if ($aliasinfo{$dom}) {
- my ($onclick,$wafon,$wafoff,$showtable);
- $onclick = ' onclick="javascript:toggleWAF();"';
- $wafoff = ' checked="checked"';
- $showtable = ' style="display:none";';
- if ($showdom) {
- $wafon = $wafoff;
- $wafoff = '';
- $showtable = ' style="display:inline;"';
- }
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable = ''.
- ''.&mt('Domain: [_1]',''.$dom.'').'
'.
- ''.&mt('WAF in use?').' '.(' 'x2).' | '.
- ''.
- ' | ';
- $itemcount++;
- }
- if (keys(%otherdoms)) {
- foreach my $key (sort(keys(%otherdoms))) {
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= ''.
- ''.&mt('Domain: [_1]',''.$key.'').' | '.
- ' | ';
- $itemcount++;
- }
- }
- } else {
- my %ip_methods = &remoteip_methods();
- if ($setdom) {
- $itemcount ++;
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- my ($nowafstyle,$wafstyle,$curr_remotip,$currwafdisplay,$vpndircheck,$vpnaliascheck,
- $currwafvpn,$wafrangestyle,$alltossl,$ssltossl);
- $wafstyle = ' style="display:none;"';
- $nowafstyle = ' style="display:table-row;"';
- $currwafdisplay = ' style="display: none"';
- $wafrangestyle = ' style="display: none"';
- $curr_remotip = 'n';
- $ssltossl = ' checked="checked"';
- if ($showdom) {
- $wafstyle = ' style="display:table-row;"';
- $nowafstyle = ' style="display:none;"';
- if (keys(%{$values{$dom}})) {
- if ($values{$dom}{remoteip} =~ /^[nmh]$/) {
- $curr_remotip = $values{$dom}{remoteip};
- }
- if ($curr_remotip eq 'h') {
- $currwafdisplay = ' style="display:table-row"';
- $wafrangestyle = ' style="display:inline-block;"';
- }
- if ($values{$dom}{'sslopt'}) {
- $alltossl = ' checked="checked"';
- $ssltossl = '';
- }
- }
- if (($values{$dom}{'vpnint'} ne '') || ($values{$dom}{'vpnext'} ne '')) {
- $vpndircheck = ' checked="checked"';
- $currwafvpn = ' style="display:table-row;"';
- $wafrangestyle = ' style="display:inline-block;"';
- } else {
- $vpnaliascheck = ' checked="checked"';
- $currwafvpn = ' style="display:none;"';
- }
- }
- $datatable .= ''.
- ''.&mt('Domain: [_1]',''.$dom.'').' | '.
- ''.&mt('WAF not in use, nothing to set').' | '.
- ''.
- ''.
- ''.&mt('Domain: [_1]',''.$dom.'').'
'.
- ''.&mt('Format for comma separated IP ranges').':
'.
- &mt('A.B.C.D/N or A.B.C.D-E.F.G.H').'
'.
- &mt('Range(s) stored in CIDR notation').' | '.
- ' | ';
- }
- if (keys(%otherdoms)) {
- foreach my $domain (sort(keys(%otherdoms))) {
- $itemcount ++;
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= ''.
- ''.&mt('Domain: [_1]',''.$domain.'').' | '.
- '';
- foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') {
- my $showval = &mt('None');
- if ($item eq 'ssl') {
- $showval = $lt{'ssltossl'};
- }
- if ($values{$domain}{$item}) {
- $showval = $values{$domain}{$item};
- if ($item eq 'ssl') {
- $showval = $lt{'alltossl'};
- } elsif ($item eq 'remoteip') {
- $showval = $ip_methods{$values{$domain}{$item}};
- }
- }
- $datatable .= ''.
- '| '.$lt{$item}.': '.$showval.' | ';
- }
- $datatable .= ' | ';
- }
- }
- }
- $$rowtotal += $itemcount;
- return $datatable;
-}
-
-sub wafproxy_titles {
- return &Apache::lonlocal::texthash(
- remoteip => "Method for determining user's IP",
- ipheader => 'Request header containing remote IP',
- trusted => 'Trusted IP range(s)',
- vpnaccess => 'Access from institutional VPN',
- vpndirect => 'via regular hostname (no WAF)',
- vpnaliased => 'via aliased hostname (WAF)',
- vpnint => 'Internal IP Range(s) for VPN sessions',
- vpnext => 'IP Range(s) for backend WAF connections',
- sslopt => 'Forwarding http/https',
- alltossl => 'WAF forwards both http and https requests to https',
- ssltossl => 'WAF forwards http requests to http and https to https',
- );
-}
-
-sub remoteip_methods {
- return &Apache::lonlocal::texthash(
- m => 'Use Apache mod_remoteip',
- h => 'Use headers parsed by LON-CAPA',
- n => 'Not in use',
- );
-}
-
sub print_usersessions {
my ($position,$dom,$settings,$rowtotal) = @_;
my ($css_class,$datatable,%checked,%choices);
@@ -7379,28 +3772,21 @@ sub print_usersessions {
if ($position eq 'top') {
if (keys(%serverhomes) > 1) {
my %spareid = ¤t_offloads_to($dom,$settings,\%servers);
- my ($curroffloadnow,$curroffloadoth);
+ my $curroffloadnow;
if (ref($settings) eq 'HASH') {
if (ref($settings->{'offloadnow'}) eq 'HASH') {
$curroffloadnow = $settings->{'offloadnow'};
}
- if (ref($settings->{'offloadoth'}) eq 'HASH') {
- $curroffloadoth = $settings->{'offloadoth'};
- }
}
- my $other_insts = scalar(keys(%by_location));
- $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,
- $other_insts,$curroffloadnow,$curroffloadoth,$rowtotal);
+ $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$curroffloadnow,$rowtotal);
} else {
$datatable .= ''.
- &mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.').
- ' | ';
+ &mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.');
}
} else {
if (keys(%by_location) == 0) {
$datatable .= ''.
- &mt('Nothing to set here, as the cluster to which this domain belongs only contains one institution.').
- ' | ';
+ &mt('Nothing to set here, as the cluster to which this domain belongs only contains one institution.');
} else {
my %lt = &usersession_titles();
my $numinrow = 5;
@@ -7642,8 +4028,7 @@ sub current_offloads_to {
}
sub spares_row {
- my ($dom,$servers,$spareid,$serverhomes,$altids,$other_insts,
- $curroffloadnow,$curroffloadoth,$rowtotal) = @_;
+ my ($dom,$servers,$spareid,$serverhomes,$altids,$curroffloadnow,$rowtotal) = @_;
my $css_class;
my $numinrow = 4;
my $itemcount = 1;
@@ -7663,34 +4048,22 @@ sub spares_row {
}
}
next unless (ref($spareid->{$server}) eq 'HASH');
- my ($checkednow,$checkedoth);
+ my $checkednow;
if (ref($curroffloadnow) eq 'HASH') {
if ($curroffloadnow->{$server}) {
$checkednow = ' checked="checked"';
}
}
- if (ref($curroffloadoth) eq 'HASH') {
- if ($curroffloadoth->{$server}) {
- $checkedoth = ' checked="checked"';
- }
- }
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
$datatable .= '
'.
&mt('[_1] when busy, offloads to:'
,''.$server.'').'
'.
- ''."\n".
+ ''."\n".
''.
+ ' '.&mt('Switch active users on next access').''.
"\n";
- if ($other_insts) {
- $datatable .= '
'.
- ''."\n".
- ''.
- "\n";
- }
my (%current,%canselect);
my @choices =
&possible_newspares($server,$spareid->{$server},$serverhomes,$altids);
@@ -7814,13 +4187,13 @@ sub print_loadbalancing {
my $numinrow = 1;
my $datatable;
my %servers = &Apache::lonnet::internet_dom_servers($dom);
- my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
+ my (%currbalancer,%currtargets,%currrules,%existing);
if (ref($settings) eq 'HASH') {
%existing = %{$settings};
}
if ((keys(%servers) > 1) || (keys(%existing) > 0)) {
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer,
- \%currtargets,\%currrules,\%currcookies);
+ \%currtargets,\%currrules);
} else {
return;
}
@@ -7894,12 +4267,6 @@ sub print_loadbalancing {
my ($numspares,@spares) = &count_servers($lonhost,%servers);
my @sparestypes = ('primary','default');
my %typetitles = &sparestype_titles();
- my %hostherechecked = (
- no => ' checked="checked"',
- );
- my %balcookiechecked = (
- no => ' checked="checked"',
- );
foreach my $sparetype (@sparestypes) {
my $targettable;
for (my $i=0; $i<$numspares; $i++) {
@@ -7945,35 +4312,8 @@ sub print_loadbalancing {
$datatable .= ''.$typetitles{$sparetype}.'
'.
'
';
}
- $hostherechecked{$sparetype} = '';
- if (ref($currtargets{$lonhost}) eq 'HASH') {
- if (ref($currtargets{$lonhost}{$sparetype}) eq 'ARRAY') {
- if (grep(/^\Q$lonhost\E$/,@{$currtargets{$lonhost}{$sparetype}})) {
- $hostherechecked{$sparetype} = ' checked="checked"';
- $hostherechecked{'no'} = '';
- }
- }
- }
}
- if ($currcookies{$lonhost}) {
- %balcookiechecked = (
- yes => ' checked="checked"',
- );
- }
- $datatable .= &mt('Hosting on balancer itself').'
'.
- '
';
- foreach my $sparetype (@sparestypes) {
- $datatable .= '
';
- }
- $datatable .= &mt('Use balancer cookie').'
'.
- '
'.
- '
'.
- ' | '.
+ $datatable .= ' | '.
&loadbalancing_rules($dom,$intdom,$currrules{$lonhost},
$othertitle,$usertypes,$types,\%servers,
\%currbalancer,$lonhost,
@@ -7987,11 +4327,10 @@ sub print_loadbalancing {
}
sub get_loadbalancers_config {
- my ($servers,$existing,$currbalancer,$currtargets,$currrules,$currcookies) = @_;
+ my ($servers,$existing,$currbalancer,$currtargets,$currrules) = @_;
return unless ((ref($servers) eq 'HASH') &&
(ref($existing) eq 'HASH') && (ref($currbalancer) eq 'HASH') &&
- (ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH') &&
- (ref($currcookies) eq 'HASH'));
+ (ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH'));
if (keys(%{$existing}) > 0) {
my $oldlonhost;
foreach my $key (sort(keys(%{$existing}))) {
@@ -8010,9 +4349,6 @@ sub get_loadbalancers_config {
$currbalancer->{$key} = 1;
$currtargets->{$key} = $existing->{$key}{'targets'};
$currrules->{$key} = $existing->{$key}{'rules'};
- if ($existing->{$key}{'cookie'}) {
- $currcookies->{$key} = 1;
- }
}
}
} else {
@@ -8068,14 +4404,9 @@ sub loadbalancing_titles {
'_LC_ipchange' => &mt('Non-SSO users with IP mismatch'),
);
my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external','_LC_ipchangesso','_LC_ipchange');
- my @available;
if (ref($types) eq 'ARRAY') {
- @available = @{$types};
+ unshift(@alltypes,@{$types},'default');
}
- unless (grep(/^default$/,@available)) {
- push(@available,'default');
- }
- unshift(@alltypes,@available);
my %titles;
foreach my $type (@alltypes) {
if ($type =~ /^_LC_/) {
@@ -8116,7 +4447,7 @@ sub loadbalance_rule_row {
}
my $space;
if ($islast && $num == 1) {
- $space = ' ';
+ $space = ' ';
}
my $output =
''.$space.
@@ -8198,21 +4529,15 @@ sub sparestype_titles {
sub contact_titles {
my %titles = &Apache::lonlocal::texthash (
- 'supportemail' => 'Support E-mail address',
- 'adminemail' => 'Default Server Admin E-mail address',
- 'errormail' => 'Error reports to be e-mailed to',
- 'packagesmail' => 'Package update alerts to be e-mailed to',
- 'helpdeskmail' => "Helpdesk requests from all users in this domain",
- 'otherdomsmail' => 'Helpdesk requests from users in other (unconfigured) domains',
- 'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)',
- 'requestsmail' => 'E-mail from course requests requiring approval',
- 'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates',
+ 'supportemail' => 'Support E-mail address',
+ 'adminemail' => 'Default Server Admin E-mail address',
+ 'errormail' => 'Error reports to be e-mailed to',
+ 'packagesmail' => 'Package update alerts to be e-mailed to',
+ 'helpdeskmail' => 'Helpdesk requests to be e-mailed to',
+ 'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)',
+ 'requestsmail' => 'E-mail from course requests requiring approval',
+ 'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates',
'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID',
- 'hostipmail' => 'E-mail from nightly check of hostname/IP network changes',
- 'errorthreshold' => 'Error count threshold for status e-mail to admin(s)',
- 'errorsysmail' => 'Error count threshold for e-mail to developer group',
- 'errorweights' => 'Weights used to compute error count',
- 'errorexcluded' => 'Servers with unsent updates excluded from count',
);
my %short_titles = &Apache::lonlocal::texthash (
adminemail => 'Admin E-mail address',
@@ -8221,41 +4546,12 @@ sub contact_titles {
return (\%titles,\%short_titles);
}
-sub helpform_fields {
- my %titles = &Apache::lonlocal::texthash (
- 'username' => 'Name',
- 'user' => 'Username/domain',
- 'phone' => 'Phone',
- 'cc' => 'Cc e-mail',
- 'course' => 'Course Details',
- 'section' => 'Sections',
- 'screenshot' => 'File upload',
- );
- my @fields = ('username','phone','user','course','section','cc','screenshot');
- my %possoptions = (
- username => ['yes','no','req'],
- phone => ['yes','no','req'],
- user => ['yes','no'],
- cc => ['yes','no'],
- course => ['yes','no'],
- section => ['yes','no'],
- screenshot => ['yes','no'],
- );
- my %fieldoptions = &Apache::lonlocal::texthash (
- 'yes' => 'Optional',
- 'req' => 'Required',
- 'no' => "Not shown",
- );
- return (\@fields,\%titles,\%fieldoptions,\%possoptions);
-}
-
sub tool_titles {
my %titles = &Apache::lonlocal::texthash (
aboutme => 'Personal web page',
blog => 'Blog',
webdav => 'WebDAV',
portfolio => 'Portfolio',
- timezone => 'Can set time zone',
official => 'Official courses (with institutional codes)',
unofficial => 'Unofficial courses',
community => 'Communities',
@@ -8270,7 +4566,6 @@ sub courserequest_titles {
unofficial => 'Unofficial',
community => 'Communities',
textbook => 'Textbook',
- lti => 'LTI Provider',
norequest => 'Not allowed',
approval => 'Approval by Dom. Coord.',
validate => 'With validation',
@@ -8384,7 +4679,7 @@ sub print_usercreation {
}
} else {
my @contexts = ('author','course','domain');
- my @authtypes = ('int','krb4','krb5','loc','lti');
+ my @authtypes = ('int','krb4','krb5','loc');
my %checked;
if (ref($settings) eq 'HASH') {
if (ref($settings->{'authtypes'}) eq 'HASH') {
@@ -8435,8 +4730,7 @@ sub print_usercreation {
sub print_selfcreation {
my ($position,$dom,$settings,$rowtotal) = @_;
- my (@selfcreate,$createsettings,$processing,$emailoptions,$emailverified,
- $emaildomain,$datatable);
+ my (@selfcreate,$createsettings,$processing,$datatable);
if (ref($settings) eq 'HASH') {
if (ref($settings->{'cancreate'}) eq 'HASH') {
$createsettings = $settings->{'cancreate'};
@@ -8453,22 +4747,12 @@ sub print_selfcreation {
if (ref($createsettings->{'selfcreateprocessing'}) eq 'HASH') {
$processing = $createsettings->{'selfcreateprocessing'};
}
- if (ref($createsettings->{'emailoptions'}) eq 'HASH') {
- $emailoptions = $createsettings->{'emailoptions'};
- }
- if (ref($createsettings->{'emailverified'}) eq 'HASH') {
- $emailverified = $createsettings->{'emailverified'};
- }
- if (ref($createsettings->{'emaildomain'}) eq 'HASH') {
- $emaildomain = $createsettings->{'emaildomain'};
- }
}
}
}
my %radiohash;
my $numinrow = 4;
map { $radiohash{'cancreate_'.$_} = 1; } @selfcreate;
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
if ($position eq 'top') {
my %choices = &Apache::lonlocal::texthash (
cancreate_login => 'Institutional Login',
@@ -8483,12 +4767,14 @@ sub print_selfcreation {
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
\%choices,$itemcount,$onclick);
$$rowtotal += $itemcount;
+
+ my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
if (ref($usertypes) eq 'HASH') {
if (keys(%{$usertypes}) > 0) {
$datatable .= &insttypes_row($createsettings,$types,$usertypes,
$dom,$numinrow,$othertitle,
- 'statustocreate',$rowtotal);
+ 'statustocreate',$$rowtotal);
$$rowtotal ++;
}
}
@@ -8501,7 +4787,7 @@ sub print_selfcreation {
$datatable .= ''.
'| '.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').' | '.
''."\n".
- ''."\n";
+ ''."\n";
for (my $i=0; $i<@fields; $i++) {
$rem = $i%($numperrow);
if ($rem == 0) {
@@ -8533,430 +4819,149 @@ sub print_selfcreation {
$$rowtotal ++;
} elsif ($position eq 'middle') {
my %domconf = &Apache::lonnet::get_dom('configuration',['usermodification'],$dom);
- my @posstypes;
+ my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+ $usertypes->{'default'} = $othertitle;
if (ref($types) eq 'ARRAY') {
- @posstypes = @{$types};
- }
- unless (grep(/^default$/,@posstypes)) {
- push(@posstypes,'default');
- }
- my %usertypeshash;
- if (ref($usertypes) eq 'HASH') {
- %usertypeshash = %{$usertypes};
- }
- $usertypeshash{'default'} = $othertitle;
- foreach my $status (@posstypes) {
- $datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'},
- $numinrow,$$rowtotal,\%usertypeshash);
- $$rowtotal ++;
+ push(@{$types},'default');
+ $usertypes->{'default'} = $othertitle;
+ foreach my $status (@{$types}) {
+ $datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'},
+ $numinrow,$$rowtotal,$usertypes);
+ $$rowtotal ++;
+ }
}
} else {
my %choices = &Apache::lonlocal::texthash (
- 'cancreate_email' => 'Non-institutional username (via e-mail verification)',
+ cancreate_email => 'E-mail address as username',
);
my @toggles = sort(keys(%choices));
my %defaultchecked = (
'cancreate_email' => 'off',
);
- my $customclass = 'LC_selfcreate_email';
- my $classprefix = 'LC_canmodify_emailusername_';
- my $optionsprefix = 'LC_options_emailusername_';
+ my $itemcount = 0;
my $display = 'none';
- my $rowstyle = 'display:none';
if (grep(/^\Qemail\E$/,@selfcreate)) {
$display = 'block';
- $rowstyle = 'display:table-row';
}
- my $onclick = "toggleRows(this.form,'cancreate_email','selfassign','$customclass','$classprefix','$optionsprefix');";
- ($datatable,$$rowtotal) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
- \%choices,$$rowtotal,$onclick);
- $datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal,$customclass,
- $rowstyle);
- $$rowtotal ++;
- $datatable .= &captcha_choice('cancreate',$createsettings,$$rowtotal,$customclass,
- $rowstyle);
- $$rowtotal ++;
- my (@ordered,@posstypes,%usertypeshash);
+ my $onclick = "toggleDisplay(this.form,'emailoptions');";
+ my $additional = '';
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
- my ($emailrules,$emailruleorder) =
- &Apache::lonnet::inst_userrules($dom,'email');
- my $primary_id = &Apache::lonnet::domain($dom,'primary');
- my $intdom = &Apache::lonnet::internet_dom($primary_id);
- if (ref($types) eq 'ARRAY') {
- @posstypes = @{$types};
- }
- if (@posstypes) {
- unless (grep(/^default$/,@posstypes)) {
- push(@posstypes,'default');
- }
- if (ref($usertypes) eq 'HASH') {
- %usertypeshash = %{$usertypes};
- }
- my $currassign;
- if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') {
- $currassign = {
- selfassign => $domdefaults{'inststatusguest'},
- };
- @ordered = @{$domdefaults{'inststatusguest'}};
- } else {
- $currassign = { selfassign => [] };
- }
- my $onclicktypes = "toggleDataRow(this.form,'selfassign','$customclass','$optionsprefix',);".
- "toggleDataRow(this.form,'selfassign','$customclass','$classprefix',1);";
- $datatable .= &insttypes_row($currassign,$types,$usertypes,$dom,
- $numinrow,$othertitle,'selfassign',
- $rowtotal,$onclicktypes,$customclass,
- $rowstyle);
- $$rowtotal ++;
- $usertypeshash{'default'} = $othertitle;
- foreach my $status (@posstypes) {
- my $css_class;
- if ($$rowtotal%2) {
- $css_class = 'LC_odd_row ';
- }
- $css_class .= $customclass;
- my $rowid = $optionsprefix.$status;
- my $hidden = 1;
- my $currstyle = 'display:none';
- if (grep(/^\Q$status\E$/,@ordered)) {
- $currstyle = $rowstyle;
- $hidden = 0;
- }
- $datatable .= &noninst_users($processing,$emailverified,$emailoptions,$emaildomain,
- $emailrules,$emailruleorder,$settings,$status,$rowid,
- $usertypeshash{$status},$css_class,$currstyle,$intdom);
- unless ($hidden) {
- $$rowtotal ++;
+ my $usertypes = {};
+ my $order = [];
+ if ((ref($domdefaults{'inststatustypes'}) eq 'HASH') && (ref($domdefaults{'inststatusguest'}) eq 'ARRAY')) {
+ $usertypes = $domdefaults{'inststatustypes'};
+ $order = $domdefaults{'inststatusguest'};
+ }
+ if (ref($order) eq 'ARRAY') {
+ push(@{$order},'default');
+ if (@{$order} > 1) {
+ $usertypes->{'default'} = &mt('Other users');
+ $additional .= ' ';
+ foreach my $status (@{$order}) {
+ $additional .= '| '.$usertypes->{$status}.' | ';
+ }
+ $additional .= ' ';
+ foreach my $status (@{$order}) {
+ $additional .= '| '.&email_as_username($rowtotal,$processing,$status).' | ';
}
+ $additional .= '
';
+ } else {
+ $usertypes->{'default'} = &mt('All users');
+ $additional .= &email_as_username($rowtotal,$processing);
}
- } else {
- my $css_class;
- if ($$rowtotal%2) {
- $css_class = 'LC_odd_row ';
- }
- $css_class .= $customclass;
- $usertypeshash{'default'} = $othertitle;
- $datatable .= &noninst_users($processing,$emailverified,$emailoptions,$emaildomain,
- $emailrules,$emailruleorder,$settings,'default','',
- $othertitle,$css_class,$rowstyle,$intdom);
- $$rowtotal ++;
}
+ $additional .= ' $description | \n".
- ''.
- '';
- my %headers = &Apache::lonlocal::texthash(
- approve => 'Processing',
- email => 'E-mail',
- username => 'Username',
- );
- foreach my $item ('approve','email','username') {
- $output .= '| '.$headers{$item}.' | ';
- }
- $output .= ' ';
- foreach my $item ('approve','email','username') {
- $output .= '';
- my (%choices,@options,$hashref,$defoption,$name,$onclick,$hascustom);
- if ($item eq 'approve') {
- %choices = &Apache::lonlocal::texthash (
- automatic => 'Automatically approved',
- approval => 'Queued for approval',
- );
- @options = ('automatic','approval');
- $hashref = $processing;
- $defoption = 'automatic';
- $name = 'cancreate_emailprocess_'.$type;
- } elsif ($item eq 'email') {
- %choices = &Apache::lonlocal::texthash (
- any => 'Any e-mail',
- inst => 'Institutional only',
- noninst => 'Non-institutional only',
- custom => 'Custom restrictions',
- );
- @options = ('any','inst','noninst');
- my $showcustom;
- if (ref($emailrules) eq 'HASH') {
- if (keys(%{$emailrules}) > 0) {
- push(@options,'custom');
- $showcustom = 'cancreate_emailrule';
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{'email_rule'}) eq 'ARRAY') {
- foreach my $rule (@{$settings->{'email_rule'}}) {
- if (exists($emailrules->{$rule})) {
- $hascustom ++;
- }
- }
- } elsif (ref($settings->{'email_rule'}) eq 'HASH') {
- if (ref($settings->{'email_rule'}{$type}) eq 'ARRAY') {
- foreach my $rule (@{$settings->{'email_rule'}{$type}}) {
- if (exists($emailrules->{$rule})) {
- $hascustom ++;
- }
- }
- }
- }
+ if ($processing->{'default'} eq $option) {
+ $checked = ' checked="checked"';
}
}
- }
- $onclick = ' onclick="toggleEmailOptions(this.form,'."'cancreate_emailoptions','$showcustom',".
- "'cancreate_emaildomain','$type'".');"';
- $hashref = $emailoptions;
- $defoption = 'any';
- $name = 'cancreate_emailoptions_'.$type;
- } elsif ($item eq 'username') {
- %choices = &Apache::lonlocal::texthash (
- all => 'Same as e-mail',
- first => 'Omit @domain',
- free => 'Free to choose',
- );
- @options = ('all','first','free');
- $hashref = $emailverified;
- $defoption = 'all';
- $name = 'cancreate_usernameoptions_'.$type;
- }
- foreach my $option (@options) {
- my $checked;
- if (ref($hashref) eq 'HASH') {
- if ($type eq '') {
- if (!exists($hashref->{'default'})) {
- if ($option eq $defoption) {
- $checked = ' checked="checked"';
- }
- } else {
- if ($hashref->{'default'} eq $option) {
- $checked = ' checked="checked"';
- }
+ } else {
+ if (!exists($processing->{$type})) {
+ if ($option eq 'automatic') {
+ $checked = ' checked="checked"';
}
} else {
- if (!exists($hashref->{$type})) {
- if ($option eq $defoption) {
- $checked = ' checked="checked"';
- }
- } else {
- if ($hashref->{$type} eq $option) {
- $checked = ' checked="checked"';
- }
- }
- }
- } elsif (($item eq 'email') && ($hascustom)) {
- if ($option eq 'custom') {
- $checked = ' checked="checked"';
- }
- } elsif ($option eq $defoption) {
- $checked = ' checked="checked"';
- }
- $output .= '
';
- if ($item eq 'email') {
- if ($option eq 'custom') {
- my $id = 'cancreate_emailrule_'.$type;
- my $display = 'none';
- if ($checked) {
- $display = 'inline';
- }
- my $numinrow = 2;
- $output .= '';
- } elsif (($option eq 'inst') || ($option eq 'noninst')) {
- my %text = &Apache::lonlocal::texthash (
- inst => 'must end:',
- noninst => 'cannot end:',
- );
- my $value;
- if (ref($emaildomain) eq 'HASH') {
- if (ref($emaildomain->{$type}) eq 'HASH') {
- $value = $emaildomain->{$type}->{$option};
- }
- }
- if ($value eq '') {
- $value = '@'.$intdom;
- }
- my $condition = 'cancreate_emaildomain_'.$option.'_'.$type;
- my $display = 'none';
- if ($checked) {
- $display = 'inline';
+ if ($processing->{$type} eq $option) {
+ $checked = ' checked="checked"';
}
- $output .= ''.
- ''.$text{$option}.' '.
- ''.
- ' ';
}
}
+ } elsif ($option eq 'automatic') {
+ $checked = ' checked="checked"';
+ }
+ my $name = 'cancreate_emailprocess';
+ if (($type ne '') && ($type ne 'default')) {
+ $name .= '_'.$type;
+ }
+ $output .= '';
+ if ($type eq '') {
+ $output .= ' ';
+ } else {
+ $output .= '
';
}
- $output .= ' | '."\n";
}
- $output .= "
| | \n";
+ $$rowtotal ++;
return $output;
}
sub captcha_choice {
- my ($context,$settings,$itemcount,$customcss,$rowstyle) = @_;
- my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext,
- $vertext,$currver);
+ my ($context,$settings,$itemcount) = @_;
+ my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext);
my %lt = &captcha_phrases();
$keyentry = 'hidden';
- my $colspan=2;
if ($context eq 'cancreate') {
$rowname = &mt('CAPTCHA validation');
} elsif ($context eq 'login') {
$rowname = &mt('"Contact helpdesk" CAPTCHA validation');
- } elsif ($context eq 'passwords') {
- $rowname = &mt('"Forgot Password" CAPTCHA validation');
- $colspan=1;
}
if (ref($settings) eq 'HASH') {
if ($settings->{'captcha'}) {
@@ -8968,11 +4973,6 @@ sub captcha_choice {
$pubtext = $lt{'pub'};
$privtext = $lt{'priv'};
$keyentry = 'text';
- $vertext = $lt{'ver'};
- $currver = $settings->{'recaptchaversion'};
- if ($currver ne '2') {
- $currver = 1;
- }
}
if (ref($settings->{'recaptchakeys'}) eq 'HASH') {
$currpub = $settings->{'recaptchakeys'}{'public'};
@@ -8981,22 +4981,9 @@ sub captcha_choice {
} else {
$checked{'original'} = ' checked="checked"';
}
- my $css_class;
- if ($itemcount%2) {
- $css_class = 'LC_odd_row';
- }
- if ($customcss) {
- $css_class .= " $customcss";
- }
- $css_class =~ s/^\s+//;
- if ($css_class) {
- $css_class = ' class="'.$css_class.'"';
- }
- if ($rowstyle) {
- $css_class .= ' style="'.$rowstyle.'"';
- }
+ my $css_class = $itemcount%2?' class="LC_odd_row"':'';
my $output = ''.
- ''.$rowname.' | '."\n".
+ ' | '.$rowname.' | '."\n".
''."\n".
+ $currpriv.'" size="40" /> |
'."\n".
'';
return $output;
}
sub user_formats_row {
- my ($type,$settings,$rules,$ruleorder,$numinrow,$rowcount,$status) = @_;
+ my ($type,$settings,$rules,$ruleorder,$numinrow,$rowcount) = @_;
my $output;
my %text = (
'username' => 'new usernames',
'id' => 'IDs',
+ 'email' => 'self-created accounts (e-mail)',
);
- unless (($type eq 'email') || ($type eq 'unamemap')) {
- my $css_class = $rowcount%2?' class="LC_odd_row"':'';
- $output = ''.
- '| '.
- &mt("Format rules to check for $text{$type}: ").
- ' | ';
+ my $css_class = $rowcount%2?' class="LC_odd_row"':'';
+ $output = ''.
+ '| ';
+ if ($type eq 'email') {
+ $output .= &mt("Formats disallowed for $text{$type}: ");
+ } else {
+ $output .= &mt("Format rules to check for $text{$type}: ");
}
+ $output .= ' | '.
+ ' | ';
- }
+ $output .= ' | ';
return $output;
}
@@ -9128,7 +5099,6 @@ sub authtype_names {
krb4 => 'Kerberos 4',
krb5 => 'Kerberos 5',
loc => 'Local',
- lti => 'LTI',
);
return %lt;
}
@@ -9171,10 +5141,7 @@ sub print_usermodification {
sub print_defaults {
my ($position,$dom,$settings,$rowtotal) = @_;
my $rownum = 0;
- my ($datatable,$css_class,$titles);
- unless ($position eq 'bottom') {
- $titles = &defaults_titles($dom);
- }
+ my ($datatable,$css_class);
if ($position eq 'top') {
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
'datelocale_def','portal_def');
@@ -9187,6 +5154,7 @@ sub print_defaults {
$defaults{$item} = $domdefaults{$item};
}
}
+ my $titles = &defaults_titles($dom);
foreach my $item (@items) {
if ($rownum%2) {
$css_class = '';
@@ -9197,13 +5165,12 @@ sub print_defaults {
''.$titles->{$item}.
' | ';
if ($item eq 'auth_def') {
- my @authtypes = ('internal','krb4','krb5','localauth','lti');
+ my @authtypes = ('internal','krb4','krb5','localauth');
my %shortauth = (
internal => 'int',
krb4 => 'krb4',
krb5 => 'krb5',
- localauth => 'loc',
- lti => 'lti',
+ localauth => 'loc'
);
my %authnames = &authtype_names();
foreach my $auth (@authtypes) {
@@ -9224,42 +5191,31 @@ sub print_defaults {
} elsif ($item eq 'lang_def') {
my $includeempty = 1;
$datatable .= &Apache::loncommon::select_language($item,$defaults{$item},$includeempty);
- } elsif ($item eq 'portal_def') {
- $datatable .= '';
- my $portalsty = 'none';
- if ($defaults{$item}) {
- $portalsty = 'block';
- }
- foreach my $field ('email','web') {
- my $checkedoff = ' checked="checked"';
- my $checkedon;
- if ($defaults{$item.'_'.$field}) {
- $checkedon = $checkedoff;
- $checkedoff = '';
- }
- $datatable .= ' '.
- ''.$titles->{$field}.' '.
- ''.
- (' 'x2).
- ''.
- ' ';
- }
} else {
- $datatable .= '';
+ my $size;
+ if ($item eq 'portal_def') {
+ $size = ' size="25"';
+ }
+ $datatable .= '';
}
$datatable .= ' | ';
$rownum ++;
}
- } elsif ($position eq 'middle') {
- my %defaults;
+ } else {
+ my (%defaults);
if (ref($settings) eq 'HASH') {
- if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
+ if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH') &&
+ (ref($settings->{'inststatusguest'}) eq 'ARRAY')) {
my $maxnum = @{$settings->{'inststatusorder'}};
for (my $i=0; $i<$maxnum; $i++) {
$css_class = $rownum%2?' class="LC_odd_row"':'';
my $item = $settings->{'inststatusorder'}->[$i];
my $title = $settings->{'inststatustypes'}->{$item};
+ my $guestok;
+ if (grep(/^\Q$item\E$/,@{$settings->{'inststatusguest'}})) {
+ $guestok = 1;
+ }
my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'$item'".');"';
$datatable .= ''.
''.
@@ -9272,12 +5228,23 @@ sub print_defaults {
}
$datatable .= '';
}
+ my ($checkedon,$checkedoff);
+ $checkedoff = ' checked="checked"';
+ if ($guestok) {
+ $checkedon = $checkedoff;
+ $checkedoff = '';
+ }
$datatable .= ' '.&mt('Internal ID:').' '.$item.' '.
''.
&mt('delete').' | '.
- ''.&mt('Name displayed').':'.
+ ' | '.&mt('Name displayed:').
''.
- ' | ';
+ ''.
+ ''.
+ ''.(' 'x2).
+ ' | ';
}
$css_class = $rownum%2?' class="LC_odd_row"':'';
my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'addinststatus_pos'".');"';
@@ -9295,28 +5262,17 @@ sub print_defaults {
''.
' '.&mt('(new)').
''.
- &mt('Name displayed').':'.
+ &mt('Name displayed:').
' | '.
+ ''.
+ ''.(' 'x2).
+ ' | ';
''."\n";
$rownum ++;
}
}
- } else {
- my ($unamemaprules,$ruleorder) =
- &Apache::lonnet::inst_userrules($dom,'unamemap');
- $css_class = $rownum%2?' class="LC_odd_row"':'';
- if ((ref($unamemaprules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) {
- my $numinrow = 2;
- $datatable .= ''.&mt('Available conversions').' | '.
- &user_formats_row('unamemap',$settings,$unamemaprules,
- $ruleorder,$numinrow).
- ' | ';
- }
- if ($datatable eq '') {
- $datatable .= ''.
- &mt('No rules set for domain in customized localenroll.pm').
- ' | ';
- }
}
$$rowtotal += $rownum;
return $datatable;
@@ -9342,11 +5298,6 @@ sub defaults_titles {
'timezone_def' => 'Default timezone',
'datelocale_def' => 'Default locale for dates',
'portal_def' => 'Portal/Default URL',
- 'email' => 'Email links use portal URL',
- 'web' => 'Public web links use portal URL',
- 'intauth_cost' => 'Encryption cost for bcrypt (positive integer)',
- 'intauth_check' => 'Check bcrypt cost if authenticated',
- 'intauth_switch' => 'Existing crypt-based switched to bcrypt on authentication',
);
if ($dom) {
my $uprimary_id = &Apache::lonnet::domain($dom,'primary');
@@ -9361,58 +5312,6 @@ sub defaults_titles {
return (\%titles);
}
-sub print_scantron {
- my ($r,$position,$dom,$confname,$settings,$rowtotal) = @_;
- if ($position eq 'top') {
- return &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
- } else {
- return &print_scantronconfig($dom,$settings,\$rowtotal);
- }
-}
-
-sub scantron_javascript {
- return <<"ENDSCRIPT";
-
-
-
-ENDSCRIPT
-
-}
-
sub print_scantronformat {
my ($r,$dom,$confname,$settings,$rowtotal) = @_;
my $itemcount = 1;
@@ -9439,8 +5338,8 @@ sub print_scantronformat {
if ($configuserok eq 'ok') {
if ($author_ok eq 'ok') {
my %legacyfile = (
- default => $Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab',
- custom => $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab',
+ default => $Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab',
+ custom => $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab',
);
my %md5chk;
foreach my $type (keys(%legacyfile)) {
@@ -9449,7 +5348,7 @@ sub print_scantronformat {
}
if ($md5chk{'default'} ne $md5chk{'custom'}) {
foreach my $type (keys(%legacyfile)) {
- ($scantronurls{$type},my $error) =
+ ($scantronurls{$type},my $error) =
&legacy_scantronformat($r,$dom,$confname,
$type,$legacyfile{$type},
$scantronurls{$type},
@@ -9460,13 +5359,13 @@ sub print_scantronformat {
}
if (keys(%error) == 0) {
$is_custom = 1;
- $confhash{'scantron'}{'scantronformat'} =
+ $confhash{'scantron'}{'scantronformat'} =
$scantronurls{'custom'};
- my $putresult =
+ my $putresult =
&Apache::lonnet::put_dom('configuration',
\%confhash,$dom);
if ($putresult ne 'ok') {
- $error{'custom'} =
+ $error{'custom'} =
''.
&mt('An error occurred updating the domain configuration: [_1]',$putresult).'';
}
@@ -9576,142 +5475,16 @@ sub legacy_scantronformat {
my ($url,$error);
my @statinfo = &Apache::lonnet::stat_file($newurl);
if ((!@statinfo) || ($statinfo[0] eq 'no_such_dir')) {
- my $modified = [];
(my $result,$url) =
- &Apache::lonconfigsettings::publishlogo($r,'copy',$legacyfile,$dom,$confname,
- 'scantron','','',$newfile,$modified);
- if ($result eq 'ok') {
- &update_modify_urls($r,$modified);
- } else {
+ &publishlogo($r,'copy',$legacyfile,$dom,$confname,'scantron',
+ '','',$newfile);
+ if ($result ne 'ok') {
$error = &mt("An error occurred publishing the [_1] bubblesheet format file in RES space. Error was: [_2].",$newfile,$result);
}
}
return ($url,$error);
}
-sub print_scantronconfig {
- my ($dom,$settings,$rowtotal) = @_;
- my $itemcount = 2;
- my $is_checked = ' checked="checked"';
- my %optionson = (
- hdr => ' checked="checked"',
- pad => ' checked="checked"',
- rem => ' checked="checked"',
- );
- my %optionsoff = (
- hdr => '',
- pad => '',
- rem => '',
- );
- my $currcsvsty = 'none';
- my ($datatable,%csvfields,%checked,%onclick,%csvoptions);
- my @fields = &scantroncsv_fields();
- my %titles = &scantronconfig_titles();
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{config}) eq 'HASH') {
- if ($settings->{config}->{dat}) {
- $checked{'dat'} = $is_checked;
- }
- if (ref($settings->{config}->{csv}) eq 'HASH') {
- if (ref($settings->{config}->{csv}->{fields}) eq 'HASH') {
- %csvfields = %{$settings->{config}->{csv}->{fields}};
- if (keys(%csvfields) > 0) {
- $checked{'csv'} = $is_checked;
- $currcsvsty = 'block';
- }
- }
- if (ref($settings->{config}->{csv}->{options}) eq 'HASH') {
- %csvoptions = %{$settings->{config}->{csv}->{options}};
- foreach my $option (keys(%optionson)) {
- unless ($csvoptions{$option}) {
- $optionsoff{$option} = $optionson{$option};
- $optionson{$option} = '';
- }
- }
- }
- }
- } else {
- $checked{'dat'} = $is_checked;
- }
- } else {
- $checked{'dat'} = $is_checked;
- }
- $onclick{'csv'} = ' onclick="toggleScantron(this.form);"';
- my $css_class = $itemcount%2? ' class="LC_odd_row"':'';
- $datatable = '| '.&mt('Supported formats').' | '.
- '';
- foreach my $item ('dat','csv') {
- my $id;
- if ($item eq 'csv') {
- $id = 'id="scantronconfcsv" ';
- }
- $datatable .= ''.(' 'x3);
- if ($item eq 'csv') {
- $datatable .= ''.
- '';
- $itemcount ++;
- }
- }
- $datatable .= ' | ';
- $$rowtotal ++;
- return $datatable;
-}
-
-sub scantronconfig_titles {
- return &Apache::lonlocal::texthash(
- dat => 'Standard format (.dat)',
- csv => 'Comma separated values (.csv)',
- hdr => 'Remove first line in file (contains column titles)',
- pad => 'Prepend 0s to PaperID',
- rem => 'Remove leading spaces (except Question Response columns)',
- CODE => 'CODE',
- ID => 'Student ID',
- PaperID => 'Paper ID',
- FirstName => 'First Name',
- LastName => 'Last Name',
- FirstQuestion => 'First Question Response',
- Section => 'Section',
- );
-}
-
-sub scantroncsv_fields {
- return ('PaperID','LastName','FirstName','ID','Section','CODE','FirstQuestion');
-}
-
sub print_coursecategories {
my ($position,$dom,$hdritem,$settings,$rowtotal) = @_;
my $datatable;
@@ -9754,7 +5527,7 @@ sub print_coursecategories {
''.$lt{$type}.' ';
}
- $datatable .= '';
+ $datatable .= '';
$itemcount ++;
}
$$rowtotal += $itemcount;
@@ -9965,7 +5738,7 @@ sub print_coursecategories {
$datatable .= &initialize_categories($itemcount);
}
} else {
- $datatable .= '| '.$hdritem->{'header'}->[1]->{'col2'}.' | '
+ $datatable .= ''.$hdritem->{'header'}->[1]->{'col2'}.' | '
.&initialize_categories($itemcount);
}
$$rowtotal += $itemcount;
@@ -10013,7 +5786,7 @@ sub print_serverstatuses {
''.
''.
- ''."\n";
+ ''."\n";
}
$$rowtotal += $rownum;
return $datatable;
@@ -10028,24 +5801,7 @@ sub serverstatus_pages {
sub defaults_javascript {
my ($settings) = @_;
- return unless (ref($settings) eq 'HASH');
- my $portal_js = <<"ENDPORTAL";
-
-function portalExtras(caller) {
- var x = caller.value;
- var y = new Array('email','web');
- for (var i=0; i 0) {
- z.style.display = 'block';
- } else {
- z.style.display = 'none';
- }
- }
- }
-}
-ENDPORTAL
+ return unless (ref($settings) eq 'HASH');
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
my $maxnum = scalar(@{$settings->{'inststatusorder'}});
if ($maxnum eq '') {
@@ -10099,112 +5855,11 @@ $jstext
return;
}
-$portal_js
-
// ]]>
ENDSCRIPT
- } else {
-return <<"ENDSCRIPT";
-
-
-ENDSCRIPT
- }
- return;
-}
-
-sub passwords_javascript {
- my ($prefix) = @_;
- my %intalert;
- if ($prefix eq 'passwords') {
- %intalert = &Apache::lonlocal::texthash (
- authcheck => 'Warning: disallowing login for an authenticated user if the stored cost is less than the default will require a password reset by/for the user.',
- authcost => 'Warning: bcrypt encryption cost for internal authentication must be an integer.',
- passmin => 'Warning: minimum password length must be a positive integer greater than 6.',
- passmax => 'Warning: maximum password length must be a positive integer (or blank).',
- passnum => 'Warning: number of previous passwords to save must be a positive integer (or blank).',
- );
- } elsif (($prefix eq 'ltisecrets') || ($prefix eq 'toolsecrets')) {
- %intalert = &Apache::lonlocal::texthash (
- passmin => 'Warning: minimum secret length must be a positive integer greater than 6.',
- passmax => 'Warning: maximum secret length must be a positive integer (or blank).',
- );
- }
- &js_escape(\%intalert);
- my $defmin = $Apache::lonnet::passwdmin;
- my $intauthjs;
- if ($prefix eq 'passwords') { $intauthjs = <<"ENDSCRIPT";
-
-function warnIntAuth(field) {
- if (field.name == 'intauth_check') {
- if (field.value == '2') {
- alert('$intalert{authcheck}');
- }
- }
- if (field.name == 'intauth_cost') {
- field.value.replace(/\s/g,'');
- if (field.value != '') {
- var regexdigit=/^\\d+\$/;
- if (!regexdigit.test(field.value)) {
- alert('$intalert{authcost}');
- }
- }
- }
- return;
-}
-
-ENDSCRIPT
-
- }
-
- $intauthjs .= <<"ENDSCRIPT";
-
-function warnInt$prefix(field) {
- field.value.replace(/^\s+/,'');
- field.value.replace(/\s+\$/,'');
- var regexdigit=/^\\d+\$/;
- if (field.name == '${prefix}_min') {
- if (field.value == '') {
- alert('$intalert{passmin}');
- field.value = '$defmin';
- } else {
- if (!regexdigit.test(field.value)) {
- alert('$intalert{passmin}');
- field.value = '$defmin';
- }
- var minval = parseInt(field.value,10);
- if (minval < $defmin) {
- alert('$intalert{passmin}');
- field.value = '$defmin';
- }
- }
- } else {
- if (field.value == '0') {
- field.value = '';
- }
- if (field.value != '') {
- if (!regexdigit.test(field.value)) {
- if (field.name == '${prefix}_max') {
- alert('$intalert{passmax}');
- } else {
- if (field.name == '${prefix}_numsaved') {
- alert('$intalert{passnum}');
- }
- }
- field.value = '';
- }
- }
}
- return;
-}
-
-ENDSCRIPT
- return &Apache::lonhtmlcommon::scripttag($intauthjs);
}
sub coursecategories_javascript {
@@ -10316,7 +5971,7 @@ ENDSCRIPT
sub initialize_categories {
my ($itemcount) = @_;
my ($datatable,$css_class,$chgstr);
- my %default_names = &Apache::lonlocal::texthash (
+ my %default_names = (
instcode => 'Official courses (with institutional codes)',
communities => 'Communities',
);
@@ -10324,7 +5979,7 @@ sub initialize_categories {
my $select1 = '';
foreach my $default ('instcode','communities') {
$css_class = $itemcount%2?' class="LC_odd_row"':'';
- $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','0'".');"';
+ $chgstr = ' onchange="javascript:reorderCats(this.form,'."'',$default"."_pos','0'".');"';
if ($default eq 'communities') {
$select1 = $select0;
$select0 = '';
@@ -10349,9 +6004,8 @@ sub initialize_categories {
.''
.''
.' '
- .&mt('Add category').''.&mt('Name:')
- .' '
- .' | ';
+ .&mt('Add category').''.&mt('Name:')
+ .' | ';
return $datatable;
}
@@ -10406,7 +6060,7 @@ sub build_category_rows {
pop(@{$path});
}
} else {
- $text .= &mt('Add subcategory:').' '.&mt('Add subcategory:').'';
+ $text .= ''.&mt('Add subcategory:').' | ';
}
}
}
@@ -10438,14 +6092,13 @@ sub build_category_rows {
}
sub modifiable_userdata_row {
- my ($context,$item,$settings,$numinrow,$rowcount,$usertypes,$fieldsref,$titlesref,
- $rowid,$customcss,$rowstyle,$itemdesc) = @_;
+ my ($context,$item,$settings,$numinrow,$rowcount,$usertypes,$fieldsref,$titlesref) = @_;
my ($role,$rolename,$statustype);
$role = $item;
if ($context eq 'cancreate') {
- if ($item =~ /^(emailusername)_(.+)$/) {
- $role = $1;
- $statustype = $2;
+ if ($item =~ /^emailusername_(.+)$/) {
+ $statustype = $1;
+ $role = 'emailusername';
if (ref($usertypes) eq 'HASH') {
if ($usertypes->{$statustype}) {
$rolename = &mt('Data provided by [_1]',$usertypes->{$statustype});
@@ -10460,8 +6113,6 @@ sub modifiable_userdata_row {
} else {
$rolename = $role;
}
- } elsif ($context eq 'lti') {
- $rolename = &mt('Institutional data used (if available)');
} else {
if ($role eq 'cr') {
$rolename = &mt('Custom role');
@@ -10482,61 +6133,44 @@ sub modifiable_userdata_row {
%fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
}
my $output;
- my $css_class;
- if ($rowcount%2) {
- $css_class = 'LC_odd_row';
- }
- if ($customcss) {
- $css_class .= " $customcss";
- }
- $css_class =~ s/^\s+//;
- if ($css_class) {
- $css_class = ' class="'.$css_class.'"';
- }
- if ($rowstyle) {
- $css_class .= ' style="'.$rowstyle.'"';
- }
- if ($rowid) {
- $rowid = ' id="'.$rowid.'"';
- }
- $output = ''.
+ my $css_class = $rowcount%2?' class="LC_odd_row"':'';
+ $output = ' '.
'| '.$rolename.' | '.
'';
my $rem;
my %checks;
if (ref($settings) eq 'HASH') {
- my $hashref;
- if ($context eq 'lti') {
- if (ref($settings) eq 'HASH') {
- $hashref = $settings->{'instdata'};
- }
- } elsif (ref($settings->{$context}) eq 'HASH') {
+ if (ref($settings->{$context}) eq 'HASH') {
if (ref($settings->{$context}->{$role}) eq 'HASH') {
- $hashref = $settings->{'lti_instdata'};
- }
- if ($role eq 'emailusername') {
- if ($statustype) {
- if (ref($settings->{$context}->{$role}->{$statustype}) eq 'HASH') {
- $hashref = $settings->{$context}->{$role}->{$statustype};
+ my $hashref = $settings->{$context}->{$role};
+ if ($role eq 'emailusername') {
+ if ($statustype) {
+ if (ref($settings->{$context}->{$role}->{$statustype}) eq 'HASH') {
+ $hashref = $settings->{$context}->{$role}->{$statustype};
+ if (ref($hashref) eq 'HASH') {
+ foreach my $field (@fields) {
+ if ($hashref->{$field}) {
+ $checks{$field} = $hashref->{$field};
+ }
+ }
+ }
+ }
}
- }
- }
- }
- if (ref($hashref) eq 'HASH') {
- foreach my $field (@fields) {
- if ($hashref->{$field}) {
- if ($role eq 'emailusername') {
- $checks{$field} = $hashref->{$field};
- } else {
- $checks{$field} = ' checked="checked" ';
+ } else {
+ if (ref($hashref) eq 'HASH') {
+ foreach my $field (@fields) {
+ if ($hashref->{$field}) {
+ $checks{$field} = ' checked="checked" ';
+ }
+ }
}
}
}
}
}
- my $total = scalar(@fields);
- for (my $i=0; $i<$total; $i++) {
- $rem = $i%($numinrow);
+
+ for (my $i=0; $i<@fields; $i++) {
+ my $rem = $i%($numinrow);
if ($rem == 0) {
if ($i > 0) {
$output .= '';
@@ -10546,8 +6180,8 @@ sub modifiable_userdata_row {
my $check = ' ';
unless ($role eq 'emailusername') {
if (exists($checks{$fields[$i]})) {
- $check = $checks{$fields[$i]};
- } elsif ($context ne 'lti') {
+ $check = $checks{$fields[$i]}
+ } else {
if ($role eq 'st') {
if (ref($settings) ne 'HASH') {
$check = ' checked="checked" ';
@@ -10557,7 +6191,6 @@ sub modifiable_userdata_row {
}
$output .= '| '.
'';
- my $prefix = 'canmodify';
if ($role eq 'emailusername') {
unless ($checks{$fields[$i]} =~ /^(required|optional)$/) {
$checks{$fields[$i]} = 'omit';
@@ -10568,27 +6201,21 @@ sub modifiable_userdata_row {
$checked='checked="checked" ';
}
$output .= ''.(' ' x2);
}
$output .= ''.$fieldtitles{$fields[$i]}.'';
} else {
- if ($context eq 'lti') {
- $prefix = 'lti';
- }
$output .= '';
}
$output .= ' | ';
+ $rem = @fields%($numinrow);
}
- $rem = $total%$numinrow;
- my $colsleft;
- if ($rem) {
- $colsleft = $numinrow - $rem;
- }
- if ($colsleft > 1) {
+ my $colsleft = $numinrow - $rem;
+ if ($colsleft > 1 ) {
$output .= ''.
' | ';
} elsif ($colsleft == 1) {
@@ -10599,14 +6226,11 @@ sub modifiable_userdata_row {
}
sub insttypes_row {
- my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context,$rowtotal,$onclick,
- $customcss,$rowstyle) = @_;
+ my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context,$rownum) = @_;
my %lt = &Apache::lonlocal::texthash (
cansearch => 'Users allowed to search',
statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)',
lockablenames => 'User preference to lock name',
- selfassign => 'Self-reportable affiliations',
- overrides => "Override domain's helpdesk settings based on requester's affiliation",
);
my $showdom;
if ($context eq 'cansearch') {
@@ -10616,22 +6240,9 @@ sub insttypes_row {
if ($context eq 'statustocreate') {
$class = 'LC_right_item';
}
- my $css_class;
- if ($$rowtotal%2) {
- $css_class = 'LC_odd_row';
- }
- if ($customcss) {
- $css_class .= ' '.$customcss;
- }
- $css_class =~ s/^\s+//;
- if ($css_class) {
- $css_class = ' class="'.$css_class.'"';
- }
- if ($rowstyle) {
- $css_class .= ' style="'.$rowstyle.'"';
- }
- if ($onclick) {
- $onclick = 'onclick="'.$onclick.'" ';
+ my $css_class = ' class="LC_odd_row"';
+ if ($rownum ne '') {
+ $css_class = ($rownum%2? ' class="LC_odd_row"':'');
}
my $output = ''.
''.$lt{$context}.$showdom.
@@ -10653,10 +6264,6 @@ sub insttypes_row {
if (grep(/^\Q$types->[$i]\E$/,@{$settings->{$context}})) {
$check = ' checked="checked" ';
}
- } elsif (ref($settings->{$context}) eq 'HASH') {
- if (ref($settings->{$context}->{$types->[$i]}) eq 'HASH') {
- $check = ' checked="checked" ';
- }
} elsif ($context eq 'statustocreate') {
$check = ' checked="checked" ';
}
@@ -10664,45 +6271,36 @@ sub insttypes_row {
$output .= ' | '.
' | ';
}
}
$rem = @{$types}%($numinrow);
}
my $colsleft = $numinrow - $rem;
- if ($context eq 'overrides') {
- if ($colsleft > 1) {
- $output .= '';
- } else {
- $output .= ' | ';
- }
- $output .= ' ';
+ if (($rem == 0) && (@{$types} > 0)) {
+ $output .= ' | ';
+ }
+ if ($colsleft > 1) {
+ $output .= '| ';
} else {
- if ($rem == 0) {
- $output .= ' | ';
- }
- if ($colsleft > 1) {
- $output .= '| ';
- } else {
- $output .= ' | ';
- }
- my $defcheck = ' ';
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{$context}) eq 'ARRAY') {
- if (grep(/^default$/,@{$settings->{$context}})) {
- $defcheck = ' checked="checked" ';
- }
- } elsif ($context eq 'statustocreate') {
+ $output .= ' | ';
+ }
+ my $defcheck = ' ';
+ if (ref($settings) eq 'HASH') {
+ if (ref($settings->{$context}) eq 'ARRAY') {
+ if (grep(/^default$/,@{$settings->{$context}})) {
$defcheck = ' checked="checked" ';
}
+ } elsif ($context eq 'statustocreate') {
+ $defcheck = ' checked="checked" ';
}
- $output .= '';
}
- $output .= ' | | ';
+ $output .= ''.
+ ' | | ';
return $output;
}
@@ -10779,14 +6377,12 @@ sub usertype_update_row {
sub modify_login {
my ($r,$dom,$confname,$lastactref,%domconfig) = @_;
my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl,
- %curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon,
- %currsaml,%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlwindow,%samlnotsso);
+ %curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon);
%title = ( coursecatalog => 'Display course catalog',
adminmail => 'Display administrator E-mail address',
helpdesk => 'Display "Contact Helpdesk" link',
newuser => 'Link for visitors to create a user account',
- loginheader => 'Log-in box header',
- saml => 'Dual SSO and non-SSO login');
+ loginheader => 'Log-in box header');
@offon = ('off','on');
if (ref($domconfig{login}) eq 'HASH') {
if (ref($domconfig{login}{loginvia}) eq 'HASH') {
@@ -10794,21 +6390,6 @@ sub modify_login {
$curr_loginvia{$lonhost} = $domconfig{login}{loginvia}{$lonhost};
}
}
- if (ref($domconfig{login}{'saml'}) eq 'HASH') {
- foreach my $lonhost (keys(%{$domconfig{login}{'saml'}})) {
- if (ref($domconfig{login}{'saml'}{$lonhost}) eq 'HASH') {
- $currsaml{$lonhost} = $domconfig{login}{'saml'}{$lonhost};
- $saml{$lonhost} = 1;
- $samltext{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'text'};
- $samlurl{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'url'};
- $samlalt{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'alt'};
- $samlimg{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'img'};
- $samltitle{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'title'};
- $samlwindow{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'window'};
- $samlnotsso{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'notsso'};
- }
- }
- }
}
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
\%domconfig,\%loginhash);
@@ -10947,16 +6528,13 @@ sub modify_login {
if ($addedfile ne '') {
push(@allnew,$addedfile);
}
- my $modified = [];
foreach my $lang (@allnew) {
my $formelem = 'loginhelpurl_'.$lang;
if ($lang eq $env{'form.loginhelpurl_add_lang'}) {
$formelem = 'loginhelpurl_add_file';
}
- (my $result,$newurl{$lang}) =
- &Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname,
- "help/$lang",'','',$newfile{$lang},
- $modified);
+ (my $result,$newurl{$lang}) = &publishlogo($r,'upload',$formelem,$dom,$confname,
+ "help/$lang",'','',$newfile{$lang});
if ($result eq 'ok') {
$loginhash{'login'}{'helpurl'}{$lang} = $newurl{$lang};
$changes{'helpurl'}{$lang} = 1;
@@ -10969,7 +6547,6 @@ sub modify_login {
}
}
}
- &update_modify_urls($r,$modified);
} else {
$error = &mt("Upload of custom log-in help file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok);
}
@@ -10989,7 +6566,7 @@ sub modify_login {
if ($domservers{$lonhost}) {
if (ref($domconfig{'login'}{'headtag'}{$lonhost}) eq 'HASH') {
$currheadtagurls{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'url'};
- $currexempt{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'exempt'};
+ $currexempt{$lonhost} = $domconfig{'login'}{'headtagexempt'}{$lonhost}{'exempt'}
}
}
}
@@ -11008,7 +6585,7 @@ sub modify_login {
} elsif ($currheadtagurls{$lonhost}) {
$loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $currheadtagurls{$lonhost};
if ($currexempt{$lonhost}) {
- if ((!exists($possexempt{$lonhost})) || ($possexempt{$lonhost} ne $currexempt{$lonhost})) {
+ if ((!exists($possexempt{$lonhost})) || ($possexempt{$lonhost} ne $currexempt{$lonhost})) {
$changes{'headtag'}{$lonhost} = 1;
}
} elsif ($possexempt{$lonhost}) {
@@ -11027,14 +6604,11 @@ sub modify_login {
if ($switchserver) {
$error = &mt("Upload of custom markup is not permitted to this server: [_1]",$switchserver);
} elsif ($author_ok eq 'ok') {
- my $modified = [];
foreach my $lonhost (@newhosts) {
my $formelem = 'loginheadtag_'.$lonhost;
- (my $result,$newheadtagurls{$lonhost}) =
- &Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname,
- "login/headtag/$lonhost",'','',
- $env{'form.loginheadtag_'.$lonhost.'.filename'},
- $modified);
+ (my $result,$newheadtagurls{$lonhost}) = &publishlogo($r,'upload',$formelem,$dom,$confname,
+ "login/headtag/$lonhost",'','',
+ $env{'form.loginheadtag_'.$lonhost.'.filename'});
if ($result eq 'ok') {
$loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $newheadtagurls{$lonhost};
$changes{'headtag'}{$lonhost} = 1;
@@ -11051,7 +6625,6 @@ sub modify_login {
}
}
}
- &update_modify_urls($r,$modified);
} else {
$error = &mt("Upload of custom markup file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok);
}
@@ -11063,99 +6636,6 @@ sub modify_login {
$errors .= ''.$error.'';
}
}
- my @delsamlimg = &Apache::loncommon::get_env_multiple('form.saml_img_del');
- my @newsamlimgs;
- foreach my $lonhost (keys(%domservers)) {
- if ($env{'form.saml_'.$lonhost}) {
- if ($env{'form.saml_img_'.$lonhost.'.filename'}) {
- push(@newsamlimgs,$lonhost);
- }
- foreach my $item ('text','alt','url','title','window','notsso') {
- $env{'form.saml_'.$item.'_'.$lonhost} =~ s/^\s+|\s+$//g;
- }
- if ($saml{$lonhost}) {
- if ($env{'form.saml_window_'.$lonhost} ne '1') {
- $env{'form.saml_window_'.$lonhost} = '';
- }
- if (grep(/^\Q$lonhost\E$/,@delsamlimg)) {
-#FIXME Need to obsolete published image
- delete($currsaml{$lonhost}{'img'});
- $changes{'saml'}{$lonhost} = 1;
- }
- if ($env{'form.saml_alt_'.$lonhost} ne $samlalt{$lonhost}) {
- $changes{'saml'}{$lonhost} = 1;
- }
- if ($env{'form.saml_text_'.$lonhost} ne $samltext{$lonhost}) {
- $changes{'saml'}{$lonhost} = 1;
- }
- if ($env{'form.saml_url_'.$lonhost} ne $samlurl{$lonhost}) {
- $changes{'saml'}{$lonhost} = 1;
- }
- if ($env{'form.saml_title_'.$lonhost} ne $samltitle{$lonhost}) {
- $changes{'saml'}{$lonhost} = 1;
- }
- if ($env{'form.saml_window_'.$lonhost} ne $samlwindow{$lonhost}) {
- $changes{'saml'}{$lonhost} = 1;
- }
- if ($env{'form.saml_notsso_'.$lonhost} ne $samlnotsso{$lonhost}) {
- $changes{'saml'}{$lonhost} = 1;
- }
- } else {
- $changes{'saml'}{$lonhost} = 1;
- }
- foreach my $item ('text','alt','url','title','window','notsso') {
- $currsaml{$lonhost}{$item} = $env{'form.saml_'.$item.'_'.$lonhost};
- }
- } else {
- if ($saml{$lonhost}) {
- $changes{'saml'}{$lonhost} = 1;
- delete($currsaml{$lonhost});
- }
- }
- }
- foreach my $posshost (keys(%currsaml)) {
- unless (exists($domservers{$posshost})) {
- delete($currsaml{$posshost});
- }
- }
- %{$loginhash{'login'}{'saml'}} = %currsaml;
- if (@newsamlimgs) {
- my $error;
- my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
- if ($configuserok eq 'ok') {
- if ($switchserver) {
- $error = &mt("Upload of SSO Button Image is not permitted to this server: [_1].",$switchserver);
- } elsif ($author_ok eq 'ok') {
- my $modified = [];
- foreach my $lonhost (@newsamlimgs) {
- my $formelem = 'saml_img_'.$lonhost;
- my ($result,$imgurl) =
- &Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname,
- "login/saml/$lonhost",'','',
- $env{'form.saml_img_'.$lonhost.'.filename'},
- $modified);
- if ($result eq 'ok') {
- $currsaml{$lonhost}{'img'} = $imgurl;
- $loginhash{'login'}{'saml'}{$lonhost}{'img'} = $imgurl;
- $changes{'saml'}{$lonhost} = 1;
- } else {
- my $puberror = &mt("Upload of SSO button image failed for [_1] because an error occurred publishing the file in RES space. Error was: [_2].",
- $lonhost,$result);
- $errors .= ''.$puberror.'';
- }
- }
- &update_modify_urls($r,$modified);
- } else {
- $error = &mt("Upload of SSO button image file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok);
- }
- } else {
- $error = &mt("Upload of SSO button image file(s) failed because a Domain Configuration user ([_1]) could not be created in domain: [_2]. Error was: [_3].",$confname,$dom,$configuserok);
- }
- if ($error) {
- &Apache::lonnet::logthis($error);
- $errors .= ''.$error.'';
- }
- }
&process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'});
my $defaulthelpfile = '/adm/loginproblems.html';
@@ -11196,31 +6676,6 @@ sub modify_login {
}
if (keys(%changes) > 0 || $colchgtext) {
&Apache::loncommon::devalidate_domconfig_cache($dom);
- if (exists($changes{'saml'})) {
- my $hostid_in_use;
- my @hosts = &Apache::lonnet::current_machine_ids();
- if (@hosts > 1) {
- foreach my $hostid (@hosts) {
- if (&Apache::lonnet::host_domain($hostid) eq $dom) {
- $hostid_in_use = $hostid;
- last;
- }
- }
- } else {
- $hostid_in_use = $r->dir_config('lonHostID');
- }
- if (($hostid_in_use) &&
- (&Apache::lonnet::host_domain($hostid_in_use) eq $dom)) {
- &Apache::lonnet::devalidate_cache_new('samllanding',$hostid_in_use);
- }
- if (ref($lastactref) eq 'HASH') {
- if (ref($changes{'saml'}) eq 'HASH') {
- my %updates;
- map { $updates{$_} = 1; } keys(%{$changes{'saml'}});
- $lastactref->{'samllanding'} = \%updates;
- }
- }
- }
if (ref($lastactref) eq 'HASH') {
$lastactref->{'domainconfig'} = 1;
}
@@ -11300,41 +6755,6 @@ sub modify_login {
}
}
}
- } elsif ($item eq 'saml') {
- if (ref($changes{$item}) eq 'HASH') {
- my %notlt = (
- text => 'Text for log-in by SSO',
- img => 'SSO button image',
- alt => 'Alt text for button image',
- url => 'SSO URL',
- title => 'Tooltip for SSO link',
- window => 'Pop-up window if iframe',
- notsso => 'Text for non-SSO log-in',
- );
- foreach my $lonhost (sort(keys(%{$changes{$item}}))) {
- if (ref($currsaml{$lonhost}) eq 'HASH') {
- $resulttext .= ''.&mt("$title{$item} in use for [_1]","$lonhost").
- '';
- foreach my $key ('text','img','alt','url','title','window','notsso') {
- if ($currsaml{$lonhost}{$key} eq '') {
- $resulttext .= '- '.&mt("$notlt{$key} not in use").'
';
- } else {
- my $value = "'$currsaml{$lonhost}{$key}'";
- if ($key eq 'img') {
- $value = ' ';
- } elsif ($key eq 'window') {
- $value = 'On';
- }
- $resulttext .= '- '.&mt("$notlt{$key} set to: [_1]",
- $value).'
';
- }
- }
- $resulttext .= ' ';
- } else {
- $resulttext .= ''.&mt("$title{$item} not in use for [_1]",$lonhost).'';
- }
- }
- }
} elsif ($item eq 'captcha') {
if (ref($loginhash{'login'}) eq 'HASH') {
my $chgtxt;
@@ -11371,13 +6791,6 @@ sub modify_login {
$chgtxt .= '';
$resulttext .= ''.$chgtxt.'';
}
- } elsif ($item eq 'recaptchaversion') {
- if (ref($loginhash{'login'}) eq 'HASH') {
- if ($loginhash{'login'}{'captcha'} eq 'recaptcha') {
- $resulttext .= ''.&mt('ReCAPTCHA for helpdesk form set to version [_1]',$loginhash{'login'}{'recaptchaversion'}).
- '';
- }
- }
} else {
$resulttext .= ''.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'';
}
@@ -11397,6 +6810,7 @@ sub modify_login {
return $resulttext;
}
+
sub check_exempt_addresses {
my ($iplist) = @_;
$iplist =~ s/^\s+//;
@@ -11437,283 +6851,6 @@ sub color_font_choices {
return %choices;
}
-sub modify_ipaccess {
- my ($dom,$lastactref,%domconfig) = @_;
- my (@allpos,%changes,%confhash,$errors,$resulttext);
- my (@items,%deletions,%itemids,@warnings);
- my ($typeorder,$types) = &commblocktype_text();
- if ($env{'form.ipaccess_add'}) {
- my $name = $env{'form.ipaccess_name_add'};
- my ($newid,$error) = &get_ipaccess_id($dom,$name);
- if ($newid) {
- $itemids{'add'} = $newid;
- push(@items,'add');
- $changes{$newid} = 1;
- } else {
- $error = &mt('Failed to acquire unique ID for new IP access control item');
- $errors .= ''.$error.'';
- }
- }
- if (ref($domconfig{'ipaccess'}) eq 'HASH') {
- my @todelete = &Apache::loncommon::get_env_multiple('form.ipaccess_del');
- if (@todelete) {
- map { $deletions{$_} = 1; } @todelete;
- }
- my $maxnum = $env{'form.ipaccess_maxnum'};
- for (my $i=0; $i<$maxnum; $i++) {
- my $itemid = $env{'form.ipaccess_id_'.$i};
- $itemid =~ s/\D+//g;
- if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') {
- if ($deletions{$itemid}) {
- $changes{$itemid} = $domconfig{'ipaccess'}{$itemid}{'name'};
- } else {
- push(@items,$i);
- $itemids{$i} = $itemid;
- }
- }
- }
- }
- foreach my $idx (@items) {
- my $itemid = $itemids{$idx};
- next unless ($itemid);
- my %current;
- unless ($idx eq 'add') {
- if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') {
- %current = %{$domconfig{'ipaccess'}{$itemid}};
- }
- }
- my $position = $env{'form.ipaccess_pos_'.$itemid};
- $position =~ s/\D+//g;
- if ($position ne '') {
- $allpos[$position] = $itemid;
- }
- my $name = $env{'form.ipaccess_name_'.$idx};
- $name =~ s/^\s+|\s+$//g;
- $confhash{$itemid}{'name'} = $name;
- my $possrange = $env{'form.ipaccess_range_'.$idx};
- $possrange =~ s/^\s+|\s+$//g;
- unless ($possrange eq '') {
- $possrange =~ s/[\r\n]+/\s/g;
- $possrange =~ s/\s*-\s*/-/g;
- $possrange =~ s/\s+/,/g;
- $possrange =~ s/,+/,/g;
- if ($possrange ne '') {
- my (@ok,$count);
- $count = 0;
- foreach my $poss (split(/\,/,$possrange)) {
- $count ++;
- $poss = &validate_ip_pattern($poss);
- if ($poss ne '') {
- push(@ok,$poss);
- }
- }
- my $diff = $count - scalar(@ok);
- if ($diff) {
- $errors .= ''.
- &mt('[quant,_1,IP] invalid and excluded from saved value for IP range(s) for [_2]',
- $diff,$name).
- '';
- }
- if (@ok) {
- my @cidr_list;
- foreach my $item (@ok) {
- @cidr_list = &Net::CIDR::cidradd($item,@cidr_list);
- }
- $confhash{$itemid}{'ip'} = join(',',@cidr_list);
- }
- }
- }
- foreach my $field ('name','ip') {
- unless (($idx eq 'add') || ($changes{$itemid})) {
- if ($current{$field} ne $confhash{$itemid}{$field}) {
- $changes{$itemid} = 1;
- last;
- }
- }
- }
- $confhash{$itemid}{'commblocks'} = {};
-
- my %commblocks;
- map { $commblocks{$_} = 1; } &Apache::loncommon::get_env_multiple('form.ipaccess_block_'.$idx);
- foreach my $type (@{$typeorder}) {
- if ($commblocks{$type}) {
- $confhash{$itemid}{'commblocks'}{$type} = 'on';
- }
- unless (($idx eq 'add') || ($changes{$itemid})) {
- if (ref($current{'commblocks'}) eq 'HASH') {
- if ($confhash{$itemid}{'commblocks'}{$type} ne $current{'commblocks'}{$type}) {
- $changes{$itemid} = 1;
- }
- } elsif ($confhash{$itemid}{'commblocks'}{$type}) {
- $changes{$itemid} = 1;
- }
- }
- }
- $confhash{$itemid}{'courses'} = {};
- my %crsdeletions;
- my @delcrs = &Apache::loncommon::get_env_multiple('form.ipaccess_course_delete_'.$idx);
- if (@delcrs) {
- map { $crsdeletions{$_} = 1; } @delcrs;
- }
- if (ref($current{'courses'}) eq 'HASH') {
- foreach my $cid (sort(keys(%{$current{'courses'}}))) {
- if ($crsdeletions{$cid}) {
- $changes{$itemid} = 1;
- } else {
- $confhash{$itemid}{'courses'}{$cid} = 1;
- }
- }
- }
- $env{'form.ipaccess_cnum_'.$idx} =~ s/^\s+|\s+$//g;
- $env{'form.ipaccess_cdom_'.$idx} =~ s/^\s+|\s+$//g;
- if (($env{'form.ipaccess_cnum_'.$idx} =~ /^$match_courseid$/) &&
- ($env{'form.ipaccess_cdom_'.$idx} =~ /^$match_domain$/)) {
- if (&Apache::lonnet::homeserver($env{'form.ipaccess_cnum_'.$idx},
- $env{'form.ipaccess_cdom_'.$idx}) eq 'no_host') {
- $errors .= ''.
- &mt('Invalid courseID [_1] omitted from list of allowed courses',
- $env{'form.ipaccess_cdom_'.$idx}.'_'.$env{'form.ipaccess_cnum_'.$idx}).
- '';
- } else {
- $confhash{$itemid}{'courses'}{$env{'form.ipaccess_cdom_'.$idx}.'_'.$env{'form.ipaccess_cnum_'.$idx}} = 1;
- $changes{$itemid} = 1;
- }
- }
- }
- if (@allpos > 0) {
- my $idx = 0;
- foreach my $itemid (@allpos) {
- if ($itemid ne '') {
- $confhash{$itemid}{'order'} = $idx;
- unless ($changes{$itemid}) {
- if (ref($domconfig{'ipaccess'}) eq 'HASH') {
- if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') {
- if ($domconfig{'ipaccess'}{$itemid}{'order'} ne $idx) {
- $changes{$itemid} = 1;
- }
- }
- }
- }
- $idx ++;
- }
- }
- }
- if (keys(%changes)) {
- my %defaultshash = (
- ipaccess => \%confhash,
- );
- my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
- $dom);
- if ($putresult eq 'ok') {
- my $cachetime = 1800;
- &Apache::lonnet::do_cache_new('ipaccess',$dom,\%confhash,$cachetime);
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'ipaccess'} = 1;
- }
- $resulttext = &mt('Changes made:').'';
- my %bynum;
- foreach my $itemid (sort(keys(%changes))) {
- if (ref($confhash{$itemid}) eq 'HASH') {
- my $position = $confhash{$itemid}{'order'};
- if ($position =~ /^\d+$/) {
- $bynum{$position} = $itemid;
- }
- }
- }
- if (keys(%deletions)) {
- foreach my $itemid (sort { $a <=> $b } keys(%deletions)) {
- $resulttext .= '- '.&mt('Deleted: [_1]',$changes{$itemid}).'
';
- }
- }
- foreach my $pos (sort { $a <=> $b } keys(%bynum)) {
- my $itemid = $bynum{$pos};
- if (ref($confhash{$itemid}) eq 'HASH') {
- $resulttext .= '- '.$confhash{$itemid}{'name'}.'
';
- my $position = $pos + 1;
- $resulttext .= '- '.&mt('Order: [_1]',$position).'
';
- if ($confhash{$itemid}{'ip'} eq '') {
- $resulttext .= '- '.&mt('No IP Range(s) set').'
';
- } else {
- $resulttext .= '- '.&mt('IP Range(s): [_1]',$confhash{$itemid}{'ip'}).'
';
- }
- if (keys(%{$confhash{$itemid}{'commblocks'}})) {
- $resulttext .= '- '.&mt('Functionality Blocked: [_1]',
- join(', ', map { $types->{$_}; } sort(keys(%{$confhash{$itemid}{'commblocks'}})))).
- '
';
- } else {
- $resulttext .= '- '.&mt('No functionality blocked').'
';
- }
- if (keys(%{$confhash{$itemid}{'courses'}})) {
- my @courses;
- foreach my $cid (sort(keys(%{$confhash{$itemid}{'courses'}}))) {
- my %courseinfo = &Apache::lonnet::coursedescription($cid,{'one_time' => 1});
- push(@courses,$courseinfo{'description'}.' ('.$cid.')');
- }
- $resulttext .= '- '.&mt('Courses/Communities allowed').':';
- } else {
- $resulttext .= '
- '.&mt('No courses allowed').'
';
- }
- $resulttext .= ' ';
- }
- }
- $resulttext .= ' ';
- } else {
- $errors .= ''.&mt('Failed to save changes').'';
- }
- } else {
- $resulttext = &mt('No changes made');
- }
- if ($errors) {
- $resulttext .= ''.&mt('The following errors occurred: ').' ';
- }
- return $resulttext;
-}
-
-sub get_ipaccess_id {
- my ($domain,$location) = @_;
- # get lock on ipaccess db
- my $lockhash = {
- lock => $env{'user.name'}.
- ':'.$env{'user.domain'},
- };
- my $tries = 0;
- my $gotlock = &Apache::lonnet::newput_dom('ipaccess',$lockhash,$domain);
- my ($id,$error);
-
- while (($gotlock ne 'ok') && ($tries<10)) {
- $tries ++;
- sleep (0.1);
- $gotlock = &Apache::lonnet::newput_dom('ipaccess',$lockhash,$domain);
- }
- if ($gotlock eq 'ok') {
- my %currids = &Apache::lonnet::dump_dom('ipaccess',$domain);
- if ($currids{'lock'}) {
- delete($currids{'lock'});
- if (keys(%currids)) {
- my @curr = sort { $a <=> $b } keys(%currids);
- if ($curr[-1] =~ /^\d+$/) {
- $id = 1 + $curr[-1];
- }
- } else {
- $id = 1;
- }
- if ($id) {
- unless (&Apache::lonnet::newput_dom('ipaccess',{ $id => $location },$domain) eq 'ok') {
- $error = 'nostore';
- }
- } else {
- $error = 'nonumber';
- }
- }
- my $dellockoutcome = &Apache::lonnet::del_dom('ipaccess',['lock'],$domain);
- } else {
- $error = 'nolock';
- }
- return ($id,$error);
-}
-
sub modify_rolecolors {
my ($r,$dom,$confname,$roles,$lastactref,%domconfig) = @_;
my ($resulttext,%rolehash);
@@ -11821,18 +6958,13 @@ sub modify_colors {
$domconfig->{$role} = {};
}
foreach my $img (@images) {
- if ($role eq 'login') {
- if (($img eq 'img') || ($img eq 'logo')) {
- if (defined($env{'form.login_showlogo_'.$img})) {
- $confhash->{$role}{'showlogo'}{$img} = 1;
- } else {
- $confhash->{$role}{'showlogo'}{$img} = 0;
- }
+ if (($role eq 'login') && (($img eq 'img') || ($img eq 'logo'))) {
+ if (defined($env{'form.login_showlogo_'.$img})) {
+ $confhash->{$role}{'showlogo'}{$img} = 1;
+ } else {
+ $confhash->{$role}{'showlogo'}{$img} = 0;
}
- if ($env{'form.login_alt_'.$img} ne '') {
- $confhash->{$role}{'alttext'}{$img} = $env{'form.login_alt_'.$img};
- }
- }
+ }
if ( ! $env{'form.'.$role.'_'.$img.'.filename'}
&& !defined($domconfig->{$role}{$img})
&& !$env{'form.'.$role.'_del_'.$img}
@@ -11849,15 +6981,12 @@ sub modify_colors {
$error = &mt("Upload of [_1] image for $role page(s) is not permitted to this server: [_2]",$choices{$img},$switchserver);
} else {
if ($author_ok eq 'ok') {
- my $modified = [];
my ($result,$logourl) =
- &Apache::lonconfigsettings::publishlogo($r,'upload',$role.'_'.$img,
- $dom,$confname,$img,$width,$height,
- '',$modified);
+ &publishlogo($r,'upload',$role.'_'.$img,
+ $dom,$confname,$img,$width,$height);
if ($result eq 'ok') {
$confhash->{$role}{$img} = $logourl;
$changes{$role}{'images'}{$img} = 1;
- &update_modify_urls($r,$modified);
} else {
$error = &mt("Upload of [_1] image for $role page(s) failed because an error occurred publishing the file in RES space. Error was: [_2].",$choices{img},$result);
}
@@ -11879,15 +7008,12 @@ sub modify_colors {
# is confname an author?
if ($switchserver eq '') {
if ($author_ok eq 'ok') {
- my $modified = [];
my ($result,$logourl) =
- &Apache::lonconfigsettings::publishlogo($r,'copy',$domconfig->{$role}{$img},
- $dom,$confname,$img,$width,$height,
- '',$modified);
+ &publishlogo($r,'copy',$domconfig->{$role}{$img},
+ $dom,$confname,$img,$width,$height);
if ($result eq 'ok') {
$confhash->{$role}{$img} = $logourl;
$changes{$role}{'images'}{$img} = 1;
- &update_modify_urls($r,$modified);
}
}
}
@@ -11913,29 +7039,15 @@ sub modify_colors {
$changes{$role}{'images'}{$img} = 1;
}
}
- if ($role eq 'login') {
- if (($img eq 'logo') || ($img eq 'img')) {
- if (ref($domconfig->{'login'}{'showlogo'}) eq 'HASH') {
- if ($confhash->{$role}{'showlogo'}{$img} ne
- $domconfig->{$role}{'showlogo'}{$img}) {
- $changes{$role}{'showlogo'}{$img} = 1;
- }
- } else {
- if ($confhash->{$role}{'showlogo'}{$img} == 0) {
- $changes{$role}{'showlogo'}{$img} = 1;
- }
+ if (($role eq 'login') && (($img eq 'logo') || ($img eq 'img'))) {
+ if (ref($domconfig->{'login'}{'showlogo'}) eq 'HASH') {
+ if ($confhash->{$role}{'showlogo'}{$img} ne
+ $domconfig->{$role}{'showlogo'}{$img}) {
+ $changes{$role}{'showlogo'}{$img} = 1;
}
- }
- if ($img ne 'login') {
- if (ref($domconfig->{$role}{'alttext'}) eq 'HASH') {
- if ($confhash->{$role}{'alttext'}{$img} ne
- $domconfig->{$role}{'alttext'}{$img}) {
- $changes{$role}{'alttext'}{$img} = 1;
- }
- } else {
- if ($confhash->{$role}{'alttext'}{$img} ne '') {
- $changes{$role}{'alttext'}{$img} = 1;
- }
+ } else {
+ if ($confhash->{$role}{'showlogo'}{$img} == 0) {
+ $changes{$role}{'showlogo'}{$img} = 1;
}
}
}
@@ -12046,11 +7158,6 @@ sub default_change_checker {
if ($confhash->{$role}{'showlogo'}{$img} == 0) {
$changes->{$role}{'showlogo'}{$img} = 1;
}
- if (ref($confhash->{$role}{'alttext'}) eq 'HASH') {
- if ($confhash->{$role}{'alttext'}{$img} ne '') {
- $changes->{$role}{'alttext'}{$img} = 1;
- }
- }
}
}
if ($confhash->{$role}{'font'}) {
@@ -12089,13 +7196,6 @@ sub display_colorchgs {
} else {
$resulttext .= ''.&mt("$choices{$item} set to not be displayed").'';
}
- } elsif (($role eq 'login') && ($key eq 'alttext')) {
- if ($confhash->{$role}{$key}{$item} ne '') {
- $resulttext .= ''.&mt("$choices{$key} for $choices{$item} set to [_1].",
- $confhash->{$role}{$key}{$item}).'';
- } else {
- $resulttext .= ''.&mt("$choices{$key} for $choices{$item} deleted.").'';
- }
} elsif ($confhash->{$role}{$item} eq '') {
$resulttext .= ''.&mt("$choices{$item} set to default").'';
} else {
@@ -12154,7 +7254,7 @@ sub check_configuser {
my ($configuserok,%currroles);
if ($uhome eq 'no_host') {
srand( time() ^ ($$ + ($$ << 15)) ); # Seed rand.
- my $configpass = &LONCAPA::Enrollment::create_password($dom);
+ my $configpass = &LONCAPA::Enrollment::create_password();
$configuserok =
&Apache::lonnet::modifyuser($dom,$confname,'','internal',
$configpass,'','','','','',undef,$servadm);
@@ -12181,16 +7281,228 @@ sub check_authorstatus {
return $author_ok;
}
-sub update_modify_urls {
- my ($r,$modified) = @_;
- if ((ref($modified) eq 'ARRAY') && (@{$modified})) {
- push(@{$modified_urls},$modified);
- unless ($registered_cleanup) {
- my $handlers = $r->get_handlers('PerlCleanupHandler');
- $r->set_handlers('PerlCleanupHandler' => [\¬ifysubscribed,@{$handlers}]);
- $registered_cleanup=1;
+sub publishlogo {
+ my ($r,$action,$formname,$dom,$confname,$subdir,$thumbwidth,$thumbheight,$savefileas) = @_;
+ my ($output,$fname,$logourl,$madethumb);
+ if ($action eq 'upload') {
+ $fname=$env{'form.'.$formname.'.filename'};
+ chop($env{'form.'.$formname});
+ } else {
+ ($fname) = ($formname =~ /([^\/]+)$/);
+ }
+ if ($savefileas ne '') {
+ $fname = $savefileas;
+ }
+ $fname=&Apache::lonnet::clean_filename($fname);
+# See if there is anything left
+ unless ($fname) { return ('error: no uploaded file'); }
+ $fname="$subdir/$fname";
+ my $docroot=$r->dir_config('lonDocRoot');
+ my $filepath="$docroot/priv";
+ my $relpath = "$dom/$confname";
+ my ($fnamepath,$file,$fetchthumb);
+ $file=$fname;
+ if ($fname=~m|/|) {
+ ($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|);
+ }
+ my @parts=split(/\//,"$filepath/$relpath/$fnamepath");
+ my $count;
+ for ($count=5;$count<=$#parts;$count++) {
+ $filepath.="/$parts[$count]";
+ if ((-e $filepath)!=1) {
+ mkdir($filepath,02770);
+ }
+ }
+ # Check for bad extension and disallow upload
+ if ($file=~/\.(\w+)$/ &&
+ (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
+ $output =
+ &mt('Invalid file extension ([_1]) - reserved for internal use.',$1);
+ } elsif ($file=~/\.(\w+)$/ &&
+ !defined(&Apache::loncommon::fileembstyle($1))) {
+ $output = &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1);
+ } elsif ($file=~/\.(\d+)\.(\w+)$/) {
+ $output = &mt('Filename not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2);
+ } elsif (-d "$filepath/$file") {
+ $output = &mt('Filename is a directory name - rename the file and re-upload');
+ } else {
+ my $source = $filepath.'/'.$file;
+ my $logfile;
+ if (!open($logfile,">>$source".'.log')) {
+ return (&mt('No write permission to Authoring Space'));
+ }
+ print $logfile
+"\n================= Publish ".localtime()." ================\n".
+$env{'user.name'}.':'.$env{'user.domain'}."\n";
+# Save the file
+ if (!open(FH,'>'.$source)) {
+ &Apache::lonnet::logthis('Failed to create '.$source);
+ return (&mt('Failed to create file'));
+ }
+ if ($action eq 'upload') {
+ if (!print FH ($env{'form.'.$formname})) {
+ &Apache::lonnet::logthis('Failed to write to '.$source);
+ return (&mt('Failed to write file'));
+ }
+ } else {
+ my $original = &Apache::lonnet::filelocation('',$formname);
+ if(!copy($original,$source)) {
+ &Apache::lonnet::logthis('Failed to copy '.$original.' to '.$source);
+ return (&mt('Failed to write file'));
+ }
+ }
+ close(FH);
+ chmod(0660, $source); # Permissions to rw-rw---.
+
+ my $targetdir=$docroot.'/res/'.$dom.'/'.$confname .'/'.$fnamepath;
+ my $copyfile=$targetdir.'/'.$file;
+
+ my @parts=split(/\//,$targetdir);
+ my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]";
+ for (my $count=5;$count<=$#parts;$count++) {
+ $path.="/$parts[$count]";
+ if (!-e $path) {
+ print $logfile "\nCreating directory ".$path;
+ mkdir($path,02770);
+ }
+ }
+ my $versionresult;
+ if (-e $copyfile) {
+ $versionresult = &logo_versioning($targetdir,$file,$logfile);
+ } else {
+ $versionresult = 'ok';
+ }
+ if ($versionresult eq 'ok') {
+ if (copy($source,$copyfile)) {
+ print $logfile "\nCopied original source to ".$copyfile."\n";
+ $output = 'ok';
+ $logourl = '/res/'.$dom.'/'.$confname.'/'.$fname;
+ push(@{$modified_urls},[$copyfile,$source]);
+ my $metaoutput =
+ &write_metadata($dom,$confname,$formname,$targetdir,$file,$logfile);
+ unless ($registered_cleanup) {
+ my $handlers = $r->get_handlers('PerlCleanupHandler');
+ $r->set_handlers('PerlCleanupHandler' => [\¬ifysubscribed,@{$handlers}]);
+ $registered_cleanup=1;
+ }
+ } else {
+ print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
+ $output = &mt('Failed to copy file to RES space').", $!";
+ }
+ if (($thumbwidth =~ /^\d+$/) && ($thumbheight =~ /^\d+$/)) {
+ my $inputfile = $filepath.'/'.$file;
+ my $outfile = $filepath.'/'.'tn-'.$file;
+ my ($fullwidth,$fullheight) = &check_dimensions($inputfile);
+ if ($fullwidth ne '' && $fullheight ne '') {
+ if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) {
+ my $thumbsize = $thumbwidth.'x'.$thumbheight;
+ system("convert -sample $thumbsize $inputfile $outfile");
+ chmod(0660, $filepath.'/tn-'.$file);
+ if (-e $outfile) {
+ my $copyfile=$targetdir.'/tn-'.$file;
+ if (copy($outfile,$copyfile)) {
+ print $logfile "\nCopied source to ".$copyfile."\n";
+ my $thumb_metaoutput =
+ &write_metadata($dom,$confname,$formname,
+ $targetdir,'tn-'.$file,$logfile);
+ push(@{$modified_urls},[$copyfile,$outfile]);
+ unless ($registered_cleanup) {
+ my $handlers = $r->get_handlers('PerlCleanupHandler');
+ $r->set_handlers('PerlCleanupHandler' => [\¬ifysubscribed,@{$handlers}]);
+ $registered_cleanup=1;
+ }
+ $madethumb = 1;
+ } else {
+ print $logfile "\nUnable to write ".$copyfile.
+ ':'.$!."\n";
+ }
+ }
+ }
+ }
+ }
+ } else {
+ $output = $versionresult;
+ }
+ }
+ return ($output,$logourl,$madethumb);
+}
+
+sub logo_versioning {
+ my ($targetdir,$file,$logfile) = @_;
+ my $target = $targetdir.'/'.$file;
+ my ($maxversion,$fn,$extn,$output);
+ $maxversion = 0;
+ if ($file =~ /^(.+)\.(\w+)$/) {
+ $fn=$1;
+ $extn=$2;
+ }
+ opendir(DIR,$targetdir);
+ while (my $filename=readdir(DIR)) {
+ if ($filename=~/\Q$fn\E\.(\d+)\.\Q$extn\E$/) {
+ $maxversion=($1>$maxversion)?$1:$maxversion;
+ }
+ }
+ $maxversion++;
+ print $logfile "\nCreating old version ".$maxversion."\n";
+ my $copyfile=$targetdir.'/'.$fn.'.'.$maxversion.'.'.$extn;
+ if (copy($target,$copyfile)) {
+ print $logfile "Copied old target to ".$copyfile."\n";
+ $copyfile=$copyfile.'.meta';
+ if (copy($target.'.meta',$copyfile)) {
+ print $logfile "Copied old target metadata to ".$copyfile."\n";
+ $output = 'ok';
+ } else {
+ print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
+ $output = &mt('Failed to copy old meta').", $!, ";
}
+ } else {
+ print $logfile "Unable to write ".$copyfile.':'.$!."\n";
+ $output = &mt('Failed to copy old target').", $!, ";
}
+ return $output;
+}
+
+sub write_metadata {
+ my ($dom,$confname,$formname,$targetdir,$file,$logfile) = @_;
+ my (%metadatafields,%metadatakeys,$output);
+ $metadatafields{'title'}=$formname;
+ $metadatafields{'creationdate'}=time;
+ $metadatafields{'lastrevisiondate'}=time;
+ $metadatafields{'copyright'}='public';
+ $metadatafields{'modifyinguser'}=$env{'user.name'}.':'.
+ $env{'user.domain'};
+ $metadatafields{'authorspace'}=$confname.':'.$dom;
+ $metadatafields{'domain'}=$dom;
+ {
+ print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file;
+ my $mfh;
+ if (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) {
+ foreach (sort(keys(%metadatafields))) {
+ unless ($_=~/\./) {
+ my $unikey=$_;
+ $unikey=~/^([A-Za-z]+)/;
+ my $tag=$1;
+ $tag=~tr/A-Z/a-z/;
+ print $mfh "\n\<$tag";
+ foreach (split(/\,/,$metadatakeys{$unikey})) {
+ my $value=$metadatafields{$unikey.'.'.$_};
+ $value=~s/\"/\'\'/g;
+ print $mfh ' '.$_.'="'.$value.'"';
+ }
+ print $mfh '>'.
+ &HTML::Entities::encode($metadatafields{$unikey},'<>&"')
+ .'';
+ }
+ }
+ $output = 'ok';
+ print $logfile "\nWrote metadata";
+ close($mfh);
+ } else {
+ print $logfile "\nFailed to open metadata file";
+ $output = &mt('Could not write metadata');
+ }
+ }
+ return $output;
}
sub notifysubscribed {
@@ -12198,7 +7510,7 @@ sub notifysubscribed {
next unless (ref($targetsource) eq 'ARRAY');
my ($target,$source)=@{$targetsource};
if ($source ne '') {
- if (open(my $logfh,">>",$source.'.log')) {
+ if (open(my $logfh,'>>'.$source.'.log')) {
print $logfh "\nCleanup phase: Notifications\n";
my @subscribed=&subscribed_hosts($target);
foreach my $subhost (@subscribed) {
@@ -12224,7 +7536,7 @@ sub notifysubscribed {
sub subscribed_hosts {
my ($target) = @_;
my @subscribed;
- if (open(my $fh,"<","$target.subscription")) {
+ if (open(my $fh,"<$target.subscription")) {
while (my $subline=<$fh>) {
if ($subline =~ /^($match_lonid):/) {
my $host = $1;
@@ -12241,21 +7553,15 @@ sub subscribed_hosts {
sub check_switchserver {
my ($dom,$confname) = @_;
- my ($allowed,$switchserver,$home);
- if ($confname eq '') {
+ my ($allowed,$switchserver);
+ my $home = &Apache::lonnet::homeserver($confname,$dom);
+ if ($home eq 'no_host') {
$home = &Apache::lonnet::domain($dom,'primary');
- } else {
- $home = &Apache::lonnet::homeserver($confname,$dom);
- if ($home eq 'no_host') {
- $home = &Apache::lonnet::domain($dom,'primary');
- }
}
my @ids=&Apache::lonnet::current_machine_ids();
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
if (!$allowed) {
- $switchserver=''.&mt('Switch Server').'';
+ $switchserver=''.&mt('Switch Server').'';
}
return $switchserver;
}
@@ -12272,7 +7578,7 @@ sub modify_quotas {
$context = $action;
}
if ($context eq 'requestcourses') {
- @usertools = ('official','unofficial','community','textbook','lti');
+ @usertools = ('official','unofficial','community','textbook');
@options =('norequest','approval','validate','autolimit');
%validations = &Apache::lonnet::auto_courserequest_checks($dom);
%titles = &courserequest_titles();
@@ -12287,7 +7593,7 @@ sub modify_quotas {
@usertools = ('author');
%titles = &authorrequest_titles();
} else {
- @usertools = ('aboutme','blog','webdav','portfolio','timezone');
+ @usertools = ('aboutme','blog','webdav','portfolio');
%titles = &tool_titles();
}
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
@@ -12321,7 +7627,7 @@ sub modify_quotas {
my @approvalnotify = &Apache::loncommon::get_env_multiple('form.'.$context.'notifyapproval');
@approvalnotify = sort(@approvalnotify);
$confhash{'notify'}{'approval'} = join(',',@approvalnotify);
- my @crstypes = ('official','unofficial','community','textbook','lti');
+ my @crstypes = ('official','unofficial','community','textbook');
my @hasuniquecode = &Apache::loncommon::get_env_multiple('form.uniquecode');
foreach my $type (@hasuniquecode) {
if (grep(/^\Q$type\E$/,@crstypes)) {
@@ -12415,7 +7721,7 @@ sub modify_quotas {
my $newpos = $env{'form.'.$itemid};
$newpos =~ s/\D+//g;
foreach my $item ('subject','title','publisher','author') {
- next if ((($item eq 'author') || ($item eq 'publisher')) &&
+ next if ((($item eq 'author') || ($item eq 'publisher')) &&
($type eq 'templates'));
$confhash{$type}{$key}{$item} = $env{'form.'.$type.'_'.$item.'_'.$i};
if ($domconfig{$action}{$type}{$key}{$item} ne $confhash{$type}{$key}{$item}) {
@@ -12429,21 +7735,17 @@ sub modify_quotas {
#FIXME need to obsolete item in RES space
} elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) {
my ($cdom,$cnum) = split(/_/,$key);
- if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
- $errors .= ''.&mt('Image not saved: could not find textbook course').'';
- } else {
- my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i,
- $cdom,$cnum,$type,$configuserok,
- $switchserver,$author_ok);
- if ($imgurl) {
- $confhash{$type}{$key}{'image'} = $imgurl;
- $changes{$type}{$key} = 1;
- }
- if ($error) {
- &Apache::lonnet::logthis($error);
- $errors .= ''.$error.'';
- }
- }
+ my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i,
+ $cdom,$cnum,$type,$configuserok,
+ $switchserver,$author_ok);
+ if ($imgurl) {
+ $confhash{$type}{$key}{'image'} = $imgurl;
+ $changes{$type}{$key} = 1;
+ }
+ if ($error) {
+ &Apache::lonnet::logthis($error);
+ $errors .= ''.$error.'';
+ }
} elsif ($domconfig{$action}{$type}{$key}{'image'}) {
$confhash{$type}{$key}{'image'} =
$domconfig{$action}{$type}{$key}{'image'};
@@ -12476,19 +7778,15 @@ sub modify_quotas {
if ($type eq 'textbooks') {
if ($env{'form.'.$type.'_addbook_image.filename'} ne '') {
my ($cdom,$cnum) = split(/_/,$newbook{$type});
- if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
- $errors .= ''.&mt('Image not saved: could not find textbook course').'';
- } else {
- my ($imageurl,$error) =
- &process_textbook_image($r,$dom,$confname,$type.'_addbook_image',$cdom,$cnum,$type,
- $configuserok,$switchserver,$author_ok);
- if ($imageurl) {
- $confhash{$type}{$newbook{$type}}{'image'} = $imageurl;
- }
- if ($error) {
- &Apache::lonnet::logthis($error);
- $errors .= ''.$error.'';
- }
+ my ($imageurl,$error) =
+ &process_textbook_image($r,$dom,$confname,$type.'_addbook_image',$cdom,$cnum,$type,
+ $configuserok,$switchserver,$author_ok);
+ if ($imageurl) {
+ $confhash{$type}{$newbook{$type}}{'image'} = $imageurl;
+ }
+ if ($error) {
+ &Apache::lonnet::logthis($error);
+ $errors .= ''.$error.'';
}
}
}
@@ -12568,7 +7866,7 @@ sub modify_quotas {
}
if ($env{'form.validationdc'}) {
my $newval = $env{'form.validationdc'};
- my %domcoords = &Apache::lonnet::get_active_domroles($dom,['dc']);
+ my %domcoords = &get_active_dcs($dom);
if (exists($domcoords{$newval})) {
$confhash{'validation'}{'dc'} = $newval;
}
@@ -12592,7 +7890,7 @@ sub modify_quotas {
}
} elsif ($confhash{'validation'}{'dc'} ne '') {
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
- }
+ }
} else {
if (ref($domconfig{'requestcourses'}) eq 'HASH') {
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
@@ -12978,14 +8276,11 @@ sub process_textbook_image {
$error = &mt('Upload of textbook image is not permitted to this server: [_1]',
$switchserver);
} elsif ($author_ok eq 'ok') {
- my $modified = [];
my ($result,$imageurl) =
- &Apache::lonconfigsettings::publishlogo($r,'upload',$caller,$dom,$confname,
- "$type/$cdom/$cnum/cover",$width,$height,
- '',$modified);
+ &publishlogo($r,'upload',$caller,$dom,$confname,
+ "$type/$dom/$cnum/cover",$width,$height);
if ($result eq 'ok') {
$url = $imageurl;
- &update_modify_urls($r,$modified);
} else {
$error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result);
}
@@ -13000,888 +8295,277 @@ sub process_textbook_image {
sub modify_ltitools {
my ($r,$dom,$action,$lastactref,%domconfig) = @_;
- my (%currtoolsec,%secchanges,%newtoolsec,%newkeyset);
- &fetch_secrets($dom,'toolsec',\%domconfig,\%currtoolsec,\%secchanges,\%newtoolsec,\%newkeyset);
-
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+ my ($newid,@allpos,%changes,%confhash,$errors,$resulttext);
my $confname = $dom.'-domainconfig';
my $servadm = $r->dir_config('lonAdmEMail');
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
-
- my ($resulttext,$ltitoolsoutput,$is_home,$errors,%ltitoolschg,%newtoolsenc,%newltitools);
- my $toolserror =
- &Apache::courseprefs::process_ltitools($r,$dom,$confname,$domconfig{'ltitools'},\%ltitoolschg,'domain',
- $lastactref,$configuserok,$switchserver,$author_ok);
-
- my $home = &Apache::lonnet::domain($dom,'primary');
- unless (($home eq 'no_host') || ($home eq '')) {
- my @ids=&Apache::lonnet::current_machine_ids();
- foreach my $id (@ids) { if ($id eq $home) { $is_home=1; last; } }
- }
-
- if (keys(%ltitoolschg)) {
- foreach my $id (keys(%ltitoolschg)) {
- if (ref($ltitoolschg{$id}) eq 'HASH') {
- foreach my $inner (keys(%{$ltitoolschg{$id}})) {
- if (($inner eq 'secret') || ($inner eq 'key')) {
- if ($is_home) {
- $newtoolsenc{$id}{$inner} = $ltitoolschg{$id}{$inner};
- }
- }
- }
- }
- }
- $ltitoolsoutput = &Apache::courseprefs::store_ltitools($dom,'','domain',\%ltitoolschg,$domconfig{'ltitools'});
- if (keys(%ltitoolschg)) {
- %newltitools = %ltitoolschg;
- }
- }
- if (ref($domconfig{'ltitools'}) eq 'HASH') {
- foreach my $id (%{$domconfig{'ltitools'}}) {
- next if ($id !~ /^\d+$/);
- unless (exists($ltitoolschg{$id})) {
- if (ref($domconfig{'ltitools'}{$id}) eq 'HASH') {
- foreach my $inner (keys(%{$domconfig{'ltitools'}{$id}})) {
- if (($inner eq 'secret') || ($inner eq 'key')) {
- if ($is_home) {
- $newtoolsenc{$id}{$inner} = $domconfig{'ltitools'}{$id}{$inner};
- }
- } else {
- $newltitools{$id}{$inner} = $domconfig{'ltitools'}{$id}{$inner};
- }
- }
- } else {
- $newltitools{$id} = $domconfig{'ltitools'}{$id};
- }
- }
- }
- }
- if ($toolserror) {
- $errors = ''.$toolserror.'';
- }
- if ((keys(%ltitoolschg) == 0) && (keys(%secchanges) == 0)) {
- $resulttext = &mt('No changes made.');
- if ($errors) {
- $resulttext .= '
'.&mt('The following errors occurred: ').'';
- }
- return $resulttext;
- }
- my %ltitoolshash = (
- $action => { %newltitools }
- );
- if (keys(%secchanges)) {
- $ltitoolshash{'toolsec'} = \%newtoolsec;
- }
- my $putresult = &Apache::lonnet::put_dom('configuration',\%ltitoolshash,$dom);
- if ($putresult eq 'ok') {
- my %keystore;
- if ($is_home) {
- my %toolsenchash = (
- $action => { %newtoolsenc }
- );
- &Apache::lonnet::put_dom('encconfig',\%toolsenchash,$dom,undef,1);
- my $cachetime = 24*60*60;
- &Apache::lonnet::do_cache_new('ltitoolsenc',$dom,\%newtoolsenc,$cachetime);
- &store_security($dom,'ltitools',\%secchanges,\%newkeyset,\%keystore,$lastactref);
- }
- $resulttext = &mt('Changes made:').'';
+ } else {
+ $resulttext = &mt('No changes made.');
}
} else {
$errors .= ''.&mt('Failed to save changes').'';
@@ -14139,51 +8706,57 @@ sub modify_lti {
return $resulttext;
}
-sub get_priv_creds {
- my ($dom,$home,$encchg,$encrypt,$storedsec) = @_;
- my ($needenc,$cipher,$privnum);
- my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
- if (($encchg) && (ref($encrypt) eq 'HASH')) {
- $needenc = $encrypt->{'consumers'}
- } else {
- $needenc = $domdefs{'ltienc_consumers'};
- }
- if ($needenc) {
- if (($storedsec eq 'ok') || ((ref($domdefs{'ltiprivhosts'}) eq 'ARRAY') &&
- (grep(/^\Q$home\E$/,@{$domdefs{'ltiprivhosts'}})))) {
- my %privhash = &Apache::lonnet::restore_dom('lti','private',$dom,$home,1);
- my $privkey = $privhash{'key'};
- $privnum = $privhash{'version'};
- if (($privnum) && ($privkey ne '')) {
- $cipher = Crypt::CBC->new({'key' => $privkey,
- 'cipher' => 'DES'});
+sub process_ltitools_image {
+ my ($r,$dom,$confname,$caller,$itemid,$configuserok,$switchserver,$author_ok) = @_;
+ my $filename = $env{'form.'.$caller.'.filename'};
+ my ($error,$url);
+ my ($width,$height) = (21,21);
+ if ($configuserok eq 'ok') {
+ if ($switchserver) {
+ $error = &mt('Upload of Tool Provider (LTI) icon is not permitted to this server: [_1]',
+ $switchserver);
+ } elsif ($author_ok eq 'ok') {
+ my ($result,$imageurl,$madethumb) =
+ &publishlogo($r,'upload',$caller,$dom,$confname,
+ "ltitools/$itemid/icon",$width,$height);
+ if ($result eq 'ok') {
+ if ($madethumb) {
+ my ($path,$imagefile) = ($imageurl =~ m{^(.+)/([^/]+)$});
+ my $imagethumb = "$path/tn-".$imagefile;
+ $url = $imagethumb;
+ } else {
+ $url = $imageurl;
+ }
+ } else {
+ $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result);
}
+ } else {
+ $error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3]. Error was: [_4].",$filename,$confname,$dom,$author_ok);
}
+ } else {
+ $error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3]. Error was: [_4].",$filename,$confname,$dom,$configuserok);
}
- return ($cipher,$privnum);
+ return ($url,$error);
}
-sub get_lti_id {
- my ($domain,$consumer,$dbname) = @_;
- unless (($dbname eq 'lti') || ($dbname eq 'suggested')) {
- return ('','invalid db');
- }
- # get lock on db
+sub get_ltitools_id {
+ my ($cdom,$title) = @_;
+ # get lock on ltitools db
my $lockhash = {
lock => $env{'user.name'}.
':'.$env{'user.domain'},
};
my $tries = 0;
- my $gotlock = &Apache::lonnet::newput_dom($dbname,$lockhash,$domain);
+ my $gotlock = &Apache::lonnet::newput_dom('ltitools',$lockhash,$cdom);
my ($id,$error);
-
+
while (($gotlock ne 'ok') && ($tries<10)) {
$tries ++;
sleep (0.1);
- $gotlock = &Apache::lonnet::newput_dom($dbname,$lockhash,$domain);
+ $gotlock = &Apache::lonnet::newput_dom('ltitools',$lockhash,$cdom);
}
if ($gotlock eq 'ok') {
- my %currids = &Apache::lonnet::dump_dom($dbname,$domain);
+ my %currids = &Apache::lonnet::dump_dom('ltitools',$cdom);
if ($currids{'lock'}) {
delete($currids{'lock'});
if (keys(%currids)) {
@@ -14195,14 +8768,14 @@ sub get_lti_id {
$id = 1;
}
if ($id) {
- unless (&Apache::lonnet::newput_dom($dbname,{ $id => $consumer },$domain) eq 'ok') {
+ unless (&Apache::lonnet::newput_dom('ltitools',{ $id => $title },$cdom) eq 'ok') {
$error = 'nostore';
}
} else {
$error = 'nonumber';
}
}
- my $dellockoutcome = &Apache::lonnet::del_dom($dbname,['lock'],$domain);
+ my $dellockoutcome = &Apache::lonnet::del_dom('ltitools',['lock'],$cdom);
} else {
$error = 'nolock';
}
@@ -14221,8 +8794,7 @@ sub modify_autoenroll {
my $autorun = &Apache::lonnet::auto_run(undef,$dom),
my %title = ( run => 'Auto-enrollment active',
sender => 'Sender for notification messages',
- coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)',
- autofailsafe => 'Failsafe for no drops if institutional data missing for a section');
+ coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)');
my @offon = ('off','on');
my $sender_uname = $env{'form.sender_uname'};
my $sender_domain = $env{'form.sender_domain'};
@@ -14232,23 +8804,11 @@ sub modify_autoenroll {
$sender_domain = '';
}
my $coowners = $env{'form.autoassign_coowners'};
- my $autofailsafe = $env{'form.autoenroll_autofailsafe'};
- $autofailsafe =~ s{^\s+|\s+$}{}g;
- if ($autofailsafe =~ /\D/) {
- undef($autofailsafe);
- }
- my $failsafe = $env{'form.autoenroll_failsafe'};
- unless (($failsafe eq 'zero') || ($failsafe eq 'any')) {
- $failsafe = 'off';
- undef($autofailsafe);
- }
my %autoenrollhash = (
autoenroll => { 'run' => $env{'form.autoenroll_run'},
'sender_uname' => $sender_uname,
'sender_domain' => $sender_domain,
'co-owners' => $coowners,
- 'autofailsafe' => $autofailsafe,
- 'failsafe' => $failsafe,
}
);
my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash,
@@ -14275,13 +8835,7 @@ sub modify_autoenroll {
}
} elsif ($coowners) {
$changes{'coowners'} = 1;
- }
- if ($currautoenroll{'autofailsafe'} ne $autofailsafe) {
- $changes{'autofailsafe'} = 1;
- }
- if ($currautoenroll{'failsafe'} ne $failsafe) {
- $changes{'failsafe'} = 1;
- }
+ }
if (keys(%changes) > 0) {
$resulttext = &mt('Changes made:').'';
if ($changes{'run'}) {
@@ -14301,30 +8855,6 @@ sub modify_autoenroll {
$lastactref->{'domainconfig'} = 1;
}
}
- if ($changes{'autofailsafe'}) {
- if ($autofailsafe ne '') {
- $resulttext .= '- '.&mt('Failsafe for no drops if institutional data missing for a section set to: [_1]',$autofailsafe).'
';
- } else {
- $resulttext .= '- '.&mt('Failsafe for no drops if institutional data missing for a section not in use').'
';
- }
- }
- if ($changes{'failsafe'}) {
- if ($failsafe eq 'off') {
- unless ($changes{'autofailsafe'}) {
- $resulttext .= '- '.&mt('Failsafe for no drops if institutional data missing for a section not in use').'
';
- }
- } elsif ($failsafe eq 'zero') {
- $resulttext .= '- '.&mt('Failsafe applies if retrieved section enrollment is zero').'
';
- } else {
- $resulttext .= '- '.&mt('Failsafe applies if retrieved section enrollment is zero or greater').'
';
- }
- }
- if (($changes{'autofailsafe'}) || ($changes{'failsafe'})) {
- &Apache::lonnet::get_domain_defaults($dom,1);
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'domdefaults'} = 1;
- }
- }
$resulttext .= ' ';
} else {
$resulttext = &mt('No changes made to auto-enrollment settings');
@@ -14346,10 +8876,8 @@ sub modify_autoupdate {
}
my @offon = ('off','on');
my %title = &Apache::lonlocal::texthash (
- run => 'Auto-update:',
- classlists => 'Updates to user information in classlists?',
- unexpired => 'Skip updates for users without active or future roles?',
- lastactive => 'Skip updates for inactive users?',
+ run => 'Auto-update:',
+ classlists => 'Updates to user information in classlists?'
);
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
my %fieldtitles = &Apache::lonlocal::texthash (
@@ -14393,23 +8921,12 @@ sub modify_autoupdate {
my %updatehash = (
autoupdate => { run => $env{'form.autoupdate_run'},
classlists => $env{'form.classlists'},
- unexpired => $env{'form.unexpired'},
fields => {%fields},
lockablenames => \@lockablenames,
}
);
- my $lastactivedays;
- if ($env{'form.lastactive'}) {
- $lastactivedays = $env{'form.lastactivedays'};
- $lastactivedays =~ s/^\s+|\s+$//g;
- unless ($lastactivedays =~ /^\d+$/) {
- undef($lastactivedays);
- $env{'form.lastactive'} = 0;
- }
- }
- $updatehash{'autoupdate'}{'lastactive'} = $lastactivedays;
foreach my $key (keys(%currautoupdate)) {
- if (($key eq 'run') || ($key eq 'classlists') || ($key eq 'unexpired') || ($key eq 'lastactive')) {
+ if (($key eq 'run') || ($key eq 'classlists')) {
if (exists($updatehash{autoupdate}{$key})) {
if ($currautoupdate{$key} ne $updatehash{autoupdate}{$key}) {
$changes{$key} = 1;
@@ -14455,16 +8972,6 @@ sub modify_autoupdate {
$changes{'lockablenames'} = 1;
}
}
- unless (grep(/^unexpired$/,keys(%currautoupdate))) {
- if ($updatehash{'autoupdate'}{'unexpired'}) {
- $changes{'unexpired'} = 1;
- }
- }
- unless (grep(/^lastactive$/,keys(%currautoupdate))) {
- if ($updatehash{'autoupdate'}{'lastactive'} ne '') {
- $changes{'lastactive'} = 1;
- }
- }
foreach my $item (@{$types},'default') {
if (defined($fields{$item})) {
if (ref($currautoupdate{'fields'}) eq 'HASH') {
@@ -14527,11 +9034,6 @@ sub modify_autoupdate {
my $newvalue;
if ($key eq 'run') {
$newvalue = $offon[$env{'form.autoupdate_run'}];
- } elsif ($key eq 'lastactive') {
- $newvalue = $offon[$env{'form.lastactive'}];
- unless ($lastactivedays eq '') {
- $newvalue .= '; '.&mt('inactive = no activity in last [quant,_1,day]',$lastactivedays);
- }
} else {
$newvalue = $offon[$env{'form.'.$key}];
}
@@ -14568,7 +9070,7 @@ sub modify_autocreate {
$newvals{$item} = 0 if ($newvals{$item} eq '');
}
$newvals{'xmldc'} = $env{'form.autocreate_xmldc'};
- my %domcoords = &Apache::lonnet::get_active_domroles($dom,['dc']);
+ my %domcoords = &get_active_dcs($dom);
unless (exists($domcoords{$newvals{'xmldc'}})) {
$newvals{'xmldc'} = '';
}
@@ -14625,7 +9127,7 @@ sub modify_autocreate {
}
sub modify_directorysrch {
- my ($dom,$lastactref,%domconfig) = @_;
+ my ($dom,%domconfig) = @_;
my ($resulttext,%changes);
my %currdirsrch;
if (ref($domconfig{'directorysrch'}) eq 'HASH') {
@@ -14633,10 +9135,8 @@ sub modify_directorysrch {
$currdirsrch{$key} = $domconfig{'directorysrch'}{$key};
}
}
- my %title = ( available => 'Institutional directory search available',
- localonly => 'Other domains can search institution',
- lcavailable => 'LON-CAPA directory search available',
- lclocalonly => 'Other domains can search LON-CAPA domain',
+ my %title = ( available => 'Directory search available',
+ localonly => 'Other domains can search',
searchby => 'Search types',
searchtypes => 'Search latitude');
my @offon = ('off','on');
@@ -14710,9 +9210,7 @@ sub modify_directorysrch {
my %dirsrch_hash = (
directorysrch => { available => $env{'form.dirsrch_available'},
cansearch => \@cansearch,
- localonly => $env{'form.dirsrch_instlocalonly'},
- lclocalonly => $env{'form.dirsrch_domlocalonly'},
- lcavailable => $env{'form.dirsrch_domavailable'},
+ localonly => $env{'form.dirsrch_localonly'},
searchby => \@searchby,
searchtypes => \@searchtypes,
}
@@ -14729,47 +9227,24 @@ sub modify_directorysrch {
$changes{'available'} = 1;
}
}
- if (exists($currdirsrch{'lcavailable'})) {
- if ($currdirsrch{'lcavailable'} ne $env{'form.dirsrch_domavailable'}) {
- $changes{'lcavailable'} = 1;
- }
- } else {
- if ($env{'form.dirsrch_lcavailable'} eq '1') {
- $changes{'lcavailable'} = 1;
- }
- }
if (exists($currdirsrch{'localonly'})) {
- if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_instlocalonly'}) {
- $changes{'localonly'} = 1;
- }
+ if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_localonly'}) {
+ $changes{'localonly'} = 1;
+ }
} else {
- if ($env{'form.dirsrch_instlocalonly'} eq '1') {
+ if ($env{'form.dirsrch_localonly'} eq '1') {
$changes{'localonly'} = 1;
}
}
- if (exists($currdirsrch{'lclocalonly'})) {
- if ($currdirsrch{'lclocalonly'} ne $env{'form.dirsrch_domlocalonly'}) {
- $changes{'lclocalonly'} = 1;
- }
- } else {
- if ($env{'form.dirsrch_domlocalonly'} eq '1') {
- $changes{'lclocalonly'} = 1;
- }
- }
if (keys(%changes) > 0) {
$resulttext = &mt('Changes made:').'';
if ($changes{'available'}) {
$resulttext .= '- '.&mt("$title{'available'} set to: $offon[$env{'form.dirsrch_available'}]").'
';
}
- if ($changes{'lcavailable'}) {
- $resulttext .= '- '.&mt("$title{'lcavailable'} set to: $offon[$env{'form.dirsrch_domavailable'}]").'
';
- }
if ($changes{'localonly'}) {
- $resulttext .= '- '.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_instlocalonly'}]").'
';
- }
- if ($changes{'lclocalonly'}) {
- $resulttext .= '- '.&mt("$title{'lclocalonly'} set to: $otherdoms[$env{'form.dirsrch_domlocalonly'}]").'
';
+ $resulttext .= '- '.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_localonly'}]").'
';
}
+
if (ref($changes{'cansearch'}) eq 'ARRAY') {
my $chgtext;
if (ref($usertypes) eq 'HASH') {
@@ -14819,12 +9294,8 @@ sub modify_directorysrch {
$resulttext .= '- '.&mt($title{'searchtypes'}.' set to: "[_1]"',$chgtext).'
';
}
$resulttext .= ' ';
- &Apache::lonnet::do_cache_new('directorysrch',$dom,$dirsrch_hash{'directorysrch'},3600);
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'directorysrch'} = 1;
- }
} else {
- $resulttext = &mt('No changes made to directory search settings');
+ $resulttext = &mt('No changes made to institution directory search settings');
}
} else {
$resulttext = ''.
@@ -14841,13 +9312,11 @@ sub modify_contacts {
$currsetting{$key} = $domconfig{'contacts'}{$key};
}
}
- my (%others,%to,%bcc,%includestr,%includeloc);
+ my (%others,%to,%bcc);
my @contacts = ('supportemail','adminemail');
- my @mailings = ('errormail','packagesmail','helpdeskmail','otherdomsmail',
- 'lonstatusmail','requestsmail','updatesmail','idconflictsmail','hostipmail');
- my @toggles = ('reporterrors','reportupdates','reportstatus');
- my @lonstatus = ('threshold','sysmail','weights','excluded');
- my ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields();
+ my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail',
+ 'requestsmail','updatesmail','idconflictsmail');
+ my @toggles = ('reporterrors','reportupdates');
foreach my $type (@mailings) {
@{$newsetting{$type}} =
&Apache::loncommon::get_env_multiple('form.'.$type);
@@ -14857,17 +9326,12 @@ sub modify_contacts {
} else {
$contacts_hash{contacts}{$type}{$item} = 0;
}
- }
+ }
$others{$type} = $env{'form.'.$type.'_others'};
$contacts_hash{contacts}{$type}{'others'} = $others{$type};
- if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
+ if ($type eq 'helpdeskmail') {
$bcc{$type} = $env{'form.'.$type.'_bcc'};
$contacts_hash{contacts}{$type}{'bcc'} = $bcc{$type};
- if (($env{'form.'.$type.'_includestr'} ne '') && ($env{'form.'.$type.'_includeloc'} =~ /^s|b$/)) {
- $includestr{$type} = $env{'form.'.$type.'_includestr'};
- $includeloc{$type} = $env{'form.'.$type.'_includeloc'};
- $contacts_hash{contacts}{$type}{'include'} = $includeloc{$type}.':'.&escape($includestr{$type});
- }
}
}
foreach my $item (@contacts) {
@@ -14879,98 +9343,6 @@ sub modify_contacts {
$contacts_hash{'contacts'}{$item} = $env{'form.'.$item};
}
}
- my ($lonstatus_defs,$lonstatus_names) = &Apache::loncommon::lon_status_items();
- foreach my $item (@lonstatus) {
- if ($item eq 'excluded') {
- my (%serverhomes,@excluded);
- map { $serverhomes{$_} = 1; } values(%Apache::lonnet::serverhomeIDs);
- my @possexcluded = &Apache::loncommon::get_env_multiple('form.errorexcluded');
- if (@possexcluded) {
- foreach my $id (sort(@possexcluded)) {
- if ($serverhomes{$id}) {
- push(@excluded,$id);
- }
- }
- }
- if (@excluded) {
- $contacts_hash{'contacts'}{'lonstatus'}{$item} = \@excluded;
- }
- } elsif ($item eq 'weights') {
- foreach my $type ('E','W','N','U') {
- $env{'form.error'.$item.'_'.$type} =~ s/^\s+|\s+$//g;
- if ($env{'form.error'.$item.'_'.$type} =~ /^\d+$/) {
- unless ($env{'form.error'.$item.'_'.$type} == $lonstatus_defs->{$type}) {
- $contacts_hash{'contacts'}{'lonstatus'}{$item}{$type} =
- $env{'form.error'.$item.'_'.$type};
- }
- }
- }
- } elsif (($item eq 'threshold') || ($item eq 'sysmail')) {
- $env{'form.error'.$item} =~ s/^\s+|\s+$//g;
- if ($env{'form.error'.$item} =~ /^\d+$/) {
- unless ($env{'form.error'.$item} == $lonstatus_defs->{$item}) {
- $contacts_hash{'contacts'}{'lonstatus'}{$item} = $env{'form.error'.$item};
- }
- }
- }
- }
- if ((ref($fields) eq 'ARRAY') && (ref($possoptions) eq 'HASH')) {
- foreach my $field (@{$fields}) {
- if (ref($possoptions->{$field}) eq 'ARRAY') {
- my $value = $env{'form.helpform_'.$field};
- $value =~ s/^\s+|\s+$//g;
- if (grep(/^\Q$value\E$/,@{$possoptions->{$field}})) {
- $contacts_hash{'contacts'}{'helpform'}{$field} = $value;
- if ($field eq 'screenshot') {
- $env{'form.helpform_maxsize'} =~ s/^\s+|\s+$//g;
- if ($env{'form.helpform_maxsize'} =~ /^\d+\.?\d*$/) {
- $contacts_hash{'contacts'}{'helpform'}{'maxsize'} = $env{'form.helpform_maxsize'};
- }
- }
- }
- }
- }
- }
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- my (@statuses,%usertypeshash,@overrides);
- if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) {
- @statuses = @{$types};
- if (ref($usertypes) eq 'HASH') {
- %usertypeshash = %{$usertypes};
- }
- }
- if (@statuses) {
- my @possoverrides = &Apache::loncommon::get_env_multiple('form.overrides');
- foreach my $type (@possoverrides) {
- if (($type ne '') && (grep(/^\Q$type\E$/,@statuses))) {
- push(@overrides,$type);
- }
- }
- if (@overrides) {
- foreach my $type (@overrides) {
- my @standard = &Apache::loncommon::get_env_multiple('form.override_'.$type);
- foreach my $item (@contacts) {
- if (grep(/^\Q$item\E$/,@standard)) {
- $contacts_hash{'contacts'}{'overrides'}{$type}{$item} = 1;
- $newsetting{'override_'.$type}{$item} = 1;
- } else {
- $contacts_hash{'contacts'}{'overrides'}{$type}{$item} = 0;
- $newsetting{'override_'.$type}{$item} = 0;
- }
- }
- $contacts_hash{'contacts'}{'overrides'}{$type}{'others'} = $env{'form.override_'.$type.'_others'};
- $contacts_hash{'contacts'}{'overrides'}{$type}{'bcc'} = $env{'form.override_'.$type.'_bcc'};
- $newsetting{'override_'.$type}{'others'} = $env{'form.override_'.$type.'_others'};
- $newsetting{'override_'.$type}{'bcc'} = $env{'form.override_'.$type.'_bcc'};
- if (($env{'form.override_'.$type.'_includestr'} ne '') && ($env{'form.override_'.$type.'_includeloc'} =~ /^s|b$/)) {
- $includestr{$type} = $env{'form.override_'.$type.'_includestr'};
- $includeloc{$type} = $env{'form.override_'.$type.'_includeloc'};
- $contacts_hash{'contacts'}{'overrides'}{$type}{'include'} = $includeloc{$type}.':'.&escape($includestr{$type});
- $newsetting{'override_'.$type}{'include'} = $contacts_hash{'contacts'}{'overrides'}{$type}{'include'};
- }
- }
- }
- }
if (keys(%currsetting) > 0) {
foreach my $item (@contacts) {
if ($to{$item} ne $currsetting{$item}) {
@@ -14990,136 +9362,10 @@ sub modify_contacts {
if ($others{$type} ne $currsetting{$type}{'others'}) {
push(@{$changes{$type}},'others');
}
- if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
+ if ($type eq 'helpdeskmail') {
if ($bcc{$type} ne $currsetting{$type}{'bcc'}) {
push(@{$changes{$type}},'bcc');
}
- my ($currloc,$currstr) = split(/:/,$currsetting{$type}{'include'},2);
- if (($includeloc{$type} ne $currloc) || (&escape($includestr{$type}) ne $currstr)) {
- push(@{$changes{$type}},'include');
- }
- }
- }
- if (ref($fields) eq 'ARRAY') {
- if (ref($currsetting{'helpform'}) eq 'HASH') {
- foreach my $field (@{$fields}) {
- if ($currsetting{'helpform'}{$field} ne $contacts_hash{'contacts'}{'helpform'}{$field}) {
- push(@{$changes{'helpform'}},$field);
- }
- if (($field eq 'screenshot') && ($contacts_hash{'contacts'}{'helpform'}{'screenshot'} ne 'no')) {
- if ($currsetting{'helpform'}{'maxsize'} ne $contacts_hash{'contacts'}{'helpform'}{'maxsize'}) {
- push(@{$changes{'helpform'}},'maxsize');
- }
- }
- }
- } else {
- foreach my $field (@{$fields}) {
- if ($contacts_hash{'contacts'}{'helpform'}{$field} ne 'yes') {
- push(@{$changes{'helpform'}},$field);
- }
- if (($field eq 'screenshot') && ($contacts_hash{'contacts'}{'helpform'}{'screenshot'} ne 'no')) {
- if ($contacts_hash{'contacts'}{'helpform'}{'maxsize'} != 1) {
- push(@{$changes{'helpform'}},'maxsize');
- }
- }
- }
- }
- }
- if (@statuses) {
- if (ref($currsetting{'overrides'}) eq 'HASH') {
- foreach my $key (keys(%{$currsetting{'overrides'}})) {
- if (ref($currsetting{'overrides'}{$key}) eq 'HASH') {
- if (ref($newsetting{'override_'.$key}) eq 'HASH') {
- foreach my $item (@contacts,'bcc','others','include') {
- if ($currsetting{'overrides'}{$key}{$item} ne $newsetting{'override_'.$key}{$item}) {
- push(@{$changes{'overrides'}},$key);
- last;
- }
- }
- } else {
- push(@{$changes{'overrides'}},$key);
- }
- }
- }
- foreach my $key (@overrides) {
- unless (exists($currsetting{'overrides'}{$key})) {
- push(@{$changes{'overrides'}},$key);
- }
- }
- } else {
- foreach my $key (@overrides) {
- push(@{$changes{'overrides'}},$key);
- }
- }
- }
- if (ref($currsetting{'lonstatus'}) eq 'HASH') {
- foreach my $key ('excluded','weights','threshold','sysmail') {
- if ($key eq 'excluded') {
- if ((ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') &&
- (ref($contacts_hash{contacts}{lonstatus}{excluded}) eq 'ARRAY')) {
- if ((ref($currsetting{'lonstatus'}{$key}) eq 'ARRAY') &&
- (@{$currsetting{'lonstatus'}{$key}})) {
- my @diffs =
- &Apache::loncommon::compare_arrays($contacts_hash{contacts}{lonstatus}{excluded},
- $currsetting{'lonstatus'}{$key});
- if (@diffs) {
- push(@{$changes{'lonstatus'}},$key);
- }
- } elsif (@{$contacts_hash{contacts}{lonstatus}{excluded}}) {
- push(@{$changes{'lonstatus'}},$key);
- }
- } elsif ((ref($currsetting{'lonstatus'}{$key}) eq 'ARRAY') &&
- (@{$currsetting{'lonstatus'}{$key}})) {
- push(@{$changes{'lonstatus'}},$key);
- }
- } elsif ($key eq 'weights') {
- if ((ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') &&
- (ref($contacts_hash{contacts}{lonstatus}{$key}) eq 'HASH')) {
- if (ref($currsetting{'lonstatus'}{$key}) eq 'HASH') {
- foreach my $type ('E','W','N','U') {
- unless ($contacts_hash{contacts}{lonstatus}{$key}{$type} eq
- $currsetting{'lonstatus'}{$key}{$type}) {
- push(@{$changes{'lonstatus'}},$key);
- last;
- }
- }
- } else {
- foreach my $type ('E','W','N','U') {
- if ($contacts_hash{contacts}{lonstatus}{$key}{$type} ne '') {
- push(@{$changes{'lonstatus'}},$key);
- last;
- }
- }
- }
- } elsif (ref($currsetting{'lonstatus'}{$key}) eq 'HASH') {
- foreach my $type ('E','W','N','U') {
- if ($currsetting{'lonstatus'}{$key}{$type} ne '') {
- push(@{$changes{'lonstatus'}},$key);
- last;
- }
- }
- }
- } elsif (($key eq 'threshold') || ($key eq 'sysmail')) {
- if (ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') {
- if ($currsetting{'lonstatus'}{$key} =~ /^\d+$/) {
- if ($currsetting{'lonstatus'}{$key} != $contacts_hash{contacts}{lonstatus}{$key}) {
- push(@{$changes{'lonstatus'}},$key);
- }
- } elsif ($contacts_hash{contacts}{lonstatus}{$key} =~ /^\d+$/) {
- push(@{$changes{'lonstatus'}},$key);
- }
- } elsif ($currsetting{'lonstatus'}{$key} =~ /^\d+$/) {
- push(@{$changes{'lonstatus'}},$key);
- }
- }
- }
- } else {
- if (ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') {
- foreach my $key ('excluded','weights','threshold','sysmail') {
- if (exists($contacts_hash{contacts}{lonstatus}{$key})) {
- push(@{$changes{'lonstatus'}},$key);
- }
- }
}
}
} else {
@@ -15129,49 +9375,26 @@ sub modify_contacts {
$default{'errormail'} = 'adminemail';
$default{'packagesmail'} = 'adminemail';
$default{'helpdeskmail'} = 'supportemail';
- $default{'otherdomsmail'} = 'supportemail';
$default{'lonstatusmail'} = 'adminemail';
$default{'requestsmail'} = 'adminemail';
$default{'updatesmail'} = 'adminemail';
- $default{'hostipmail'} = 'adminemail';
foreach my $item (@contacts) {
if ($to{$item} ne $default{$item}) {
- $changes{$item} = 1;
+ $changes{$item} = 1;
}
}
foreach my $type (@mailings) {
if ((@{$newsetting{$type}} != 1) || ($newsetting{$type}[0] ne $default{$type})) {
+
push(@{$changes{$type}},@{$newsetting{$type}});
}
if ($others{$type} ne '') {
push(@{$changes{$type}},'others');
}
- if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
+ if ($type eq 'helpdeskmail') {
if ($bcc{$type} ne '') {
push(@{$changes{$type}},'bcc');
}
- if (($includeloc{$type} =~ /^b|s$/) && ($includestr{$type} ne '')) {
- push(@{$changes{$type}},'include');
- }
- }
- }
- if (ref($fields) eq 'ARRAY') {
- foreach my $field (@{$fields}) {
- if ($contacts_hash{'contacts'}{'helpform'}{$field} ne 'yes') {
- push(@{$changes{'helpform'}},$field);
- }
- if (($field eq 'screenshot') && ($contacts_hash{'contacts'}{'helpform'}{'screenshot'} ne 'no')) {
- if ($contacts_hash{'contacts'}{'helpform'}{'maxsize'} != 1) {
- push(@{$changes{'helpform'}},'maxsize');
- }
- }
- }
- }
- if (ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') {
- foreach my $key ('excluded','weights','threshold','sysmail') {
- if (exists($contacts_hash{contacts}{lonstatus}{$key})) {
- push(@{$changes{'lonstatus'}},$key);
- }
}
}
}
@@ -15203,11 +9426,7 @@ sub modify_contacts {
}
foreach my $type (@mailings) {
if (ref($changes{$type}) eq 'ARRAY') {
- if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
- $resulttext .= ''.$titles->{$type}.' -- '.&mt('sent to').': ';
- } else {
- $resulttext .= ''.$titles->{$type}.': ';
- }
+ $resulttext .= ''.$titles->{$type}.': ';
my @text;
foreach my $item (@{$newsetting{$type}}) {
push(@text,$short_titles->{$item});
@@ -15215,775 +9434,44 @@ sub modify_contacts {
if ($others{$type} ne '') {
push(@text,$others{$type});
}
- if (@text) {
- $resulttext .= ''.
- join(', ',@text).'';
- }
- if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
+ $resulttext .= ''.
+ join(', ',@text).'';
+ if ($type eq 'helpdeskmail') {
if ($bcc{$type} ne '') {
- my $bcctext;
- if (@text) {
- $bcctext = ' '.&mt('with Bcc to');
- } else {
- $bcctext = '(Bcc)';
- }
- $resulttext .= $bcctext.': '.$bcc{$type}.'';
- } elsif (!@text) {
- $resulttext .= &mt('No one');
- }
- if ($includestr{$type} ne '') {
- if ($includeloc{$type} eq 'b') {
- $resulttext .= '
'.&mt('Text automatically added to e-mail body:').' '.$includestr{$type};
- } elsif ($includeloc{$type} eq 's') {
- $resulttext .= '
'.&mt('Text automatically added to e-mail subject:').' '.$includestr{$type};
- }
+ $resulttext .= ' '.&mt('with Bcc to').': '.$bcc{$type}.'';
}
- } elsif (!@text) {
- $resulttext .= &mt('No recipients');
}
$resulttext .= '';
}
}
- if (ref($changes{'overrides'}) eq 'ARRAY') {
- my @deletions;
- foreach my $type (@{$changes{'overrides'}}) {
- if ($usertypeshash{$type}) {
- if (grep(/^\Q$type\E/,@overrides)) {
- $resulttext .= ''.&mt("Overrides based on requester's affiliation set for [_1]",
- $usertypeshash{$type}).'- ';
- if (ref($newsetting{'override_'.$type}) eq 'HASH') {
- my @text;
- foreach my $item (@contacts) {
- if ($newsetting{'override_'.$type}{$item}) {
- push(@text,$short_titles->{$item});
- }
- }
- if ($newsetting{'override_'.$type}{'others'} ne '') {
- push(@text,$newsetting{'override_'.$type}{'others'});
- }
-
- if (@text) {
- $resulttext .= &mt('Helpdesk e-mail sent to: [_1]',
- ''.join(', ',@text).'');
- }
- if ($newsetting{'override_'.$type}{'bcc'} ne '') {
- my $bcctext;
- if (@text) {
- $bcctext = ' '.&mt('with Bcc to');
- } else {
- $bcctext = '(Bcc)';
- }
- $resulttext .= $bcctext.': '.$newsetting{'override_'.$type}{'bcc'}.'';
- } elsif (!@text) {
- $resulttext .= &mt('Helpdesk e-mail sent to no one');
- }
- $resulttext .= '
';
- if ($newsetting{'override_'.$type}{'include'} ne '') {
- my ($loc,$str) = split(/:/,$newsetting{'override_'.$type}{'include'});
- if ($loc eq 'b') {
- $resulttext .= '- '.&mt('Text automatically added to e-mail body:').' '.&unescape($str).'
';
- } elsif ($loc eq 's') {
- $resulttext .= '- '.&mt('Text automatically added to e-mail subject:').' '.&unescape($str).'
';
- }
- }
- }
- $resulttext .= '
';
- } else {
- push(@deletions,$usertypeshash{$type});
- }
- }
- }
- if (@deletions) {
- $resulttext .= ''.&mt("Overrides based on requester's affiliation discontinued for: [_1]",
- join(', ',@deletions)).'';
- }
- }
my @offon = ('off','on');
- my $corelink = &core_link_msu();
if ($changes{'reporterrors'}) {
$resulttext .= ''.
&mt('E-mail error reports to [_1] set to "'.
$offon[$env{'form.reporterrors'}].'".',
- $corelink).
+ &Apache::loncommon::modal_link('http://loncapa.org/core.html',
+ &mt('LON-CAPA core group - MSU'),600,500)).
'';
}
if ($changes{'reportupdates'}) {
$resulttext .= ''.
&mt('E-mail record of completed LON-CAPA updates to [_1] set to "'.
$offon[$env{'form.reportupdates'}].'".',
- $corelink).
- '';
- }
- if ($changes{'reportstatus'}) {
- $resulttext .= ''.
- &mt('E-mail status if errors above threshold to [_1] set to "'.
- $offon[$env{'form.reportstatus'}].'".',
- $corelink).
+ &Apache::loncommon::modal_link('http://loncapa.org/core.html',
+ &mt('LON-CAPA core group - MSU'),600,500)).
'';
}
- if (ref($changes{'lonstatus'}) eq 'ARRAY') {
- $resulttext .= ''.
- &mt('Nightly status check e-mail settings').':';
- my (%defval,%use_def,%shown);
- $defval{'threshold'} = $lonstatus_defs->{'threshold'};
- $defval{'sysmail'} = $lonstatus_defs->{'sysmail'};
- $defval{'weights'} =
- join(', ',map { $lonstatus_names->{$_}.'='.$lonstatus_defs->{$_}; } ('E','W','N','U'));
- $defval{'excluded'} = &mt('None');
- if (ref($contacts_hash{'contacts'}{'lonstatus'}) eq 'HASH') {
- foreach my $item ('threshold','sysmail','weights','excluded') {
- if (exists($contacts_hash{'contacts'}{'lonstatus'}{$item})) {
- if (($item eq 'threshold') || ($item eq 'sysmail')) {
- $shown{$item} = $contacts_hash{'contacts'}{'lonstatus'}{$item};
- } elsif ($item eq 'weights') {
- if (ref($contacts_hash{'contacts'}{'lonstatus'}{$item}) eq 'HASH') {
- foreach my $type ('E','W','N','U') {
- $shown{$item} .= $lonstatus_names->{$type}.'=';
- if (exists($contacts_hash{'contacts'}{'lonstatus'}{$item}{$type})) {
- $shown{$item} .= $contacts_hash{'contacts'}{'lonstatus'}{$item}{$type};
- } else {
- $shown{$item} .= $lonstatus_defs->{$type};
- }
- $shown{$item} .= ', ';
- }
- $shown{$item} =~ s/, $//;
- } else {
- $shown{$item} = $defval{$item};
- }
- } elsif ($item eq 'excluded') {
- if (ref($contacts_hash{'contacts'}{'lonstatus'}{$item}) eq 'ARRAY') {
- $shown{$item} = join(', ',@{$contacts_hash{'contacts'}{'lonstatus'}{$item}});
- } else {
- $shown{$item} = $defval{$item};
- }
- }
- } else {
- $shown{$item} = $defval{$item};
- }
- }
- } else {
- foreach my $item ('threshold','weights','excluded','sysmail') {
- $shown{$item} = $defval{$item};
- }
- }
- foreach my $item ('threshold','weights','excluded','sysmail') {
- $resulttext .= '- '.&mt($titles->{'error'.$item}.' -- [_1]',
- $shown{$item}).'
';
- }
- $resulttext .= ' ';
- }
- if ((ref($changes{'helpform'}) eq 'ARRAY') && (ref($fields) eq 'ARRAY')) {
- my (@optional,@required,@unused,$maxsizechg);
- foreach my $field (@{$changes{'helpform'}}) {
- if ($field eq 'maxsize') {
- $maxsizechg = 1;
- next;
- }
- if ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'yes') {
- push(@optional,$field);
- } elsif ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'no') {
- push(@unused,$field);
- } elsif ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'req') {
- push(@required,$field);
- }
- }
- if (@optional) {
- $resulttext .= ''.
- &mt('Help form fields changed to "Optional": [_1].',
- ''.join(', ',map { $fieldtitles->{$_}; } @optional)).''.
- '';
- }
- if (@required) {
- $resulttext .= ''.
- &mt('Help form fields changed to "Required": [_1].',
- ''.join(', ',map { $fieldtitles->{$_}; } @required)).''.
- '';
- }
- if (@unused) {
- $resulttext .= ''.
- &mt('Help form fields changed to "Not shown": [_1].',
- ''.join(', ',map { $fieldtitles->{$_}; } @unused)).''.
- '';
- }
- if ($maxsizechg) {
- $resulttext .= ''.
- &mt('Max size for file uploaded to help form by logged-in user set to [_1] MB.',
- $contacts_hash{'contacts'}{'helpform'}{'maxsize'}).
- '';
- }
- }
- $resulttext .= '';
- } else {
- $resulttext = &mt('No changes made to contacts and form settings');
- }
- } else {
- $resulttext = ''.
- &mt('An error occurred: [_1]',$putresult).'';
- }
- return $resulttext;
-}
-
-sub modify_passwords {
- my ($r,$dom,$confname,$lastactref,%domconfig) = @_;
- my ($resulttext,%current,%changes,%newvalues,@oktypes,$errors,
- $updatedefaults,$updateconf);
- my $customfn = 'resetpw.html';
- if (ref($domconfig{'passwords'}) eq 'HASH') {
- %current = %{$domconfig{'passwords'}};
- }
- my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- if (ref($types) eq 'ARRAY') {
- @oktypes = @{$types};
- }
- push(@oktypes,'default');
-
- my %titles = &Apache::lonlocal::texthash (
- intauth_cost => 'Encryption cost for bcrypt (positive integer)',
- intauth_check => 'Check bcrypt cost if authenticated',
- intauth_switch => 'Existing crypt-based switched to bcrypt on authentication',
- permanent => 'Permanent e-mail address',
- critical => 'Critical notification address',
- notify => 'Notification address',
- min => 'Minimum password length',
- max => 'Maximum password length',
- chars => 'Required characters',
- numsaved => 'Number of previous passwords to save',
- reset => 'Resetting Forgotten Password',
- intauth => 'Encryption of Stored Passwords (Internal Auth)',
- rules => 'Rules for LON-CAPA Passwords',
- crsownerchg => 'Course Owner Changing Student Passwords',
- username => 'Username',
- email => 'E-mail address',
- );
-
-#
-# Retrieve current domain configuration for internal authentication from $domconfig{'defaults'}.
-#
- my (%curr_defaults,%save_defaults);
- if (ref($domconfig{'defaults'}) eq 'HASH') {
- foreach my $key (keys(%{$domconfig{'defaults'}})) {
- if ($key =~ /^intauth_(cost|check|switch)$/) {
- $curr_defaults{$key} = $domconfig{'defaults'}{$key};
- } else {
- $save_defaults{$key} = $domconfig{'defaults'}{$key};
- }
- }
- }
- my %staticdefaults = (
- 'resetlink' => 2,
- 'resetcase' => \@oktypes,
- 'resetprelink' => 'both',
- 'resetemail' => ['critical','notify','permanent'],
- 'intauth_cost' => 10,
- 'intauth_check' => 0,
- 'intauth_switch' => 0,
- );
- $staticdefaults{'min'} = $Apache::lonnet::passwdmin;
- foreach my $type (@oktypes) {
- $staticdefaults{'resetpostlink'}{$type} = ['email','username'];
- }
- my $linklife = $env{'form.passwords_link'};
- $linklife =~ s/^\s+|\s+$//g;
- if (($linklife =~ /^\d+(|\.\d*)$/) && ($linklife > 0)) {
- $newvalues{'resetlink'} = $linklife;
- if ($current{'resetlink'}) {
- if ($current{'resetlink'} ne $linklife) {
- $changes{'reset'} = 1;
- }
- } elsif (!ref($domconfig{passwords}) eq 'HASH') {
- if ($staticdefaults{'resetlink'} ne $linklife) {
- $changes{'reset'} = 1;
- }
- }
- } elsif ($current{'resetlink'}) {
- $changes{'reset'} = 1;
- }
- my @casesens;
- my @posscase = &Apache::loncommon::get_env_multiple('form.passwords_case_sensitive');
- foreach my $case (sort(@posscase)) {
- if (grep(/^\Q$case\E$/,@oktypes)) {
- push(@casesens,$case);
- }
- }
- $newvalues{'resetcase'} = \@casesens;
- if (ref($current{'resetcase'}) eq 'ARRAY') {
- my @diffs = &Apache::loncommon::compare_arrays($current{'resetcase'},\@casesens);
- if (@diffs > 0) {
- $changes{'reset'} = 1;
- }
- } elsif (!ref($domconfig{passwords}) eq 'HASH') {
- my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetcase'},\@casesens);
- if (@diffs > 0) {
- $changes{'reset'} = 1;
- }
- }
- if ($env{'form.passwords_prelink'} =~ /^(both|either)$/) {
- $newvalues{'resetprelink'} = $env{'form.passwords_prelink'};
- if (exists($current{'resetprelink'})) {
- if ($current{'resetprelink'} ne $newvalues{'resetprelink'}) {
- $changes{'reset'} = 1;
- }
- } elsif (!ref($domconfig{passwords}) eq 'HASH') {
- if ($staticdefaults{'resetprelink'} ne $newvalues{'resetprelink'}) {
- $changes{'reset'} = 1;
- }
- }
- } elsif ($current{'resetprelink'}) {
- $changes{'reset'} = 1;
- }
- foreach my $type (@oktypes) {
- my @possplink = &Apache::loncommon::get_env_multiple('form.passwords_postlink_'.$type);
- my @postlink;
- foreach my $item (sort(@possplink)) {
- if ($item =~ /^(email|username)$/) {
- push(@postlink,$item);
- }
- }
- $newvalues{'resetpostlink'}{$type} = \@postlink;
- unless ($changes{'reset'}) {
- if (ref($current{'resetpostlink'}) eq 'HASH') {
- if (ref($current{'resetpostlink'}{$type}) eq 'ARRAY') {
- my @diffs = &Apache::loncommon::compare_arrays($current{'resetpostlink'}{$type},\@postlink);
- if (@diffs > 0) {
- $changes{'reset'} = 1;
- }
- } else {
- $changes{'reset'} = 1;
- }
- } elsif (!ref($domconfig{passwords}) eq 'HASH') {
- my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetpostlink'}{$type},\@postlink);
- if (@diffs > 0) {
- $changes{'reset'} = 1;
- }
- }
- }
- }
- my @possemailsrc = &Apache::loncommon::get_env_multiple('form.passwords_emailsrc');
- my @resetemail;
- foreach my $item (sort(@possemailsrc)) {
- if ($item =~ /^(permanent|critical|notify)$/) {
- push(@resetemail,$item);
- }
- }
- $newvalues{'resetemail'} = \@resetemail;
- unless ($changes{'reset'}) {
- if (ref($current{'resetemail'}) eq 'ARRAY') {
- my @diffs = &Apache::loncommon::compare_arrays($current{'resetemail'},\@resetemail);
- if (@diffs > 0) {
- $changes{'reset'} = 1;
- }
- } elsif (!ref($domconfig{passwords}) eq 'HASH') {
- my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetemail'},\@resetemail);
- if (@diffs > 0) {
- $changes{'reset'} = 1;
- }
- }
- }
- if ($env{'form.passwords_stdtext'} == 0) {
- $newvalues{'resetremove'} = 1;
- unless ($current{'resetremove'}) {
- $changes{'reset'} = 1;
- }
- } elsif ($current{'resetremove'}) {
- $changes{'reset'} = 1;
- }
- if ($env{'form.passwords_customfile.filename'} ne '') {
- my $servadm = $r->dir_config('lonAdmEMail');
- my ($configuserok,$author_ok,$switchserver) =
- &config_check($dom,$confname,$servadm);
- my $error;
- if ($configuserok eq 'ok') {
- if ($switchserver) {
- $error = &mt("Upload of file containing domain-specific text is not permitted to this server: [_1]",$switchserver);
- } else {
- if ($author_ok eq 'ok') {
- my $modified = [];
- my ($result,$customurl) =
- &Apache::lonconfigsettings::publishlogo($r,'upload','passwords_customfile',$dom,
- $confname,'customtext/resetpw','','',$customfn,
- $modified);
- if ($result eq 'ok') {
- $newvalues{'resetcustom'} = $customurl;
- $changes{'reset'} = 1;
- &update_modify_urls($r,$modified);
- } else {
- $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$customfn,$result);
- }
- } else {
- $error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3]. Error was: [_4].",$customfn,$confname,$dom,$author_ok);
- }
- }
- } else {
- $error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3]. Error was: [_4].",$customfn,$confname,$dom,$configuserok);
- }
- if ($error) {
- &Apache::lonnet::logthis($error);
- $errors .= ''.$error.'';
- }
- } elsif ($current{'resetcustom'}) {
- if ($env{'form.passwords_custom_del'}) {
- $changes{'reset'} = 1;
- } else {
- $newvalues{'resetcustom'} = $current{'resetcustom'};
- }
- }
- $env{'form.intauth_cost'} =~ s/^\s+|\s+$//g;
- if (($env{'form.intauth_cost'} ne '') && ($env{'form.intauth_cost'} =~ /^\d+$/)) {
- $save_defaults{'intauth_cost'} = $env{'form.intauth_cost'};
- if ($save_defaults{'intauth_cost'} ne $curr_defaults{'intauth_cost'}) {
- $changes{'intauth'} = 1;
- }
- } else {
- $save_defaults{'intauth_cost'} = $curr_defaults{'intauth_cost'};
- }
- if ($env{'form.intauth_check'} =~ /^(0|1|2)$/) {
- $save_defaults{'intauth_check'} = $env{'form.intauth_check'};
- if ($save_defaults{'intauth_check'} ne $curr_defaults{'intauth_check'}) {
- $changes{'intauth'} = 1;
- }
- } else {
- $save_defaults{'intauth_check'} = $curr_defaults{'intauth_check'};
- }
- if ($env{'form.intauth_switch'} =~ /^(0|1|2)$/) {
- $save_defaults{'intauth_switch'} = $env{'form.intauth_switch'};
- if ($save_defaults{'intauth_switch'} ne $curr_defaults{'intauth_switch'}) {
- $changes{'intauth'} = 1;
- }
- } else {
- $save_defaults{'intauth_check'} = $curr_defaults{'intauth_check'};
- }
- foreach my $item ('cost','check','switch') {
- if ($save_defaults{'intauth_'.$item} ne $domdefaults{'intauth_'.$item}) {
- $domdefaults{'intauth_'.$item} = $save_defaults{'intauth_'.$item};
- $updatedefaults = 1;
- }
- }
- &password_rule_changes('passwords',\%newvalues,\%current,\%changes);
- my %crsownerchg = (
- by => [],
- for => [],
- );
- foreach my $item ('by','for') {
- my @posstypes = &Apache::loncommon::get_env_multiple('form.passwords_crsowner_'.$item);
- foreach my $type (sort(@posstypes)) {
- if (grep(/^\Q$type\E$/,@oktypes)) {
- push(@{$crsownerchg{$item}},$type);
- }
- }
- }
- $newvalues{'crsownerchg'} = \%crsownerchg;
- if (ref($current{'crsownerchg'}) eq 'HASH') {
- foreach my $item ('by','for') {
- if (ref($current{'crsownerchg'}{$item}) eq 'ARRAY') {
- my @diffs = &Apache::loncommon::compare_arrays($current{'crsownerchg'}{$item},$crsownerchg{$item});
- if (@diffs > 0) {
- $changes{'crsownerchg'} = 1;
- last;
- }
- }
- }
- } elsif (!(ref($domconfig{passwords}) eq 'HASH')) {
- foreach my $item ('by','for') {
- if (@{$crsownerchg{$item}} > 0) {
- $changes{'crsownerchg'} = 1;
- last;
- }
- }
- }
-
- my %confighash = (
- defaults => \%save_defaults,
- passwords => \%newvalues,
- );
- &process_captcha('passwords',\%changes,$confighash{'passwords'},$domconfig{'passwords'});
-
- my $putresult = &Apache::lonnet::put_dom('configuration',\%confighash,$dom);
- if ($putresult eq 'ok') {
- if (keys(%changes) > 0) {
- $resulttext = &mt('Changes made: ').'';
- foreach my $key ('reset','intauth','rules','crsownerchg') {
- if ($changes{$key}) {
- unless ($key eq 'intauth') {
- $updateconf = 1;
- }
- $resulttext .= '- '.$titles{$key}.':
';
- if ($key eq 'reset') {
- if ($confighash{'passwords'}{'captcha'} eq 'original') {
- $resulttext .= '- '.&mt('CAPTCHA validation set to use: original CAPTCHA').'
';
- } elsif ($confighash{'passwords'}{'captcha'} eq 'recaptcha') {
- $resulttext .= '- '.&mt('CAPTCHA validation set to use: reCAPTCHA').' '.
- &mt('version: [_1]',$confighash{'passwords'}{'recaptchaversion'}).'
';
- if (ref($confighash{'passwords'}{'recaptchakeys'}) eq 'HASH') {
- $resulttext .= &mt('Public key: [_1]',$confighash{'passwords'}{'recaptchakeys'}{'public'}).''.
- &mt('Private key: [_1]',$confighash{'passwords'}{'recaptchakeys'}{'private'}).' ';
- }
- } else {
- $resulttext .= '- '.&mt('No CAPTCHA validation').'
';
- }
- if ($confighash{'passwords'}{'resetlink'}) {
- $resulttext .= '- '.&mt('Reset link expiration set to [quant,_1,hour]',$confighash{'passwords'}{'resetlink'}).'
';
- } else {
- $resulttext .= '- '.&mt('No reset link expiration set.').' '.
- &mt('Will default to 2 hours').'
';
- }
- if (ref($confighash{'passwords'}{'resetcase'}) eq 'ARRAY') {
- if (@{$confighash{'passwords'}{'resetcase'}} == 0) {
- $resulttext .= '- '.&mt('User input for username and/or e-mail address not case sensitive for "Forgot Password" web form').'
';
- } else {
- my $casesens;
- foreach my $type (@{$confighash{'passwords'}{'resetcase'}}) {
- if ($type eq 'default') {
- $casesens .= $othertitle.', ';
- } elsif ($usertypes->{$type} ne '') {
- $casesens .= $usertypes->{$type}.', ';
- }
- }
- $casesens =~ s/\Q, \E$//;
- $resulttext .= '- '.&mt('"Forgot Password" web form input for username and/or e-mail address is case-sensitive for: [_1]',$casesens).'
';
- }
- } else {
- $resulttext .= '- '.&mt('Case-sensitivity not set for "Forgot Password" web form').' '.&mt('Will default to case-sensitive for username and/or e-mail address for all').'
';
- }
- if ($confighash{'passwords'}{'resetprelink'} eq 'either') {
- $resulttext .= '- '.&mt('Users can enter either a username or an e-mail address in "Forgot Password" web form').'
';
- } else {
- $resulttext .= '- '.&mt('Users can enter both a username and an e-mail address in "Forgot Password" web form').'
';
- }
- if (ref($confighash{'passwords'}{'resetpostlink'}) eq 'HASH') {
- my $output;
- if (ref($types) eq 'ARRAY') {
- foreach my $type (@{$types}) {
- if (ref($confighash{'passwords'}{'resetpostlink'}{$type}) eq 'ARRAY') {
- if (@{$confighash{'passwords'}{'resetpostlink'}{$type}} == 0) {
- $output .= $usertypes->{$type}.' -- '.&mt('none');
- } else {
- $output .= $usertypes->{$type}.' -- '.
- join(', ',map { $titles{$_}; } (@{$confighash{'passwords'}{'resetpostlink'}{$type}})).'; ';
- }
- }
- }
- }
- if (ref($confighash{'passwords'}{'resetpostlink'}{'default'}) eq 'ARRAY') {
- if (@{$confighash{'passwords'}{'resetpostlink'}{'default'}} == 0) {
- $output .= $othertitle.' -- '.&mt('none');
- } else {
- $output .= $othertitle.' -- '.
- join(', ',map { $titles{$_}; } (@{$confighash{'passwords'}{'resetpostlink'}{'default'}}));
- }
- }
- if ($output) {
- $resulttext .= '- '.&mt('Information required for new password form (by user type) set to: [_1]',$output).'
';
- } else {
- $resulttext .= '- '.&mt('Information required for new password form not set.').' '.&mt('Will default to requiring both the username and an e-mail address').'
';
- }
- } else {
- $resulttext .= '- '.&mt('Information required for new password form not set.').' '.&mt('Will default to requiring both the username and an e-mail address').'
';
- }
- if (ref($confighash{'passwords'}{'resetemail'}) eq 'ARRAY') {
- if (@{$confighash{'passwords'}{'resetemail'}} > 0) {
- $resulttext .= '- '.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$confighash{'passwords'}{'resetemail'}})).'
';
- } else {
- $resulttext .= '- '.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'
';
- }
- } else {
- $resulttext .= '- '.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'
';
- }
- if ($confighash{'passwords'}{'resetremove'}) {
- $resulttext .= '- '.&mt('Preamble to "Forgot Password" web form not shown').'
';
- } else {
- $resulttext .= '- '.&mt('Preamble to "Forgot Password" web form is shown').'
';
- }
- if ($confighash{'passwords'}{'resetcustom'}) {
- my $customlink = &Apache::loncommon::modal_link($confighash{'passwords'}{'resetcustom'},
- &mt('custom text'),600,500,undef,undef,
- undef,undef,'background-color:#ffffff');
- $resulttext .= '- '.&mt('Preamble to "Forgot Password" form includes: [_1]',$customlink).'
';
- } else {
- $resulttext .= '- '.&mt('No custom text included in preamble to "Forgot Password" form').'
';
- }
- } elsif ($key eq 'intauth') {
- foreach my $item ('cost','switch','check') {
- my $value = $save_defaults{$key.'_'.$item};
- if ($item eq 'switch') {
- my %optiondesc = &Apache::lonlocal::texthash (
- 0 => 'No',
- 1 => 'Yes',
- 2 => 'Yes, and copy existing passwd file to passwd.bak file',
- );
- if ($value =~ /^(0|1|2)$/) {
- $value = $optiondesc{$value};
- } else {
- $value = &mt('none -- defaults to No');
- }
- } elsif ($item eq 'check') {
- my %optiondesc = &Apache::lonlocal::texthash (
- 0 => 'No',
- 1 => 'Yes, allow login then update passwd file using default cost (if higher)',
- 2 => 'Yes, disallow login if stored cost is less than domain default',
- );
- if ($value =~ /^(0|1|2)$/) {
- $value = $optiondesc{$value};
- } else {
- $value = &mt('none -- defaults to No');
- }
- }
- $resulttext .= '- '.&mt('[_1] set to "[_2]"',$titles{$key.'_'.$item},$value).'
';
- }
- } elsif ($key eq 'rules') {
- foreach my $rule ('min','max','numsaved') {
- if ($confighash{'passwords'}{$rule} eq '') {
- if ($rule eq 'min') {
- $resulttext .= '- '.&mt('[_1] not set.',$titles{$rule});
- ' '.&mt('Default of [_1] will be used',
- $Apache::lonnet::passwdmin).'
';
- } else {
- $resulttext .= '- '.&mt('[_1] set to none',$titles{$rule}).'
';
- }
- } else {
- $resulttext .= '- '.&mt('[_1] set to [_2]',$titles{$rule},$confighash{'passwords'}{$rule}).'
';
- }
- }
- if (ref($confighash{'passwords'}{'chars'}) eq 'ARRAY') {
- if (@{$confighash{'passwords'}{'chars'}} > 0) {
- my %rulenames = &Apache::lonlocal::texthash(
- uc => 'At least one upper case letter',
- lc => 'At least one lower case letter',
- num => 'At least one number',
- spec => 'At least one non-alphanumeric',
- );
- my $needed = '- '.
- join('
- ',map {$rulenames{$_} } @{$confighash{'passwords'}{'chars'}}).
- '
';
- $resulttext .= '- '.&mt('[_1] set to: [_2]',$titles{'chars'},$needed).'
';
- } else {
- $resulttext .= '- '.&mt('[_1] set to none',$titles{'chars'}).'
';
- }
- } else {
- $resulttext .= '- '.&mt('[_1] set to none',$titles{'chars'}).'
';
- }
- } elsif ($key eq 'crsownerchg') {
- if (ref($confighash{'passwords'}{'crsownerchg'}) eq 'HASH') {
- if ((@{$confighash{'passwords'}{'crsownerchg'}{'by'}} == 0) ||
- (@{$confighash{'passwords'}{'crsownerchg'}{'for'}} == 0)) {
- $resulttext .= '- '.&mt('Course owner may not change student passwords.').'
';
- } else {
- my %crsownerstr;
- foreach my $item ('by','for') {
- if (ref($confighash{'passwords'}{'crsownerchg'}{$item}) eq 'ARRAY') {
- foreach my $type (@{$confighash{'passwords'}{'crsownerchg'}{$item}}) {
- if ($type eq 'default') {
- $crsownerstr{$item} .= $othertitle.', ';
- } elsif ($usertypes->{$type} ne '') {
- $crsownerstr{$item} .= $usertypes->{$type}.', ';
- }
- }
- $crsownerstr{$item} =~ s/\Q, \E$//;
- }
- }
- $resulttext .= '- '.&mt('Course owner (with status: [_1]) may change passwords for students (with status: [_2]).',
- $crsownerstr{'by'},$crsownerstr{'for'}).'
';
- }
- } else {
- $resulttext .= '- '.&mt('Course owner may not change student passwords.').'
';
- }
- }
- $resulttext .= ' ';
- }
- }
$resulttext .= ' ';
} else {
- $resulttext = &mt('No changes made to password settings');
- }
- my $cachetime = 24*60*60;
- if ($updatedefaults) {
- &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'domdefaults'} = 1;
- }
- }
- if ($updateconf) {
- &Apache::lonnet::do_cache_new('passwdconf',$dom,$confighash{'passwords'},$cachetime);
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'passwdconf'} = 1;
- }
+ $resulttext = &mt('No changes made to contact information');
}
} else {
$resulttext = ''.
- &mt('An error occurred: [_1]',$putresult).'';
- }
- if ($errors) {
- $resulttext .= ''.&mt('The following errors occurred: ').' ';
+ &mt('An error occurred: [_1].',$putresult).'';
}
return $resulttext;
}
-sub password_rule_changes {
- my ($prefix,$newvalues,$current,$changes) = @_;
- return unless ((ref($newvalues) eq 'HASH') &&
- (ref($current) eq 'HASH') &&
- (ref($changes) eq 'HASH'));
- my (@rules,%staticdefaults);
- if ($prefix eq 'passwords') {
- @rules = ('min','max','numsaved');
- } elsif (($prefix eq 'ltisecrets') || ($prefix eq 'toolsecrets')) {
- @rules = ('min','max');
- }
- $staticdefaults{'min'} = $Apache::lonnet::passwdmin;
- foreach my $rule (@rules) {
- $env{'form.'.$prefix.'_'.$rule} =~ s/^\s+|\s+$//g;
- my $ruleok;
- if ($rule eq 'min') {
- if ($env{'form.'.$prefix.'_'.$rule} =~ /^\d+$/) {
- if ($env{'form.'.$prefix.'_'.$rule} >= $staticdefaults{$rule}) {
- $ruleok = 1;
- }
- }
- } elsif (($env{'form.'.$prefix.'_'.$rule} =~ /^\d+$/) &&
- ($env{'form.'.$prefix.'_'.$rule} ne '0')) {
- $ruleok = 1;
- }
- if ($ruleok) {
- $newvalues->{$rule} = $env{'form.'.$prefix.'_'.$rule};
- if (exists($current->{$rule})) {
- if ($newvalues->{$rule} ne $current->{$rule}) {
- $changes->{'rules'} = 1;
- }
- } elsif ($rule eq 'min') {
- if ($staticdefaults{$rule} ne $newvalues->{$rule}) {
- $changes->{'rules'} = 1;
- }
- } else {
- $changes->{'rules'} = 1;
- }
- } elsif (exists($current->{$rule})) {
- $changes->{'rules'} = 1;
- }
- }
- my @posschars = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_chars');
- my @chars;
- foreach my $item (sort(@posschars)) {
- if ($item =~ /^(uc|lc|num|spec)$/) {
- push(@chars,$item);
- }
- }
- $newvalues->{'chars'} = \@chars;
- unless ($changes->{'rules'}) {
- if (ref($current->{'chars'}) eq 'ARRAY') {
- my @diffs = &Apache::loncommon::compare_arrays($current->{'chars'},\@chars);
- if (@diffs > 0) {
- $changes->{'rules'} = 1;
- }
- } else {
- if (@chars > 0) {
- $changes->{'rules'} = 1;
- }
- }
- }
- return;
-}
-
sub modify_usercreation {
my ($dom,%domconfig) = @_;
my ($resulttext,%curr_usercreation,%changes,%authallowed,%cancreate,%save_usercreate);
@@ -15993,10 +9481,11 @@ sub modify_usercreation {
if ($key eq 'cancreate') {
if (ref($domconfig{'usercreation'}{$key}) eq 'HASH') {
foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) {
- if (($item eq 'requestcrs') || ($item eq 'course') || ($item eq 'author')) {
- $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
- } else {
+ if (($item eq 'selfcreate') || ($item eq 'statustocreate') ||
+ ($item eq 'captcha') || ($item eq 'recaptchakeys')) {
$save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
+ } else {
+ $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
}
}
}
@@ -16068,7 +9557,7 @@ sub modify_usercreation {
}
my @authen_contexts = ('author','course','domain');
- my @authtypes = ('int','krb4','krb5','loc','lti');
+ my @authtypes = ('int','krb4','krb5','loc');
my %authhash;
foreach my $item (@authen_contexts) {
my @authallowed = &Apache::loncommon::get_env_multiple('form.'.$item.'_auth');
@@ -16199,18 +9688,14 @@ sub modify_usercreation {
}
sub modify_selfcreation {
- my ($dom,$lastactref,%domconfig) = @_;
- my ($resulttext,$warningmsg,%curr_usercreation,%curr_usermodify,%curr_inststatus,%changes,%cancreate);
- my (%save_usercreate,%save_usermodify,%save_inststatus,@types,%usertypes);
- my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
- my ($othertitle,$usertypesref,$typesref) = &Apache::loncommon::sorted_inst_types($dom);
- if (ref($typesref) eq 'ARRAY') {
- @types = @{$typesref};
- }
- if (ref($usertypesref) eq 'HASH') {
- %usertypes = %{$usertypesref};
+ my ($dom,%domconfig) = @_;
+ my ($resulttext,$warningmsg,%curr_usercreation,%curr_usermodify,%changes,%cancreate);
+ my (%save_usercreate,%save_usermodify);
+ my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+ if (ref($types) eq 'ARRAY') {
+ $usertypes->{'default'} = $othertitle;
+ push(@{$types},'default');
}
- $usertypes{'default'} = $othertitle;
#
# Retrieve current domain configuration for self-creation of usernames from $domconfig{'usercreation'}.
#
@@ -16220,11 +9705,9 @@ sub modify_selfcreation {
if (ref($domconfig{'usercreation'}{$key}) eq 'HASH') {
foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) {
if (($item eq 'selfcreate') || ($item eq 'statustocreate') ||
- ($item eq 'captcha') || ($item eq 'recaptchakeys') ||
- ($item eq 'recaptchaversion') || ($item eq 'notify') ||
- ($item eq 'emailusername') || ($item eq 'shibenv') ||
- ($item eq 'selfcreateprocessing') || ($item eq 'emailverified') ||
- ($item eq 'emailoptions') || ($item eq 'emaildomain')) {
+ ($item eq 'captcha') || ($item eq 'recaptchakeys') ||
+ ($item eq 'emailusername') || ($item eq 'notify') ||
+ ($item eq 'selfcreateprocessing') || ($item eq 'shibenv')) {
$curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
} else {
$save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
@@ -16250,160 +9733,41 @@ sub modify_selfcreation {
}
}
}
-#
-# Retrieve current domain configuration for institutional status types from $domconfig{'inststatus'}.
-#
- if (ref($domconfig{'inststatus'}) eq 'HASH') {
- foreach my $key (keys(%{$domconfig{'inststatus'}})) {
- if ($key eq 'inststatusguest') {
- $curr_inststatus{$key} = $domconfig{'inststatus'}{$key};
- } else {
- $save_inststatus{$key} = $domconfig{'inststatus'}{$key};
- }
- }
- }
my @contexts = ('selfcreate');
@{$cancreate{'selfcreate'}} = ();
%{$cancreate{'emailusername'}} = ();
- if (@types) {
- @{$cancreate{'statustocreate'}} = ();
- }
+ @{$cancreate{'statustocreate'}} = ();
%{$cancreate{'selfcreateprocessing'}} = ();
%{$cancreate{'shibenv'}} = ();
- %{$cancreate{'emailverified'}} = ();
- %{$cancreate{'emailoptions'}} = ();
- %{$cancreate{'emaildomain'}} = ();
my %selfcreatetypes = (
sso => 'users authenticated by institutional single sign on',
login => 'users authenticated by institutional log-in',
- email => 'users verified by e-mail',
+ email => 'users who provide a valid e-mail address for use as username',
);
#
# Populate $cancreate{'selfcreate'} array reference with types of user, for which self-creation of user accounts
# is permitted.
#
- my ($emailrules,$emailruleorder) = &Apache::lonnet::inst_userrules($dom,'email');
- my (@statuses,%email_rule);
+ my @statuses;
+ if (ref($domconfig{'inststatus'}) eq 'HASH') {
+ if (ref($domconfig{'inststatus'}{'inststatusguest'}) eq 'ARRAY') {
+ @statuses = @{$domconfig{'inststatus'}{'inststatusguest'}};
+ }
+ }
+ push(@statuses,'default');
+
foreach my $item ('login','sso','email') {
if ($item eq 'email') {
if ($env{'form.cancreate_email'}) {
- if (@types) {
- my @poss_statuses = &Apache::loncommon::get_env_multiple('form.selfassign');
- foreach my $status (@poss_statuses) {
- if (grep(/^\Q$status\E$/,(@types,'default'))) {
- push(@statuses,$status);
- }
- }
- $save_inststatus{'inststatusguest'} = \@statuses;
- } else {
- push(@statuses,'default');
- }
- if (@statuses) {
- my %curr_rule;
- if (ref($curr_usercreation{'email_rule'}) eq 'ARRAY') {
- foreach my $type (@statuses) {
- $curr_rule{$type} = $curr_usercreation{'email_rule'};
- }
- } elsif (ref($curr_usercreation{'email_rule'}) eq 'HASH') {
- foreach my $type (@statuses) {
- $curr_rule{$type} = $curr_usercreation{'email_rule'}{$type};
- }
- }
- push(@{$cancreate{'selfcreate'}},'email');
- push(@contexts,('selfcreateprocessing','emailverified','emailoptions'));
- my %curremaildom;
- if (ref($curr_usercreation{'cancreate'}{'emaildomain'}) eq 'HASH') {
- %curremaildom = %{$curr_usercreation{'cancreate'}{'emaildomain'}};
- }
- foreach my $type (@statuses) {
- if ($env{'form.cancreate_emailprocess_'.$type} =~ /^(?:approval|automatic)$/) {
- $cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess_'.$type};
- }
- if ($env{'form.cancreate_usernameoptions_'.$type} =~ /^(?:all|first|free)$/) {
- $cancreate{'emailverified'}{$type} = $env{'form.cancreate_usernameoptions_'.$type};
- }
- if ($env{'form.cancreate_emailoptions_'.$type} =~ /^(any|inst|noninst|custom)$/) {
-#
-# Retrieve rules (if any) governing types of e-mail address which may be used to verify a username.
-#
- my $chosen = $1;
- if (($chosen eq 'inst') || ($chosen eq 'noninst')) {
- my $emaildom;
- if ($env{'form.cancreate_emaildomain_'.$chosen.'_'.$type} =~ /^\@[^\@]+$/) {
- $emaildom = $env{'form.cancreate_emaildomain_'.$chosen.'_'.$type};
- $cancreate{'emaildomain'}{$type}{$chosen} = $emaildom;
- if (ref($curremaildom{$type}) eq 'HASH') {
- if (exists($curremaildom{$type}{$chosen})) {
- if ($curremaildom{$type}{$chosen} ne $emaildom) {
- push(@{$changes{'cancreate'}},'emaildomain');
- }
- } elsif ($emaildom ne '') {
- push(@{$changes{'cancreate'}},'emaildomain');
- }
- } elsif ($emaildom ne '') {
- push(@{$changes{'cancreate'}},'emaildomain');
- }
- }
- $cancreate{'emailoptions'}{$type} = $env{'form.cancreate_emailoptions_'.$type};
- } elsif ($chosen eq 'custom') {
- my @possemail_rules = &Apache::loncommon::get_env_multiple('form.email_rule_'.$type);
- $email_rule{$type} = [];
- if (ref($emailrules) eq 'HASH') {
- foreach my $rule (@possemail_rules) {
- if (exists($emailrules->{$rule})) {
- push(@{$email_rule{$type}},$rule);
- }
- }
- }
- if (@{$email_rule{$type}}) {
- $cancreate{'emailoptions'}{$type} = 'custom';
- if (ref($curr_rule{$type}) eq 'ARRAY') {
- if (@{$curr_rule{$type}} > 0) {
- foreach my $rule (@{$curr_rule{$type}}) {
- if (!grep(/^\Q$rule\E$/,@{$email_rule{$type}})) {
- push(@{$changes{'email_rule'}},$type);
- }
- }
- }
- foreach my $type (@{$email_rule{$type}}) {
- if (!grep(/^\Q$type\E$/,@{$curr_rule{$type}})) {
- push(@{$changes{'email_rule'}},$type);
- }
- }
- } else {
- push(@{$changes{'email_rule'}},$type);
- }
- }
- } else {
- $cancreate{'emailoptions'}{$type} = $env{'form.cancreate_emailoptions_'.$type};
- }
- }
- }
- if (@types) {
- if (ref($curr_inststatus{'inststatusguest'}) eq 'ARRAY') {
- my @changed = &Apache::loncommon::compare_arrays(\@statuses,$curr_inststatus{'inststatusguest'});
- if (@changed) {
- push(@{$changes{'inststatus'}},'inststatusguest');
- }
- } else {
- push(@{$changes{'inststatus'}},'inststatusguest');
- }
- }
- } else {
- delete($env{'form.cancreate_email'});
- if (ref($curr_inststatus{'inststatusguest'}) eq 'ARRAY') {
- if (@{$curr_inststatus{'inststatusguest'}} > 0) {
- push(@{$changes{'inststatus'}},'inststatusguest');
- }
- }
- }
- } else {
- $save_inststatus{'inststatusguest'} = [];
- if (ref($curr_inststatus{'inststatusguest'}) eq 'ARRAY') {
- if (@{$curr_inststatus{'inststatusguest'}} > 0) {
- push(@{$changes{'inststatus'}},'inststatusguest');
+ push(@{$cancreate{'selfcreate'}},'email');
+ push(@contexts,'selfcreateprocessing');
+ foreach my $type (@statuses) {
+ if ($type eq 'default') {
+ $cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess'};
+ } else {
+ $cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess_'.$type};
}
}
}
@@ -16413,7 +9777,7 @@ sub modify_selfcreation {
}
}
}
- my (%userinfo,%savecaptcha);
+ my (@email_rule,%userinfo,%savecaptcha);
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
#
# Populate $cancreate{'emailusername'}{$type} hash ref with information fields (if new user will provide data
@@ -16422,8 +9786,8 @@ sub modify_selfcreation {
if ($env{'form.cancreate_email'}) {
push(@contexts,'emailusername');
- if (@statuses) {
- foreach my $type (@statuses) {
+ if (ref($types) eq 'ARRAY') {
+ foreach my $type (@{$types}) {
if (ref($infofields) eq 'ARRAY') {
foreach my $field (@{$infofields}) {
if ($env{'form.canmodify_emailusername_'.$type.'_'.$field} =~ /^(required|optional)$/) {
@@ -16435,7 +9799,7 @@ sub modify_selfcreation {
}
#
# Populate $cancreate{'notify'} hash ref with names of Domain Coordinators who are to be notified of
-# queued requests for self-creation of account verified by e-mail.
+# queued requests for self-creation of account using e-mail address as username
#
my @approvalnotify = &Apache::loncommon::get_env_multiple('form.selfcreationnotifyapproval');
@@ -16455,13 +9819,36 @@ sub modify_selfcreation {
push(@{$changes{'cancreate'}},'notify');
}
+#
+# Retrieve rules (if any) governing types of e-mail address which may be used as a username
+#
+ @email_rule = &Apache::loncommon::get_env_multiple('form.email_rule');
&process_captcha('cancreate',\%changes,\%savecaptcha,$curr_usercreation{'cancreate'});
+ if (ref($curr_usercreation{'email_rule'}) eq 'ARRAY') {
+ if (@{$curr_usercreation{'email_rule'}} > 0) {
+ foreach my $type (@{$curr_usercreation{'email_rule'}}) {
+ if (!grep(/^\Q$type\E$/,@email_rule)) {
+ push(@{$changes{'email_rule'}},$type);
+ }
+ }
+ }
+ if (@email_rule > 0) {
+ foreach my $type (@email_rule) {
+ if (!grep(/^\Q$type\E$/,@{$curr_usercreation{'email_rule'}})) {
+ push(@{$changes{'email_rule'}},$type);
+ }
+ }
+ }
+ } elsif (@email_rule > 0) {
+ push(@{$changes{'email_rule'}},@email_rule);
+ }
}
#
# Check if domain default is set appropriately, if self-creation of accounts is to be available for
# institutional log-in.
#
if (grep(/^login$/,@{$cancreate{'selfcreate'}})) {
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
if (!((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) ||
($domdefaults{'auth_def'} eq 'localauth'))) {
$warningmsg = &mt('Although account creation has been set to be available for institutional logins, currently default authentication in this domain has not been set to support this.').' '.
@@ -16480,10 +9867,14 @@ sub modify_selfcreation {
# which the user may supply, if institutional data is unavailable.
#
if (($env{'form.cancreate_login'}) || ($env{'form.cancreate_sso'})) {
- if (@types) {
- @{$cancreate{'statustocreate'}} = &Apache::loncommon::get_env_multiple('form.statustocreate');
- push(@contexts,'statustocreate');
- foreach my $type (@types) {
+ if (ref($types) eq 'ARRAY') {
+ if (@{$types} > 1) {
+ @{$cancreate{'statustocreate'}} = &Apache::loncommon::get_env_multiple('form.statustocreate');
+ push(@contexts,'statustocreate');
+ } else {
+ undef($cancreate{'statustocreate'});
+ }
+ foreach my $type (@{$types}) {
my @modifiable = &Apache::loncommon::get_env_multiple('form.canmodify_'.$type);
foreach my $field (@fields) {
if (grep(/^\Q$field\E$/,@modifiable)) {
@@ -16494,7 +9885,7 @@ sub modify_selfcreation {
}
}
if (ref($curr_usermodify{'selfcreate'}) eq 'HASH') {
- foreach my $type (@types) {
+ foreach my $type (@{$types}) {
if (ref($curr_usermodify{'selfcreate'}{$type}) eq 'HASH') {
foreach my $field (@fields) {
if ($save_usermodify{'selfcreate'}{$type}{$field} ne
@@ -16506,7 +9897,7 @@ sub modify_selfcreation {
}
}
} else {
- foreach my $type (@types) {
+ foreach my $type (@{$types}) {
push(@{$changes{'selfcreate'}},$type);
}
}
@@ -16555,28 +9946,34 @@ sub modify_selfcreation {
}
} elsif (ref($curr_usercreation{'cancreate'}{$item}) eq 'HASH') {
if (ref($cancreate{$item}) eq 'HASH') {
- foreach my $type (keys(%{$curr_usercreation{'cancreate'}{$item}})) {
- if (ref($curr_usercreation{'cancreate'}{$item}{$type}) eq 'HASH') {
- foreach my $field (keys(%{$curr_usercreation{'cancreate'}{$item}{$type}})) {
- unless ($curr_usercreation{'cancreate'}{$item}{$type}{$field} eq $cancreate{$item}{$type}{$field}) {
+ foreach my $curr (keys(%{$curr_usercreation{'cancreate'}{$item}})) {
+ if (ref($curr_usercreation{'cancreate'}{$item}{$curr}) eq 'HASH') {
+ foreach my $field (keys(%{$curr_usercreation{'cancreate'}{$item}{$curr}})) {
+ unless ($curr_usercreation{'cancreate'}{$item}{$curr}{$field} eq $cancreate{$item}{$curr}{$field}) {
if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
push(@{$changes{'cancreate'}},$item);
}
}
}
- } elsif (($item eq 'selfcreateprocessing') || ($item eq 'emailverified') || ($item eq 'emailoptions')) {
- if ($cancreate{$item}{$type} ne $curr_usercreation{'cancreate'}{$item}{$type}) {
+ } elsif ($item eq 'selfcreateprocessing') {
+ if ($cancreate{$item}{$curr} ne $curr_usercreation{'cancreate'}{$item}{$curr}) {
+ if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+ push(@{$changes{'cancreate'}},$item);
+ }
+ }
+ } else {
+ if (!$cancreate{$item}{$curr}) {
if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
push(@{$changes{'cancreate'}},$item);
}
}
}
}
- foreach my $type (keys(%{$cancreate{$item}})) {
- if (ref($cancreate{$item}{$type}) eq 'HASH') {
- foreach my $field (keys(%{$cancreate{$item}{$type}})) {
- if (ref($curr_usercreation{'cancreate'}{$item}{$type}) eq 'HASH') {
- unless ($curr_usercreation{'cancreate'}{$item}{$type}{$field} eq $cancreate{$item}{$type}{$field}) {
+ foreach my $field (keys(%{$cancreate{$item}})) {
+ if (ref($cancreate{$item}{$field}) eq 'HASH') {
+ foreach my $inner (keys(%{$cancreate{$item}{$field}})) {
+ if (ref($curr_usercreation{'cancreate'}{$item}{$field}) eq 'HASH') {
+ unless ($curr_usercreation{'cancreate'}{$item}{$field}{$inner} eq $cancreate{$item}{$field}{$inner}) {
if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
push(@{$changes{'cancreate'}},$item);
}
@@ -16587,8 +9984,14 @@ sub modify_selfcreation {
}
}
}
- } elsif (($item eq 'selfcreateprocessing') || ($item eq 'emailverified') || ($item eq 'emailoptions')) {
- if ($cancreate{$item}{$type} ne $curr_usercreation{'cancreate'}{$item}{$type}) {
+ } elsif ($item eq 'selfcreateprocessing') {
+ if ($cancreate{$item}{$field} ne $curr_usercreation{'cancreate'}{$item}{$field}) {
+ if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+ push(@{$changes{'cancreate'}},$item);
+ }
+ }
+ } else {
+ if (!$curr_usercreation{'cancreate'}{$item}{$field}) {
if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
push(@{$changes{'cancreate'}},$item);
}
@@ -16603,11 +10006,11 @@ sub modify_selfcreation {
push(@{$changes{'cancreate'}},$item);
}
}
- }
- } elsif (($item eq 'selfcreateprocessing') || ($item eq 'emailverified') || ($item eq 'emailoptions')) {
- if (ref($cancreate{$item}) eq 'HASH') {
- if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
- push(@{$changes{'cancreate'}},$item);
+ } elsif (ref($cancreate{$item}) eq 'HASH') {
+ if (!$cancreate{$item}{$curr_usercreation{'cancreate'}{$item}}) {
+ if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+ push(@{$changes{'cancreate'}},$item);
+ }
}
}
} elsif ($item eq 'emailusername') {
@@ -16632,7 +10035,6 @@ sub modify_selfcreation {
#
$save_usercreate{'cancreate'}{'captcha'} = $savecaptcha{'captcha'};
$save_usercreate{'cancreate'}{'recaptchakeys'} = $savecaptcha{'recaptchakeys'};
- $save_usercreate{'cancreate'}{'recaptchaversion'} = $savecaptcha{'recaptchaversion'};
$save_usercreate{'cancreate'}{'selfcreate'} = $cancreate{'selfcreate'};
if (ref($cancreate{'notify'}) eq 'HASH') {
$save_usercreate{'cancreate'}{'notify'} = $cancreate{'notify'};
@@ -16640,15 +10042,6 @@ sub modify_selfcreation {
if (ref($cancreate{'selfcreateprocessing'}) eq 'HASH') {
$save_usercreate{'cancreate'}{'selfcreateprocessing'} = $cancreate{'selfcreateprocessing'};
}
- if (ref($cancreate{'emailverified'}) eq 'HASH') {
- $save_usercreate{'cancreate'}{'emailverified'} = $cancreate{'emailverified'};
- }
- if (ref($cancreate{'emailoptions'}) eq 'HASH') {
- $save_usercreate{'cancreate'}{'emailoptions'} = $cancreate{'emailoptions'};
- }
- if (ref($cancreate{'emaildomain'}) eq 'HASH') {
- $save_usercreate{'cancreate'}{'emaildomain'} = $cancreate{'emaildomain'};
- }
if (ref($cancreate{'statustocreate'}) eq 'ARRAY') {
$save_usercreate{'cancreate'}{'statustocreate'} = $cancreate{'statustocreate'};
}
@@ -16656,18 +10049,16 @@ sub modify_selfcreation {
$save_usercreate{'cancreate'}{'shibenv'} = $cancreate{'shibenv'};
}
$save_usercreate{'cancreate'}{'emailusername'} = $cancreate{'emailusername'};
- $save_usercreate{'email_rule'} = \%email_rule;
+ $save_usercreate{'emailrule'} = \@email_rule;
my %userconfig_hash = (
usercreation => \%save_usercreate,
usermodification => \%save_usermodify,
- inststatus => \%save_inststatus,
);
-
my $putresult = &Apache::lonnet::put_dom('configuration',\%userconfig_hash,
$dom);
#
-# Accumulate details of changes to domain configuration for self-creation of usernames in $resulttext
+# Accumulate details of changes to domain cofiguration for self-creation of usernames in $resulttext
#
if ($putresult eq 'ok') {
if (keys(%changes) > 0) {
@@ -16675,7 +10066,7 @@ sub modify_selfcreation {
if (ref($changes{'cancreate'}) eq 'ARRAY') {
my %lt = &selfcreation_types();
foreach my $type (@{$changes{'cancreate'}}) {
- my $chgtext = '';
+ my $chgtext;
if ($type eq 'selfcreate') {
if (@{$cancreate{$type}} == 0) {
$chgtext .= &mt('Self creation of a new user account is not permitted.');
@@ -16690,25 +10081,18 @@ sub modify_selfcreation {
if (grep(/^(login|sso)$/,@{$cancreate{$type}})) {
if (ref($cancreate{'statustocreate'}) eq 'ARRAY') {
if (@{$cancreate{'statustocreate'}} == 0) {
- $chgtext .= ''.
- &mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts via log-in or single sign-on.").
- '
';
+ $chgtext .= '
'.
+ ''.
+ &mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts.").
+ '';
}
}
}
- if (grep(/^email$/,@{$cancreate{$type}})) {
- if (!@statuses) {
- $chgtext .= ''.
- &mt("However, e-mail verification is currently set to 'unavailable' for all user types (including 'other'), so self-creation of accounts is not possible for non-institutional log-in.").
- '
';
-
- }
- }
}
}
} elsif ($type eq 'shibenv') {
if (keys(%{$cancreate{$type}}) == 0) {
- $chgtext .= &mt('Shibboleth-autheticated user does not use environment variables to set user information').'
';
+ $chgtext .= &mt('Shibboleth-autheticated user does not use environment variables to set user information');
} else {
$chgtext .= &mt('Shibboleth-autheticated user information set from environment variables, as follows:').
'';
@@ -16721,7 +10105,7 @@ sub modify_selfcreation {
}
}
$chgtext .= ' ';
- }
+ }
} elsif ($type eq 'statustocreate') {
if ((ref($cancreate{'selfcreate'}) eq 'ARRAY') &&
(ref($cancreate{'statustocreate'}) eq 'ARRAY')) {
@@ -16734,7 +10118,7 @@ sub modify_selfcreation {
&mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts.").
'';
}
- } elsif (keys(%usertypes) > 0) {
+ } elsif (ref($usertypes) eq 'HASH') {
if (grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) {
$chgtext .= &mt('Creation of a new account for an institutional user is restricted to the following institutional affiliation(s):');
} else {
@@ -16745,12 +10129,12 @@ sub modify_selfcreation {
if ($case eq 'default') {
$chgtext .= ''.$othertitle.'';
} else {
- $chgtext .= ''.$usertypes{$case}.'';
+ $chgtext .= ''.$usertypes->{$case}.'';
}
}
$chgtext .= '';
if (!grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) {
- $chgtext .= ''.
+ $chgtext .= '
'.
&mt('However, users authenticated by institutional login/single sign on are not currently permitted to create accounts.').
'';
}
@@ -16762,129 +10146,26 @@ sub modify_selfcreation {
$chgtext .= &mt('Although institutional affiliations permitted to create accounts were changed, self creation of accounts is not currently permitted for any authentication types.');
}
}
- $chgtext .= '
';
}
} elsif ($type eq 'selfcreateprocessing') {
my %choices = &Apache::lonlocal::texthash (
automatic => 'Automatic approval',
approval => 'Queued for approval',
);
- if (@types) {
- if (@statuses) {
- $chgtext .= &mt('Processing of requests to create account with e-mail verification set as follows:').
- '';
- foreach my $status (@statuses) {
- if ($status eq 'default') {
- $chgtext .= '- '.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}}.'
';
- } else {
- $chgtext .= '- '.$usertypes{$status}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}}.'
';
- }
- }
- $chgtext .= ' ';
- }
- } else {
- $chgtext .= &mt('Processing of requests to create account with e-mail verification set to: "[_1]"',
- $choices{$cancreate{'selfcreateprocessing'}{'default'}});
- }
- } elsif ($type eq 'emailverified') {
- my %options = &Apache::lonlocal::texthash (
- all => 'Same as e-mail',
- first => 'Omit @domain',
- free => 'Free to choose',
- );
- if (@types) {
- if (@statuses) {
- $chgtext .= &mt('For self-created accounts verified by e-mail address, username is set as follows:').
- '';
- foreach my $status (@statuses) {
- if ($status eq 'default') {
- $chgtext .= '- '.$othertitle.' -- '.$options{$cancreate{'emailverified'}{$status}}.'
';
- } else {
- $chgtext .= '- '.$usertypes{$status}.' -- '.$options{$cancreate{'emailverified'}{$status}}.'
';
- }
- }
- $chgtext .= ' ';
- }
- } else {
- $chgtext .= &mt("For self-created accounts verified by e-mail address, user's username is: '[_1]'",
- $options{$cancreate{'emailverified'}{'default'}});
- }
- } elsif ($type eq 'emailoptions') {
- my %options = &Apache::lonlocal::texthash (
- any => 'Any e-mail',
- inst => 'Institutional only',
- noninst => 'Non-institutional only',
- custom => 'Custom restrictions',
- );
- if (@types) {
- if (@statuses) {
- $chgtext .= &mt('For self-created accounts verified by e-mail address, requirements for e-mail address are as follows:').
- '';
- foreach my $status (@statuses) {
- if ($type eq 'default') {
- $chgtext .= '- '.$othertitle.' -- '.$options{$cancreate{'emailoptions'}{$status}}.'
';
- } else {
- $chgtext .= '- '.$usertypes{$status}.' -- '.$options{$cancreate{'emailoptions'}{$status}}.'
';
- }
- }
- $chgtext .= ' ';
- }
+ if (@statuses > 1) {
+ $chgtext .= &mt('Processing of requests to create account with e-mail address as username set as follows:').
+ '';
+ foreach my $type (@statuses) {
+ if ($type eq 'default') {
+ $chgtext .= '- '.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'
';
+ } else {
+ $chgtext .= '- '.$usertypes->{$type}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'
';
+ }
+ }
+ $chgtext .= ' ';
} else {
- if ($cancreate{'emailoptions'}{'default'} eq 'any') {
- $chgtext .= &mt('For self-created accounts verified by e-mail address, any e-mail may be used');
- } else {
- $chgtext .= &mt('For self-created accounts verified by e-mail address, e-mail restricted to: "[_1]"',
- $options{$cancreate{'emailoptions'}{'default'}});
- }
- }
- } elsif ($type eq 'emaildomain') {
- my $output;
- if (@statuses) {
- foreach my $type (@statuses) {
- if (ref($cancreate{'emaildomain'}{$type}) eq 'HASH') {
- if ($cancreate{'emailoptions'}{$type} eq 'inst') {
- if ($type eq 'default') {
- if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') ||
- ($cancreate{'emaildomain'}{$type}{'inst'} eq '')) {
- $output = ''.$othertitle.' -- '.&mt('No restriction on e-mail domain').'';
- } else {
- $output = ''.$othertitle.' -- '.&mt("User's e-mail address needs to end: [_1]",
- $cancreate{'emaildomain'}{$type}{'inst'}).'';
- }
- } else {
- if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') ||
- ($cancreate{'emaildomain'}{$type}{'inst'} eq '')) {
- $output = ''.$usertypes{$type}.' -- '.&mt('No restriction on e-mail domain').'';
- } else {
- $output = ''.$usertypes{$type}.' -- '.&mt("User's e-mail address needs to end: [_1]",
- $cancreate{'emaildomain'}{$type}{'inst'}).'';
- }
- }
- } elsif ($cancreate{'emailoptions'}{$type} eq 'noninst') {
- if ($type eq 'default') {
- if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') ||
- ($cancreate{'emaildomain'}{$type}{'noninst'} eq '')) {
- $output = ''.$othertitle.' -- '.&mt('No restriction on e-mail domain').'';
- } else {
- $output = ''.$othertitle.' -- '.&mt("User's e-mail address must not end: [_1]",
- $cancreate{'emaildomain'}{$type}{'noninst'}).'';
- }
- } else {
- if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') ||
- ($cancreate{'emaildomain'}{$type}{'noninst'} eq '')) {
- $output = ''.$usertypes{$type}.' -- '.&mt('No restriction on e-mail domain').'';
- } else {
- $output = ''.$usertypes{$type}.' -- '.&mt("User's e-mail address must not end: [_1]",
- $cancreate{'emaildomain'}{$type}{'noninst'}).'';
- }
- }
- }
- }
- }
- }
- if ($output ne '') {
- $chgtext .= &mt('For self-created accounts verified by e-mail address:').
- '';
+ $chgtext .= &mt('Processing of requests to create account with e-mail address as username set to: "[_1]"',
+ $choices{$cancreate{'selfcreateprocessing'}{'default'}});
}
} elsif ($type eq 'captcha') {
if ($savecaptcha{$type} eq 'notused') {
@@ -16915,17 +10196,13 @@ sub modify_selfcreation {
$chgtext .= ''.&mt('Private key set to [_1]',$pubkey).'';
}
$chgtext .= '';
- } elsif ($type eq 'recaptchaversion') {
- if ($savecaptcha{'captcha'} eq 'recaptcha') {
- $chgtext .= &mt('ReCAPTCHA set to version [_1]',$savecaptcha{$type});
- }
} elsif ($type eq 'emailusername') {
if (ref($cancreate{'emailusername'}) eq 'HASH') {
- if (@statuses) {
- foreach my $type (@statuses) {
+ if (ref($types) eq 'ARRAY') {
+ foreach my $type (@{$types}) {
if (ref($cancreate{'emailusername'}{$type}) eq 'HASH') {
if (keys(%{$cancreate{'emailusername'}{$type}}) > 0) {
- $chgtext .= &mt('When self-creating account with e-mail verification, the following information will be provided by [_1]:',"'$usertypes{$type}'").
+ $chgtext .= &mt('When self-creating account with e-mail as username, the following information will be provided by [_1]:',"'$usertypes->{$type}'").
'';
foreach my $field (@{$infofields}) {
if ($cancreate{'emailusername'}{$type}{$field}) {
@@ -16934,86 +10211,48 @@ sub modify_selfcreation {
}
$chgtext .= ' ';
} else {
- $chgtext .= &mt('When self creating account with e-mail verification, no information besides e-mail address will be provided by [_1].',"'$usertypes{$type}'").'
';
+ $chgtext .= &mt('When self creating account with e-mail as username, no information besides e-mail address will be provided by [_1].',"'$usertypes->{$type}'").'
';
}
} else {
- $chgtext .= &mt('When self creating account with e-mail verification, no information besides e-mail address will be provided by [_1].',"'$usertypes{$type}'").'
';
+ $chgtext .= &mt('When self creating account with e-mail as username, no information besides e-mail address will be provided by [_1].',"'$usertypes->{$type}'").'
';
}
}
}
}
} elsif ($type eq 'notify') {
- my $numapprove = 0;
+ $chgtext = &mt('No Domain Coordinators will receive notification of username requests requiring approval.');
if (ref($changes{'cancreate'}) eq 'ARRAY') {
if ((grep(/^notify$/,@{$changes{'cancreate'}})) && (ref($cancreate{'notify'}) eq 'HASH')) {
if ($cancreate{'notify'}{'approval'}) {
- $chgtext .= &mt('Notification of username requests requiring approval will be sent to: ').$cancreate{'notify'}{'approval'};
- $numapprove ++;
+ $chgtext = &mt('Notification of username requests requiring approval will be sent to: ').$cancreate{'notify'}{'approval'};
}
}
}
- unless ($numapprove) {
- $chgtext .= &mt('No Domain Coordinators will receive notification of username requests requiring approval.');
- }
}
if ($chgtext) {
$resulttext .= ''.$chgtext.'';
}
}
}
- if ((ref($changes{'email_rule'}) eq 'ARRAY') && (@{$changes{'email_rule'}} > 0)) {
+ if (ref($changes{'email_rule'}) eq 'ARRAY') {
my ($emailrules,$emailruleorder) =
&Apache::lonnet::inst_userrules($dom,'email');
- foreach my $type (@{$changes{'email_rule'}}) {
- if (ref($email_rule{$type}) eq 'ARRAY') {
- my $chgtext = '';
- foreach my $rule (@{$email_rule{$type}}) {
- if (ref($emailrules->{$rule}) eq 'HASH') {
- $chgtext .= '- '.$emailrules->{$rule}{'name'}.'
';
- }
- }
- $chgtext .= ' ';
- my $typename;
- if (@types) {
- if ($type eq 'default') {
- $typename = $othertitle;
- } else {
- $typename = $usertypes{$type};
- }
- $chgtext .= &mt('(Affiliation: [_1])',$typename);
- }
- if (@{$email_rule{$type}} > 0) {
- $resulttext .= ''.
- &mt('Accounts may not be created by users verified by e-mail, for e-mail addresses of the following types: ',
- $usertypes{$type}).
- $chgtext.
- '';
- } else {
- $resulttext .= ''.
- &mt('There are now no restrictions on e-mail addresses which may be used for verification when a user requests an account.').
- ''.
- &mt('(Affiliation: [_1])',$typename);
- }
+ my $chgtext = '';
+ foreach my $type (@email_rule) {
+ if (ref($emailrules->{$type}) eq 'HASH') {
+ $chgtext .= '- '.$emailrules->{$type}{'name'}.'
';
}
}
- }
- if (ref($changes{'inststatus'}) eq 'ARRAY') {
- if (ref($save_inststatus{'inststatusguest'}) eq 'ARRAY') {
- if (@{$save_inststatus{'inststatusguest'}} > 0) {
- my $chgtext = '';
- foreach my $type (@{$save_inststatus{'inststatusguest'}}) {
- $chgtext .= '- '.$usertypes{$type}.'
';
- }
- $chgtext .= ' ';
- $resulttext .= '- '.
- &mt('A user will self-report one of the following affiliations when requesting an account verified by e-mail: ').
- $chgtext.
- '
';
- } else {
- $resulttext .= '- '.
- &mt('No affiliations available for self-reporting when requesting an account verified by e-mail.').
- '
';
- }
+ $chgtext .= ' ';
+ if (@email_rule > 0) {
+ $resulttext .= ''.
+ &mt('Accounts may not be created by users self-enrolling with e-mail addresses of the following types: ').
+ $chgtext.
+ '';
+ } else {
+ $resulttext .= ''.
+ &mt('There are now no restrictions on e-mail addresses which may be used as a username when self-enrolling.').
+ '';
}
}
if (ref($changes{'selfcreate'}) eq 'ARRAY') {
@@ -17021,9 +10260,9 @@ sub modify_selfcreation {
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
foreach my $type (@{$changes{'selfcreate'}}) {
my $typename = $type;
- if (keys(%usertypes) > 0) {
- if ($usertypes{$type} ne '') {
- $typename = $usertypes{$type};
+ if (ref($usertypes) eq 'HASH') {
+ if ($usertypes->{$type} ne '') {
+ $typename = $usertypes->{$type};
}
}
my @modifiable;
@@ -17046,12 +10285,6 @@ sub modify_selfcreation {
$resulttext .= '';
}
$resulttext .= '';
- my $cachetime = 24*60*60;
- $domdefaults{'inststatusguest'} = $save_inststatus{'inststatusguest'};
- &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'domdefaults'} = 1;
- }
} else {
$resulttext = &mt('No changes made to self-creation settings');
}
@@ -17066,30 +10299,24 @@ sub modify_selfcreation {
}
sub process_captcha {
- my ($container,$changes,$newsettings,$currsettings) = @_;
- return unless ((ref($changes) eq 'HASH') && (ref($newsettings) eq 'HASH'));
+ my ($container,$changes,$newsettings,$current) = @_;
+ return unless ((ref($changes) eq 'HASH') && (ref($newsettings) eq 'HASH') || (ref($current) eq 'HASH'));
$newsettings->{'captcha'} = $env{'form.'.$container.'_captcha'};
unless ($newsettings->{'captcha'} eq 'recaptcha' || $newsettings->{'captcha'} eq 'notused') {
$newsettings->{'captcha'} = 'original';
}
- my %current;
- if (ref($currsettings) eq 'HASH') {
- %current = %{$currsettings};
- }
- if ($current{'captcha'} ne $newsettings->{'captcha'}) {
+ if ($current->{'captcha'} ne $newsettings->{'captcha'}) {
if ($container eq 'cancreate') {
if (ref($changes->{'cancreate'}) eq 'ARRAY') {
push(@{$changes->{'cancreate'}},'captcha');
} elsif (!defined($changes->{'cancreate'})) {
$changes->{'cancreate'} = ['captcha'];
}
- } elsif ($container eq 'passwords') {
- $changes->{'reset'} = 1;
} else {
$changes->{'captcha'} = 1;
}
}
- my ($newpub,$newpriv,$currpub,$currpriv,$newversion,$currversion);
+ my ($newpub,$newpriv,$currpub,$currpriv);
if ($newsettings->{'captcha'} eq 'recaptcha') {
$newpub = $env{'form.'.$container.'_recaptchapub'};
$newpriv = $env{'form.'.$container.'_recaptchapriv'};
@@ -17099,16 +10326,10 @@ sub process_captcha {
public => $newpub,
private => $newpriv,
};
- $newversion = $env{'form.'.$container.'_recaptchaversion'};
- $newversion =~ s/\D//g;
- if ($newversion ne '2') {
- $newversion = 1;
- }
- $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 => '',
@@ -17116,25 +10337,6 @@ sub process_captcha {
}
}
}
- if ($current{'captcha'} eq 'recaptcha') {
- $currversion = $current{'recaptchaversion'};
- if ($currversion ne '2') {
- $currversion = 1;
- }
- }
- if ($currversion ne $newversion) {
- if ($container eq 'cancreate') {
- if (ref($changes->{'cancreate'}) eq 'ARRAY') {
- push(@{$changes->{'cancreate'}},'recaptchaversion');
- } elsif (!defined($changes->{'cancreate'})) {
- $changes->{'cancreate'} = ['recaptchaversion'];
- }
- } elsif ($container eq 'passwords') {
- $changes->{'reset'} = 1;
- } else {
- $changes->{'recaptchaversion'} = 1;
- }
- }
if (($newpub ne $currpub) || ($newpriv ne $currpriv)) {
if ($container eq 'cancreate') {
if (ref($changes->{'cancreate'}) eq 'ARRAY') {
@@ -17142,8 +10344,6 @@ sub process_captcha {
} elsif (!defined($changes->{'cancreate'})) {
$changes->{'cancreate'} = ['recaptchakeys'];
}
- } elsif ($container eq 'passwords') {
- $changes->{'reset'} = 1;
} else {
$changes->{'recaptchakeys'} = 1;
}
@@ -17258,9 +10458,8 @@ sub modify_defaults {
my ($dom,$lastactref,%domconfig) = @_;
my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors);
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
- my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def',
- 'portal_def');
- my @authtypes = ('internal','krb4','krb5','localauth','lti');
+ my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def','portal_def');
+ my @authtypes = ('internal','krb4','krb5','localauth');
foreach my $item (@items) {
$newvalues{$item} = $env{'form.'.$item};
if ($item eq 'auth_def') {
@@ -17297,107 +10496,18 @@ sub modify_defaults {
}
} elsif ($item eq 'portal_def') {
if ($newvalues{$item} ne '') {
- if ($newvalues{$item} =~ /^https?\:\/\/(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])\/?$/) {
- foreach my $field ('email','web') {
- if ($env{'form.'.$item.'_'.$field}) {
- $newvalues{$item.'_'.$field} = $env{'form.'.$item.'_'.$field};
- }
- }
- } else {
+ unless ($newvalues{$item} =~ /^https?\:\/\/(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])\/?$/) {
push(@errors,$item);
}
}
}
if (grep(/^\Q$item\E$/,@errors)) {
$newvalues{$item} = $domdefaults{$item};
- if ($item eq 'portal_def') {
- if ($domdefaults{$item}) {
- foreach my $field ('email','web') {
- if (exists($domdefaults{$item.'_'.$field})) {
- $newvalues{$item.'_'.$field} = $domdefaults{$item.'_'.$field};
- }
- }
- }
- }
} elsif ($domdefaults{$item} ne $newvalues{$item}) {
$changes{$item} = 1;
}
- if ($item eq 'portal_def') {
- unless (grep(/^\Q$item\E$/,@errors)) {
- if ($newvalues{$item} eq '') {
- foreach my $field ('email','web') {
- if (exists($domdefaults{$item.'_'.$field})) {
- delete($domdefaults{$item.'_'.$field});
- }
- }
- } else {
- unless ($changes{$item}) {
- foreach my $field ('email','web') {
- if ($domdefaults{$item.'_'.$field} ne $newvalues{$item.'_'.$field}) {
- $changes{$item} = 1;
- last;
- }
- }
- }
- foreach my $field ('email','web') {
- if ($newvalues{$item.'_'.$field}) {
- $domdefaults{$item.'_'.$field} = $newvalues{$item.'_'.$field};
- } elsif (exists($domdefaults{$item.'_'.$field})) {
- delete($domdefaults{$item.'_'.$field});
- }
- }
- }
- }
- }
$domdefaults{$item} = $newvalues{$item};
}
- my %staticdefaults = (
- 'intauth_cost' => 10,
- 'intauth_check' => 0,
- 'intauth_switch' => 0,
- );
- foreach my $item ('intauth_cost','intauth_check','intauth_switch') {
- if (exists($domdefaults{$item})) {
- $newvalues{$item} = $domdefaults{$item};
- } else {
- $newvalues{$item} = $staticdefaults{$item};
- }
- }
- my ($unamemaprules,$ruleorder);
- my @possunamemaprules = &Apache::loncommon::get_env_multiple('form.unamemap_rule');
- if (@possunamemaprules) {
- ($unamemaprules,$ruleorder) =
- &Apache::lonnet::inst_userrules($dom,'unamemap');
- if ((ref($unamemaprules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) {
- if (@{$ruleorder} > 0) {
- my %possrules;
- map { $possrules{$_} = 1; } @possunamemaprules;
- foreach my $rule (@{$ruleorder}) {
- if ($possrules{$rule}) {
- push(@{$newvalues{'unamemap_rule'}},$rule);
- }
- }
- }
- }
- }
- if (ref($domdefaults{'unamemap_rule'}) eq 'ARRAY') {
- if (ref($newvalues{'unamemap_rule'}) eq 'ARRAY') {
- my @rulediffs = &Apache::loncommon::compare_arrays($domdefaults{'unamemap_rule'},
- $newvalues{'unamemap_rule'});
- if (@rulediffs) {
- $changes{'unamemap_rule'} = 1;
- $domdefaults{'unamemap_rule'} = $newvalues{'unamemap_rule'};
- }
- } elsif (@{$domdefaults{'unamemap_rule'}} > 0) {
- $changes{'unamemap_rule'} = 1;
- delete($domdefaults{'unamemap_rule'});
- }
- } elsif (ref($newvalues{'unamemap_rule'}) eq 'ARRAY') {
- if (@{$newvalues{'unamemap_rule'}} > 0) {
- $changes{'unamemap_rule'} = 1;
- $domdefaults{'unamemap_rule'} = $newvalues{'unamemap_rule'};
- }
- }
my %defaults_hash = (
defaults => \%newvalues,
);
@@ -17416,18 +10526,9 @@ sub modify_defaults {
}
my @todelete = &Apache::loncommon::get_env_multiple('form.inststatus_delete');
my @allpos;
+ my %guests;
my %alltypes;
- my @inststatusguest;
- if (ref($currinststatus) eq 'HASH') {
- if (ref($currinststatus->{'inststatusguest'}) eq 'ARRAY') {
- foreach my $type (@{$currinststatus->{'inststatusguest'}}) {
- unless (grep(/^\Q$type\E$/,@todelete)) {
- push(@inststatusguest,$type);
- }
- }
- }
- }
- my ($currtitles,$currorder);
+ my ($currtitles,$currguests,$currorder);
if (ref($currinststatus) eq 'HASH') {
if (ref($currinststatus->{'inststatusorder'}) eq 'ARRAY') {
foreach my $type (@{$currinststatus->{'inststatusorder'}}) {
@@ -17442,8 +10543,14 @@ sub modify_defaults {
$allpos[$position] = $type;
$alltypes{$type} = $env{'form.inststatus_title_'.$type};
$alltypes{$type} =~ s/`//g;
+ if ($env{'form.inststatus_guest_'.$type}) {
+ $guests{$type} = 1;
+ }
}
}
+ if (ref($currinststatus->{'inststatusguest'}) eq 'ARRAY') {
+ $currguests = join(',',@{$currinststatus->{'inststatusguest'}});
+ }
$currorder = join(',',@{$currinststatus->{'inststatusorder'}});
$currtitles =~ s/,$//;
}
@@ -17452,6 +10559,9 @@ sub modify_defaults {
my $newtype = $env{'form.addinststatus'};
$newtype =~ s/\W//g;
unless (exists($alltypes{$newtype})) {
+ if ($env{'form.addinststatus_guest'}) {
+ $guests{$newtype} = 1;
+ }
$alltypes{$newtype} = $env{'form.addinststatus_title'};
$alltypes{$newtype} =~ s/`//g;
my $position = $env{'form.addinststatus_pos'};
@@ -17461,10 +10571,13 @@ sub modify_defaults {
}
}
}
- my @orderedstatus;
+ my (@orderedstatus,@orderedguests);
foreach my $type (@allpos) {
unless (($type eq '') || (grep(/^\Q$type\E$/,@orderedstatus))) {
push(@orderedstatus,$type);
+ if ($guests{$type}) {
+ push(@orderedguests,$type);
+ }
}
}
foreach my $type (keys(%alltypes)) {
@@ -17475,7 +10588,7 @@ sub modify_defaults {
$defaults_hash{'inststatus'} = {
inststatustypes => \%alltypes,
inststatusorder => \@orderedstatus,
- inststatusguest => \@inststatusguest,
+ inststatusguest => \@orderedguests,
};
if (ref($defaults_hash{'inststatus'}) eq 'HASH') {
foreach my $item ('inststatustypes','inststatusorder','inststatusguest') {
@@ -17485,6 +10598,9 @@ sub modify_defaults {
if ($currorder ne join(',',@orderedstatus)) {
$changes{'inststatus'}{'inststatusorder'} = 1;
}
+ if ($currguests ne join(',',@orderedguests)) {
+ $changes{'inststatus'}{'inststatusguest'} = 1;
+ }
my $newtitles;
foreach my $item (@orderedstatus) {
$newtitles .= $alltypes{$item}.',';
@@ -17503,36 +10619,27 @@ sub modify_defaults {
foreach my $item (sort(keys(%changes))) {
if ($item eq 'inststatus') {
if (ref($changes{'inststatus'}) eq 'HASH') {
- if (@orderedstatus) {
+ if (($changes{'inststatus'}{'inststatustypes'}) || $changes{'inststatus'}{'inststatusorder'}) {
$resulttext .= ''.&mt('Institutional user status types set to:').' ';
foreach my $type (@orderedstatus) {
$resulttext .= $alltypes{$type}.', ';
}
$resulttext =~ s/, $//;
$resulttext .= '';
- } else {
- $resulttext .= ''.&mt('Institutional user status types deleted').'';
}
- }
- } elsif ($item eq 'unamemap_rule') {
- if (ref($newvalues{'unamemap_rule'}) eq 'ARRAY') {
- my @rulenames;
- if (ref($unamemaprules) eq 'HASH') {
- foreach my $rule (@{$newvalues{'unamemap_rule'}}) {
- if (ref($unamemaprules->{$rule}) eq 'HASH') {
- push(@rulenames,$unamemaprules->{$rule}->{'name'});
+ if ($changes{'inststatus'}{'inststatusguest'}) {
+ $resulttext .= '';
+ if (@orderedguests) {
+ $resulttext .= &mt('Types assignable to "non-institutional" usernames set to:').' ';
+ foreach my $type (@orderedguests) {
+ $resulttext .= $alltypes{$type}.', ';
}
+ $resulttext =~ s/, $//;
+ } else {
+ $resulttext .= &mt('Types assignable to "non-institutional" usernames set to none.');
}
+ $resulttext .= '';
}
- if (@rulenames) {
- $resulttext .= ''.&mt('Mapping for missing usernames includes: [_1]',
- '').
- '';
- } else {
- $resulttext .= ''.&mt('No mapping for missing usernames via standard log-in').'';
- }
- } else {
- $resulttext .= ''.&mt('Mapping for missing usernames via standard log-in deleted').'';
}
} else {
my $value = $env{'form.'.$item};
@@ -17545,25 +10652,11 @@ sub modify_defaults {
krb4 => 'krb4',
krb5 => 'krb5',
localauth => 'loc',
- lti => 'lti',
);
$value = $authnames{$shortauth{$value}};
}
$resulttext .= ''.&mt('[_1] set to "[_2]"',$title->{$item},$value).'';
- $mailmsgtext .= "$title->{$item} set to $value\n";
- if ($item eq 'portal_def') {
- if ($env{'form.'.$item} ne '') {
- foreach my $field ('email','web') {
- $value = $env{'form.'.$item.'_'.$field};
- if ($value) {
- $value = &mt('Yes');
- } else {
- $value = &mt('No');
- }
- $resulttext .= ''.&mt('[_1] set to "[_2]"',$title->{$field},$value).'';
- }
- }
- }
+ $mailmsgtext .= "$title->{$item} set to $value\n";
}
}
$resulttext .= '';
@@ -17609,7 +10702,7 @@ sub modify_scantron {
my $custom = 'custom.tab';
my $default = 'default.tab';
my $servadm = $r->dir_config('lonAdmEMail');
- my ($configuserok,$author_ok,$switchserver) =
+ my ($configuserok,$author_ok,$switchserver) =
&config_check($dom,$confname,$servadm);
if ($env{'form.scantronformat.filename'} ne '') {
my $error;
@@ -17618,15 +10711,12 @@ sub modify_scantron {
$error = &mt("Upload of bubblesheet format file is not permitted to this server: [_1]",$switchserver);
} else {
if ($author_ok eq 'ok') {
- my $modified = [];
my ($result,$scantronurl) =
- &Apache::lonconfigsettings::publishlogo($r,'upload','scantronformat',$dom,
- $confname,'scantron','','',$custom,
- $modified);
+ &publishlogo($r,'upload','scantronformat',$dom,
+ $confname,'scantron','','',$custom);
if ($result eq 'ok') {
$confhash{'scantron'}{'scantronformat'} = $scantronurl;
$changes{'scantronformat'} = 1;
- &update_modify_urls($r,$modified);
} else {
$error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$custom,$result);
}
@@ -17647,67 +10737,6 @@ sub modify_scantron {
if ($env{'form.scantronformat_del'}) {
$confhash{'scantron'}{'scantronformat'} = '';
$changes{'scantronformat'} = 1;
- } else {
- $confhash{'scantron'}{'scantronformat'} = $domconfig{'scantron'}{'scantronformat'};
- }
- }
- }
- my @options = ('hdr','pad','rem');
- my @fields = &scantroncsv_fields();
- my %titles = &scantronconfig_titles();
- my @formats = &Apache::loncommon::get_env_multiple('form.scantronconfig');
- my ($newdat,$currdat,%newcol,%currcol);
- if (grep(/^dat$/,@formats)) {
- $confhash{'scantron'}{config}{dat} = 1;
- $newdat = 1;
- } else {
- $newdat = 0;
- }
- if (grep(/^csv$/,@formats)) {
- my %bynum;
- foreach my $field (@fields) {
- if ($env{'form.scantronconfig_csv_'.$field} =~ /^(\d+)$/) {
- my $posscol = $1;
- if (($posscol < 20) && (!$bynum{$posscol})) {
- $confhash{'scantron'}{config}{csv}{fields}{$field} = $posscol;
- $bynum{$posscol} = $field;
- $newcol{$field} = $posscol;
- }
- }
- }
- if (keys(%newcol)) {
- foreach my $option (@options) {
- if ($env{'form.scantroncsv_'.$option}) {
- $confhash{'scantron'}{config}{csv}{options}{$option} = 1;
- }
- }
- }
- }
- $currdat = 1;
- if (ref($domconfig{'scantron'}) eq 'HASH') {
- if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') {
- unless (exists($domconfig{'scantron'}{'config'}{'dat'})) {
- $currdat = 0;
- }
- if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') {
- if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
- %currcol = %{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}};
- }
- }
- }
- }
- if ($currdat != $newdat) {
- $changes{'config'} = 1;
- } else {
- foreach my $field (@fields) {
- if ($currcol{$field} ne '') {
- if ($currcol{$field} ne $newcol{$field}) {
- $changes{'config'} = 1;
- last;
- }
- } elsif ($newcol{$field} ne '') {
- $changes{'config'} = 1;
- last;
}
}
}
@@ -17718,68 +10747,33 @@ sub modify_scantron {
if (keys(%changes) > 0) {
if (ref($confhash{'scantron'}) eq 'HASH') {
$resulttext = &mt('Changes made:').'';
- if ($changes{'scantronformat'}) {
- if ($confhash{'scantron'}{'scantronformat'} eq '') {
- $resulttext .= '- '.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'
';
- } else {
- $resulttext .= '- '.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'
';
- }
- }
- if ($changes{'config'}) {
- if (ref($confhash{'scantron'}{'config'}) eq 'HASH') {
- if ($confhash{'scantron'}{'config'}{'dat'}) {
- $resulttext .= '- '.&mt('Bubblesheet data upload formats includes .dat format').'
';
- }
- if (ref($confhash{'scantron'}{'config'}{'csv'}) eq 'HASH') {
- if (ref($confhash{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
- if (keys(%{$confhash{'scantron'}{'config'}{'csv'}{'fields'}})) {
- $resulttext .= '- '.&mt('Bubblesheet data upload formats includes .csv format, with following fields/column numbers supported:').'
';
- foreach my $field (@fields) {
- if ($confhash{'scantron'}{'config'}{'csv'}{'fields'}{$field} ne '') {
- my $showcol = $confhash{'scantron'}{'config'}{'csv'}{'fields'}{$field} + 1;
- $resulttext .= '- '.$titles{$field}.': '.$showcol.'
';
- }
- }
- $resulttext .= ' ';
- if (ref($confhash{'scantron'}{'config'}{'csv'}{'options'}) eq 'HASH') {
- if (keys(%{$confhash{'scantron'}{'config'}{'csv'}{'options'}})) {
- $resulttext .= '- '.&mt('Bubblesheet data upload formats includes .csv format, with following options:').'
';
- foreach my $option (@options) {
- if ($confhash{'scantron'}{'config'}{'csv'}{'options'}{$option} ne '') {
- $resulttext .= '- '.$titles{$option}.'
';
- }
- }
- $resulttext .= ' ';
- }
- }
- }
- }
- }
- } else {
- $resulttext .= '- '.&mt('No bubblesheet data upload formats set -- will default to assuming .dat format').'
';
- }
+ if ($confhash{'scantron'}{'scantronformat'} eq '') {
+ $resulttext .= '- '.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'
';
+ } else {
+ $resulttext .= '- '.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'
';
}
$resulttext .= ' ';
} else {
$resulttext = &mt('Changes made to bubblesheet format file.');
}
+ $resulttext .= '';
&Apache::loncommon::devalidate_domconfig_cache($dom);
if (ref($lastactref) eq 'HASH') {
$lastactref->{'domainconfig'} = 1;
}
} else {
- $resulttext = &mt('No changes made to bubblesheet format settings');
+ $resulttext = &mt('No changes made to bubblesheet format file');
}
} else {
$resulttext = ''.
&mt('An error occurred: [_1]',$putresult).'';
}
} else {
- $resulttext = &mt('No changes made to bubblesheet format settings');
+ $resulttext = &mt('No changes made to bubblesheet format file');
}
if ($errors) {
- $resulttext .= ''.&mt('The following errors occurred: ').' ';
+ $resulttext .= &mt('The following errors occurred: ').'';
}
return $resulttext;
}
@@ -18024,10 +11018,6 @@ sub modify_coursecategories {
}
$resulttext .= '';
}
- &Apache::lonnet::do_cache_new('cats',$dom,$cathash,3600);
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'cats'} = 1;
- }
}
$resulttext .= '';
if ($changes{'unauth'} || $changes{'auth'}) {
@@ -18179,210 +11169,32 @@ sub modify_serverstatuses {
}
sub modify_helpsettings {
- my ($r,$dom,$confname,$lastactref,%domconfig) = @_;
+ my ($r,$dom,$confname,%domconfig) = @_;
my ($resulttext,$errors,%changes,%helphash);
my %defaultchecked = ('submitbugs' => 'on');
my @offon = ('off','on');
my @toggles = ('submitbugs');
- my %current = ('submitbugs' => '',
- 'adhoc' => {},
- );
if (ref($domconfig{'helpsettings'}) eq 'HASH') {
- %current = %{$domconfig{'helpsettings'}};
- }
- my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
- foreach my $item (@toggles) {
- if ($defaultchecked{$item} eq 'on') {
- if ($current{$item} eq '') {
- if ($env{'form.'.$item} eq '0') {
- $changes{$item} = 1;
- }
- } elsif ($current{$item} ne $env{'form.'.$item}) {
- $changes{$item} = 1;
- }
- } elsif ($defaultchecked{$item} eq 'off') {
- if ($current{$item} eq '') {
- if ($env{'form.'.$item} eq '1') {
- $changes{$item} = 1;
- }
- } elsif ($current{$item} ne $env{'form.'.$item}) {
- $changes{$item} = 1;
- }
- }
- if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) {
- $helphash{'helpsettings'}{$item} = $env{'form.'.$item};
- }
- }
- my $maxnum = $env{'form.helproles_maxnum'};
- my $confname = $dom.'-domainconfig';
- my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_');
- my (@allpos,%newsettings,%changedprivs,$newrole);
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- my @accesstypes = ('all','dh','da','none','status','inc','exc');
- my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']);
- my %lt = &Apache::lonlocal::texthash(
- s => 'system',
- d => 'domain',
- order => 'Display order',
- access => 'Role usage',
- all => 'All with domain helpdesk or helpdesk assistant role',
- dh => 'All with domain helpdesk role',
- da => 'All with domain helpdesk assistant role',
- none => 'None',
- status => 'Determined based on institutional status',
- inc => 'Include all, but exclude specific personnel',
- exc => 'Exclude all, but include specific personnel',
- );
- for (my $num=0; $num<=$maxnum; $num++) {
- my ($prefix,$identifier,$rolename,%curr);
- if ($num == $maxnum) {
- next unless ($env{'form.newcusthelp'} == $maxnum);
- $identifier = 'custhelp'.$num;
- $prefix = 'helproles_'.$num;
- $rolename = $env{'form.custhelpname'.$num};
- $rolename=~s/[^A-Za-z0-9]//gs;
- next if ($rolename eq '');
- next if (exists($existing{'rolesdef_'.$rolename}));
- my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$identifier);
- my $result = &Apache::lonnet::definerole($rolename,$newprivs{'s'},$newprivs{'d'},
- $newprivs{'c'},$confname,$dom);
- if ($result ne 'ok') {
- $errors .= ''.
- &mt('An error occurred storing the new custom role: [_1]',
- $result).'';
- next;
- } else {
- $changedprivs{$rolename} = \%newprivs;
- $newrole = $rolename;
- }
- } else {
- $prefix = 'helproles_'.$num;
- $rolename = $env{'form.'.$prefix};
- next if ($rolename eq '');
- next unless (exists($existing{'rolesdef_'.$rolename}));
- $identifier = 'custhelp'.$num;
- my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$identifier);
- my %currprivs;
- ($currprivs{'s'},$currprivs{'d'},$currprivs{'c'}) =
- split(/\_/,$existing{'rolesdef_'.$rolename});
- foreach my $level ('c','d','s') {
- if ($newprivs{$level} ne $currprivs{$level}) {
- my $result = &Apache::lonnet::definerole($rolename,$newprivs{'s'},$newprivs{'d'},
- $newprivs{'c'},$confname,$dom);
- if ($result ne 'ok') {
- $errors .= ''.
- &mt('An error occurred storing privileges for existing role [_1]: [_2]',
- $rolename,$result).'';
- } else {
- $changedprivs{$rolename} = \%newprivs;
- }
- last;
- }
- }
- if (ref($current{'adhoc'}) eq 'HASH') {
- if (ref($current{'adhoc'}{$rolename}) eq 'HASH') {
- %curr = %{$current{'adhoc'}{$rolename}};
- }
- }
- }
- my $newpos = $env{'form.'.$prefix.'_pos'};
- $newpos =~ s/\D+//g;
- $allpos[$newpos] = $rolename;
- my $newdesc = $env{'form.'.$prefix.'_desc'};
- $helphash{'helpsettings'}{'adhoc'}{$rolename}{'desc'} = $newdesc;
- if ($curr{'desc'}) {
- if ($curr{'desc'} ne $newdesc) {
- $changes{'customrole'}{$rolename}{'desc'} = 1;
- $newsettings{$rolename}{'desc'} = $newdesc;
- }
- } elsif ($newdesc ne '') {
- $changes{'customrole'}{$rolename}{'desc'} = 1;
- $newsettings{$rolename}{'desc'} = $newdesc;
- }
- my $access = $env{'form.'.$prefix.'_access'};
- if (grep(/^\Q$access\E$/,@accesstypes)) {
- $helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = $access;
- if ($access eq 'status') {
- my @statuses = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_status');
- if (scalar(@statuses) == 0) {
- $helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = 'none';
- } else {
- my (@shownstatus,$numtypes);
- $helphash{'helpsettings'}{'adhoc'}{$rolename}{$access} = [];
- if (ref($types) eq 'ARRAY') {
- $numtypes = scalar(@{$types});
- foreach my $type (sort(@statuses)) {
- if ($type eq 'default') {
- push(@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}},$type);
- } elsif (grep(/^\Q$type\E$/,@{$types})) {
- push(@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}},$type);
- push(@shownstatus,$usertypes->{$type});
- }
- }
- }
- if (grep(/^default$/,@statuses)) {
- push(@shownstatus,$othertitle);
- }
- if (scalar(@shownstatus) == 1+$numtypes) {
- $helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = 'all';
- delete($helphash{'helpsettings'}{'adhoc'}{$rolename}{'status'});
- } else {
- $newsettings{$rolename}{'status'} = join(' '.&mt('or').' ',@shownstatus);
- if (ref($curr{'status'}) eq 'ARRAY') {
- my @diffs = &Apache::loncommon::compare_arrays($helphash{'helpsettings'}{'adhoc'}{$rolename}{$access},$curr{$access});
- if (@diffs) {
- $changes{'customrole'}{$rolename}{$access} = 1;
- }
- } elsif (@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}}) {
- $changes{'customrole'}{$rolename}{$access} = 1;
- }
- }
- }
- } elsif (($access eq 'inc') || ($access eq 'exc')) {
- my @personnel = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_staff_'.$access);
- my @newspecstaff;
- $helphash{'helpsettings'}{'adhoc'}{$rolename}{$access} = [];
- foreach my $person (sort(@personnel)) {
- if ($domhelpdesk{$person}) {
- push(@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}},$person);
+ foreach my $item (@toggles) {
+ if ($defaultchecked{$item} eq 'on') {
+ if ($domconfig{'helpsettings'}{$item} eq '') {
+ if ($env{'form.'.$item} eq '0') {
+ $changes{$item} = 1;
}
+ } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
+ $changes{$item} = 1;
}
- if (ref($curr{$access}) eq 'ARRAY') {
- my @diffs = &Apache::loncommon::compare_arrays($helphash{'helpsettings'}{'adhoc'}{$rolename}{$access},$curr{$access});
- if (@diffs) {
- $changes{'customrole'}{$rolename}{$access} = 1;
+ } elsif ($defaultchecked{$item} eq 'off') {
+ if ($domconfig{'helpsettings'}{$item} eq '') {
+ if ($env{'form.'.$item} eq '1') {
+ $changes{$item} = 1;
}
- } elsif (@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}}) {
- $changes{'customrole'}{$rolename}{$access} = 1;
- }
- foreach my $person (@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}}) {
- my ($uname,$udom) = split(/:/,$person);
- push(@newspecstaff,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom,'lastname'),$uname,$udom));
+ } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
+ $changes{$item} = 1;
}
- $newsettings{$rolename}{$access} = join(', ',sort(@newspecstaff));
}
- } else {
- $helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'}= 'all';
- }
- unless ($curr{'access'} eq $access) {
- $changes{'customrole'}{$rolename}{'access'} = 1;
- $newsettings{$rolename}{'access'} = $lt{$helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'}};
- }
- }
- if (@allpos > 0) {
- my $idx = 0;
- foreach my $rolename (@allpos) {
- if ($rolename ne '') {
- $helphash{'helpsettings'}{'adhoc'}{$rolename}{'order'} = $idx;
- if (ref($current{'adhoc'}) eq 'HASH') {
- if (ref($current{'adhoc'}{$rolename}) eq 'HASH') {
- if ($current{'adhoc'}{$rolename}{'order'} ne $idx) {
- $changes{'customrole'}{$rolename}{'order'} = 1;
- $newsettings{$rolename}{'order'} = $idx+1;
- }
- }
- }
- $idx ++;
+ if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) {
+ $helphash{'helpsettings'}{$item} = $env{'form.'.$item};
}
}
}
@@ -18390,115 +11202,25 @@ sub modify_helpsettings {
if (keys(%changes) > 0) {
$putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom);
if ($putresult eq 'ok') {
- if (ref($helphash{'helpsettings'}) eq 'HASH') {
- $domdefaults{'submitbugs'} = $helphash{'helpsettings'}{'submitbugs'};
- if (ref($helphash{'helpsettings'}{'adhoc'}) eq 'HASH') {
- $domdefaults{'adhocroles'} = $helphash{'helpsettings'}{'adhoc'};
- }
- }
- my $cachetime = 24*60*60;
- &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'domdefaults'} = 1;
- }
- } else {
- $errors .= ''.
- &mt('An error occurred storing the settings: [_1]',
- $putresult).'';
- }
- }
- if ((keys(%changes) && ($putresult eq 'ok')) || (keys(%changedprivs))) {
- $resulttext = &mt('Changes made:').'';
- my (%shownprivs,@levelorder);
- @levelorder = ('c','d','s');
- if ((keys(%changes)) && ($putresult eq 'ok')) {
+ $resulttext = &mt('Changes made:').'';
foreach my $item (sort(keys(%changes))) {
if ($item eq 'submitbugs') {
$resulttext .= '- '.&mt('Display link to: [_1] set to "'.$offon[$env{'form.'.$item}].'".',
&Apache::loncommon::modal_link('http://bugs.loncapa.org',
&mt('LON-CAPA bug tracker'),600,500)).'
';
- } elsif ($item eq 'customrole') {
- if (ref($changes{'customrole'}) eq 'HASH') {
- my @keyorder = ('order','desc','access','status','exc','inc');
- my %keytext = &Apache::lonlocal::texthash(
- order => 'Order',
- desc => 'Role description',
- access => 'Role usage',
- status => 'Allowed institutional types',
- exc => 'Allowed personnel',
- inc => 'Disallowed personnel',
- );
- foreach my $role (sort(keys(%{$changes{'customrole'}}))) {
- if (ref($changes{'customrole'}{$role}) eq 'HASH') {
- if ($role eq $newrole) {
- $resulttext .= '- '.&mt('New custom role added: [_1]',
- $role).'
';
- } else {
- $resulttext .= '- '.&mt('Existing custom role modified: [_1]',
- $role).'
';
- }
- foreach my $key (@keyorder) {
- if ($changes{'customrole'}{$role}{$key}) {
- $resulttext .= '- '.&mt("[_1] set to: [_2]",
- $keytext{$key},$newsettings{$role}{$key}).
- '
';
- }
- }
- if (ref($changedprivs{$role}) eq 'HASH') {
- $shownprivs{$role} = 1;
- $resulttext .= '- '.&mt('Privileges set to :').'
';
- foreach my $level (@levelorder) {
- foreach my $item (split(/\:/,$changedprivs{$role}{$level})) {
- next if ($item eq '');
- my ($priv) = split(/\&/,$item,2);
- if (&Apache::lonnet::plaintext($priv)) {
- $resulttext .= '- '.&Apache::lonnet::plaintext($priv);
- unless ($level eq 'c') {
- $resulttext .= ' ('.$lt{$level}.')';
- }
- $resulttext .= '
';
- }
- }
- }
- $resulttext .= ' ';
- }
- $resulttext .= ' ';
- }
- }
- }
- }
- }
- }
- if (keys(%changedprivs)) {
- foreach my $role (sort(keys(%changedprivs))) {
- unless ($shownprivs{$role}) {
- $resulttext .= '- '.&mt('Existing custom role modified: [_1]',
- $role).'
'.
- '- '.&mt('Privileges set to :').'
';
- foreach my $level (@levelorder) {
- foreach my $item (split(/\:/,$changedprivs{$role}{$level})) {
- next if ($item eq '');
- my ($priv) = split(/\&/,$item,2);
- if (&Apache::lonnet::plaintext($priv)) {
- $resulttext .= '- '.&Apache::lonnet::plaintext($priv);
- unless ($level eq 'c') {
- $resulttext .= ' ('.$lt{$level}.')';
- }
- $resulttext .= '
';
- }
- }
- }
- $resulttext .= ' ';
}
}
+ $resulttext .= ' ';
+ } else {
+ $resulttext = &mt('No changes made to help settings');
+ $errors .= ' - '.
+ &mt('An error occurred storing the settings: [_1]',
+ $putresult).'
';
}
- $resulttext .= ' ';
- } else {
- $resulttext = &mt('No changes made to help settings');
}
if ($errors) {
$resulttext .= '
'.&mt('The following errors occurred: ').'';
+ $errors.' ';
}
return $resulttext;
}
@@ -18507,31 +11229,20 @@ sub modify_coursedefaults {
my ($dom,$lastactref,%domconfig) = @_;
my ($resulttext,$errors,%changes,%defaultshash);
my %defaultchecked = (
+ 'canuse_pdfforms' => 'off',
'uselcmath' => 'on',
- 'usejsme' => 'on',
- 'inline_chem' => 'on',
- 'ltiauth' => 'off',
+ 'usejsme' => 'on'
);
- my @toggles = ('uselcmath','usejsme','inline_chem','ltiauth');
+ my @toggles = ('canuse_pdfforms','uselcmath','usejsme');
my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial',
- 'uploadquota_community','uploadquota_textbook','coursequota_official',
- 'coursequota_unofficial','coursequota_community','coursequota_textbook',
- 'mysqltables_official','mysqltables_unofficial','mysqltables_community',
- 'mysqltables_textbook');
+ 'uploadquota_community','uploadquota_textbook');
my @types = ('official','unofficial','community','textbook');
my %staticdefaults = (
anonsurvey_threshold => 10,
uploadquota => 500,
- coursequota => 20,
postsubmit => 60,
- mysqltables => 172800,
- domexttool => 1,
);
- my %texoptions = (
- MathJax => 'MathJax',
- mimetex => &mt('Convert to Images'),
- tth => &mt('TeX to HTML'),
- );
+
$defaultshash{'coursedefaults'} = {};
if (ref($domconfig{'coursedefaults'}) ne 'HASH') {
@@ -18570,41 +11281,26 @@ sub modify_coursedefaults {
}
$defaultshash{'coursedefaults'}{$item} = $newdef;
} else {
- my ($setting,$type) = ($item =~ /^(uploadquota|coursequota|mysqltables)_(\w+)$/);
- if (ref($domconfig{'coursedefaults'}{$setting}) eq 'HASH') {
- $currdef = $domconfig{'coursedefaults'}{$setting}{$type};
+ my ($type) = ($item =~ /^\Quploadquota_\E(\w+)$/);
+ if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
+ $currdef = $domconfig{'coursedefaults'}{'uploadquota'}{$type};
}
$newdef =~ s/[^\w.\-]//g;
- $defaultshash{'coursedefaults'}{$setting}{$type} = $newdef;
+ $defaultshash{'coursedefaults'}{'uploadquota'}{$type} = $newdef;
}
if ($currdef ne $newdef) {
+ my $staticdef;
if ($item eq 'anonsurvey_threshold') {
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) {
$changes{$item} = 1;
}
- } elsif ($item =~ /^(uploadquota|coursequota|mysqltables)_/) {
- my $setting = $1;
- unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) {
- $changes{$setting} = 1;
+ } else {
+ unless (($currdef eq '') && ($newdef == $staticdefaults{'uploadquota'})) {
+ $changes{'uploadquota'} = 1;
}
}
}
}
- my $texengine;
- if ($env{'form.texengine'} =~ /^(MathJax|mimetex|tth)$/) {
- $texengine = $env{'form.texengine'};
- my $currdef = $domconfig{'coursedefaults'}{'texengine'};
- if ($currdef eq '') {
- unless ($texengine eq $Apache::lonnet::deftex) {
- $changes{'texengine'} = 1;
- }
- } elsif ($currdef ne $texengine) {
- $changes{'texengine'} = 1;
- }
- }
- if ($texengine ne '') {
- $defaultshash{'coursedefaults'}{'texengine'} = $texengine;
- }
my $currclone = $domconfig{'coursedefaults'}{'canclone'};
my @currclonecode;
if (ref($currclone) eq 'HASH') {
@@ -18613,7 +11309,7 @@ sub modify_coursedefaults {
}
}
my $newclone;
- if ($env{'form.canclone'} =~ /^(none|domain|instcode)$/) {
+ if ($env{'form.canclone'} =~ /^(none|domain|instcode)$/) {
$newclone = $env{'form.canclone'};
}
if ($newclone eq 'instcode') {
@@ -18636,8 +11332,8 @@ sub modify_coursedefaults {
$newclone eq '';
}
} elsif ($newclone ne '') {
- $defaultshash{'coursedefaults'}{'canclone'} = $newclone;
- }
+ $defaultshash{'coursedefaults'}{'canclone'} = $newclone;
+ }
if ($newclone ne $currclone) {
$changes{'canclone'} = 1;
}
@@ -18655,10 +11351,10 @@ sub modify_coursedefaults {
$defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type};
}
} else {
- if ($env{'form.coursecredits'} eq '1') {
+ if ($env{'form.coursecredits'} eq '1') {
foreach my $type (@types) {
unless ($type eq 'community') {
- if ($domconfig{'coursedefaults'}{'coursecredits'}{$type} ne $credits{$type}) {
+ if ($domconfig{'coursedefaults'}{'coursecredits'}{$type} ne $credits{$type}) {
$changes{'coursecredits'} = 1;
}
$defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type};
@@ -18701,7 +11397,7 @@ sub modify_coursedefaults {
}
if (exists($currtimeout{$type})) {
if ($timeout ne $currtimeout{$type}) {
- $changes{'postsubmit'} = 1;
+ $changes{'postsubmit'} = 1;
}
} elsif ($timeout ne '') {
$changes{'postsubmit'} = 1;
@@ -18717,63 +11413,20 @@ sub modify_coursedefaults {
$changes{'postsubmit'} = 1;
}
}
- my (%newdomexttool,%newexttool,%olddomexttool,%oldexttool);
- map { $newdomexttool{$_} = 1; } &Apache::loncommon::get_env_multiple('form.domexttool');
- map { $newexttool{$_} = 1; } &Apache::loncommon::get_env_multiple('form.exttool');
- if (ref($domconfig{'coursedefaults'}{'domexttool'}) eq 'HASH') {
- %olddomexttool = %{$domconfig{'coursedefaults'}{'domexttool'}};
- } else {
- foreach my $type (@types) {
- if ($staticdefaults{'domexttool'}) {
- $olddomexttool{$type} = 1;
- } else {
- $olddomexttool{$type} = 0;
- }
- }
- }
- if (ref($domconfig{'coursedefaults'}{'exttool'}) eq 'HASH') {
- %oldexttool = %{$domconfig{'coursedefaults'}{'exttool'}};
- } else {
- foreach my $type (@types) {
- if ($staticdefaults{'exttool'}) {
- $oldexttool{$type} = 1;
- } else {
- $oldexttool{$type} = 0;
- }
- }
- }
- foreach my $type (@types) {
- unless ($newdomexttool{$type}) {
- $newdomexttool{$type} = 0;
- }
- unless ($newexttool{$type}) {
- $newexttool{$type} = 0;
- }
- if ($newdomexttool{$type} != $olddomexttool{$type}) {
- $changes{'domexttool'} = 1;
- }
- if ($newexttool{$type} != $oldexttool{$type}) {
- $changes{'exttool'} = 1;
- }
- }
- $defaultshash{'coursedefaults'}{'domexttool'} = \%newdomexttool;
- $defaultshash{'coursedefaults'}{'exttool'} = \%newexttool;
}
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
$dom);
if ($putresult eq 'ok') {
if (keys(%changes) > 0) {
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
- if (($changes{'uploadquota'}) || ($changes{'postsubmit'}) ||
+ if (($changes{'canuse_pdfforms'}) || ($changes{'uploadquota'}) || ($changes{'postsubmit'}) ||
($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) ||
- ($changes{'canclone'}) || ($changes{'mysqltables'}) || ($changes{'texengine'}) ||
- ($changes{'inline_chem'}) || ($changes{'ltiauth'}) || ($changes{'domexttool'}) ||
- ($changes{'exttool'}) || ($changes{'coursequota'})) {
- foreach my $item ('uselcmath','usejsme','inline_chem','texengine','ltiauth') {
+ ($changes{'canclone'})) {
+ foreach my $item ('canuse_pdfforms','uselcmath','usejsme') {
if ($changes{$item}) {
$domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};
}
- }
+ }
if ($changes{'coursecredits'}) {
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
foreach my $type (keys(%{$defaultshash{'coursedefaults'}{'coursecredits'}})) {
@@ -18800,13 +11453,6 @@ sub modify_coursedefaults {
}
}
}
- if ($changes{'coursequota'}) {
- if (ref($defaultshash{'coursedefaults'}{'coursequota'}) eq 'HASH') {
- foreach my $type (@types) {
- $domdefaults{$type.'coursequota'}=$defaultshash{'coursedefaults'}{'coursequota'}{$type};
- }
- }
- }
if ($changes{'canclone'}) {
if (ref($defaultshash{'coursedefaults'}{'canclone'}) eq 'HASH') {
if (ref($defaultshash{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') {
@@ -18819,20 +11465,6 @@ sub modify_coursedefaults {
$domdefaults{'canclone'}=$defaultshash{'coursedefaults'}{'canclone'};
}
}
- if ($changes{'domexttool'}) {
- if (ref($defaultshash{'coursedefaults'}{'domexttool'}) eq 'HASH') {
- foreach my $type (@types) {
- $domdefaults{$type.'domexttool'}=$defaultshash{'coursedefaults'}{'domexttool'}{$type};
- }
- }
- }
- if ($changes{'exttool'}) {
- if (ref($defaultshash{'coursedefaults'}{'exttool'}) eq 'HASH') {
- foreach my $type (@types) {
- $domdefaults{$type.'exttool'}=$defaultshash{'coursedefaults'}{'exttool'}{$type};
- }
- }
- }
my $cachetime = 24*60*60;
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
if (ref($lastactref) eq 'HASH') {
@@ -18841,7 +11473,13 @@ sub modify_coursedefaults {
}
$resulttext = &mt('Changes made:').'';
foreach my $item (sort(keys(%changes))) {
- if ($item eq 'uselcmath') {
+ if ($item eq 'canuse_pdfforms') {
+ if ($env{'form.'.$item} eq '1') {
+ $resulttext .= '- '.&mt("Course/Community users can create/upload PDF forms set to 'on'").'
';
+ } else {
+ $resulttext .= '- '.&mt('Course/Community users can create/upload PDF forms set to "off"').'
';
+ }
+ } elsif ($item eq 'uselcmath') {
if ($env{'form.'.$item} eq '1') {
$resulttext .= '- '.&mt('Math preview uses LON-CAPA previewer (javascript), if supported by browser.').'
';
} else {
@@ -18851,18 +11489,7 @@ sub modify_coursedefaults {
if ($env{'form.'.$item} eq '1') {
$resulttext .= '- '.&mt('Molecule editor uses JSME (HTML5), if supported by browser.').'
';
} else {
- $resulttext .= '- '.&mt('Molecule editor uses JME (Java), if supported by client OS.').'
';
- }
- } elsif ($item eq 'inline_chem') {
- if ($env{'form.'.$item} eq '1') {
- $resulttext .= '- '.&mt('Chemical Reaction Response uses inline previewer').'
';
- } else {
- $resulttext .= '- '.&mt('Chemical Reaction Response uses pop-up previewer').'
';
- }
- } elsif ($item eq 'texengine') {
- if ($defaultshash{'coursedefaults'}{'texengine'} ne '') {
- $resulttext .= '- '.&mt('Default method to display mathematics set to: "[_1]"',
- $texoptions{$defaultshash{'coursedefaults'}{'texengine'}}).'
';
+ $resulttext .= '- '.&mt('Molecule editor uses JME (Java), if supported by client OS.').'
';
}
} elsif ($item eq 'anonsurvey_threshold') {
$resulttext .= '- '.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'
';
@@ -18872,42 +11499,19 @@ sub modify_coursedefaults {
'- '.&mt('Official courses: [_1] MB',''.$defaultshash{'coursedefaults'}{'uploadquota'}{'official'}.'').'
'.
'- '.&mt('Unofficial courses: [_1] MB',''.$defaultshash{'coursedefaults'}{'uploadquota'}{'unofficial'}.'').'
'.
'- '.&mt('Textbook courses: [_1] MB',''.$defaultshash{'coursedefaults'}{'uploadquota'}{'textbook'}.'').'
'.
+
'- '.&mt('Communities: [_1] MB',''.$defaultshash{'coursedefaults'}{'uploadquota'}{'community'}.'').'
'.
' '.
'';
} else {
$resulttext .= ''.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$staticdefaults{'uploadquota'}).'';
}
- } elsif ($item eq 'coursequota') {
- if (ref($defaultshash{'coursedefaults'}{'coursequota'}) eq 'HASH') {
- $resulttext .= ''.&mt('Default cumulative quota for all group portfolio spaces in course set as follows:').''.
- '- '.&mt('Official courses: [_1] MB',''.$defaultshash{'coursedefaults'}{'coursequota'}{'official'}.'').'
'.
- '- '.&mt('Unofficial courses: [_1] MB',''.$defaultshash{'coursedefaults'}{'coursequota'}{'unofficial'}.'').'
'.
- '- '.&mt('Textbook courses: [_1] MB',''.$defaultshash{'coursedefaults'}{'coursequota'}{'textbook'}.'').'
'.
- '- '.&mt('Communities: [_1] MB',''.$defaultshash{'coursedefaults'}{'coursequota'}{'community'}.'').'
'.
- ' '.
- '';
- } else {
- $resulttext .= ''.&mt('Default cumulative quota for all group portfolio spaces in course remains default: [_1] MB',$staticdefaults{'coursequota'}).'';
- }
- } elsif ($item eq 'mysqltables') {
- if (ref($defaultshash{'coursedefaults'}{'mysqltables'}) eq 'HASH') {
- $resulttext .= ''.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver').''.
- '- '.&mt('Official courses: [_1] s',''.$defaultshash{'coursedefaults'}{'mysqltables'}{'official'}.'').'
'.
- '- '.&mt('Unofficial courses: [_1] s',''.$defaultshash{'coursedefaults'}{'mysqltables'}{'unofficial'}.'').'
'.
- '- '.&mt('Textbook courses: [_1] s',''.$defaultshash{'coursedefaults'}{'mysqltables'}{'textbook'}.'').'
'.
- '- '.&mt('Communities: [_1] s',''.$defaultshash{'coursedefaults'}{'mysqltables'}{'community'}.'').'
'.
- ' '.
- '';
- } else {
- $resulttext .= ''.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver remains default: [_1] s',$staticdefaults{'uploadquota'}).'';
- }
} elsif ($item eq 'postsubmit') {
if ($domdefaults{'postsubmit'} eq 'off') {
$resulttext .= ''.&mt('Submit button(s) remain enabled on page after student makes submission.');
} else {
$resulttext .= ''.&mt('Submit button(s) disabled on page after student makes submission').'; ';
- if (ref($defaultshash{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
+ if (ref($defaultshash{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
$resulttext .= &mt('durations:').'';
foreach my $type (@types) {
$resulttext .= '- ';
@@ -18936,7 +11540,7 @@ sub modify_coursedefaults {
}
$resulttext .= '
';
}
- $resulttext .= '';
+ $resulttext .= '';
}
} elsif ($item eq 'coursecredits') {
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
@@ -18964,41 +11568,7 @@ sub modify_coursedefaults {
} elsif ($defaultshash{'coursedefaults'}{'canclone'} eq 'domain') {
$resulttext .= ''.&mt('By default, a course requester can clone any course from his/her domain.').'';
} else {
- $resulttext .= ''.&mt('By default, only course owner and coordinators may clone a course.').'';
- }
- } elsif ($item eq 'ltiauth') {
- if ($env{'form.'.$item} eq '1') {
- $resulttext .= ''.&mt('LTI launch of deep-linked URL need not require re-authentication').'';
- } else {
- $resulttext .= ''.&mt('LTI launch of deep-linked URL will require re-authentication').'';
- }
- } elsif ($item eq 'domexttool') {
- my @noyes = (&mt('no'),&mt('yes'));
- if (ref($defaultshash{'coursedefaults'}{'domexttool'}) eq 'HASH') {
- $resulttext .= ''.&mt('External Tools defined in the domain may be used as follows:').''.
- '- '.&mt('Official courses: [_1]',''.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'official'}].'').'
'.
- '- '.&mt('Unofficial courses: [_1]',''.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'unofficial'}].'').'
'.
- '- '.&mt('Textbook courses: [_1]',''.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'textbook'}].'').'
'.
- '- '.&mt('Placement tests: [_1]',''.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'placement'}].'').'
'.
- '- '.&mt('Communities: [_1]',''.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'community'}].'').'
'.
- ' '.
- '';
- } else {
- $resulttext .= ''.&mt('External Tools defined in the domain may be used in all course types, by default').'';
- }
- } elsif ($item eq 'exttool') {
- my @noyes = (&mt('no'),&mt('yes'));
- if (ref($defaultshash{'coursedefaults'}{'exttool'}) eq 'HASH') {
- $resulttext .= ''.&mt('External Tools can be defined and configured in course containers as follows:').''.
- '- '.&mt('Official courses: [_1]',''.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'official'}].'').'
'.
- '- '.&mt('Unofficial courses: [_1]',''.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'unofficial'}].'').'
'.
- '- '.&mt('Textbook courses: [_1]',''.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'textbook'}].'').'
'.
- '- '.&mt('Placement tests: [_1]',''.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'placement'}].'').'
'.
- '- '.&mt('Communities: [_1]',''.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'community'}].'').'
'.
- ' '.
- '';
- } else {
- $resulttext .= ''.&mt('External Tools can not be defined in any course types, by default').'';
+ $resulttext .= ''.&mt('By default, only course owner and coordinators may clone a course.').'';
}
}
}
@@ -19233,12 +11803,12 @@ sub modify_selfenrollment {
$resulttext .= '';
}
}
- }
- if ((exists($changes{'admin'})) || (exists($changes{'default'}))) {
- my $cachetime = 24*60*60;
- &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'domdefaults'} = 1;
+ if ((exists($changes{'admin'})) || (exists($changes{'default'}))) {
+ my $cachetime = 24*60*60;
+ &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+ if (ref($lastactref) eq 'HASH') {
+ $lastactref->{'domdefaults'} = 1;
+ }
}
}
$resulttext .= '';
@@ -19252,345 +11822,6 @@ sub modify_selfenrollment {
return $resulttext;
}
-sub modify_wafproxy {
- my ($dom,$action,$lastactref,%domconfig) = @_;
- my %servers = &Apache::lonnet::internet_dom_servers($dom);
- my (%othercontrol,%canset,%values,%curralias,%currsaml,%currvalue,@warnings,
- %wafproxy,%changes,%expirecache,%expiresaml);
- foreach my $server (sort(keys(%servers))) {
- my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server});
- if ($serverhome eq $server) {
- my $serverdom = &Apache::lonnet::host_domain($server);
- if ($serverdom eq $dom) {
- $canset{$server} = 1;
- }
- }
- }
- if (ref($domconfig{'wafproxy'}) eq 'HASH') {
- %{$values{$dom}} = ();
- if (ref($domconfig{'wafproxy'}{'alias'}) eq 'HASH') {
- %curralias = %{$domconfig{'wafproxy'}{'alias'}};
- }
- if (ref($domconfig{'wafproxy'}{'saml'}) eq 'HASH') {
- %currsaml = %{$domconfig{'wafproxy'}{'saml'}};
- }
- foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') {
- $currvalue{$item} = $domconfig{'wafproxy'}{$item};
- }
- }
- my $output;
- if (keys(%canset)) {
- %{$wafproxy{'alias'}} = ();
- %{$wafproxy{'saml'}} = ();
- foreach my $key (sort(keys(%canset))) {
- if ($env{'form.wafproxy_'.$dom}) {
- $wafproxy{'alias'}{$key} = $env{'form.wafproxy_alias_'.$key};
- $wafproxy{'alias'}{$key} =~ s/^\s+|\s+$//g;
- if ($wafproxy{'alias'}{$key} ne $curralias{$key}) {
- $changes{'alias'} = 1;
- }
- if ($env{'form.wafproxy_alias_saml_'.$key}) {
- $wafproxy{'saml'}{$key} = 1;
- }
- if ($wafproxy{'saml'}{$key} ne $currsaml{$key}) {
- $changes{'saml'} = 1;
- }
- } else {
- $wafproxy{'alias'}{$key} = '';
- $wafproxy{'saml'}{$key} = '';
- if ($curralias{$key}) {
- $changes{'alias'} = 1;
- }
- if ($currsaml{$key}) {
- $changes{'saml'} = 1;
- }
- }
- if ($wafproxy{'alias'}{$key} eq '') {
- if ($curralias{$key}) {
- $expirecache{$key} = 1;
- }
- delete($wafproxy{'alias'}{$key});
- }
- if ($wafproxy{'saml'}{$key} eq '') {
- if ($currsaml{$key}) {
- $expiresaml{$key} = 1;
- }
- delete($wafproxy{'saml'}{$key});
- }
- }
- unless (keys(%{$wafproxy{'alias'}})) {
- delete($wafproxy{'alias'});
- }
- unless (keys(%{$wafproxy{'saml'}})) {
- delete($wafproxy{'saml'});
- }
- # Localization for values in %warn occurs in &mt() calls separately.
- my %warn = (
- trusted => 'trusted IP range(s)',
- vpnint => 'internal IP range(s) for VPN sessions(s)',
- vpnext => 'IP range(s) for backend WAF connections',
- );
- foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') {
- my $possible = $env{'form.wafproxy_'.$item};
- $possible =~ s/^\s+|\s+$//g;
- if ($possible ne '') {
- if ($item eq 'remoteip') {
- if ($possible =~ /^[mhn]$/) {
- $wafproxy{$item} = $possible;
- }
- } elsif ($item eq 'ipheader') {
- if ($wafproxy{'remoteip'} eq 'h') {
- $wafproxy{$item} = $possible;
- }
- } elsif ($item eq 'sslopt') {
- if ($possible =~ /^0|1$/) {
- $wafproxy{$item} = $possible;
- }
- } else {
- my (@ok,$count);
- if (($item eq 'vpnint') || ($item eq 'vpnext')) {
- unless ($env{'form.wafproxy_vpnaccess'}) {
- $possible = '';
- }
- } elsif ($item eq 'trusted') {
- unless ($wafproxy{'remoteip'} eq 'h') {
- $possible = '';
- }
- }
- unless ($possible eq '') {
- $possible =~ s/[\r\n]+/\s/g;
- $possible =~ s/\s*-\s*/-/g;
- $possible =~ s/\s+/,/g;
- $possible =~ s/,+/,/g;
- }
- $count = 0;
- if ($possible ne '') {
- foreach my $poss (split(/\,/,$possible)) {
- $count ++;
- $poss = &validate_ip_pattern($poss);
- if ($poss ne '') {
- push(@ok,$poss);
- }
- }
- my $diff = $count - scalar(@ok);
- if ($diff) {
- push(@warnings,''.
- &mt('[quant,_1,IP] invalid and excluded from saved value for [_2]',
- $diff,$warn{$item}).
- '');
- }
- if (@ok) {
- my @cidr_list;
- foreach my $item (@ok) {
- @cidr_list = &Net::CIDR::cidradd($item,@cidr_list);
- }
- $wafproxy{$item} = join(',',@cidr_list);
- }
- }
- }
- if ($wafproxy{$item} ne $currvalue{$item}) {
- $changes{$item} = 1;
- }
- } elsif ($currvalue{$item}) {
- $changes{$item} = 1;
- }
- }
- } else {
- if (keys(%curralias)) {
- $changes{'alias'} = 1;
- }
- if (keys(%currsaml)) {
- $changes{'saml'} = 1;
- }
- if (keys(%currvalue)) {
- foreach my $key (keys(%currvalue)) {
- $changes{$key} = 1;
- }
- }
- }
- if (keys(%changes)) {
- my %defaultshash = (
- wafproxy => \%wafproxy,
- );
- my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
- $dom);
- if ($putresult eq 'ok') {
- my $cachetime = 24*60*60;
- my (%domdefaults,$updatedomdefs);
- foreach my $item ('ipheader','trusted','vpnint','vpnext','sslopt') {
- if ($changes{$item}) {
- unless ($updatedomdefs) {
- %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
- $updatedomdefs = 1;
- }
- if ($wafproxy{$item}) {
- $domdefaults{'waf_'.$item} = $wafproxy{$item};
- } elsif (exists($domdefaults{'waf_'.$item})) {
- delete($domdefaults{'waf_'.$item});
- }
- }
- }
- if ($updatedomdefs) {
- &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'domdefaults'} = 1;
- }
- }
- if ((exists($wafproxy{'alias'})) || (keys(%expirecache))) {
- my %updates = %expirecache;
- foreach my $key (keys(%expirecache)) {
- &Apache::lonnet::devalidate_cache_new('proxyalias',$key);
- }
- if (ref($wafproxy{'alias'}) eq 'HASH') {
- my $cachetime = 24*60*60;
- foreach my $key (keys(%{$wafproxy{'alias'}})) {
- $updates{$key} = 1;
- &Apache::lonnet::do_cache_new('proxyalias',$key,$wafproxy{'alias'}{$key},
- $cachetime);
- }
- }
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'proxyalias'} = \%updates;
- }
- }
- if ((exists($wafproxy{'saml'})) || (keys(%expiresaml))) {
- my %samlupdates = %expiresaml;
- foreach my $key (keys(%expiresaml)) {
- &Apache::lonnet::devalidate_cache_new('proxysaml',$key);
- }
- if (ref($wafproxy{'saml'}) eq 'HASH') {
- my $cachetime = 24*60*60;
- foreach my $key (keys(%{$wafproxy{'saml'}})) {
- $samlupdates{$key} = 1;
- &Apache::lonnet::do_cache_new('proxysaml',$key,$wafproxy{'saml'}{$key},
- $cachetime);
- }
- }
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'proxysaml'} = \%samlupdates;
- }
- }
- $output = &mt('Changes were made to Web Application Firewall/Reverse Proxy').'';
- foreach my $item ('alias','saml','remoteip','ipheader','trusted','vpnint','vpnext','sslopt') {
- if ($changes{$item}) {
- if ($item eq 'alias') {
- my $numaliased = 0;
- if (ref($wafproxy{'alias'}) eq 'HASH') {
- my $shown;
- if (keys(%{$wafproxy{'alias'}})) {
- foreach my $server (sort(keys(%{$wafproxy{'alias'}}))) {
- $shown .= '- '.&mt('[_1] aliased by [_2]',
- &Apache::lonnet::hostname($server),
- $wafproxy{'alias'}{$server}).'
';
- $numaliased ++;
- }
- if ($numaliased) {
- $output .= '- '.&mt('Aliases for hostnames set to: [_1]',
- '').'
';
- }
- }
- }
- unless ($numaliased) {
- $output .= '- '.&mt('Aliases deleted for hostnames').'
';
- }
- } elsif ($item eq 'saml') {
- my $shown;
- if (ref($wafproxy{'saml'}) eq 'HASH') {
- if (keys(%{$wafproxy{'saml'}})) {
- $shown = join(', ',sort(keys(%{$wafproxy{'saml'}})));
- }
- }
- if ($shown) {
- $output .= '- '.&mt('Alias used by SSO Auth for: [_1]',
- $shown).'
';
- } else {
- $output .= '- '.&mt('No alias used for SSO Auth').'
';
- }
- } else {
- if ($item eq 'remoteip') {
- my %ip_methods = &remoteip_methods();
- if ($wafproxy{$item} =~ /^[mh]$/) {
- $output .= '- '.&mt("Method for determining user's IP set to: [_1]",
- $ip_methods{$wafproxy{$item}}).'
';
- } else {
- if (($env{'form.wafproxy_'.$dom}) && (ref($wafproxy{'alias'}) eq 'HASH')) {
- $output .= '- '.&mt("No method in use to get user's real IP (will report IP used by WAF).").
- '
';
- } else {
- $output .= '- '.&mt('WAF/Reverse Proxy not in use').'
';
- }
- }
- } elsif ($item eq 'ipheader') {
- if ($wafproxy{$item}) {
- $output .= '- '.&mt('Request header with remote IP set to: [_1]',
- $wafproxy{$item}).'
';
- } else {
- $output .= '- '.&mt('Request header with remote IP deleted').'
';
- }
- } elsif ($item eq 'trusted') {
- if ($wafproxy{$item}) {
- $output .= '- '.&mt('Trusted IP range(s) set to: [_1]',
- $wafproxy{$item}).'
';
- } else {
- $output .= '- '.&mt('Trusted IP range(s) deleted').'
';
- }
- } elsif ($item eq 'vpnint') {
- if ($wafproxy{$item}) {
- $output .= '- '.&mt('Internal IP Range(s) for VPN sessions set to: [_1]',
- $wafproxy{$item}).'
';
- } else {
- $output .= '- '.&mt('Internal IP Range(s) for VPN sessions deleted').'
';
- }
- } elsif ($item eq 'vpnext') {
- if ($wafproxy{$item}) {
- $output .= '- '.&mt('IP Range(s) for backend WAF connections set to: [_1]',
- $wafproxy{$item}).'
';
- } else {
- $output .= '- '.&mt('IP Range(s) for backend WAF connections deleted').'
';
- }
- } elsif ($item eq 'sslopt') {
- if ($wafproxy{$item}) {
- $output .= '- '.&mt('WAF/Reverse Proxy expected to forward requests to https on LON-CAPA node, regardless of original protocol in web browser (http or https).').'
';
- } else {
- $output .= '- '.&mt('WAF/Reverse Proxy expected to preserve original protocol in web browser (either http or https) when forwarding to LON-CAPA node.').'
';
- }
- }
- }
- }
- }
- $output .= ' ';
- } else {
- $output = ''.
- &mt('An error occurred: [_1]',$putresult).'';
- }
- } elsif (keys(%canset)) {
- $output = &mt('No changes made to Web Application Firewall/Reverse Proxy settings');
- }
- if (@warnings) {
- $output .= '
'.&mt('Warnings:').''.
- join("\n",@warnings).' ';
- }
- return $output;
-}
-
-sub validate_ip_pattern {
- my ($pattern) = @_;
- if ($pattern =~ /^([^-]+)\-([^-]+)$/) {
- my ($start,$end) = ($1,$2);
- if ((&Net::CIDR::cidrvalidate($start)) && (&Net::CIDR::cidrvalidate($end))) {
- if (($start !~ m{/}) && ($end !~ m{/})) {
- return $start.'-'.$end;
- }
- }
- } elsif ($pattern ne '') {
- $pattern = &Net::CIDR::cidrvalidate($pattern);
- if ($pattern ne '') {
- return $pattern;
- }
- }
- return;
-}
-
sub modify_usersessions {
my ($dom,$lastactref,%domconfig) = @_;
my @hostingtypes = ('version','excludedomain','includedomain');
@@ -19758,7 +11989,6 @@ sub modify_usersessions {
}
}
$defaultshash{'usersessions'}{'offloadnow'} = {};
- $defaultshash{'usersessions'}{'offloadoth'} = {};
my @offloadnow = &Apache::loncommon::get_env_multiple('form.offloadnow');
my @okoffload;
if (@offloadnow) {
@@ -19775,22 +12005,6 @@ sub modify_usersessions {
}
}
}
- my @offloadoth = &Apache::loncommon::get_env_multiple('form.offloadoth');
- my @okoffloadoth;
- if (@offloadoth) {
- foreach my $server (@offloadoth) {
- if (&Apache::lonnet::hostname($server) ne '') {
- unless (grep(/^\Q$server\E$/,@okoffloadoth)) {
- push(@okoffloadoth,$server);
- }
- }
- }
- if (@okoffloadoth) {
- foreach my $lonhost (@okoffloadoth) {
- $defaultshash{'usersessions'}{'offloadoth'}{$lonhost} = 1;
- }
- }
- }
if (ref($domconfig{'usersessions'}) eq 'HASH') {
if (ref($domconfig{'usersessions'}{'spares'}) eq 'HASH') {
if (ref($changes{'spares'}) eq 'HASH') {
@@ -19801,38 +12015,26 @@ sub modify_usersessions {
} else {
$savespares = 1;
}
- foreach my $offload ('offloadnow','offloadoth') {
- if (ref($domconfig{'usersessions'}{$offload}) eq 'HASH') {
- foreach my $lonhost (keys(%{$domconfig{'usersessions'}{$offload}})) {
- unless ($defaultshash{'usersessions'}{$offload}{$lonhost}) {
- $changes{$offload} = 1;
- last;
- }
+ if (ref($domconfig{'usersessions'}{'offloadnow'}) eq 'HASH') {
+ foreach my $lonhost (keys(%{$domconfig{'usersessions'}{'offloadnow'}})) {
+ unless ($defaultshash{'usersessions'}{'offloadnow'}{$lonhost}) {
+ $changes{'offloadnow'} = 1;
+ last;
}
- unless ($changes{$offload}) {
- foreach my $lonhost (keys(%{$defaultshash{'usersessions'}{$offload}})) {
- unless ($domconfig{'usersessions'}{$offload}{$lonhost}) {
- $changes{$offload} = 1;
- last;
- }
+ }
+ unless ($changes{'offloadnow'}) {
+ foreach my $lonhost (keys(%{$defaultshash{'usersessions'}{'offloadnow'}})) {
+ unless ($domconfig{'usersessions'}{'offloadnow'}{$lonhost}) {
+ $changes{'offloadnow'} = 1;
+ last;
}
}
- } else {
- if (($offload eq 'offloadnow') && (@okoffload)) {
- $changes{'offloadnow'} = 1;
- }
- if (($offload eq 'offloadoth') && (@okoffloadoth)) {
- $changes{'offloadoth'} = 1;
- }
}
- }
- } else {
- if (@okoffload) {
+ } elsif (@okoffload) {
$changes{'offloadnow'} = 1;
}
- if (@okoffloadoth) {
- $changes{'offloadoth'} = 1;
- }
+ } elsif (@okoffload) {
+ $changes{'offloadnow'} = 1;
}
my $nochgmsg = &mt('No changes made to settings for user session hosting/offloading.');
if ((keys(%changes) > 0) || ($savespares)) {
@@ -19849,16 +12051,11 @@ sub modify_usersessions {
if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') {
$domdefaults{'offloadnow'} = $defaultshash{'usersessions'}{'offloadnow'};
}
- if (ref($defaultshash{'usersessions'}{'offloadoth'}) eq 'HASH') {
- $domdefaults{'offloadoth'} = $defaultshash{'usersessions'}{'offloadoth'};
- }
}
my $cachetime = 24*60*60;
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
- &Apache::lonnet::do_cache_new('usersessions',$dom,$defaultshash{'usersessions'},3600);
if (ref($lastactref) eq 'HASH') {
$lastactref->{'domdefaults'} = 1;
- $lastactref->{'usersessions'} = 1;
}
if (keys(%changes) > 0) {
my %lt = &usersession_titles();
@@ -19912,7 +12109,7 @@ sub modify_usersessions {
}
} else {
if ($type eq 'version') {
- $newvalue .= ' '.&mt('(or later)');
+ $newvalue .= ' '.&mt('(or later)');
}
$resulttext .= ''.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'';
}
@@ -19925,31 +12122,16 @@ sub modify_usersessions {
if ($changes{'offloadnow'}) {
if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') {
if (keys(%{$defaultshash{'usersessions'}{'offloadnow'}}) > 0) {
- $resulttext .= ''.&mt('Switch any active user on next access, for server(s):').'';
+ $resulttext .= '- '.&mt('Switch active users on next access, for server(s):').'
';
foreach my $lonhost (sort(keys(%{$defaultshash{'usersessions'}{'offloadnow'}}))) {
$resulttext .= '- '.$lonhost.'
';
}
$resulttext .= ' ';
} else {
- $resulttext .= ' - '.&mt('No servers now set to switch any active user on next access.');
- }
- } else {
- $resulttext .= '
- '.&mt('No servers now set to switch any active user on next access.').'
';
- }
- }
- if ($changes{'offloadoth'}) {
- if (ref($defaultshash{'usersessions'}{'offloadoth'}) eq 'HASH') {
- if (keys(%{$defaultshash{'usersessions'}{'offloadoth'}}) > 0) {
- $resulttext .= '- '.&mt('Switch other institutions on next access, for server(s):').'
';
- foreach my $lonhost (sort(keys(%{$defaultshash{'usersessions'}{'offloadoth'}}))) {
- $resulttext .= '- '.$lonhost.'
';
- }
- $resulttext .= ' ';
- } else {
- $resulttext .= ' - '.&mt('No servers now set to switch other institutions on next access.');
+ $resulttext .= '
- '.&mt('No servers now set to switch active users on next access.');
}
} else {
- $resulttext .= '
- '.&mt('No servers now set to switch other institutions on next access.').'
';
+ $resulttext .= '- '.&mt('No servers now set to switch active users on next access.').'
';
}
}
$resulttext .= ' ';
@@ -19977,12 +12159,12 @@ sub modify_loadbalancing {
my @sparestypes = ('primary','default');
my %typetitles = &sparestype_titles();
my $resulttext;
- my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
+ my (%currbalancer,%currtargets,%currrules,%existing);
if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
%existing = %{$domconfig{'loadbalancing'}};
}
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer,
- \%currtargets,\%currrules,\%currcookies);
+ \%currtargets,\%currrules);
my ($saveloadbalancing,%defaultshash,%changes);
my ($alltypes,$othertypes,$titles) =
&loadbalancing_titles($dom,$intdom,$usertypes,$types);
@@ -20026,24 +12208,7 @@ sub modify_loadbalancing {
push(@offloadto,$target);
}
}
- }
- if ($env{'form.loadbalancing_target_'.$i.'_hosthere'} eq $sparetype) {
- unless(grep(/^\Q$balancer\E$/,@offloadto)) {
- push(@offloadto,$balancer);
- }
- }
- $defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto;
- }
- if ($env{'form.loadbalancing_cookie_'.$i}) {
- $defaultshash{'loadbalancing'}{$balancer}{'cookie'} = 1;
- if (exists($currbalancer{$balancer})) {
- unless ($currcookies{$balancer}) {
- $changes{'curr'}{$balancer}{'cookie'} = 1;
- }
- }
- } elsif (exists($currbalancer{$balancer})) {
- if ($currcookies{$balancer}) {
- $changes{'curr'}{$balancer}{'cookie'} = 1;
+ $defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto;
}
}
if (ref($currtargets{$balancer}) eq 'HASH') {
@@ -20083,7 +12248,7 @@ sub modify_loadbalancing {
}
if ($rule eq 'specific') {
my $specifiedhost = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type};
- if (exists($servers{$specifiedhost})) {
+ if (exists($servers{$specifiedhost})) {
$rule = $specifiedhost;
}
}
@@ -20159,7 +12324,7 @@ sub modify_loadbalancing {
if ($rule eq '') {
$balancetext = $ruletitles{'default'};
} elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer') ||
- ($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) {
+ ($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) {
if (($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) {
foreach my $sparetype (@sparestypes) {
if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') {
@@ -20199,33 +12364,24 @@ sub modify_loadbalancing {
}
}
}
- if ($changes{'curr'}{$balancer}{'cookie'}) {
- if ($currcookies{$balancer}) {
- $resulttext .= ''.&mt('Load Balancer: [_1] -- cookie use disabled',
- $balancer).'';
- } else {
- $resulttext .= ''.&mt('Load Balancer: [_1] -- cookie use enabled',
- $balancer).'';
- }
- }
- }
- }
- if (keys(%toupdate)) {
- my %thismachine;
- my $updatedhere;
- my $cachetime = 60*60*24;
- map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
- foreach my $lonhost (keys(%toupdate)) {
- if ($thismachine{$lonhost}) {
- unless ($updatedhere) {
- &Apache::lonnet::do_cache_new('loadbalancing',$dom,
- $defaultshash{'loadbalancing'},
- $cachetime);
- $updatedhere = 1;
+ if (keys(%toupdate)) {
+ my %thismachine;
+ my $updatedhere;
+ my $cachetime = 60*60*24;
+ map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
+ foreach my $lonhost (keys(%toupdate)) {
+ if ($thismachine{$lonhost}) {
+ unless ($updatedhere) {
+ &Apache::lonnet::do_cache_new('loadbalancing',$dom,
+ $defaultshash{'loadbalancing'},
+ $cachetime);
+ $updatedhere = 1;
+ }
+ } else {
+ my $cachekey = &escape('loadbalancing').':'.&escape($dom);
+ &Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]);
+ }
}
- } else {
- my $cachekey = &escape('loadbalancing').':'.&escape($dom);
- &Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]);
}
}
}
@@ -20287,9 +12443,24 @@ sub recurse_cat_deletes {
return;
}
+sub get_active_dcs {
+ my ($dom) = @_;
+ my $now = time;
+ my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc'],$now,$now);
+ my %domcoords;
+ my $numdcs = 0;
+ foreach my $server (keys(%dompersonnel)) {
+ foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {
+ my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
+ $domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user};
+ }
+ }
+ return %domcoords;
+}
+
sub active_dc_picker {
my ($dom,$numinrow,$inputtype,$name,%currhash) = @_;
- my %domcoords = &Apache::lonnet::get_active_domroles($dom,['dc']);
+ my %domcoords = &get_active_dcs($dom);
my @domcoord = keys(%domcoords);
if (keys(%currhash)) {
foreach my $dc (keys(%currhash)) {
@@ -20437,12 +12608,12 @@ sub lonbalance_targets_js {
}
push(@alltypes,'default','_LC_adv','_LC_author','_LC_internetdom','_LC_external');
$allinsttypes = join("','",@alltypes);
- my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
+ my (%currbalancer,%currtargets,%currrules,%existing);
if (ref($settings) eq 'HASH') {
%existing = %{$settings};
}
&get_loadbalancers_config($servers,\%existing,\%currbalancer,
- \%currtargets,\%currrules,\%currcookies);
+ \%currtargets,\%currrules);
my $balancers = join("','",sort(keys(%currbalancer)));
return <<"END";
@@ -20795,7 +12966,7 @@ function updateNewSpares(formname,lonhos
function checkNewSpares(lonhost,type) {
var newSpare = document.getElementById('newspare_'+type+'_'+lonhost);
var chosen = newSpare.options[newSpare.selectedIndex].value;
- if (chosen != '') {
+ if (chosen != '') {
var othertype;
var othernewSpare;
if (type == 'primary') {
@@ -20853,8 +13024,6 @@ function updateCaptcha(caller,context) {
var pubitem;
var privtext;
var pubtext;
- var versionitem;
- var versiontext;
if (document.getElementById(context+'_recaptchapub')) {
pubitem = document.getElementById(context+'_recaptchapub');
} else {
@@ -20875,16 +13044,6 @@ function updateCaptcha(caller,context) {
} else {
return;
}
- if (document.getElementById(context+'_recaptchaversion')) {
- versionitem = document.getElementById(context+'_recaptchaversion');
- } else {
- return;
- }
- if (document.getElementById(context+'_recaptchavertxt')) {
- versiontext = document.getElementById(context+'_recaptchavertxt');
- } else {
- return;
- }
if (caller.checked) {
if (caller.value == 'recaptcha') {
pubitem.type = 'text';
@@ -20893,16 +13052,11 @@ function updateCaptcha(caller,context) {
privitem.size = '40';
pubtext.innerHTML = "$lt{'pub'}";
privtext.innerHTML = "$lt{'priv'}";
- versionitem.type = 'text';
- versionitem.size = '3';
- versiontext.innerHTML = "$lt{'ver'}";
} else {
pubitem.type = 'hidden';
privitem.type = 'hidden';
- versionitem.type = 'hidden';
pubtext.innerHTML = '';
privtext.innerHTML = '';
- versiontext.innerHTML = '';
}
}
return;
@@ -20927,9 +13081,8 @@ function toggleDisplay(domForm,caller) {
var optionsElement = domForm.coursecredits;
var checkval = 1;
var dispval = 'block';
- var selfcreateRegExp = /^cancreate_emailverified/;
if (caller == 'emailoptions') {
- optionsElement = domForm.cancreate_email;
+ optionsElement = domForm.cancreate_email;
}
if (caller == 'studentsubmission') {
optionsElement = domForm.postsubmit;
@@ -20938,11 +13091,6 @@ function toggleDisplay(domForm,caller) {
optionsElement = domForm.canclone;
checkval = 'instcode';
}
- if (selfcreateRegExp.test(caller)) {
- optionsElement = domForm.elements[caller];
- checkval = 'other';
- dispval = 'inline'
- }
if (optionsElement.length) {
var currval;
for (var i=0; i 'original (CAPTCHA)',
recaptcha => 'successor (ReCAPTCHA)',
notused => 'unused',
- ver => 'ReCAPTCHA version (1 or 2)',
);
}
@@ -20984,49 +13131,16 @@ sub devalidate_remote_domconfs {
my %servers = &Apache::lonnet::internet_dom_servers($dom);
my %thismachine;
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
- my @posscached = ('domainconfig','domdefaults','ltitools','usersessions',
- 'directorysrch','passwdconf','cats','proxyalias','proxysaml',
- 'ipaccess');
- my %cache_by_lonhost;
- if (exists($cachekeys->{'samllanding'})) {
- if (ref($cachekeys->{'samllanding'}) eq 'HASH') {
- my %landing = %{$cachekeys->{'samllanding'}};
- my %domservers = &Apache::lonnet::get_servers($dom);
- if (keys(%domservers)) {
- foreach my $server (keys(%domservers)) {
- my @cached;
- next if ($thismachine{$server});
- if ($landing{$server}) {
- push(@cached,&escape('samllanding').':'.&escape($server));
- }
- if (@cached) {
- $cache_by_lonhost{$server} = \@cached;
- }
- }
- }
- }
- }
+ my @posscached = ('domainconfig','domdefaults','ltitools');
if (keys(%servers)) {
foreach my $server (keys(%servers)) {
next if ($thismachine{$server});
my @cached;
foreach my $name (@posscached) {
if ($cachekeys->{$name}) {
- if (($name eq 'proxyalias') || ($name eq 'proxysaml')) {
- if (ref($cachekeys->{$name}) eq 'HASH') {
- foreach my $key (keys(%{$cachekeys->{$name}})) {
- push(@cached,&escape($name).':'.&escape($key));
- }
- }
- } else {
- push(@cached,&escape($name).':'.&escape($dom));
- }
+ push(@cached,&escape($name).':'.&escape($dom));
}
}
- if ((exists($cache_by_lonhost{$server})) &&
- (ref($cache_by_lonhost{$server}) eq 'ARRAY')) {
- push(@cached,@{$cache_by_lonhost{$server}});
- }
if (@cached) {
&Apache::lonnet::remote_devalidate_cache($server,\@cached);
}
|