--- loncom/interface/domainprefs.pm 2010/04/14 05:16:47 1.102.2.14 +++ loncom/interface/domainprefs.pm 2009/10/06 18:24:29 1.111 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.102.2.14 2010/04/14 05:16:47 raeburn Exp $ +# $Id: domainprefs.pm,v 1.111 2009/10/06 18:24:29 jms Exp $ # # Copyright Michigan State University Board of Trustees # @@ -199,12 +199,12 @@ sub handler { } my %domconfig = &Apache::lonnet::get_dom('configuration',['login','rolecolors', - 'quotas','autoenroll','autoupdate','autocreate', - 'directorysrch','usercreation','usermodification', - 'contacts','defaults','scantron','coursecategories', - 'serverstatuses','requestcourses'],$dom); + 'quotas','autoenroll','autoupdate','directorysrch', + 'usercreation','usermodification','contacts','defaults', + 'scantron','coursecategories','serverstatuses', + 'requestcourses'],$dom); my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', - 'autoupdate','autocreate','directorysrch','contacts', + 'autoupdate','directorysrch','contacts', 'usercreation','usermodification','scantron', 'requestcourses','coursecategories','serverstatuses'); my %prefs = ( @@ -220,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', @@ -233,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', @@ -250,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', @@ -310,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 => '',}, @@ -326,14 +319,8 @@ sub handler { col3 => 'Specific IPs', }], }, - 'coursedefaults' => - {text => 'Course/Community defaults', - help => 'Domain_Configuration_Course_Defaults', - header => [{col1 => 'Setting', - col2 => 'Value',}], - }, ); - my %servers = &dom_servers($dom); + my %servers = &Apache::lonnet::get_servers($dom); if (keys(%servers) > 1) { $prefs{'login'} = { text => 'Log-in page options', help => 'Domain_Configuration_Login_Page', @@ -347,7 +334,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); @@ -410,8 +397,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') { @@ -497,18 +482,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'}).'
@@ -532,7 +506,8 @@ sub print_config_box { - '. + '. + &print_usermodification('bottom',$dom,$settings,\$rowtotal); $rowtotal ++; } elsif ($action eq 'coursecategories') { @@ -615,8 +590,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') { @@ -641,17 +614,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 %servers = &Apache::lonnet::get_servers($dom); my $choice = $choices{'disallowlogin'}; $css_class = ' class="LC_odd_row"'; - $datatable .= ''. + $datatable .= ''. ''; return $datatable; @@ -845,31 +787,28 @@ sub print_login { sub login_choices { my %choices = &Apache::lonlocal::texthash ( - coursecatalog => 'Display Course/Community Catalog link?', - adminmail => "Display Administrator's E-mail Address?", + coursecatalog => 'Display Course Catalog link?', + 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; } @@ -887,6 +826,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}; @@ -904,6 +844,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}; @@ -922,6 +866,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; @@ -950,7 +898,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 = ''. ''; if (!$is_custom->{'font'}) { $datatable .= ''; @@ -964,6 +912,22 @@ sub display_color_options { '    '. ''; + unless ($role eq 'login') { + $datatable .= ''. + ''; + if (!$is_custom->{'fontmenu'}) { + $datatable .= ''; + } else { + $datatable .= ''; + } + $fontlink = &color_pick($phase,$role,'fontmenu',$choices->{'fontmenu'},$designs->{'fontmenu'}); + $datatable .= ''; + } my $switchserver = &check_switchserver($dom,$confname); foreach my $img (@{$images}) { $itemcount ++; @@ -1319,15 +1283,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 { @@ -1350,7 +1314,7 @@ sub print_quotas { if ($context eq 'requestcourses') { $datatable .= ''; foreach my $item (@usertools) { - $datatable .= ''; + $datatable .= ''; } $datatable .= '
'.&mt($item->{'header'}->[2]->{'col1'}).''.&mt($item->{'header'}->[2]->{'col2'}).'
'.&mt($item->{'header'}->[2]->{'col2'}).'
'.$choice.''.$choices{'disallowlogin'}.''. - ''. - ''. - ''. - ''."\n"; + ''."\n"; my %disallowed; if (ref($settings) eq 'HASH') { if (ref($settings->{'loginvia'}) eq 'HASH') { @@ -660,52 +631,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}.'
'.$lonhost.'
'.$choices->{'font'}.''.&mt('Default in use:').' '.$defaults->{'font'}.'
'.$choices->{'fontmenu'}.''.&mt('Default in use:').' '.$defaults->{'fontmenu'}.' '. + ' '.$fontlink. + '    '. + '
'.$cell{$item}.''.$cell{$item}.'
'; } @@ -1427,13 +1391,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 { @@ -1456,7 +1420,7 @@ sub print_quotas { if ($context eq 'requestcourses') { $datatable .= ''; foreach my $item (@usertools) { - $datatable .= ''.$defcell{$item}.''; + $datatable .= ''.$defcell{$item}.''; } $datatable .= ''; } @@ -1530,13 +1494,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 { @@ -1559,7 +1523,7 @@ sub print_quotas { if ($context eq 'requestcourses') { $datatable .= ''; foreach my $item (@usertools) { - $datatable .= ''.$advcell{$item}.''; + $datatable .= ''.$advcell{$item}.''; } $datatable .= ''; } @@ -1649,7 +1613,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') { @@ -1668,18 +1632,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'}; } @@ -1710,16 +1662,8 @@ sub print_autoenroll { &mt('username').': '. '  '.&mt('domain'). - ': '.$domform.''. - ''. - ''.&mt('Automatically assign co-ownership').''. - ' '. - ''. - ''; - $$rowtotal += 3; + ': '.$domform.''; + $$rowtotal += 2; return $datatable; } @@ -1761,17 +1705,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; @@ -1792,57 +1728,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 = ' '; @@ -1960,13 +1845,12 @@ sub print_contacts { my ($dom,$settings,$rowtotal) = @_; my $datatable; my @contacts = ('adminemail','supportemail'); - my (%checked,%to,%otheremails,%bccemails); + my (%checked,%to,%otheremails); my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail', 'requestsmail'); foreach my $type (@mailings) { $otheremails{$type} = ''; } - $bccemails{'helpdeskmail'} = ''; if (ref($settings) eq 'HASH') { foreach my $item (@contacts) { if (exists($settings->{$item})) { @@ -1982,9 +1866,6 @@ sub print_contacts { } } $otheremails{$type} = $settings->{$type}{'others'}; - if ($type eq 'helpdeskmail') { - $bccemails{$type} = $settings->{$type}{'bcc'}; - } } } elsif ($type eq 'lonstatusmail') { $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; @@ -2028,79 +1909,13 @@ sub print_contacts { } $datatable .= '
'.&mt('Others').':  '. ''; - if ($type eq 'helpdeskmail') { - $datatable .= '
'.&mt('Bcc').':'.(' 'x6). - ''; - } - $datatable .= ''."\n"; + 'value="'.$otheremails{$type}.'" />'. + ''."\n"; } $$rowtotal += $rownum; 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')); - - my (%checkedon,%checkedoff,$datatable,$css_class); - - 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,$itemcount); -} - -sub print_coursedefaults { - my ($dom,$settings,$rowtotal) = @_; - my ($css_class,$datatable); - my $itemcount = 1; - my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles); - %choices = - &Apache::lonlocal::texthash ( - canuse_pdfforms => 'Course/Community users can create/upload PDF forms', - ); - %defaultchecked = ('canuse_pdfforms' => 'off'); - @toggles = ('canuse_pdfforms',); - ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, - \%choices,$itemcount); - $$rowtotal += $itemcount; - return $datatable; -} - sub contact_titles { my %titles = &Apache::lonlocal::texthash ( 'supportemail' => 'Support E-mail address', @@ -2146,7 +1961,7 @@ sub courserequest_titles { sub courserequest_conditions { my %conditions = &Apache::lonlocal::texthash ( - approval => '(Processing of request subject to approval by Domain Coordinator).', + approval => '(Processing of request subject to approval by Domain Coordinator).', validate => '(Processing of request subject to instittutional validation).', ); return %conditions; @@ -2642,7 +2457,7 @@ sub print_scantronformat { ''; if ($scantronurl) { $datatable .= ''. - &mt('Default bubblesheet format file').''; + &mt('Default scantron format file').''; } else { $datatable = &mt('File unavailable for display'); } @@ -2669,7 +2484,7 @@ sub print_scantronformat { } elsif ($scantronurl) { $datatable .= ''. ''. - &mt('Custom bubblesheet format file').''. ' '. @@ -2698,7 +2513,7 @@ sub legacy_scantronformat { &publishlogo($r,'copy',$legacyfile,$dom,$confname,'scantron', '','',$newfile); if ($result ne 'ok') { - $error = &mt("An error occurred publishing the [_1] bubblesheet format file in RES space. Error was: [_2].",$newfile,$result); + $error = &mt("An error occurred publishing the [_1] scantron format file in RES space. Error was: [_2].",$newfile,$result); } } return ($url,$error); @@ -2712,11 +2527,6 @@ sub print_coursecategories { my $toggle_cats_dom = ' checked="checked" '; my $can_cat_crs = ' '; my $can_cat_dom = ' checked="checked" '; - my $toggle_catscomm_comm = ' '; - my $toggle_catscomm_dom = ' checked="checked" '; - my $can_catcomm_comm = ' '; - my $can_catcomm_dom = ' checked="checked" '; - if (ref($settings) eq 'HASH') { if ($settings->{'togglecats'} eq 'crs') { $toggle_cats_crs = $toggle_cats_dom; @@ -2726,25 +2536,14 @@ sub print_coursecategories { $can_cat_crs = $can_cat_dom; $can_cat_dom = ' '; } - if ($settings->{'togglecatscomm'} eq 'comm') { - $toggle_catscomm_comm = $toggle_catscomm_dom; - $toggle_catscomm_dom = ' '; - } - if ($settings->{'categorizecomm'} eq 'comm') { - $can_catcomm_comm = $can_catcomm_dom; - $can_catcomm_dom = ' '; - } } my %title = &Apache::lonlocal::texthash ( - togglecats => 'Show/Hide a course in catalog', - togglecatscomm => 'Show/Hide a community in catalog', - categorize => 'Assign a category to a course', - categorizecomm => 'Assign a category to a community', + togglecats => 'Show/Hide a course in the catalog', + categorize => 'Assign a category to a course', ); my %level = &Apache::lonlocal::texthash ( - dom => 'Set in Domain', - crs => 'Set in Course', - comm => 'Set in Community', + dom => 'Set in "Modify Course" (Domain)', + crs => 'Set in "Modify Parameters" (Course)', ); $datatable = ''. ''.$title{'togglecats'}.''. @@ -2760,22 +2559,8 @@ sub print_coursecategories { $can_cat_dom.' value="dom" />'.$level{'dom'}.' '. ''. - ''. - ''.$title{'togglecatscomm'}.''. - ' '. - ''. - ''. - ''.$title{'categorizecomm'}.''. - ''. - ' '. - ''. ''; - $$rowtotal += 4; + $$rowtotal += 2; } else { my $css_class; my $itemcount = 1; @@ -2797,15 +2582,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; @@ -2826,33 +2603,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 { @@ -2970,7 +2721,7 @@ sub print_serverstatuses { sub serverstatus_pages { return ('userstatus','lonstatus','loncron','server-status','codeversions', 'clusterstatus','metadata_keywords','metadata_harvest', - 'takeoffline','takeonline','showenv','toggledebug'); + 'takeoffline','takeonline','showenv'); } sub coursecategories_javascript { @@ -2995,9 +2746,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"; @@ -3079,40 +2814,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 { @@ -3422,14 +3139,6 @@ sub modify_login { newuser => 'Link for visitors to create a user account', loginheader => 'Log-in box header'); 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; ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], \%domconfig,\%loginhash); @@ -3443,92 +3152,18 @@ sub modify_login { \%loginhash); } - my %servers = &dom_servers($dom); - my @loginvia_attribs = ('serverpath','custompath','exempt'); + my %servers = &Apache::lonnet::get_servers($dom); 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; - } - } - } else { - if (defined($servers{$env{'form.'.$lonhost.'_server'}})) { - $loginhash{login}{loginvia}{$lonhost}{'server'} = $env{'form.'.$lonhost.'_server'}; - $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; - } + if ($env{'form.'.$lonhost.'_serverurl'} ne '') { + if (defined($servers{$env{'form.'.$lonhost.'_serverurl'}})) { + $loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'}; + $changes{$item} = 1; } } } } - + my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash, $dom); if ($putresult eq 'ok') { @@ -3575,35 +3210,6 @@ sub modify_login { foreach my $item (sort(keys(%changes))) { if ($item eq 'loginheader') { $resulttext .= '
  • '.&mt("$title{$item} set to $env{'form.loginheader'}").'
    • '; - } elsif ($item eq 'loginvia') { - if (ref($changes{$item}) eq 'HASH') { - $resulttext .= '
  • '.&mt('Log-in page availability:').'
    • '; - } } else { $resulttext .= '
  • '.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'
    • '; } @@ -3631,6 +3237,7 @@ sub color_font_choices { links => "Link colors", images => "Images", font => "Font color", + fontmenu => "Font Menu", pgbg => "Page", tabbg => "Header", sidebg => "Border", @@ -3688,6 +3295,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'); @@ -3810,6 +3418,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}) { @@ -4305,7 +3924,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') { @@ -4525,8 +4144,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'}; @@ -4535,12 +4153,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, @@ -4561,13 +4178,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:').''; } else { $resulttext = &mt('No changes made to auto-enrollment settings'); @@ -4615,7 +4221,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) { @@ -4623,35 +4229,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)) { @@ -4669,11 +4253,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; } } } @@ -4683,41 +4265,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 { @@ -4731,17 +4284,7 @@ sub modify_autoupdate { if (keys(%changes) > 0) { $resulttext = &mt('Changes made:').''; @@ -5626,7 +5077,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: '); } @@ -5770,7 +5221,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) = @@ -5810,25 +5261,25 @@ sub modify_scantron { if (ref($confhash{'scantron'}) eq 'HASH') { $resulttext = &mt('Changes made:').''; } 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: ').'