--- loncom/interface/domainprefs.pm 2010/03/23 20:06:04 1.102.2.12 +++ loncom/interface/domainprefs.pm 2009/11/10 19:12:11 1.118 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.102.2.12 2010/03/23 20:06:04 raeburn Exp $ +# $Id: domainprefs.pm,v 1.118 2009/11/10 19:12:11 jms Exp $ # # Copyright Michigan State University Board of Trustees # @@ -199,15 +199,14 @@ sub handler { } my %domconfig = &Apache::lonnet::get_dom('configuration',['login','rolecolors', - 'quotas','autoenroll','autoupdate','autocreate', - 'directorysrch','usercreation','usermodification', - 'contacts','defaults','scantron','coursecategories', - 'serverstatuses','requestcourses','coursedefaults'],$dom); + 'quotas','autoenroll','autoupdate','directorysrch', + 'usercreation','usermodification','contacts','defaults', + 'scantron','coursecategories','serverstatuses', + 'requestcourses','helpsettings'],$dom); my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', - 'autoupdate','autocreate','directorysrch','contacts', + 'autoupdate','directorysrch','contacts', 'usercreation','usermodification','scantron', - 'requestcourses','coursecategories','serverstatuses', - 'coursedefaults'); + 'requestcourses','coursecategories','serverstatuses','helpsettings'); my %prefs = ( 'rolecolors' => { text => 'Default color schemes', @@ -221,12 +220,13 @@ sub handler { {col1 => 'Administrator Settings', col2 => '',}], }, - 'login' => + 'login' => { text => 'Log-in page options', help => 'Domain_Configuration_Login_Page', header => [{col1 => 'Item', col2 => '',}], }, + 'defaults' => { text => 'Default authentication/language/timezone', help => 'Domain_Configuration_LangTZAuth', @@ -234,7 +234,7 @@ sub handler { col2 => 'Value'}], }, 'quotas' => - { text => 'User blogs, personal information pages, portfolios', + { text => 'User blogs, personal information pages and portfolios', help => 'Domain_Configuration_Quotas', header => [{col1 => 'User affiliation', col2 => 'Available tools', @@ -251,16 +251,8 @@ sub handler { help => 'Domain_Configuration_Auto_Updates', header => [{col1 => 'Setting', col2 => 'Value',}, - {col1 => 'Setting', - col2 => 'Affiliation'}, {col1 => 'User population', - col2 => 'Updateable user data'}], - }, - 'autocreate' => - { text => 'Auto-course creation settings', - help => 'Domain_Configuration_Auto_Creation', - header => [{col1 => 'Configuration Setting', - col2 => 'Value',}], + col2 => 'Updataeable user data'}], }, 'directorysrch' => { text => 'Institutional directory searches', @@ -311,7 +303,7 @@ sub handler { col2 => 'Value'}], }, 'coursecategories' => - { text => 'Cataloging of courses/communities', + { text => 'Cataloging of courses', help => 'Domain_Configuration_Cataloging_Courses', header => [{col1 => 'Category settings', col2 => '',}, @@ -327,9 +319,9 @@ sub handler { col3 => 'Specific IPs', }], }, - 'coursedefaults' => - {text => 'Course/Community defaults', - help => 'Domain_Configuration_Course_Defaults', + 'helpsettings' => + {text => 'Help page settings', + help => 'Domain_Configuration_Help_Settings', header => [{col1 => 'Setting', col2 => 'Value',}], }, @@ -348,7 +340,7 @@ sub handler { my @actions = &Apache::loncommon::get_env_multiple('form.actions'); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'pickactions')", - text=>"Settings to display/modify"}); + text=>"Pick functionality"}); my $confname = $dom.'-domainconfig'; if ($phase eq 'process') { &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles); @@ -411,8 +403,6 @@ sub process_changes { $output = &modify_autoenroll($dom,%domconfig); } elsif ($action eq 'autoupdate') { $output = &modify_autoupdate($dom,%domconfig); - } elsif ($action eq 'autocreate') { - $output = &modify_autocreate($dom,%domconfig); } elsif ($action eq 'directorysrch') { $output = &modify_directorysrch($dom,%domconfig); } elsif ($action eq 'usercreation') { @@ -431,8 +421,8 @@ sub process_changes { $output = &modify_serverstatuses($dom,%domconfig); } elsif ($action eq 'requestcourses') { $output = &modify_quotas($dom,$action,%domconfig); - } elsif ($action eq 'coursedefaults') { - $output = &modify_coursedefaults($dom,%domconfig); + } elsif ($action eq 'helpsettings') { + $output = &modify_helpsettings($dom,%domconfig); } return $output; } @@ -483,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); } @@ -500,18 +492,7 @@ sub print_config_box { '; $rowtotal ++; if ($action eq 'autoupdate') { - $output .= &print_autoupdate('middle',$dom,$settings,\$rowtotal).' - - - - - - - - - '. - &print_autoupdate('bottom',$dom,$settings,\$rowtotal); - $rowtotal ++; + $output .= &print_autoupdate('bottom',$dom,$settings,\$rowtotal); } elsif ($action eq 'usercreation') { $output .= &print_usercreation('middle',$dom,$settings,\$rowtotal).'
'.&mt($item->{'header'}->[2]->{'col1'}).''.&mt($item->{'header'}->[2]->{'col2'}).'
@@ -535,7 +516,8 @@ sub print_config_box { - '. + '. + &print_usermodification('bottom',$dom,$settings,\$rowtotal); $rowtotal ++; } elsif ($action eq 'coursecategories') { @@ -618,8 +600,6 @@ sub print_config_box { $output .= &print_quotas($dom,$settings,\$rowtotal,$action); } elsif ($action eq 'autoenroll') { $output .= &print_autoenroll($dom,$settings,\$rowtotal); - } elsif ($action eq 'autocreate') { - $output .= &print_autocreate($dom,$settings,\$rowtotal); } elsif ($action eq 'directorysrch') { $output .= &print_directorysrch($dom,$settings,\$rowtotal); } elsif ($action eq 'contacts') { @@ -630,9 +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 'coursedefaults') { - $output .= &print_coursedefaults($dom,$settings,\$rowtotal); - } + } elsif ($action eq 'helpsettings') { + $output .= &print_helpsettings($dom,$settings,\$rowtotal); + } } $output .= '
'.&mt($item->{'header'}->[2]->{'col1'}).''.&mt($item->{'header'}->[2]->{'col2'}).'
'.&mt($item->{'header'}->[2]->{'col2'}).'
@@ -646,17 +626,15 @@ sub print_login { my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_; my ($css_class,$datatable); my %choices = &login_choices(); + my $itemcount = 1; if ($position eq 'top') { my %servers = &dom_servers($dom); my $choice = $choices{'disallowlogin'}; $css_class = ' class="LC_odd_row"'; - $datatable .= ''.$choice.''. + $datatable .= ''.$choices{'disallowlogin'}.''. ''. - ''. - ''. - ''. - ''."\n"; + ''."\n"; my %disallowed; if (ref($settings) eq 'HASH') { if (ref($settings->{'loginvia'}) eq 'HASH') { @@ -665,52 +643,23 @@ sub print_login { } foreach my $lonhost (sort(keys(%servers))) { my $direct = 'selected="selected"'; - if (ref($disallowed{$lonhost}) eq 'HASH') { - if ($disallowed{$lonhost}{'server'} ne '') { - $direct = ''; - } + if ($disallowed{$lonhost} eq '') { + $direct = ''; } $datatable .= ''. - ''. - ''; - my ($custom,$exempt); - if (ref($disallowed{$lonhost}) eq 'HASH') { - $custom = $disallowed{$lonhost}{'custompath'}; - $exempt = $disallowed{$lonhost}{'exempt'}; - } - $datatable .= ''. - ''. - ''; + $datatable .= ''; } $datatable .= '
'.$choices{'hostid'}.''.$choices{'server'}.''.$choices{'serverpath'}.''.$choices{'custompath'}.''.$choices{'exempt'}.'
'.$choices{'serverurl'}.'
'.$servers{$lonhost}.'
'; return $datatable; @@ -851,30 +800,27 @@ sub login_choices { my %choices = &Apache::lonlocal::texthash ( coursecatalog => 'Display Course/Community Catalog link?', - adminmail => "Display Administrator's E-mail Address?", + adminmail => "Display Administrator's E-mail Address?", disallowlogin => "Login page requests redirected", hostid => "Server", - server => "Redirect to:", - serverpath => "Path", - custompath => "Custom", - exempt => "Exempt IP(s)", + serverurl => "Redirect to log-in via:", directlogin => "No redirect", - newuser => "Link to create a user account", - img => "Header", - logo => "Main Logo", - domlogo => "Domain Logo", - login => "Log-in Header", - textcol => "Text color", - bgcol => "Box color", - bgs => "Background colors", - links => "Link colors", - font => "Font color", - pgbg => "Header", - mainbg => "Page", - sidebg => "Login box", - link => "Link", - alink => "Active link", - vlink => "Visited link", + newuser => "Link to create a user account", + img => "Header", + logo => "Main Logo", + domlogo => "Domain Logo", + login => "Log-in Header", + textcol => "Text color", + bgcol => "Box color", + bgs => "Background colors", + links => "Link colors", + font => "Font color", + pgbg => "Header", + mainbg => "Page", + sidebg => "Login box", + link => "Link", + alink => "Active link", + vlink => "Visited link", ); return %choices; } @@ -892,6 +838,7 @@ sub print_rolecolors { my %defaults = ( img => $defaultdesign{$role.'.img'}, font => $defaultdesign{$role.'.font'}, + fontmenu => $defaultdesign{$role.'.fontmenu'}, ); foreach my $item (@bgs) { $defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item}; @@ -909,6 +856,10 @@ sub print_rolecolors { $designs{'font'} = $settings->{$role}->{'font'}; $is_custom{'font'} = 1; } + if ($settings->{$role}->{'fontmenu'} ne '') { + $designs{'fontmenu'} = $settings->{$role}->{'fontmenu'}; + $is_custom{'fontmenu'} = 1; + } foreach my $item (@bgs) { if ($settings->{$role}->{$item} ne '') { $designs{'bgs'}{$item} = $settings->{$role}->{$item}; @@ -927,6 +878,10 @@ sub print_rolecolors { $designs{img} = $designhash{$dom.'.'.$role.'.img'}; $is_custom{'img'} = 1; } + if ($designhash{$dom.'.'.$role.'.fontmenu'} ne '') { + $designs{fontmenu} = $designhash{$dom.'.'.$role.'.fontmenu'}; + $is_custom{'fontmenu'} = 1; + } if ($designhash{$dom.'.'.$role.'.font'} ne '') { $designs{font} = $designhash{$dom.'.'.$role.'.font'}; $is_custom{'font'} = 1; @@ -955,7 +910,7 @@ sub display_color_options { my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs, $images,$bgs,$links,$alt_text,$rowtotal,$logintext,$loginheader) = @_; my $css_class = $itemcount%2?' class="LC_odd_row"':''; - my $datatable = ''. + my $datatable = ''. ''.$choices->{'font'}.''; if (!$is_custom->{'font'}) { $datatable .= ''.&mt('Default in use:').' '.$defaults->{'font'}.''; @@ -969,6 +924,22 @@ sub display_color_options { '    '. ''; + unless ($role eq 'login') { + $datatable .= ''. + ''.$choices->{'fontmenu'}.''; + if (!$is_custom->{'fontmenu'}) { + $datatable .= ''.&mt('Default in use:').' '.$defaults->{'fontmenu'}.''; + } else { + $datatable .= ' '; + } + $fontlink = &color_pick($phase,$role,'fontmenu',$choices->{'fontmenu'},$designs->{'fontmenu'}); + $datatable .= ''. + ' '.$fontlink. + '    '. + ''; + } my $switchserver = &check_switchserver($dom,$confname); foreach my $img (@{$images}) { $itemcount ++; @@ -1324,15 +1295,15 @@ sub print_quotas { $cell{$item} .= ''; + $titles{$option}.' '; if ($option eq 'autolimit') { - $cell{$item} .= ' '; } - $cell{$item} .= ' '; + $cell{$item} .= '  '; if ($option eq 'autolimit') { - $cell{$item} .= $titles{'unlimited'}; + $cell{$item} .= $titles{'unlimited'} } } } else { @@ -1355,7 +1326,7 @@ sub print_quotas { if ($context eq 'requestcourses') { $datatable .= ''; foreach my $item (@usertools) { - $datatable .= ''.$cell{$item}.''; + $datatable .= ''.$cell{$item}.''; } $datatable .= ''; } @@ -1432,13 +1403,13 @@ sub print_quotas { '_default" value="'.$val.'"'.$checked.' />'. $titles{$option}.''; if ($option eq 'autolimit') { - $defcell{$item} .= ' '; } - $defcell{$item} .= ' '; + $defcell{$item} .= '  '; if ($option eq 'autolimit') { - $defcell{$item} .= $titles{'unlimited'}; + $defcell{$item} .= $titles{'unlimited'} } } } else { @@ -1461,7 +1432,7 @@ sub print_quotas { if ($context eq 'requestcourses') { $datatable .= ''; foreach my $item (@usertools) { - $datatable .= ''.$defcell{$item}.''; + $datatable .= ''.$defcell{$item}.''; } $datatable .= ''; } @@ -1535,13 +1506,13 @@ sub print_quotas { '__LC_adv" value="'.$val.'"'.$checked.' />'. $titles{$option}.''; if ($option eq 'autolimit') { - $advcell{$item} .= ' '; } - $advcell{$item} .= ' '; + $advcell{$item} .= '  '; if ($option eq 'autolimit') { - $advcell{$item} .= $titles{'unlimited'}; + $advcell{$item} .= $titles{'unlimited'} } } } else { @@ -1564,7 +1535,7 @@ sub print_quotas { if ($context eq 'requestcourses') { $datatable .= ''; foreach my $item (@usertools) { - $datatable .= ''.$advcell{$item}.''; + $datatable .= ''.$advcell{$item}.''; } $datatable .= ''; } @@ -1654,7 +1625,7 @@ sub print_courserequestmail { sub print_autoenroll { my ($dom,$settings,$rowtotal) = @_; my $autorun = &Apache::lonnet::auto_run(undef,$dom), - my ($defdom,$runon,$runoff,$coownerson,$coownersoff); + my ($defdom,$runon,$runoff); if (ref($settings) eq 'HASH') { if (exists($settings->{'run'})) { if ($settings->{'run'} eq '0') { @@ -1673,18 +1644,6 @@ sub print_autoenroll { $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'})) { $defdom = $settings->{'sender_domain'}; } @@ -1715,16 +1674,8 @@ sub print_autoenroll { &mt('username').': '. '  '.&mt('domain'). - ': '.$domform.''. - ''. - ''.&mt('Automatically assign co-ownership').''. - ' '. - ''. - ''; - $$rowtotal += 3; + ': '.$domform.''; + $$rowtotal += 2; return $datatable; } @@ -1766,17 +1717,9 @@ sub print_autoupdate { $classlistsoff.'value="0" />'.&mt('No').''. ''; $$rowtotal += 2; - } elsif ($position eq 'middle') { - my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); - my $numinrow = 3; - my $locknamesettings; - $datatable .= &insttypes_row($settings,$types,$usertypes, - $dom,$numinrow,$othertitle, - 'lockablenames'); - $$rowtotal ++; } else { my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); - my @fields = ('lastname','firstname','middlename','generation', + my @fields = ('lastname','firstname','middlename','gen', 'permanentemail','id'); my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); my $numrows = 0; @@ -1797,57 +1740,6 @@ sub print_autoupdate { return $datatable; } -sub print_autocreate { - my ($dom,$settings,$rowtotal) = @_; - my (%createon,%createoff); - my $curr_dc; - my @types = ('xml','req'); - if (ref($settings) eq 'HASH') { - foreach my $item (@types) { - $createoff{$item} = ' checked="checked" '; - $createon{$item} = ' '; - if (exists($settings->{$item})) { - if ($settings->{$item}) { - $createon{$item} = ' checked="checked" '; - $createoff{$item} = ' '; - } - } - } - $curr_dc = $settings->{'xmldc'}; - } else { - foreach my $item (@types) { - $createoff{$item} = ' checked="checked" '; - $createon{$item} = ' '; - } - } - $$rowtotal += 2; - my $datatable=''. - ''.&mt('Create pending official courses from XML files').''. - ' '. - ''; - my ($numdc,$dctable) = &active_dc_picker($dom,$curr_dc); - if ($numdc > 1) { - $datatable .= ''. - &mt('XML files processed as: (choose Dom. Coord.)'). - ''.$dctable.''. - ''; - $$rowtotal ++ ; - } else { - $datatable .= ''; - } - $datatable .= ''.&mt('Create pending requests for official courses (if validated)').''. - ' '. - ''. - ''; - return $datatable; -} - sub print_directorysrch { my ($dom,$settings,$rowtotal) = @_; my $srchon = ' '; @@ -2036,24 +1928,34 @@ sub print_contacts { return $datatable; } -sub radiobutton_prefs { - my ($settings,$toggles,$defaultchecked,$choices,$itemcount) = @_; - return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && - (ref($choices) eq 'HASH')); +sub print_helpsettings { - my (%checkedon,%checkedoff,$datatable,$css_class); - - foreach my $item (@{$toggles}) { - if ($defaultchecked->{$item} eq 'on') { + 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') { + } elsif ($defaultchecked{$item} eq 'off') { $checkedoff{$item} = ' checked="checked" '; $checkedon{$item} = ' '; } } + if (ref($settings) eq 'HASH') { - foreach my $item (@{$toggles}) { + foreach my $item (@toggles) { if ($settings->{$item} eq '1') { $checkedon{$item} = ' checked="checked" '; $checkedoff{$item} = ' '; @@ -2062,11 +1964,12 @@ sub radiobutton_prefs { $checkedon{$item} = ' '; } } - } - foreach my $item (@{$toggles}) { + } + + foreach my $item (@toggles) { $css_class = $itemcount%2?' class="LC_odd_row"':''; - $datatable .= - ''.$choices->{$item}. + $datatable .= + ''.$choices{$item}. ''. ''. ' '. ''. - ''. - ''.$title{'togglecatscomm'}.''. - ' '. - ''. - ''. - ''.$title{'categorizecomm'}.''. - ''. - ' '. - ''. ''; - $$rowtotal += 4; + $$rowtotal += 2; } else { my $css_class; my $itemcount = 1; @@ -2793,15 +2650,7 @@ sub print_coursecategories { if (ref($cats[0]) eq 'ARRAY') { my $numtop = @{$cats[0]}; my $maxnum = $numtop; - my %default_names = ( - instcode => &mt('Official courses'), - communities => &mt('Communities'), - ); - - if ((!grep(/^instcode$/,@{$cats[0]})) || - ($cathash->{'instcode::0'} eq '') || - (!grep(/^communities$/,@{$cats[0]})) || - ($cathash->{'communities::0'} eq '')) { + if ((!grep(/^instcode$/,@{$cats[0]})) || ($cathash->{'instcode::0'} eq '')) { $maxnum ++; } my $lastidx; @@ -2822,33 +2671,14 @@ sub print_coursecategories { $datatable .= ''; } $datatable .= ''; - if ($parent eq 'instcode' || $parent eq 'communities') { - $datatable .= '' - .$default_names{$parent}.''; - if ($parent eq 'instcode') { - $datatable .= '
(' - .&mt('with institutional codes') - .')'; - } else { - $datatable .= '
'; - } - $datatable .= '' - .''; - if ($parent eq 'instcode') { - $datatable .= ' '; - } else { - $datatable .= '
' - .''; - } - $datatable .= ''; - if ($parent eq 'communities') { - $datatable .= '
'; - } - $datatable .= ''; + if ($parent eq 'instcode') { + $datatable .= ''.&mt('Official courses') + .'
(' + .&mt('with institutional codes').')' + .' ' + .''; } else { $datatable .= $parent .' ' + .&mt('Official courses').''.'
(' + .&mt('with institutional codes').')' + .' ' + .''; } } } else { @@ -2991,9 +2814,6 @@ sub coursecategories_javascript { $jstext = ' var categories = Array(1);'."\n". ' categories[0] = Array("instcode_pos");'."\n"; } - my $instcode_reserved = &mt('The name: "instcode" is a reserved category'); - my $communities_reserved = &mt('The name: "communities" is a reserved category'); - my $choose_again = '\\n'.&mt('Please use a different name for the new top level category'); $output = <<"ENDSCRIPT"; @@ -3075,40 +2882,25 @@ ENDSCRIPT sub initialize_categories { my ($itemcount) = @_; - my ($datatable,$css_class,$chgstr); - my %default_names = ( - instcode => 'Official courses (with institutional codes)', - communities => 'Communities', - ); - my $select0 = ' selected="selected"'; - my $select1 = ''; - foreach my $default ('instcode','communities') { - $css_class = $itemcount%2?' class="LC_odd_row"':''; - $chgstr = ' onchange="javascript:reorderCats(this.form,'."'',$default"."_pos','0'".');"'; - if ($default eq 'communities') { - $select1 = $select0; - $select0 = ''; - } - $datatable .= '' - .' ' - .$default_names{$default} - .'' - .' '; } } + $rem = @{$types}%($numinrow); } my $colsleft = $numinrow - $rem; - if (($rem == 0) && (@{$types} > 0)) { - $output .= ''; - } if ($colsleft > 1) { $output .= ''; } else { @@ -3440,91 +3229,22 @@ sub modify_login { } my %servers = &dom_servers($dom); - my @loginvia_attribs = ('serverpath','custompath','exempt'); if (keys(%servers) > 1) { foreach my $lonhost (keys(%servers)) { - next if ($env{'form.'.$lonhost.'_server'} eq $lonhost); - if (ref($curr_loginvia{$lonhost}) eq 'HASH') { - if ($env{'form.'.$lonhost.'_server'} eq $curr_loginvia{$lonhost}{'server'}) { - $loginhash{login}{loginvia}{$lonhost}{'server'} = $curr_loginvia{$lonhost}{'server'}; - } elsif ($curr_loginvia{$lonhost}{'server'} ne '') { - if (defined($servers{$env{'form.'.$lonhost.'_server'}})) { - $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; - } - } + 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.'_server'}})) { - $loginhash{login}{loginvia}{$lonhost}{'server'} = $env{'form.'.$lonhost.'_server'}; + if (defined($servers{$env{'form.'.$lonhost.'_serverurl'}})) { + $loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'}; $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; - } } } } } - + my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash, $dom); if ($putresult eq 'ok') { @@ -3575,30 +3295,13 @@ sub modify_login { if (ref($changes{$item}) eq 'HASH') { $resulttext .= '
  • '.&mt('Log-in page availability:').'
      '; foreach my $lonhost (sort(keys(%{$changes{$item}}))) { - if (defined($servers{$loginhash{login}{loginvia}{$lonhost}{'server'}})) { - 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 .= '
    • '.&mt('Server: [_1] log-in page redirects to [_2].',$servers{$lonhost},''.$target.''); - if ($loginhash{login}{loginvia}{$lonhost}{'exempt'} ne '') { - $resulttext .= ' '.&mt('No redirection for clients from following IPs:').' '.$loginhash{login}{loginvia}{$lonhost}{'exempt'}; - } - $resulttext .= '
      • '; - } else { - $resulttext .= '
    • '.&mt('Server: [_1] has standard log-in page.',$lonhost).'
      • '; - } + if ($servers{$env{'form.'.$lonhost.'_serverurl'}} ne '') { + $resulttext .= '
    • '.&mt('Server: [_1] log-in page now redirects to [_2]',$lonhost,$servers{$env{'form.'.$lonhost.'_serverurl'}}).'
      • '; } else { - $resulttext .= '
    • '.&mt('Server: [_1] has standard log-in page.',$servers{$lonhost}).'
      • '; + $resulttext .= '
    • '.&mt('Server: [_1] now has standard log-in page.',$lonhost).'
      • '; } } - $resulttext .= '
    • '; + $resulttext .= ''; } } else { $resulttext .= '
  • '.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'
    • '; @@ -3627,6 +3330,7 @@ sub color_font_choices { links => "Link colors", images => "Images", font => "Font color", + fontmenu => "Font Menu", pgbg => "Page", tabbg => "Header", sidebg => "Border", @@ -3684,6 +3388,7 @@ sub modify_colors { @logintext = ('textcol','bgcol'); } else { %choices = &color_font_choices(); + $confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'}; } if ($role eq 'login') { @images = ('img','logo','domlogo','login'); @@ -3806,6 +3511,17 @@ sub modify_colors { $changes{$role}{'font'} = 1; } } + if ($role ne 'login') { + if ($domconfig->{$role}{'fontmenu'} ne '') { + if ($confhash->{$role}{'fontmenu'} ne $domconfig->{$role}{'fontmenu'}) { + $changes{$role}{'fontmenu'} = 1; + } + } else { + if ($confhash->{$role}{'fontmenu'}) { + $changes{$role}{'fontmenu'} = 1; + } + } + } foreach my $item (@bgs) { if ($domconfig->{$role}{$item} ne '') { if ($confhash->{$role}{$item} ne $domconfig->{$role}{$item}) { @@ -4301,7 +4017,7 @@ sub modify_quotas { } foreach my $item (@usertools) { foreach my $type (@{$types},'default','_LC_adv') { - my $unset; + my $unset; if ($context eq 'requestcourses') { $unset = '0'; if ($type eq '_LC_adv') { @@ -4521,8 +4237,7 @@ sub modify_autoenroll { } my $autorun = &Apache::lonnet::auto_run(undef,$dom), my %title = ( run => 'Auto-enrollment active', - sender => 'Sender for notification messages', - coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)'); + sender => 'Sender for notification messages'); my @offon = ('off','on'); my $sender_uname = $env{'form.sender_uname'}; my $sender_domain = $env{'form.sender_domain'}; @@ -4531,12 +4246,11 @@ sub modify_autoenroll { } elsif ($sender_uname eq '') { $sender_domain = ''; } - my $coowners = $env{'form.autoassign_coowners'}; my %autoenrollhash = ( autoenroll => { run => $env{'form.autoenroll_run'}, sender_uname => $sender_uname, sender_domain => $sender_domain, - 'co-owners' => $coowners, + } ); my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash, @@ -4557,13 +4271,6 @@ sub modify_autoenroll { if ($currautoenroll{'sender_domain'} ne $sender_domain) { $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) { $resulttext = &mt('Changes made:').'
      '; if ($changes{'run'}) { @@ -4576,10 +4283,6 @@ sub modify_autoenroll { $resulttext .= '
    • '.&mt("$title{'sender'} set to [_1]",$sender_uname.':'.$sender_domain).'
      • '; } } - if ($changes{'coowners'}) { - $resulttext .= '
    • '.&mt("$title{'coowners'} set to $offon[$env{'form.autoassign_coowners'}]").'
      • '; - &Apache::loncommon::devalidate_domconfig_cache($dom); - } $resulttext .= '
    '; } else { $resulttext = &mt('No changes made to auto-enrollment settings'); @@ -4611,7 +4314,7 @@ sub modify_autoupdate { lastname => 'Last Name', firstname => 'First Name', middlename => 'Middle Name', - generation => 'Generation', + gen => 'Generation', ); my $othertitle = &mt('All users'); if (keys(%{$usertypes}) > 0) { @@ -4619,35 +4322,13 @@ sub modify_autoupdate { } foreach my $key (keys(%env)) { if ($key =~ /^form\.updateable_(.+)_([^_]+)$/) { - my ($usertype,$item) = ($1,$2); - if (grep(/^\Q$item\E$/,keys(%fieldtitles))) { - if ($usertype eq 'default') { - push(@{$fields{$1}},$2); - } elsif (ref($types) eq 'ARRAY') { - if (grep(/^\Q$usertype\E$/,@{$types})) { - push(@{$fields{$1}},$2); - } - } - } - } - } - my @lockablenames = &Apache::loncommon::get_env_multiple('form.lockablenames'); - @lockablenames = sort(@lockablenames); - if (ref($currautoupdate{'lockablenames'}) eq 'ARRAY') { - my @changed = &Apache::loncommon::compare_arrays($currautoupdate{'lockablenames'},\@lockablenames); - if (@changed) { - $changes{'lockablenames'} = 1; - } - } else { - if (@lockablenames) { - $changes{'lockablenames'} = 1; + push(@{$fields{$1}},$2); } } my %updatehash = ( autoupdate => { run => $env{'form.autoupdate_run'}, classlists => $env{'form.classlists'}, fields => {%fields}, - lockablenames => \@lockablenames, } ); foreach my $key (keys(%currautoupdate)) { @@ -4665,11 +4346,9 @@ sub modify_autoupdate { foreach my $type (@{$currautoupdate{$key}{$item}}) { if (!exists($fields{$item})) { $change = 1; - last; } elsif (ref($fields{$item}) eq 'ARRAY') { if (!grep(/^\Q$type\E$/,@{$fields{$item}})) { $change = 1; - last; } } } @@ -4679,41 +4358,12 @@ sub modify_autoupdate { } } } - } elsif ($key eq 'lockablenames') { - if (ref($currautoupdate{$key}) eq 'ARRAY') { - my @changed = &Apache::loncommon::compare_arrays($currautoupdate{'lockablenames'},\@lockablenames); - if (@changed) { - $changes{'lockablenames'} = 1; - } - } else { - if (@lockablenames) { - $changes{'lockablenames'} = 1; - } - } - } - } - unless (grep(/^\Qlockablenames\E$/,keys(%currautoupdate))) { - if (@lockablenames) { - $changes{'lockablenames'} = 1; } } foreach my $item (@{$types},'default') { if (defined($fields{$item})) { if (ref($currautoupdate{'fields'}) eq 'HASH') { - if (ref($currautoupdate{'fields'}{$item}) eq 'ARRAY') { - my $change = 0; - if (ref($fields{$item}) eq 'ARRAY') { - foreach my $type (@{$fields{$item}}) { - if (!grep(/^\Q$type\E$/,@{$currautoupdate{'fields'}{$item}})) { - $change = 1; - last; - } - } - } - if ($change) { - push(@{$changes{'fields'}},$item); - } - } else { + if (!exists($currautoupdate{'fields'}{$item})) { push(@{$changes{'fields'}},$item); } } else { @@ -4727,17 +4377,7 @@ sub modify_autoupdate { if (keys(%changes) > 0) { $resulttext = &mt('Changes made:').'
      '; foreach my $key (sort(keys(%changes))) { - if ($key eq 'lockablenames') { - $resulttext .= '
    • '; - if (@lockablenames) { - $usertypes->{'default'} = $othertitle; - $resulttext .= &mt("User preference to disable replacement of user's name with institutional data (by auto-update), available for the following affiliations:").' '. - join(', ', map { $usertypes->{$_}; } @lockablenames).'
      • '; - } else { - $resulttext .= &mt("User preference to disable replacement of user's name with institutional data (by auto-update) is unavailable."); - } - $resulttext .= ''; - } elsif (ref($changes{$key}) eq 'ARRAY') { + if (ref($changes{$key}) eq 'ARRAY') { foreach my $item (@{$changes{$key}}) { my @newvalues; foreach my $type (@{$fields{$item}}) { @@ -4776,78 +4416,6 @@ sub modify_autoupdate { return $resulttext; } -sub modify_autocreate { - my ($dom,%domconfig) = @_; - my ($resulttext,%changes,%currautocreate,%newvals,%autocreatehash); - if (ref($domconfig{'autocreate'}) eq 'HASH') { - foreach my $key (keys(%{$domconfig{'autocreate'}})) { - $currautocreate{$key} = $domconfig{'autocreate'}{$key}; - } - } - my %title= ( xml => 'Auto-creation of courses in XML course description files', - req => 'Auto-creation of validated requests for official courses', - xmldc => 'Identity of course creator of courses from XML files', - ); - my @types = ('xml','req'); - foreach my $item (@types) { - $newvals{$item} = $env{'form.autocreate_'.$item}; - $newvals{$item} =~ s/\D//g; - $newvals{$item} = 0 if ($newvals{$item} eq ''); - } - $newvals{'xmldc'} = $env{'form.autocreate_xmldc'}; - my %domcoords = &get_active_dcs($dom); - unless (exists($domcoords{$newvals{'xmldc'}})) { - $newvals{'xmldc'} = ''; - } - %autocreatehash = ( - autocreate => { xml => $newvals{'xml'}, - req => $newvals{'req'}, - } - ); - if ($newvals{'xmldc'} ne '') { - $autocreatehash{'autocreate'}{'xmldc'} = $newvals{'xmldc'}; - } - my $putresult = &Apache::lonnet::put_dom('configuration',\%autocreatehash, - $dom); - if ($putresult eq 'ok') { - my @items = @types; - if ($newvals{'xml'}) { - push(@items,'xmldc'); - } - foreach my $item (@items) { - if (exists($currautocreate{$item})) { - if ($currautocreate{$item} ne $newvals{$item}) { - $changes{$item} = 1; - } - } elsif ($newvals{$item}) { - $changes{$item} = 1; - } - } - if (keys(%changes) > 0) { - my @offon = ('off','on'); - $resulttext = &mt('Changes made:').'
        '; - foreach my $item (@types) { - if ($changes{$item}) { - my $newtxt = $offon[$newvals{$item}]; - $resulttext .= '
      • '.&mt("$title{$item} set to [_1]$newtxt [_2]",'','').'
        • '; - } - } - if ($changes{'xmldc'}) { - my ($dcname,$dcdom) = split(':',$newvals{'xmldc'}); - my $newtxt = &Apache::loncommon::plainname($dcname,$dcdom); - $resulttext .= '
      • '.&mt("$title{'xmldc'} set to [_1]$newtxt [_2]",'','').'
        • '; - } - $resulttext .= '
      '; - } else { - $resulttext = &mt('No changes made to auto-creation settings'); - } - } else { - $resulttext = ''. - &mt('An error occurred: [_1]',$putresult).''; - } - return $resulttext; -} - sub modify_directorysrch { my ($dom,%domconfig) = @_; my ($resulttext,%changes); @@ -5602,7 +5170,7 @@ sub modify_usermodification { } my @modifiable; if ($context eq 'selfcreate') { - $resulttext .= '
    • '.&mt('Self-creation of account by users with status: [_1]',$rolename).' - '.&mt('modifiable fields (if institutional data blank): '); + $resulttext .= '
    • '.&mt('Self-creation of account by users with status: [_1] ',$rolename).' - '.&mt('modifiable fields (if institutional data blank): '); } else { $resulttext .= '
    • '.&mt('Target user with [_1] role',$rolename).' - '.&mt('modifiable fields: '); } @@ -5746,7 +5314,7 @@ sub modify_scantron { my $error; if ($configuserok eq 'ok') { if ($switchserver) { - $error = &mt("Upload of bubblesheet format file is not permitted to this server: [_1]",$switchserver); + $error = &mt("Upload of scantron format file is not permitted to this server: [_1]",$switchserver); } else { if ($author_ok eq 'ok') { my ($result,$scantronurl) = @@ -5786,25 +5354,25 @@ sub modify_scantron { if (ref($confhash{'scantron'}) eq 'HASH') { $resulttext = &mt('Changes made:').'
        '; if ($confhash{'scantron'}{'scantronformat'} eq '') { - $resulttext .= '
      • '.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'
        • '; + $resulttext .= '
      • '.&mt('[_1] scantron format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'
        • '; } else { - $resulttext .= '
      • '.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'
        • '; + $resulttext .= '
      • '.&mt('Custom scantron format file ([_1]) uploaded for use with courses in this domain.',$custom).'
        • '; } $resulttext .= '
      '; } else { - $resulttext = &mt('Changes made to bubblesheet format file.'); + $resulttext = &mt('Changes made to scantron format file.'); } $resulttext .= '
    '; &Apache::loncommon::devalidate_domconfig_cache($dom); } else { - $resulttext = &mt('No changes made to bubblesheet format file'); + $resulttext = &mt('No changes made to scantron format file'); } } else { $resulttext = ''. &mt('An error occurred: [_1]',$putresult).''; } } else { - $resulttext = &mt('No changes made to bubblesheet format file'); + $resulttext = &mt('No changes made to scantron format file'); } if ($errors) { $resulttext .= &mt('The following errors occurred: ').'
      '. @@ -5828,33 +5396,18 @@ sub modify_coursecategories { $changes{'categorize'} = 1; $domconfig{'coursecategories'}{'categorize'} = $env{'form.categorize'}; } - if ($domconfig{'coursecategories'}{'togglecatscomm'} ne $env{'form.togglecatscomm'}) { - $changes{'togglecatscomm'} = 1; - $domconfig{'coursecategories'}{'togglecatscomm'} = $env{'form.togglecatscomm'}; - } - if ($domconfig{'coursecategories'}{'categorizecomm'} ne $env{'form.categorizecomm'}) { - $changes{'categorizecomm'} = 1; - $domconfig{'coursecategories'}{'categorizecomm'} = $env{'form.categorizecomm'}; - } } else { $changes{'togglecats'} = 1; $changes{'categorize'} = 1; - $changes{'togglecatscomm'} = 1; - $changes{'categorizecomm'} = 1; $domconfig{'coursecategories'} = { togglecats => $env{'form.togglecats'}, categorize => $env{'form.categorize'}, - togglecatscomm => $env{'form.togglecatscomm'}, - categorizecomm => $env{'form.categorizecomm'}, }; } if (ref($cathash) eq 'HASH') { if (($domconfig{'coursecategories'}{'cats'}{'instcode::0'} ne '') && ($env{'form.instcode'} == 0)) { push (@deletecategory,'instcode::0'); } - if (($domconfig{'coursecategories'}{'cats'}{'communities::0'} ne '') && ($env{'form.communities'} == 0)) { - push(@deletecategory,'communities::0'); - } } my (@predelcats,@predeltrails,%predelallitems,%sort_by_deltrail); if (ref($cathash) eq 'HASH') { @@ -5904,26 +5457,10 @@ sub modify_coursecategories { $adds{$newitem} = 1; } } - if ($env{'form.communities'} eq '1') { - if (ref($cathash) eq 'HASH') { - my $newitem = 'communities::0'; - if ($cathash->{$newitem} eq '') { - $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.communities_pos'}; - $adds{$newitem} = 1; - } - } else { - my $newitem = 'communities::0'; - $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.communities_pos'}; - $adds{$newitem} = 1; - } - } if ($env{'form.addcategory_name'} ne '') { - if (($env{'form.addcategory_name'} ne 'instcode') && - ($env{'form.addcategory_name'} ne 'communities')) { - my $newitem = &escape($env{'form.addcategory_name'}).'::0'; - $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos'}; - $adds{$newitem} = 1; - } + my $newitem = &escape($env{'form.addcategory_name'}).'::0'; + $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos'}; + $adds{$newitem} = 1; } my $putresult; if ((keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) { @@ -5960,15 +5497,12 @@ sub modify_coursecategories { $putresult = &Apache::lonnet::put_dom('configuration',\%domconfig,$dom); if ($putresult eq 'ok') { my %title = ( - togglecats => 'Show/Hide a course in catalog', - categorize => 'Assign a category to a course', - togglecatscomm => 'Show/Hide a community in catalog', - categorizecomm => 'Assign a category to a community', + togglecats => 'Show/Hide a course in the catalog', + categorize => 'Category assigned to course', ); my %level = ( - dom => 'set in Domain ("Modify Course/Community")', - crs => 'set in Course ("Course Configuration")', - comm => 'set in Community ("Community Configuration")', + dom => 'set from "Modify Course" (Domain)', + crs => 'set from "Parameters" (Course)', ); $resulttext = &mt('Changes made:').'
        '; if ($changes{'togglecats'}) { @@ -5977,12 +5511,6 @@ sub modify_coursecategories { if ($changes{'categorize'}) { $resulttext .= '
      • '.&mt("$title{'categorize'} $level{$env{'form.categorize'}}").'
        • '; } - if ($changes{'togglecatscomm'}) { - $resulttext .= '
      • '.&mt("$title{'togglecatscomm'} $level{$env{'form.togglecatscomm'}}").'
        • '; - } - if ($changes{'categorizecomm'}) { - $resulttext .= '
      • '.&mt("$title{'categorizecomm'} $level{$env{'form.categorizecomm'}}").'
        • '; - } if ((keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) { my $cathash; if (ref($domconfig{'coursecategories'}) eq 'HASH') { @@ -6032,7 +5560,7 @@ sub modify_coursecategories { &mt('An error occurred: [_1]',$putresult).''; } } else { - $resulttext = &mt('No changes made to course and community categories'); + $resulttext = &mt('No changes made to course categories'); } return $resulttext; } @@ -6162,68 +5690,68 @@ sub modify_serverstatuses { return $resulttext; } -sub modify_coursedefaults { +sub modify_helpsettings { my ($dom,%domconfig) = @_; - my ($resulttext,$errors,%changes,%defaultshash); - my %defaultchecked = ('canuse_pdfforms' => 'off'); - my @offon = ('off','on'); - my @toggles = ('canuse_pdfforms'); - - $defaultshash{'coursedefaults'} = {}; - - if (ref($domconfig{'coursedefaults'}) ne 'HASH') { - if ($domconfig{'coursedefaults'} eq '') { - $domconfig{'coursedefaults'} = {}; - } - } - - if (ref($domconfig{'coursedefaults'}) eq 'HASH') { + 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{'coursedefaults'}{$item} eq '') && - ($env{'form.'.$item} eq '0')) { - $changes{$item} = 1; - } elsif ($domconfig{'coursdefaults'}{$item} ne $env{'form.'.$item}) { - $changes{$item} = 1; - } - } elsif ($defaultchecked{$item} eq 'off') { - if (($domconfig{'coursedefaults'}{$item} eq '') && - ($env{'form.'.$item} eq '1')) { - $changes{$item} = 1; - } elsif ($domconfig{'coursedefaults'}{$item} ne $env{'form.'.$item}) { - $changes{$item} = 1; - } - } - $defaultshash{'coursedefaults'}{$item} = $env{'form.'.$item}; - } + + 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',\%defaultshash, + + my $putresult = &Apache::lonnet::put_dom('configuration',\%helphash, $dom); + if ($putresult eq 'ok') { if (keys(%changes) > 0) { - if ($changes{'canuse_pdfforms'}) { - my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); - $domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'}; - my $cachetime = 24*60*60; - &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); - } - $resulttext = &mt('Changes made:').'
          '; - foreach my $item (sort(keys(%changes))) { - if ($item eq 'canuse_pdfforms') { - if ($env{'form.'.$item} eq '1') { - $resulttext .= '
        • '.&mt("Course/Community users can create/upload PDF forms set to 'on'").'
          • '; - } else { - $resulttext .= '
        • '.&mt('Course/Community users can create/upload PDF forms set to "off"').'
          • '; - } - } - } - $resulttext .= '
        '; - } else { - $resulttext = &mt('No changes made to course defaults'); - } + $resulttext = &mt('Changes made:').'
          '; + foreach my $item (sort(keys(%changes))) { + if ($item eq 'submitbugs') { + $resulttext .= '
        • '.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'
          • '; + } + } + $resulttext .= '
        '; + } else { + $resulttext = &mt('No changes made to help settings'); + } } else { $resulttext = ''. - &mt('An error occurred: [_1]',$putresult).''; + &mt('An error occurred: [_1]',$putresult).''; + } + if ($errors) { + $resulttext .= &mt('The following errors occurred: ').'
          '. + $errors.'
        '; } return $resulttext; } @@ -6301,74 +5829,4 @@ sub dom_servers { return %uniqservers; } -sub get_active_dcs { - my ($dom) = @_; - my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']); - my %domcoords; - my $numdcs = 0; - my $now = time; - foreach my $server (keys(%dompersonnel)) { - foreach my $user (sort(keys(%{$dompersonnel{$server}}))) { - my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); - my ($end,$start) = split(':',$dompersonnel{$server}{$user}); - if (($end eq '') || ($end == 0) || ($end > $now)) { - if ($start <= $now) { - $domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user}; - } - } - } - } - return %domcoords; -} - -sub active_dc_picker { - my ($dom,$curr_dc) = @_; - my %domcoords = &get_active_dcs($dom); - my @dcs = sort(keys(%domcoords)); - my $numdcs = scalar(@dcs); - my $datatable; - my $numinrow = 2; - if ($numdcs > 1) { - $datatable = ''; - for (my $i=0; $i<@dcs; $i++) { - my $rem = $i%($numinrow); - if ($rem == 0) { - if ($i > 0) { - $datatable .= ''; - } - $datatable .= ''; - } - my $check = ' '; - if ($curr_dc eq '') { - if (!$i) { - $check = ' checked="checked" '; - } - } elsif ($dcs[$i] eq $curr_dc) { - $check = ' checked="checked" '; - } - if ($i == @dcs - 1) { - my $colsleft = $numinrow - $rem; - if ($colsleft > 1) { - $datatable .= ''; - } - $datatable .= '
        '; - } else { - $datatable .= ''; - } - } else { - $datatable .= ''; - } - my ($dcname,$dcdom) = split(':',$dcs[$i]); - $datatable .= '
        '; - } elsif (@dcs) { - $datatable .= ''; - } - return ($numdcs,$datatable); -} - 1;