version 1.125, 2010/02/16 17:31:47
|
version 1.130, 2010/03/11 21:18:24
|
Line 658 sub print_login {
|
Line 658 sub print_login {
|
my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_; |
my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_; |
my ($css_class,$datatable); |
my ($css_class,$datatable); |
my %choices = &login_choices(); |
my %choices = &login_choices(); |
my $itemcount = 1; |
|
|
|
if ($position eq 'top') { |
if ($position eq 'top') { |
my %servers = &dom_servers($dom); |
my %servers = &dom_servers($dom); |
my $choice = $choices{'disallowlogin'}; |
my $choice = $choices{'disallowlogin'}; |
$css_class = ' class="LC_odd_row"'; |
$css_class = ' class="LC_odd_row"'; |
$datatable .= '<tr'.$css_class.'><td>'.$choices{'disallowlogin'}.'</td>'. |
$datatable .= '<tr'.$css_class.'><td>'.$choice.'</td>'. |
'<td align="right"><table><tr><th>'.$choices{'hostid'}.'</th>'. |
'<td align="right"><table><tr><th>'.$choices{'hostid'}.'</th>'. |
'<th>'.$choices{'serverurl'}.'</th></tr>'."\n"; |
'<th>'.$choices{'server'}.'</th>'. |
|
'<th>'.$choices{'serverpath'}.'</th>'. |
|
'<th>'.$choices{'custompath'}.'</th>'. |
|
'<th><span class="LC_nobreak">'.$choices{'exempt'}.'</span></th></tr>'."\n"; |
my %disallowed; |
my %disallowed; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'loginvia'}) eq 'HASH') { |
if (ref($settings->{'loginvia'}) eq 'HASH') { |
Line 675 sub print_login {
|
Line 677 sub print_login {
|
} |
} |
foreach my $lonhost (sort(keys(%servers))) { |
foreach my $lonhost (sort(keys(%servers))) { |
my $direct = 'selected="selected"'; |
my $direct = 'selected="selected"'; |
if ($disallowed{$lonhost} eq '') { |
if (ref($disallowed{$lonhost}) eq 'HASH') { |
$direct = ''; |
if ($disallowed{$lonhost}{'server'} ne '') { |
|
$direct = ''; |
|
} |
} |
} |
$datatable .= '<tr><td>'.$servers{$lonhost}.'</td>'. |
$datatable .= '<tr><td>'.$servers{$lonhost}.'</td>'. |
'<td><select name="'.$lonhost.'_serverurl">'. |
'<td><select name="'.$lonhost.'_server">'. |
'<option value=""'.$direct.'>'.$choices{'directlogin'}. |
'<option value=""'.$direct.'>'.$choices{'directlogin'}. |
'</option>'; |
'</option>'; |
foreach my $hostid (keys(%servers)) { |
foreach my $hostid (keys(%servers)) { |
next if ($servers{$hostid} eq $servers{$lonhost}); |
next if ($servers{$hostid} eq $servers{$lonhost}); |
my $selected = ''; |
my $selected = ''; |
if ($hostid eq $disallowed{$lonhost}) { |
if (ref($disallowed{$lonhost}) eq 'HASH') { |
$selected = 'selected="selected"'; |
if ($hostid eq $disallowed{$lonhost}{'server'}) { |
|
$selected = 'selected="selected"'; |
|
} |
} |
} |
$datatable .= '<option value="'.$hostid.'"'.$selected.'>'. |
$datatable .= '<option value="'.$hostid.'"'.$selected.'>'. |
$servers{$hostid}.'</option>'; |
$servers{$hostid}.'</option>'; |
} |
} |
$datatable .= '</select></td></tr>'; |
$datatable .= '</select></td>'. |
|
'<td><select name="'.$lonhost.'_serverpath">'; |
|
foreach my $path ('','/','/adm/login','/adm/roles','custom') { |
|
my $pathname = $path; |
|
if ($path eq 'custom') { |
|
$pathname = &mt('Custom Path').' ->'; |
|
} |
|
my $selected = ''; |
|
if (ref($disallowed{$lonhost}) eq 'HASH') { |
|
if ($path eq $disallowed{$lonhost}{'serverpath'}) { |
|
$selected = 'selected="selected"'; |
|
} |
|
} elsif ($path eq '') { |
|
$selected = 'selected="selected"'; |
|
} |
|
$datatable .= '<option value="'.$path.'"'.$selected.'>'.$pathname.'</option>'; |
|
} |
|
$datatable .= '</select></td>'; |
|
my ($custom,$exempt); |
|
if (ref($disallowed{$lonhost}) eq 'HASH') { |
|
$custom = $disallowed{$lonhost}{'custompath'}; |
|
$exempt = $disallowed{$lonhost}{'exempt'}; |
|
} |
|
$datatable .= '<td><input type="text" name="'.$lonhost.'_custompath" size="6" value="'.$custom.'" /></td>'. |
|
'<td><input type="text" name="'.$lonhost.'_exempt" size="8" value="'.$exempt.'" /></td>'. |
|
'</tr>'; |
} |
} |
$datatable .= '</table></td></tr>'; |
$datatable .= '</table></td></tr>'; |
return $datatable; |
return $datatable; |
Line 835 sub login_choices {
|
Line 866 sub login_choices {
|
adminmail => "Display Administrator's E-mail Address?", |
adminmail => "Display Administrator's E-mail Address?", |
disallowlogin => "Login page requests redirected", |
disallowlogin => "Login page requests redirected", |
hostid => "Server", |
hostid => "Server", |
serverurl => "Redirect to log-in via:", |
server => "Redirect to:", |
|
serverpath => "Path", |
|
custompath => "Custom", |
|
exempt => "Exempt IP(s)", |
directlogin => "No redirect", |
directlogin => "No redirect", |
newuser => "Link to create a user account", |
newuser => "Link to create a user account", |
img => "Header", |
img => "Header", |
Line 1327 sub print_quotas {
|
Line 1361 sub print_quotas {
|
$cell{$item} .= '<span class="LC_nobreak"><label>'. |
$cell{$item} .= '<span class="LC_nobreak"><label>'. |
'<input type="radio" name="crsreq_'.$item. |
'<input type="radio" name="crsreq_'.$item. |
'_'.$type.'" value="'.$val.'"'.$checked.' />'. |
'_'.$type.'" value="'.$val.'"'.$checked.' />'. |
$titles{$option}.'</label> '; |
$titles{$option}.'</label>'; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$cell{$item} .= '<input type="text" name="crsreq_'. |
$cell{$item} .= ' <input type="text" name="crsreq_'. |
$item.'_limit_'.$type.'" size="1" '. |
$item.'_limit_'.$type.'" size="1" '. |
'value="'.$currlimit.'" />'; |
'value="'.$currlimit.'" />'; |
} |
} |
$cell{$item} .= '</span> '; |
$cell{$item} .= '</span> '; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$cell{$item} .= $titles{'unlimited'} |
$cell{$item} .= $titles{'unlimited'}; |
} |
} |
} |
} |
} else { |
} else { |
Line 1435 sub print_quotas {
|
Line 1469 sub print_quotas {
|
'_default" value="'.$val.'"'.$checked.' />'. |
'_default" value="'.$val.'"'.$checked.' />'. |
$titles{$option}.'</label>'; |
$titles{$option}.'</label>'; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$defcell{$item} .= '<input type="text" name="crsreq_'. |
$defcell{$item} .= ' <input type="text" name="crsreq_'. |
$item.'_limit_default" size="1" '. |
$item.'_limit_default" size="1" '. |
'value="'.$currlimit.'" />'; |
'value="'.$currlimit.'" />'; |
} |
} |
$defcell{$item} .= '</span> '; |
$defcell{$item} .= '</span> '; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$defcell{$item} .= $titles{'unlimited'} |
$defcell{$item} .= $titles{'unlimited'}; |
} |
} |
} |
} |
} else { |
} else { |
Line 1538 sub print_quotas {
|
Line 1572 sub print_quotas {
|
'__LC_adv" value="'.$val.'"'.$checked.' />'. |
'__LC_adv" value="'.$val.'"'.$checked.' />'. |
$titles{$option}.'</label>'; |
$titles{$option}.'</label>'; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$advcell{$item} .= '<input type="text" name="crsreq_'. |
$advcell{$item} .= ' <input type="text" name="crsreq_'. |
$item.'_limit__LC_adv" size="1" '. |
$item.'_limit__LC_adv" size="1" '. |
'value="'.$currlimit.'" />'; |
'value="'.$currlimit.'" />'; |
} |
} |
$advcell{$item} .= '</span> '; |
$advcell{$item} .= '</span> '; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$advcell{$item} .= $titles{'unlimited'} |
$advcell{$item} .= $titles{'unlimited'}; |
} |
} |
} |
} |
} else { |
} else { |
Line 1657 sub print_courserequestmail {
|
Line 1691 sub print_courserequestmail {
|
sub print_autoenroll { |
sub print_autoenroll { |
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$settings,$rowtotal) = @_; |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my ($defdom,$runon,$runoff); |
my ($defdom,$runon,$runoff,$coownerson,$coownersoff); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (exists($settings->{'run'})) { |
if (exists($settings->{'run'})) { |
if ($settings->{'run'} eq '0') { |
if ($settings->{'run'} eq '0') { |
Line 1676 sub print_autoenroll {
|
Line 1710 sub print_autoenroll {
|
$runon = ' '; |
$runon = ' '; |
} |
} |
} |
} |
|
if (exists($settings->{'co-owners'})) { |
|
if ($settings->{'co-owners'} eq '0') { |
|
$coownersoff = ' checked="checked" '; |
|
$coownerson = ' '; |
|
} else { |
|
$coownerson = ' checked="checked" '; |
|
$coownersoff = ' '; |
|
} |
|
} else { |
|
$coownersoff = ' checked="checked" '; |
|
$coownerson = ' '; |
|
} |
if (exists($settings->{'sender_domain'})) { |
if (exists($settings->{'sender_domain'})) { |
$defdom = $settings->{'sender_domain'}; |
$defdom = $settings->{'sender_domain'}; |
} |
} |
Line 1706 sub print_autoenroll {
|
Line 1752 sub print_autoenroll {
|
&mt('username').': '. |
&mt('username').': '. |
'<input type="text" name="sender_uname" value="'. |
'<input type="text" name="sender_uname" value="'. |
$notif_sender.'" size="10" /> '.&mt('domain'). |
$notif_sender.'" size="10" /> '.&mt('domain'). |
': '.$domform.'</span></td></tr>'; |
': '.$domform.'</span></td></tr>'. |
$$rowtotal += 2; |
'<tr class="LC_odd_row">'. |
|
'<td>'.&mt('Automatically assign co-ownership').'</td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="autoassign_coowners"'. |
|
$coownerson.' value="1" />'.&mt('Yes').'</label> '. |
|
'<label><input type="radio" name="autoassign_coowners"'. |
|
$coownersoff.' value="0" />'.&mt('No').'</label></span></td>'. |
|
'</tr>'; |
|
$$rowtotal += 3; |
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 2707 sub print_scantronformat {
|
Line 2761 sub print_scantronformat {
|
'<span class="LC_nobreak">'; |
'<span class="LC_nobreak">'; |
if ($scantronurl) { |
if ($scantronurl) { |
$datatable .= '<a href="'.$scantronurl.'" target="_blank">'. |
$datatable .= '<a href="'.$scantronurl.'" target="_blank">'. |
&mt('Default scantron format file').'</a>'; |
&mt('Default bubblesheet format file').'</a>'; |
} else { |
} else { |
$datatable = &mt('File unavailable for display'); |
$datatable = &mt('File unavailable for display'); |
} |
} |
Line 2734 sub print_scantronformat {
|
Line 2788 sub print_scantronformat {
|
} elsif ($scantronurl) { |
} elsif ($scantronurl) { |
$datatable .= '<td><span class="LC_nobreak">'. |
$datatable .= '<td><span class="LC_nobreak">'. |
'<a href="'.$scantronurl.'" target="_blank">'. |
'<a href="'.$scantronurl.'" target="_blank">'. |
&mt('Custom scantron format file').'</a><label>'. |
&mt('Custom bubblesheet format file').'</a><label>'. |
'<input type="checkbox" name="scantronformat_del"'. |
'<input type="checkbox" name="scantronformat_del"'. |
'" value="1" />'.&mt('Delete?').'</label></span></td>'. |
'" value="1" />'.&mt('Delete?').'</label></span></td>'. |
'<td><span class="LC_nobreak"> '. |
'<td><span class="LC_nobreak"> '. |
Line 2763 sub legacy_scantronformat {
|
Line 2817 sub legacy_scantronformat {
|
&publishlogo($r,'copy',$legacyfile,$dom,$confname,'scantron', |
&publishlogo($r,'copy',$legacyfile,$dom,$confname,'scantron', |
'','',$newfile); |
'','',$newfile); |
if ($result ne 'ok') { |
if ($result ne 'ok') { |
$error = &mt("An error occurred publishing the [_1] scantron format file in RES space. Error was: [_2].",$newfile,$result); |
$error = &mt("An error occurred publishing the [_1] bubblesheet format file in RES space. Error was: [_2].",$newfile,$result); |
} |
} |
} |
} |
return ($url,$error); |
return ($url,$error); |
Line 3506 sub modify_login {
|
Line 3560 sub modify_login {
|
} |
} |
|
|
my %servers = &dom_servers($dom); |
my %servers = &dom_servers($dom); |
|
my @loginvia_attribs = ('serverpath','custompath','exempt'); |
if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
foreach my $lonhost (keys(%servers)) { |
foreach my $lonhost (keys(%servers)) { |
next if ($env{'form.'.$lonhost.'_serverurl'} eq $lonhost); |
next if ($env{'form.'.$lonhost.'_server'} eq $lonhost); |
if ($env{'form.'.$lonhost.'_serverurl'} eq $curr_loginvia{$lonhost}) { |
if (ref($curr_loginvia{$lonhost}) eq 'HASH') { |
$loginhash{login}{loginvia}{$lonhost} = $curr_loginvia{$lonhost}; next; |
if ($env{'form.'.$lonhost.'_server'} eq $curr_loginvia{$lonhost}{'server'}) { |
} |
$loginhash{login}{loginvia}{$lonhost}{'server'} = $curr_loginvia{$lonhost}{'server'}; |
if ($curr_loginvia{$lonhost} ne '') { |
} elsif ($curr_loginvia{$lonhost}{'server'} ne '') { |
$loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'}; |
if (defined($servers{$env{'form.'.$lonhost.'_server'}})) { |
$changes{'loginvia'}{$lonhost} = 1; |
$loginhash{login}{loginvia}{$lonhost}{'server'} = $env{'form.'.$lonhost.'_server'}; |
|
$changes{'loginvia'}{$lonhost} = 1; |
|
} else { |
|
$loginhash{login}{loginvia}{$lonhost}{'server'} = ''; |
|
$changes{'loginvia'}{$lonhost} = 1; |
|
} |
|
} else { |
|
if (defined($servers{$env{'form.'.$lonhost.'_server'}})) { |
|
$loginhash{login}{loginvia}{$lonhost}{'server'} = $env{'form.'.$lonhost.'_server'}; |
|
$changes{'loginvia'}{$lonhost} = 1; |
|
} |
|
} |
|
if ($loginhash{login}{loginvia}{$lonhost}{'server'} eq '') { |
|
foreach my $item (@loginvia_attribs) { |
|
$loginhash{login}{loginvia}{$lonhost}{$item} = ''; |
|
} |
|
} else { |
|
foreach my $item (@loginvia_attribs) { |
|
my $new = $env{'form.'.$lonhost.'_'.$item}; |
|
if (($item eq 'serverpath') && ($new eq 'custom')) { |
|
$env{'form.'.$lonhost.'_custompath'} =~ s/\s+//g; |
|
if ($env{'form.'.$lonhost.'_custompath'} eq '') { |
|
$new = '/'; |
|
} |
|
} |
|
if (($item eq 'custompath') && |
|
($env{'form.'.$lonhost.'_serverpath'} ne 'custom')) { |
|
$new = ''; |
|
} |
|
if ($new ne $curr_loginvia{$lonhost}{$item}) { |
|
$changes{'loginvia'}{$lonhost} = 1; |
|
} |
|
if ($item eq 'exempt') { |
|
$new =~ s/^\s+//; |
|
$new =~ s/\s+$//; |
|
my @poss_ips = split(/\s*[,:]\s*/,$new); |
|
my @okips; |
|
foreach my $ip (@poss_ips) { |
|
if ($ip =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) { |
|
if (($1 <= 255) && ($2 <= 255) && ($3 <= 255) && ($4 <= 255)) { |
|
push(@okips,$ip); |
|
} |
|
} |
|
} |
|
if (@okips > 0) { |
|
$new = join(',',@okips); |
|
} else { |
|
$new = ''; |
|
} |
|
} |
|
|
|
$loginhash{login}{loginvia}{$lonhost}{$item} = $new; |
|
} |
|
} |
} else { |
} else { |
if (defined($servers{$env{'form.'.$lonhost.'_serverurl'}})) { |
if (defined($servers{$env{'form.'.$lonhost.'_server'}})) { |
$loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'}; |
$loginhash{login}{loginvia}{$lonhost}{'server'} = $env{'form.'.$lonhost.'_server'}; |
$changes{'loginvia'}{$lonhost} = 1; |
$changes{'loginvia'}{$lonhost} = 1; |
|
foreach my $item (@loginvia_attribs) { |
|
my $new = $env{'form.'.$lonhost.'_'.$item}; |
|
if (($item eq 'serverpath') && ($new eq 'custom')) { |
|
if ($env{'form.'.$lonhost.'_custompath'} eq '') { |
|
$new = '/'; |
|
} |
|
} |
|
if (($item eq 'custompath') && |
|
($env{'form.'.$lonhost.'_serverpath'} ne 'custom')) { |
|
$new = ''; |
|
} |
|
$loginhash{login}{loginvia}{$lonhost}{$item} = $new; |
|
} |
} |
} |
} |
} |
} |
} |
Line 3574 sub modify_login {
|
Line 3695 sub modify_login {
|
if (ref($changes{$item}) eq 'HASH') { |
if (ref($changes{$item}) eq 'HASH') { |
$resulttext .= '<li>'.&mt('Log-in page availability:').'<ul>'; |
$resulttext .= '<li>'.&mt('Log-in page availability:').'<ul>'; |
foreach my $lonhost (sort(keys(%{$changes{$item}}))) { |
foreach my $lonhost (sort(keys(%{$changes{$item}}))) { |
if ($servers{$env{'form.'.$lonhost.'_serverurl'}} ne '') { |
if (defined($servers{$loginhash{login}{loginvia}{$lonhost}{'server'}})) { |
$resulttext .= '<li>'.&mt('Server: [_1] log-in page now redirects to [_2]',$lonhost,$servers{$env{'form.'.$lonhost.'_serverurl'}}).'</li>'; |
if (ref($loginhash{login}{loginvia}{$lonhost}) eq 'HASH') { |
|
my $protocol = $Apache::lonnet::protocol{$env{'form.'.$lonhost.'_server'}}; |
|
$protocol = 'http' if ($protocol ne 'https'); |
|
my $target = $protocol.'://'.$servers{$env{'form.'.$lonhost.'_server'}}; |
|
|
|
if ($loginhash{login}{loginvia}{$lonhost}{'serverpath'} eq 'custom') { |
|
$target .= $loginhash{login}{loginvia}{$lonhost}{'custompath'}; |
|
} else { |
|
$target .= $loginhash{login}{loginvia}{$lonhost}{'serverpath'}; |
|
} |
|
$resulttext .= '<li>'.&mt('Server: [_1] log-in page redirects to [_2].',$servers{$lonhost},'<a href="'.$target.'">'.$target.'</a>'); |
|
if ($loginhash{login}{loginvia}{$lonhost}{'exempt'} ne '') { |
|
$resulttext .= ' '.&mt('No redirection for clients from following IPs:').' '.$loginhash{login}{loginvia}{$lonhost}{'exempt'}; |
|
} |
|
$resulttext .= '</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Server: [_1] has standard log-in page.',$lonhost).'</li>'; |
|
} |
} else { |
} else { |
$resulttext .= '<li>'.&mt('Server: [_1] now has standard log-in page.',$lonhost).'</li>'; |
$resulttext .= '<li>'.&mt('Server: [_1] has standard log-in page.',$servers{$lonhost}).'</li>'; |
} |
} |
} |
} |
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
} else { |
} else { |
$resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>'; |
$resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>'; |
Line 4516 sub modify_autoenroll {
|
Line 4654 sub modify_autoenroll {
|
} |
} |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my %title = ( run => 'Auto-enrollment active', |
my %title = ( run => 'Auto-enrollment active', |
sender => 'Sender for notification messages'); |
sender => 'Sender for notification messages', |
|
coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)'); |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
my $sender_uname = $env{'form.sender_uname'}; |
my $sender_uname = $env{'form.sender_uname'}; |
my $sender_domain = $env{'form.sender_domain'}; |
my $sender_domain = $env{'form.sender_domain'}; |
Line 4525 sub modify_autoenroll {
|
Line 4664 sub modify_autoenroll {
|
} elsif ($sender_uname eq '') { |
} elsif ($sender_uname eq '') { |
$sender_domain = ''; |
$sender_domain = ''; |
} |
} |
|
my $coowners = $env{'form.autoassign_coowners'}; |
my %autoenrollhash = ( |
my %autoenrollhash = ( |
autoenroll => { run => $env{'form.autoenroll_run'}, |
autoenroll => { 'run' => $env{'form.autoenroll_run'}, |
sender_uname => $sender_uname, |
'sender_uname' => $sender_uname, |
sender_domain => $sender_domain, |
'sender_domain' => $sender_domain, |
|
'co-owners' => $coowners, |
} |
} |
); |
); |
my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash, |
Line 4550 sub modify_autoenroll {
|
Line 4690 sub modify_autoenroll {
|
if ($currautoenroll{'sender_domain'} ne $sender_domain) { |
if ($currautoenroll{'sender_domain'} ne $sender_domain) { |
$changes{'sender'} = 1; |
$changes{'sender'} = 1; |
} |
} |
|
if ($currautoenroll{'co-owners'} ne '') { |
|
if ($currautoenroll{'co-owners'} ne $coowners) { |
|
$changes{'coowners'} = 1; |
|
} |
|
} elsif ($coowners) { |
|
$changes{'coowners'} = 1; |
|
} |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
if ($changes{'run'}) { |
if ($changes{'run'}) { |
Line 4562 sub modify_autoenroll {
|
Line 4709 sub modify_autoenroll {
|
$resulttext .= '<li>'.&mt("$title{'sender'} set to [_1]",$sender_uname.':'.$sender_domain).'</li>'; |
$resulttext .= '<li>'.&mt("$title{'sender'} set to [_1]",$sender_uname.':'.$sender_domain).'</li>'; |
} |
} |
} |
} |
|
if ($changes{'coowners'}) { |
|
$resulttext .= '<li>'.&mt("$title{'coowners'} set to $offon[$env{'form.autoassign_coowners'}]").'</li>'; |
|
&Apache::loncommon::devalidate_domconfig_cache($dom); |
|
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext = &mt('No changes made to auto-enrollment settings'); |
$resulttext = &mt('No changes made to auto-enrollment settings'); |
Line 5521 sub modify_usermodification {
|
Line 5672 sub modify_usermodification {
|
} |
} |
my @modifiable; |
my @modifiable; |
if ($context eq 'selfcreate') { |
if ($context eq 'selfcreate') { |
$resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Self-creation of account by users with status: [_1] ',$rolename).'</span> - '.&mt('modifiable fields (if institutional data blank): '); |
$resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Self-creation of account by users with status: [_1]',$rolename).'</span> - '.&mt('modifiable fields (if institutional data blank): '); |
} else { |
} else { |
$resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Target user with [_1] role',$rolename).'</span> - '.&mt('modifiable fields: '); |
$resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Target user with [_1] role',$rolename).'</span> - '.&mt('modifiable fields: '); |
} |
} |
Line 5665 sub modify_scantron {
|
Line 5816 sub modify_scantron {
|
my $error; |
my $error; |
if ($configuserok eq 'ok') { |
if ($configuserok eq 'ok') { |
if ($switchserver) { |
if ($switchserver) { |
$error = &mt("Upload of scantron format file is not permitted to this server: [_1]",$switchserver); |
$error = &mt("Upload of bubblesheet format file is not permitted to this server: [_1]",$switchserver); |
} else { |
} else { |
if ($author_ok eq 'ok') { |
if ($author_ok eq 'ok') { |
my ($result,$scantronurl) = |
my ($result,$scantronurl) = |
Line 5705 sub modify_scantron {
|
Line 5856 sub modify_scantron {
|
if (ref($confhash{'scantron'}) eq 'HASH') { |
if (ref($confhash{'scantron'}) eq 'HASH') { |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
if ($confhash{'scantron'}{'scantronformat'} eq '') { |
if ($confhash{'scantron'}{'scantronformat'} eq '') { |
$resulttext .= '<li>'.&mt('[_1] scantron format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('Custom scantron format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>'; |
$resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>'; |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext = &mt('Changes made to scantron format file.'); |
$resulttext = &mt('Changes made to bubblesheet format file.'); |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
} else { |
} else { |
$resulttext = &mt('No changes made to scantron format file'); |
$resulttext = &mt('No changes made to bubblesheet format file'); |
} |
} |
} else { |
} else { |
$resulttext = '<span class="LC_error">'. |
$resulttext = '<span class="LC_error">'. |
&mt('An error occurred: [_1]',$putresult).'</span>'; |
&mt('An error occurred: [_1]',$putresult).'</span>'; |
} |
} |
} else { |
} else { |
$resulttext = &mt('No changes made to scantron format file'); |
$resulttext = &mt('No changes made to bubblesheet format file'); |
} |
} |
if ($errors) { |
if ($errors) { |
$resulttext .= &mt('The following errors occurred: ').'<ul>'. |
$resulttext .= &mt('The following errors occurred: ').'<ul>'. |