version 1.111, 2009/10/06 18:24:29
|
version 1.114, 2009/10/20 14:29:44
|
Line 657 sub print_login {
|
Line 657 sub print_login {
|
'coursecatalog' => 'on', |
'coursecatalog' => 'on', |
'adminmail' => 'off', |
'adminmail' => 'off', |
'newuser' => 'off', |
'newuser' => 'off', |
|
'submitbugs' => 'on', |
); |
); |
my @toggles = ('coursecatalog','adminmail','newuser'); |
my @toggles = ('coursecatalog','adminmail','newuser','submitbugs'); |
my (%checkedon,%checkedoff); |
my (%checkedon,%checkedoff); |
foreach my $item (@toggles) { |
foreach my $item (@toggles) { |
if ($defaultchecked{$item} eq 'on') { |
if ($defaultchecked{$item} eq 'on') { |
Line 790 sub login_choices {
|
Line 791 sub login_choices {
|
coursecatalog => 'Display Course Catalog link?', |
coursecatalog => 'Display Course Catalog link?', |
adminmail => "Display Administrator's E-mail Address?", |
adminmail => "Display Administrator's E-mail Address?", |
disallowlogin => "Login page requests redirected", |
disallowlogin => "Login page requests redirected", |
|
submitbugs => "Display "Submit Bug" link?", |
hostid => "Server", |
hostid => "Server", |
serverurl => "Redirect to log-in via:", |
serverurl => "Redirect to log-in via:", |
directlogin => "No redirect", |
directlogin => "No redirect", |
Line 2721 sub print_serverstatuses {
|
Line 2723 sub print_serverstatuses {
|
sub serverstatus_pages { |
sub serverstatus_pages { |
return ('userstatus','lonstatus','loncron','server-status','codeversions', |
return ('userstatus','lonstatus','loncron','server-status','codeversions', |
'clusterstatus','metadata_keywords','metadata_harvest', |
'clusterstatus','metadata_keywords','metadata_harvest', |
'takeoffline','takeonline','showenv'); |
'takeoffline','takeonline','showenv','toggledebug'); |
} |
} |
|
|
sub coursecategories_javascript { |
sub coursecategories_javascript { |
Line 3137 sub modify_login {
|
Line 3139 sub modify_login {
|
my %title = ( coursecatalog => 'Display course catalog', |
my %title = ( coursecatalog => 'Display course catalog', |
adminmail => 'Display administrator E-mail address', |
adminmail => 'Display administrator E-mail address', |
newuser => 'Link for visitors to create a user account', |
newuser => 'Link for visitors to create a user account', |
|
submitbugs => 'Link for users to submit a bug', |
loginheader => 'Log-in box header'); |
loginheader => 'Log-in box header'); |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
|
my %curr_loginvia; |
|
if (ref($domconfig{login}) eq 'HASH') { |
|
if (ref($domconfig{login}{loginvia}) eq 'HASH') { |
|
foreach my $lonhost (keys(%{$domconfig{login}{loginvia}})) { |
|
$curr_loginvia{$lonhost} = $domconfig{login}{loginvia}{$lonhost}; |
|
} |
|
} |
|
} |
my %loginhash; |
my %loginhash; |
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], |
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], |
\%domconfig,\%loginhash); |
\%domconfig,\%loginhash); |
my @toggles = ('coursecatalog','adminmail','newuser'); |
my @toggles = ('coursecatalog','adminmail','newuser','submitbugs'); |
foreach my $item (@toggles) { |
foreach my $item (@toggles) { |
$loginhash{login}{$item} = $env{'form.'.$item}; |
$loginhash{login}{$item} = $env{'form.'.$item}; |
} |
} |
Line 3155 sub modify_login {
|
Line 3166 sub modify_login {
|
my %servers = &Apache::lonnet::get_servers($dom); |
my %servers = &Apache::lonnet::get_servers($dom); |
if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
foreach my $lonhost (keys(%servers)) { |
foreach my $lonhost (keys(%servers)) { |
if ($env{'form.'.$lonhost.'_serverurl'} ne '') { |
next if ($env{'form.'.$lonhost.'_serverurl'} eq $curr_loginvia{$lonhost}); |
|
next if ($env{'form.'.$lonhost.'_serverurl'} eq $lonhost); |
|
if ($curr_loginvia{$lonhost} ne '') { |
|
$loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'}; |
|
$changes{'loginvia'}{$lonhost} = 1; |
|
} else { |
if (defined($servers{$env{'form.'.$lonhost.'_serverurl'}})) { |
if (defined($servers{$env{'form.'.$lonhost.'_serverurl'}})) { |
$loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'}; |
$loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'}; |
$changes{$item} = 1; |
$changes{'loginvia'}{$lonhost} = 1; |
} |
} |
} |
} |
} |
} |
Line 3167 sub modify_login {
|
Line 3183 sub modify_login {
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash, |
$dom); |
$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
my @toggles = ('coursecatalog','adminmail','newuser'); |
my @toggles = ('coursecatalog','adminmail','newuser','submitbugs'); |
my %defaultchecked = ( |
my %defaultchecked = ( |
'coursecatalog' => 'on', |
'coursecatalog' => 'on', |
'adminmail' => 'off', |
'adminmail' => 'off', |
'newuser' => 'off', |
'newuser' => 'off', |
|
'submitbugs' => 'on', |
); |
); |
if (ref($domconfig{'login'}) eq 'HASH') { |
if (ref($domconfig{'login'}) eq 'HASH') { |
foreach my $item (@toggles) { |
foreach my $item (@toggles) { |
Line 3210 sub modify_login {
|
Line 3227 sub modify_login {
|
foreach my $item (sort(keys(%changes))) { |
foreach my $item (sort(keys(%changes))) { |
if ($item eq 'loginheader') { |
if ($item eq 'loginheader') { |
$resulttext .= '<li>'.&mt("$title{$item} set to $env{'form.loginheader'}").'</li>'; |
$resulttext .= '<li>'.&mt("$title{$item} set to $env{'form.loginheader'}").'</li>'; |
|
} elsif ($item eq 'loginvia') { |
|
if (ref($changes{$item}) eq 'HASH') { |
|
$resulttext .= '<li>'.&mt('Log-in page availability:').'<ul>'; |
|
foreach my $lonhost (sort(keys(%{$changes{$item}}))) { |
|
if ($servers{$env{'form.'.$lonhost.'_serverurl'}} ne '') { |
|
$resulttext .= '<li>'.&mt('Server: [_1] log-in page now redirects to [_2]',$lonhost,$servers{$env{'form.'.$lonhost.'_serverurl'}}).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Server: [_1] now has standard log-in page.',$lonhost).'</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>'; |
} |
} |