--- loncom/interface/domainprefs.pm 2009/10/23 16:14:43 1.116 +++ loncom/interface/domainprefs.pm 2009/11/16 04:03:05 1.119 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.116 2009/10/23 16:14:43 bisitz Exp $ +# $Id: domainprefs.pm,v 1.119 2009/11/16 04:03:05 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -202,11 +202,11 @@ sub handler { 'quotas','autoenroll','autoupdate','directorysrch', 'usercreation','usermodification','contacts','defaults', 'scantron','coursecategories','serverstatuses', - 'requestcourses'],$dom); + 'requestcourses','helpsettings'],$dom); my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', 'autoupdate','directorysrch','contacts', 'usercreation','usermodification','scantron', - 'requestcourses','coursecategories','serverstatuses'); + 'requestcourses','coursecategories','serverstatuses','helpsettings'); my %prefs = ( 'rolecolors' => { text => 'Default color schemes', @@ -319,8 +319,14 @@ sub handler { col3 => 'Specific IPs', }], }, + 'helpsettings' => + {text => 'Help page settings', + help => 'Domain_Configuration_Help_Settings', + header => [{col1 => 'Setting', + col2 => 'Value',}], + }, ); - my %servers = &Apache::lonnet::get_servers($dom); + my %servers = &dom_servers($dom); if (keys(%servers) > 1) { $prefs{'login'} = { text => 'Log-in page options', help => 'Domain_Configuration_Login_Page', @@ -415,6 +421,8 @@ sub process_changes { $output = &modify_serverstatuses($dom,%domconfig); } elsif ($action eq 'requestcourses') { $output = &modify_quotas($dom,$action,%domconfig); + } elsif ($action eq 'helpsettings') { + $output = &modify_helpsettings($dom,%domconfig); } return $output; } @@ -465,6 +473,8 @@ sub print_config_box { $colspan = ' colspan="2"'; } elsif ($action eq 'requestcourses') { $output .= &print_quotas($dom,$settings,\$rowtotal,$action); + } elsif ($action eq 'helpsettings') { + $output .= &print_helpsettings($dom,$settings,\$rowtotal); } else { $output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal); } @@ -600,7 +610,9 @@ sub print_config_box { $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal); } elsif ($action eq 'serverstatuses') { $output .= &print_serverstatuses($dom,$settings,\$rowtotal); - } + } elsif ($action eq 'helpsettings') { + $output .= &print_helpsettings($dom,$settings,\$rowtotal); + } } $output .= ' @@ -617,7 +629,7 @@ sub print_login { my $itemcount = 1; if ($position eq 'top') { - my %servers = &Apache::lonnet::get_servers($dom); + my %servers = &dom_servers($dom); my $choice = $choices{'disallowlogin'}; $css_class = ' class="LC_odd_row"'; $datatable .= ''.$choices{'disallowlogin'}.''. @@ -657,9 +669,8 @@ sub print_login { 'coursecatalog' => 'on', 'adminmail' => 'off', 'newuser' => 'off', - 'submitbugs' => 'on', ); - my @toggles = ('coursecatalog','adminmail','newuser','submitbugs'); + my @toggles = ('coursecatalog','adminmail','newuser'); my (%checkedon,%checkedoff); foreach my $item (@toggles) { if ($defaultchecked{$item} eq 'on') { @@ -791,7 +802,6 @@ sub login_choices { coursecatalog => 'Display Course/Community Catalog link?', adminmail => "Display Administrator's E-mail Address?", disallowlogin => "Login page requests redirected", - submitbugs => "Display "Submit Bug" link?", hostid => "Server", serverurl => "Redirect to log-in via:", directlogin => "No redirect", @@ -1918,6 +1928,62 @@ sub print_contacts { return $datatable; } +sub print_helpsettings { + + my ($dom,$settings,$rowtotal) = @_; + my ($css_class,$datatable); + my $itemcount = 1; + my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles); + + %choices = + &Apache::lonlocal::texthash ( + submitbugs => 'Display "Submit a bug" link?', + ); + + %defaultchecked = ('submitbugs' => 'on'); + + @toggles = ('submitbugs',); + + foreach my $item (@toggles) { + if ($defaultchecked{$item} eq 'on') { + $checkedon{$item} = ' checked="checked" '; + $checkedoff{$item} = ' '; + } elsif ($defaultchecked{$item} eq 'off') { + $checkedoff{$item} = ' checked="checked" '; + $checkedon{$item} = ' '; + } + } + + if (ref($settings) eq 'HASH') { + foreach my $item (@toggles) { + if ($settings->{$item} eq '1') { + $checkedon{$item} = ' checked="checked" '; + $checkedoff{$item} = ' '; + } elsif ($settings->{$item} eq '0') { + $checkedoff{$item} = ' checked="checked" '; + $checkedon{$item} = ' '; + } + } + } + + foreach my $item (@toggles) { + $css_class = $itemcount%2?' class="LC_odd_row"':''; + $datatable .= + ''.$choices{$item}. + ''. + ''. + ' '. + ''. + ''; + $itemcount ++; + } + return $datatable; + +} + sub contact_titles { my %titles = &Apache::lonlocal::texthash ( 'supportemail' => 'Support E-mail address', @@ -3139,7 +3205,6 @@ sub modify_login { my %title = ( coursecatalog => 'Display course catalog', adminmail => 'Display administrator E-mail address', newuser => 'Link for visitors to create a user account', - submitbugs => 'Link for users to submit a bug', loginheader => 'Log-in box header'); my @offon = ('off','on'); my %curr_loginvia; @@ -3153,7 +3218,7 @@ sub modify_login { my %loginhash; ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], \%domconfig,\%loginhash); - my @toggles = ('coursecatalog','adminmail','newuser','submitbugs'); + my @toggles = ('coursecatalog','adminmail','newuser'); foreach my $item (@toggles) { $loginhash{login}{$item} = $env{'form.'.$item}; } @@ -3163,11 +3228,13 @@ sub modify_login { \%loginhash); } - my %servers = &Apache::lonnet::get_servers($dom); + my %servers = &dom_servers($dom); if (keys(%servers) > 1) { foreach my $lonhost (keys(%servers)) { - next if ($env{'form.'.$lonhost.'_serverurl'} eq $curr_loginvia{$lonhost}); next if ($env{'form.'.$lonhost.'_serverurl'} eq $lonhost); + if ($env{'form.'.$lonhost.'_serverurl'} eq $curr_loginvia{$lonhost}) { + $loginhash{login}{loginvia}{$lonhost} = $curr_loginvia{$lonhost}; next; + } if ($curr_loginvia{$lonhost} ne '') { $loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'}; $changes{'loginvia'}{$lonhost} = 1; @@ -3179,16 +3246,15 @@ sub modify_login { } } } - + my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash, $dom); if ($putresult eq 'ok') { - my @toggles = ('coursecatalog','adminmail','newuser','submitbugs'); + my @toggles = ('coursecatalog','adminmail','newuser'); my %defaultchecked = ( 'coursecatalog' => 'on', 'adminmail' => 'off', 'newuser' => 'off', - 'submitbugs' => 'on', ); if (ref($domconfig{'login'}) eq 'HASH') { foreach my $item (@toggles) { @@ -5626,6 +5692,72 @@ sub modify_serverstatuses { return $resulttext; } +sub modify_helpsettings { + my ($dom,%domconfig) = @_; + my ($resulttext,$errors,%changes,%helphash); + + my %defaultchecked = ('submitbugs' => 'on'); + my @offon = ('off','on'); + my %title = ( submitbugs => 'Display link for users to submit a bug'); + my @toggles = ('submitbugs'); + + $helphash{'helpsettings'} = {}; + + if (ref($domconfig{'helpsettings'}) ne 'HASH') { + if ($domconfig{'helpsettings'} eq '') { + $domconfig{'helpsettings'} = {}; + } + } + + if (ref($domconfig{'helpsettings'}) eq 'HASH') { + + foreach my $item (@toggles) { + + if ($defaultchecked{$item} eq 'on') { + if (($domconfig{'helpsettings'}{$item} eq '') && + ($env{'form.'.$item} eq '0')) { + $changes{$item} = 1; + } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) { + $changes{$item} = 1; + } + } elsif ($defaultchecked{$item} eq 'off') { + if (($domconfig{'helpsettings'}{$item} eq '') && + ($env{'form.'.$item} eq '1')) { + $changes{$item} = 1; + } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) { + $changes{$item} = 1; + } + } + $helphash{'helpsettings'}{$item} = $env{'form.'.$item}; + } + } + + my $putresult = &Apache::lonnet::put_dom('configuration',\%helphash, + $dom); + + if ($putresult eq 'ok') { + if (keys(%changes) > 0) { + $resulttext = &mt('Changes made:').''; + } else { + $resulttext = &mt('No changes made to help settings'); + } + } else { + $resulttext = ''. + &mt('An error occurred: [_1]',$putresult).''; + } + if ($errors) { + $resulttext .= &mt('The following errors occurred: ').''; + } + return $resulttext; +} + sub recurse_check { my ($chkcats,$categories,$depth,$name) = @_; if (ref($chkcats->[$depth]{$name}) eq 'ARRAY') { @@ -5666,4 +5798,37 @@ sub recurse_cat_deletes { return; } +sub dom_servers { + my ($dom) = @_; + my (%uniqservers,%servers); + my $primaryserver = &Apache::lonnet::hostname(&Apache::lonnet::domain($dom,'primary')); + my @machinedoms = &Apache::lonnet::machine_domains($primaryserver); + foreach my $mdom (@machinedoms) { + my %currservers = %servers; + my %server = &Apache::lonnet::get_servers($mdom); + %servers = (%currservers,%server); + } + my %by_hostname; + foreach my $id (keys(%servers)) { + push(@{$by_hostname{$servers{$id}}},$id); + } + foreach my $hostname (sort(keys(%by_hostname))) { + if (@{$by_hostname{$hostname}} > 1) { + my $match = 0; + foreach my $id (@{$by_hostname{$hostname}}) { + if (&Apache::lonnet::host_domain($id) eq $dom) { + $uniqservers{$id} = $hostname; + $match = 1; + } + } + unless ($match) { + $uniqservers{$by_hostname{$hostname}[0]} = $hostname; + } + } else { + $uniqservers{$by_hostname{$hostname}[0]} = $hostname; + } + } + return %uniqservers; +} + 1;