version 1.126, 2010/02/19 15:41:40
|
version 1.128, 2010/03/03 16:43:41
|
Line 664 sub print_login {
|
Line 664 sub print_login {
|
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 678 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 867 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 1362 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 1470 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 1573 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 3506 sub modify_login {
|
Line 3541 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 3676 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>'; |