version 1.53, 2008/05/29 03:27:33
|
version 1.55, 2008/06/03 17:02:12
|
Line 96 sub handler {
|
Line 96 sub handler {
|
col2 => '',}], |
col2 => '',}], |
}, |
}, |
'defaults' => |
'defaults' => |
{ text => 'Default authentication/language', |
{ text => 'Default authentication/language/timezone', |
help => '', |
help => '', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
col2 => 'Value'}], |
col2 => 'Value'}], |
Line 1782 sub print_usermodification {
|
Line 1782 sub print_usermodification {
|
|
|
sub print_defaults { |
sub print_defaults { |
my ($dom,$rowtotal) = @_; |
my ($dom,$rowtotal) = @_; |
my @items = ('auth_def','auth_arg_def','lang_def'); |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def'); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
my $titles = &defaults_titles(); |
my $titles = &defaults_titles(); |
my $rownum = 0; |
my $rownum = 0; |
Line 1814 sub print_defaults {
|
Line 1814 sub print_defaults {
|
'" value="'.$auth.'"'.$checked.'/>'. |
'" value="'.$auth.'"'.$checked.'/>'. |
$authnames{$shortauth{$auth}}.'</label> '; |
$authnames{$shortauth{$auth}}.'</label> '; |
} |
} |
|
} elsif ($item eq 'timezone_def') { |
|
my $includeempty = 1; |
|
$datatable .= &Apache::loncommon::select_timezone($item,$domdefaults{$item},undef,$includeempty); |
} else { |
} else { |
$datatable .= '<input type="text" name="'.$item.'" value="'. |
$datatable .= '<input type="text" name="'.$item.'" value="'. |
$domdefaults{$item}.'" />'; |
$domdefaults{$item}.'" />'; |
Line 1830 sub defaults_titles {
|
Line 1833 sub defaults_titles {
|
'auth_def' => 'Default authentication type', |
'auth_def' => 'Default authentication type', |
'auth_arg_def' => 'Default authentication argument', |
'auth_arg_def' => 'Default authentication argument', |
'lang_def' => 'Default language', |
'lang_def' => 'Default language', |
|
'timezone_def' => 'Default timezone', |
); |
); |
return (\%titles); |
return (\%titles); |
} |
} |
Line 2470 sub modify_login {
|
Line 2474 sub modify_login {
|
'adminmail' => 'off', |
'adminmail' => 'off', |
'newuser' => 'off', |
'newuser' => 'off', |
); |
); |
foreach my $item (@toggles) { |
if (ref($domconfig{'login'}) eq 'HASH') { |
if ($defaultchecked{$item} eq 'on') { |
foreach my $item (@toggles) { |
if (($domconfig{'login'}{$item} eq '0') && |
if ($defaultchecked{$item} eq 'on') { |
($env{'form.'.$item} eq '1')) { |
if (($domconfig{'login'}{$item} eq '0') && |
$changes{$item} = 1; |
($env{'form.'.$item} eq '1')) { |
} elsif (($domconfig{'login'}{$item} eq '' || |
$changes{$item} = 1; |
$domconfig{'login'}{$item} eq '1') && |
} elsif (($domconfig{'login'}{$item} eq '' || |
($env{'form.'.$item} eq '0')) { |
$domconfig{'login'}{$item} eq '1') && |
$changes{$item} = 1; |
($env{'form.'.$item} eq '0')) { |
} |
$changes{$item} = 1; |
} elsif ($defaultchecked{$item} eq 'off') { |
} |
if (($domconfig{'login'}{$item} eq '1') && |
} elsif ($defaultchecked{$item} eq 'off') { |
($env{'form.'.$item} eq '0')) { |
if (($domconfig{'login'}{$item} eq '1') && |
$changes{$item} = 1; |
($env{'form.'.$item} eq '0')) { |
} elsif (($domconfig{'login'}{$item} eq '' || |
$changes{$item} = 1; |
$domconfig{'login'}{$item} eq '0') && |
} elsif (($domconfig{'login'}{$item} eq '' || |
($env{'form.'.$item} eq '1')) { |
$domconfig{'login'}{$item} eq '0') && |
$changes{$item} = 1; |
($env{'form.'.$item} eq '1')) { |
|
$changes{$item} = 1; |
|
} |
} |
} |
} |
} |
} |
if (($domconfig{'login'}{'loginheader'} eq 'text') && |
if (($domconfig{'login'}{'loginheader'} eq 'text') && |
($env{'form.loginheader'} eq 'image')) { |
($env{'form.loginheader'} eq 'image')) { |
$changes{'loginheader'} = 1; |
$changes{'loginheader'} = 1; |
} elsif (($domconfig{'login'}{'loginheader'} eq '' || |
} elsif (($domconfig{'login'}{'loginheader'} eq '' || |
$domconfig{'login'}{'loginheader'} eq 'image') && |
$domconfig{'login'}{'loginheader'} eq 'image') && |
($env{'form.loginheader'} eq 'text')) { |
($env{'form.loginheader'} eq 'text')) { |
$changes{'loginheader'} = 1; |
$changes{'loginheader'} = 1; |
} |
} |
} |
if (keys(%changes) > 0 || $colchgtext) { |
if (keys(%changes) > 0 || $colchgtext) { |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
Line 2530 sub color_font_choices {
|
Line 2536 sub color_font_choices {
|
img => "Header", |
img => "Header", |
bgs => "Background colors", |
bgs => "Background colors", |
links => "Link colors", |
links => "Link colors", |
|
images => "Images", |
font => "Font color", |
font => "Font color", |
pgbg => "Page", |
pgbg => "Page", |
tabbg => "Header", |
tabbg => "Header", |
Line 2545 sub modify_rolecolors {
|
Line 2552 sub modify_rolecolors {
|
my ($r,$dom,$confname,$roles,%domconfig) = @_; |
my ($r,$dom,$confname,$roles,%domconfig) = @_; |
my ($resulttext,%rolehash); |
my ($resulttext,%rolehash); |
$rolehash{'rolecolors'} = {}; |
$rolehash{'rolecolors'} = {}; |
|
if (ref($domconfig{'rolecolors'}) ne 'HASH') { |
|
if ($domconfig{'rolecolors'} eq '') { |
|
$domconfig{'rolecolors'} = {}; |
|
} |
|
} |
my ($errors,%changes) = &modify_colors($r,$dom,$confname,$roles, |
my ($errors,%changes) = &modify_colors($r,$dom,$confname,$roles, |
$domconfig{'rolecolors'},$rolehash{'rolecolors'}); |
$domconfig{'rolecolors'},$rolehash{'rolecolors'}); |
my $putresult = &Apache::lonnet::put_dom('configuration',\%rolehash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%rolehash, |
Line 3140 sub modify_quotas {
|
Line 3152 sub modify_quotas {
|
} |
} |
foreach my $key (keys(%formhash)) { |
foreach my $key (keys(%formhash)) { |
if ($formhash{$key} ne '') { |
if ($formhash{$key} ne '') { |
if (!exists($domconfig{'quotas'}{$key})) { |
if (ref($domconfig{'quotas'}) eq 'HASH') { |
|
if (!exists($domconfig{'quotas'}{$key})) { |
|
$changes{$key} = 1; |
|
} |
|
} else { |
$changes{$key} = 1; |
$changes{$key} = 1; |
} |
} |
} |
} |
Line 4067 sub modify_defaults {
|
Line 4083 sub modify_defaults {
|
my ($dom,$r) = @_; |
my ($dom,$r) = @_; |
my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors); |
my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
my @items = ('auth_def','auth_arg_def','lang_def'); |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def'); |
my @authtypes = ('internal','krb4','krb5','localauth'); |
my @authtypes = ('internal','krb4','krb5','localauth'); |
foreach my $item (@items) { |
foreach my $item (@items) { |
$newvalues{$item} = $env{'form.'.$item}; |
$newvalues{$item} = $env{'form.'.$item}; |
Line 4088 sub modify_defaults {
|
Line 4104 sub modify_defaults {
|
push(@errors,$item); |
push(@errors,$item); |
} |
} |
} |
} |
|
} elsif ($item eq 'timezone_def') { |
|
if ($newvalues{$item} ne '') { |
|
my @timezones = &DateTime::TimeZone->all_names; |
|
if (!grep(/^\Q$newvalues{$item}\E/,@timezones)) { |
|
push(@errors,$item); |
|
} |
|
} |
} |
} |
if (grep(/^\Q$item\E$/,@errors)) { |
if (grep(/^\Q$item\E$/,@errors)) { |
$newvalues{$item} = $domdefaults{$item}; |
$newvalues{$item} = $domdefaults{$item}; |
Line 4099 sub modify_defaults {
|
Line 4122 sub modify_defaults {
|
defaults => { auth_def => $newvalues{'auth_def'}, |
defaults => { auth_def => $newvalues{'auth_def'}, |
auth_arg_def => $newvalues{'auth_arg_def'}, |
auth_arg_def => $newvalues{'auth_arg_def'}, |
lang_def => $newvalues{'lang_def'}, |
lang_def => $newvalues{'lang_def'}, |
|
timezone_def => $newvalues{'timezone_def'}, |
} |
} |
); |
); |
my $title = &defaults_titles(); |
my $title = &defaults_titles(); |
Line 4131 sub modify_defaults {
|
Line 4155 sub modify_defaults {
|
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
&Apache::lonnet::do_cache_new('domdefaults',$dom, |
&Apache::lonnet::do_cache_new('domdefaults',$dom, |
$defaults_hash{'defaults'},$cachetime); |
$defaults_hash{'defaults'},$cachetime); |
my $sysmail = $r->dir_config('lonSysEMail'); |
if ($changes{'auth_def'} || $changes{'auth_arg_def'} || $changes{'lang_def'}) { |
&Apache::lonmsg::sendemail($sysmail,"LON-CAPA Domain Settings Change - $dom",$mailmsgtext); |
my $sysmail = $r->dir_config('lonSysEMail'); |
|
&Apache::lonmsg::sendemail($sysmail,"LON-CAPA Domain Settings Change - $dom",$mailmsgtext); |
|
} |
} else { |
} else { |
$resulttext = &mt('No changes made to default authentication/language settings'); |
$resulttext = &mt('No changes made to default authentication/language/timezone settings'); |
} |
} |
} else { |
} else { |
$resulttext = '<span class="LC_error">'. |
$resulttext = '<span class="LC_error">'. |
Line 4233 sub modify_coursecategories {
|
Line 4259 sub modify_coursecategories {
|
my ($dom,%domconfig) = @_; |
my ($dom,%domconfig) = @_; |
my ($resulttext,%deletions,%reorderings,%needreordering,%adds,$errors); |
my ($resulttext,%deletions,%reorderings,%needreordering,%adds,$errors); |
my @deletecategory = &Apache::loncommon::get_env_multiple('form.deletecategory'); |
my @deletecategory = &Apache::loncommon::get_env_multiple('form.deletecategory'); |
if (($domconfig{'coursecategories'}{'instcode::0'} ne '') && ($env{'form.instcode'} == 0)) { |
if (ref($domconfig{'coursecategories'}) eq 'HASH') { |
push (@deletecategory,'instcode::0'); |
if (($domconfig{'coursecategories'}{'instcode::0'} ne '') && ($env{'form.instcode'} == 0)) { |
|
push (@deletecategory,'instcode::0'); |
|
} |
} |
} |
my (@predelcats,@predeltrails,%predelallitems); |
my (@predelcats,@predeltrails,%predelallitems); |
if (ref($domconfig{'coursecategories'}) eq 'HASH') { |
if (ref($domconfig{'coursecategories'}) eq 'HASH') { |