--- loncom/interface/domainprefs.pm 2010/03/23 20:06:04 1.102.2.12 +++ loncom/interface/domainprefs.pm 2009/09/23 02:40:13 1.102.4.1 @@ -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.102.4.1 2009/09/23 02:40:13 gci 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'],$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'); my %prefs = ( 'rolecolors' => { text => 'Default color schemes', @@ -234,7 +233,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 +250,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 +302,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,28 +318,12 @@ 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); - if (keys(%servers) > 1) { - $prefs{'login'} = { text => 'Log-in page options', - help => 'Domain_Configuration_Login_Page', - header => [{col1 => 'Log-in Service', - col2 => 'Server Setting',}, - {col1 => 'Log-in Page Items', - col2 => ''}], - }; - } my @roles = ('student','coordinator','author','admin'); 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 +386,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 +404,6 @@ 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); } return $output; } @@ -452,11 +423,9 @@ sub print_config_box { &Apache::loncommon::help_open_topic($item->{'help'}).''."\n". ''; $rowtotal ++; - my $numheaders = 1; - if (ref($item->{'header'}) eq 'ARRAY') { - $numheaders = scalar(@{$item->{'header'}}); - } - if ($numheaders > 1) { + if (($action eq 'autoupdate') || ($action eq 'rolecolors') || + ($action eq 'usercreation') || ($action eq 'usermodification') || + ($action eq 'coursecategories') || ($action eq 'requestcourses')) { my $colspan = ''; if (($action eq 'rolecolors') || ($action eq 'coursecategories')) { $colspan = ' colspan="2"'; @@ -478,9 +447,6 @@ sub print_config_box { $output .= &print_usermodification('top',$dom,$settings,\$rowtotal); } elsif ($action eq 'coursecategories') { $output .= &print_coursecategories('top',$dom,$item,$settings,\$rowtotal); - } elsif ($action eq 'login') { - $output .= &print_login('top',$dom,$confname,$phase,$settings,\$rowtotal); - $colspan = ' colspan="2"'; } elsif ($action eq 'requestcourses') { $output .= &print_quotas($dom,$settings,\$rowtotal,$action); } else { @@ -500,18 +466,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,13 +490,12 @@ sub print_config_box { - '. + '. + &print_usermodification('bottom',$dom,$settings,\$rowtotal); $rowtotal ++; } elsif ($action eq 'coursecategories') { $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); - } elsif ($action eq 'login') { - $output .= &print_login('bottom',$dom,$confname,$phase,$settings,\$rowtotal); } elsif ($action eq 'requestcourses') { $output .= &print_courserequestmail($dom,$settings,\$rowtotal); } else { @@ -612,14 +566,11 @@ sub print_config_box { $output .= ''; $rowtotal ++; if ($action eq 'login') { - $output .= &print_login('bottom',$dom,$confname,$phase,$settings, - \$rowtotal); + $output .= &print_login($dom,$confname,$phase,$settings,\$rowtotal); } elsif ($action eq 'quotas') { $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,8 +581,6 @@ 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); } } $output .= ' @@ -643,79 +592,8 @@ sub print_config_box { } sub print_login { - my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_; - my ($css_class,$datatable); + my ($dom,$confname,$phase,$settings,$rowtotal) = @_; my %choices = &login_choices(); - - if ($position eq 'top') { - my %servers = &dom_servers($dom); - my $choice = $choices{'disallowlogin'}; - $css_class = ' class="LC_odd_row"'; - $datatable .= ''. - ''; - return $datatable; - } - my %defaultchecked = ( 'coursecatalog' => 'on', 'adminmail' => 'off', @@ -850,15 +728,8 @@ sub print_login { sub login_choices { my %choices = &Apache::lonlocal::texthash ( - coursecatalog => 'Display Course/Community Catalog link?', + 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)", - directlogin => "No redirect", newuser => "Link to create a user account", img => "Header", logo => "Main Logo", @@ -1255,7 +1126,7 @@ sub print_quotas { my ($css_class,%titles); if ($context eq 'requestcourses') { @usertools = ('official','unofficial','community'); - @options =('norequest','approval','validate','autolimit'); + @options =('norequest','approval','autolimit','validate'); %validations = &Apache::lonnet::auto_courserequest_checks($dom); %titles = &courserequest_titles(); } else { @@ -1324,16 +1195,16 @@ sub print_quotas { $cell{$item} .= ''; + $titles{$option}.' '; if ($option eq 'autolimit') { - $cell{$item} .= ' '; } - $cell{$item} .= ' '; if ($option eq 'autolimit') { $cell{$item} .= $titles{'unlimited'}; } + $cell{$item} .= '  '; } } else { my $checked = 'checked="checked" '; @@ -1432,11 +1303,11 @@ 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'}; } @@ -1535,11 +1406,11 @@ 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'}; } @@ -1654,7 +1525,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 +1544,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 +1574,8 @@ sub print_autoenroll { &mt('username').': '. '  '.&mt('domain'). - ': '.$domform.''. - ''. - ''. - ''. - ''; - $$rowtotal += 3; + ': '.$domform.''; + $$rowtotal += 2; return $datatable; } @@ -1766,17 +1617,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 +1640,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=''. - ''. - ''. - ''; - $$rowtotal ++ ; - } else { - $datatable .= ''; - } - $datatable .= ''. - ''. - ''; - return $datatable; -} - sub print_directorysrch { my ($dom,$settings,$rowtotal) = @_; my $srchon = ' '; @@ -2036,67 +1828,6 @@ 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')); - - 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 .= - ''. - ''. - ''; - $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', @@ -2638,7 +2369,7 @@ sub print_scantronformat { ''; if ($scantronurl) { $datatable .= ''. - &mt('Default bubblesheet format file').''; + &mt('Default scantron format file').''; } else { $datatable = &mt('File unavailable for display'); } @@ -2665,7 +2396,7 @@ sub print_scantronformat { } elsif ($scantronurl) { $datatable .= ''. ''. ''. @@ -2756,22 +2471,8 @@ sub print_coursecategories { $can_cat_dom.' value="dom" />'.$level{'dom'}.' '. ''. - ''. - ''. - ''. - ''. - ''. - ''. ''; - $$rowtotal += 4; + $$rowtotal += 2; } else { my $css_class; my $itemcount = 1; @@ -2793,15 +2494,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 +2515,14 @@ sub print_coursecategories { $datatable .= ''; } $datatable .= ''; - } else { - $datatable .= '
'.&mt($item->{'header'}->[2]->{'col1'}).''.&mt($item->{'header'}->[2]->{'col2'}).'
'.&mt($item->{'header'}->[2]->{'col2'}).'
'.$choice.''. - ''. - ''. - ''. - ''."\n"; - my %disallowed; - if (ref($settings) eq 'HASH') { - if (ref($settings->{'loginvia'}) eq 'HASH') { - %disallowed = %{$settings->{'loginvia'}}; - } - } - foreach my $lonhost (sort(keys(%servers))) { - my $direct = 'selected="selected"'; - if (ref($disallowed{$lonhost}) eq 'HASH') { - if ($disallowed{$lonhost}{'server'} ne '') { - $direct = ''; - } - } - $datatable .= ''. - ''. - ''; - my ($custom,$exempt); - if (ref($disallowed{$lonhost}) eq 'HASH') { - $custom = $disallowed{$lonhost}{'custompath'}; - $exempt = $disallowed{$lonhost}{'exempt'}; - } - $datatable .= ''. - ''. - ''; - } - $datatable .= '
'.$choices{'hostid'}.''.$choices{'server'}.''.$choices{'serverpath'}.''.$choices{'custompath'}.''.$choices{'exempt'}.'
'.$servers{$lonhost}.'
'.&mt('Automatically assign co-ownership').' '. - '
'.&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.'
'.&mt('Create pending requests for official courses (if validated)').' '. - '
'.$choices->{$item}. - ''. - ' '. - '
'. ''. - &mt('Custom bubblesheet format file').' '. @@ -2694,7 +2425,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); @@ -2708,11 +2439,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; @@ -2722,25 +2448,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'}.'
'.$title{'togglecatscomm'}.' '. - '
'.$title{'categorizecomm'}.''. - ' '. - '
'; - if ($parent eq 'instcode' || $parent eq 'communities') { - $datatable .= '' - .$default_names{$parent}.''; - if ($parent eq 'instcode') { - $datatable .= '
(' - .&mt('with institutional codes') - .')
'; - } - $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 .'