--- loncom/interface/domainprefs.pm 2007/08/26 15:31:03 1.25 +++ loncom/interface/domainprefs.pm 2007/12/12 19:44:53 1.34 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.25 2007/08/26 15:31:03 raeburn Exp $ +# $Id: domainprefs.pm,v 1.34 2007/12/12 19:44:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -61,89 +61,191 @@ sub handler { &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['phase']); - my $phase = "display"; + my $phase = 'pickactions'; if ( exists($env{'form.phase'}) ) { $phase = $env{'form.phase'}; } my %domconfig = &Apache::lonnet::get_dom('configuration',['login','rolecolors', - 'quotas','autoenroll','autoupdate','directorysrch'],$dom); - my @prefs = ( - { text => 'Default color schemes', - help => 'Default_Color_Schemes', - action => 'rolecolors', - header => [{col1 => 'Student Settings', - col2 => '',}, - {col1 => 'Coordinator Settings', - col2 => '',}, - {col1 => 'Author Settings', - col2 => '',}, - {col1 => 'Administrator Settings', - col2 => '',}], - }, - { text => 'Log-in page options', - help => 'Domain_Log-in_Page', - action => 'login', - header => [{col1 => 'Item', - col2 => '',}], - }, - { text => 'Default quotas for user portfolios', - help => 'Default_User_Quota', - action => 'quotas', - header => [{col1 => 'User type', - col2 => 'Default quota'}], - }, - { text => 'Auto-enrollment settings', - help => 'Domain_Auto_Enrollment', - action => 'autoenroll', - header => [{col1 => 'Configuration setting', - col2 => 'Value(s)'}], - }, - { text => 'Auto-update settings', - help => 'Domain_Auto_Update', - action => 'autoupdate', - header => [{col1 => 'Setting', - col2 => 'Value',}, - {col1 => 'User Population', - col2 => 'Updataeable user data'}], - }, - { text => 'Institutional directory searches', - help => 'Domain_Directory_Search', - action => 'directorysrch', - header => [{col1 => 'Setting', - col2 => 'Value',}], - }, + 'quotas','autoenroll','autoupdate','directorysrch', + 'usercreation','usermodification','contacts'],$dom); + my @prefs_order = ('rolecolors','login','quotas','autoenroll', + 'autoupdate','directorysrch','contacts', + 'usercreation','usermodification'); + my %prefs = ( + 'rolecolors' => + { text => 'Default color schemes', + help => 'Default_Color_Schemes', + header => [{col1 => 'Student Settings', + col2 => '',}, + {col1 => 'Coordinator Settings', + col2 => '',}, + {col1 => 'Author Settings', + col2 => '',}, + {col1 => 'Administrator Settings', + col2 => '',}], + }, + 'login' => + { text => 'Log-in page options', + help => 'Domain_Log-in_Page', + header => [{col1 => 'Item', + col2 => '',}], + }, + 'quotas' => + { text => 'Default quotas for user portfolios', + help => 'Default_User_Quota', + header => [{col1 => 'User type', + col2 => 'Default quota'}], + }, + 'autoenroll' => + { text => 'Auto-enrollment settings', + help => 'Domain_Auto_Enrollment', + header => [{col1 => 'Configuration setting', + col2 => 'Value(s)'}], + }, + 'autoupdate' => + { text => 'Auto-update settings', + help => 'Domain_Auto_Update', + header => [{col1 => 'Setting', + col2 => 'Value',}, + {col1 => 'User Population', + col2 => 'Updataeable user data'}], + }, + 'directorysrch' => + { text => 'Institutional directory searches', + help => 'Domain_Directory_Search', + header => [{col1 => 'Setting', + col2 => 'Value',}], + }, + 'contacts' => + { text => 'Contact Information', + help => 'Domain_Contact_Information', + header => [{col1 => 'Setting', + col2 => 'Value',}], + }, + + 'usercreation' => + { text => 'User creation', + help => 'Domain_User_Creation', + header => [{col1 => 'Format Rule Type', + col2 => 'Format Rules in force'}, + {col1 => 'User account creation', + col2 => 'Usernames which may be created',}, + {col1 => 'Context', + col2 => 'Assignable Authentication Types'}], + }, + 'usermodification' => + { text => 'User modification', + help => 'Domain_User_Modification', + header => [{col1 => 'Target user has role', + col2 => 'User information updateable in author context'}, + {col1 => 'Target user has role', + col2 => 'User information updateable in course context'}], + }, ); my @roles = ('student','coordinator','author','admin'); + my @actions = &Apache::loncommon::get_env_multiple('form.actions'); &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:changePage(document.$phase,'display')", - text=>"Domain Configuration"}); + ({href=>"javascript:changePage(document.$phase,'pickactions')", + text=>"Pick functionality"}); my $confname = $dom.'-domainconfig'; if ($phase eq 'process') { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:changePage(document.$phase,'$phase')", + ({href=>"javascript:changePage(document.$phase,'display')", + text=>"Domain Configuration"}, + {href=>"javascript:changePage(document.$phase,'$phase')", text=>"Updated"}); &print_header($r,$phase); - foreach my $item (@prefs) { - $r->print('

'.&mt($item->{'text'}).'

'. - &process_changes($r,$dom,$confname, - $item->{'action'},\@roles,%domconfig)); + foreach my $item (@prefs_order) { + if (grep(/^\Q$item\E$/,@actions)) { + $r->print('

'.&mt($prefs{$item}{'text'}).'

'. + &process_changes($r,$dom,$confname,$item, + \@roles,%domconfig)); + } } $r->print('

'); - &print_footer($r,$phase,'display','Back to actions menu'); + &print_footer($r,$phase,'display','Back to configuration display', + \@actions); $r->print('

'); + } elsif ($phase eq 'display') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'display')", + text=>"Domain Configuration"}); + &print_header($r,$phase); + if (@actions > 0) { + my $rowsum = 0; + my (%output,%rowtotal,@items); + my $halfway = @actions/2; + foreach my $item (@prefs_order) { + if (grep(/^\Q$item\E$/,@actions)) { + push(@items,$item); + ($output{$item},$rowtotal{$item}) = + &print_config_box($r,$dom,$confname,$phase, + $item,$prefs{$item}, + $domconfig{$item}); + $rowsum += $rowtotal{$item}; + } + } + my $colend; + my $halfway = $rowsum/2; + my $aggregate = 0; + my $sumleft = 0; + my $sumright = 0; + my $crossover; + for (my $i=0; $i<@items; $i++) { + $aggregate += $rowtotal{$items[$i]}; + if ($aggregate > $halfway) { + $crossover = $i; + last; + } + } + for (my $i=0; $i<$crossover; $i++) { + $sumleft += $rowtotal{$items[$i]}; + } + for (my $i=$crossover+1; $i<@items; $i++) { + $sumright += $rowtotal{$items[$i]}; + } + if ((@items > 1) && ($env{'form.numcols'} == 2)) { + my $sumdiff = $sumright - $sumleft; + if ($sumdiff > 0) { + $colend = $crossover + 1; + } else { + $colend = $crossover; + } + } else { + $colend = @items; + } + $r->print('

'); + for (my $i=0; $i<$colend; $i++) { + $r->print($output{$items[$i]}); + } + $r->print(''); + if ($colend < @items) { + for (my $i=$colend; $i<@items; $i++) { + $r->print($output{$items[$i]}); + } + } + $r->print('

'); + $r->print(&print_footer($r,$phase,'process','Save',\@actions)); + } else { + $r->print(''. + ''."\n". + ''.&mt('No settings chosen'). + ''); + } + $r->print(''); + $r->print(&Apache::loncommon::end_page()); } else { if ($phase eq '') { - $phase = 'display'; + $phase = 'pickactions'; } - my %helphash; - my $numprefs = @prefs; + my %helphash; &print_header($r,$phase); if (keys(%domconfig) == 0) { my $primarylibserv = &Apache::lonnet::domain($dom,'primary'); - my $perlvarref = &LONCAPA::Configuration::read_conf('loncapa.conf'); - my $hostid = $perlvarref->{'lonHostID'}; - if ($hostid ne $primarylibserv) { + my @ids=&Apache::lonnet::current_machine_ids(); + if (!grep(/^\Q$primarylibserv\E$/,@ids)) { my %designhash = &Apache::loncommon::get_domainconf($dom); my @loginimages = ('img','logo','domlogo'); my $custom_img_count = 0; @@ -159,24 +261,39 @@ sub handler { } if ($custom_img_count > 0) { my $switch_server = &check_switchserver($dom,$confname); - $r->print(&mt('Domain configuration settings have yet to be saved for this domain via the web-based domain preferences interface.').'
'.&mt("While this remains so, you must switch to the domain's primary library server in order to update settings.").'

'.&mt("Thereafter, you will be able to update settings from this screen when logged in to any server in the LON-CAPA network (with a DC role selected in the domain), although you will still need to switch to the domain's primary library server to upload new images or logos.").'

'.$switch_server.' '.&mt('to primary library server for domain: [_1]',$dom)); + $r->print( + &mt('Domain configuration settings have yet to be saved for this domain via the web-based domain preferences interface.').'
'. + &mt("While this remains so, you must switch to the domain's primary library server in order to update settings.").'

'. + &mt("Thereafter, (with a Domain Coordinator role selected in the domain) you will be able to update settings when logged in to any server in the LON-CAPA network.").'
'. + &mt("However, you will still need to switch to the domain's primary library server to upload new images or logos.").'

'); + if ($switch_server) { + $r->print($switch_server.' '.&mt('to primary library server for domain: [_1]',$dom)); + } return OK; } } } - $r->print(' - -
'); - foreach my $item (@prefs) { - if ($item->{'action'} eq 'login') { - $r->print(' '); - } - &print_config_box($r,$dom,$confname,$phase,$item->{'action'}, - $item,$domconfig{$item->{'action'}}); - } - $r->print(' -
'); - &print_footer($r,$phase,'process','Save changes'); + $r->print('

'.&mt('Functionality to display/modify').'

'); + $r->print(''."\n".'

  '. + '

'); + foreach my $item (@prefs_order) { + $r->print('

'); + } + $r->print('

'.&mt('Display options').'

'."\n". + '

'.&mt('Display using: ')."\n". + '  '. + ''. + &mt('two columns').'

'); + $r->print(&print_footer($r,$phase,'display','Go')); + $r->print(''); + $r->print(&Apache::loncommon::end_page()); } return OK; } @@ -197,37 +314,52 @@ sub process_changes { $output = &modify_autoupdate($dom,%domconfig); } elsif ($action eq 'directorysrch') { $output = &modify_directorysrch($dom,%domconfig); + } elsif ($action eq 'usercreation') { + $output = &modify_usercreation($dom,%domconfig); + } elsif ($action eq 'usermodification') { + $output = &modify_usermodification($dom,%domconfig); + } elsif ($action eq 'contacts') { + $output = &modify_contacts($dom,%domconfig); } return $output; } sub print_config_box { my ($r,$dom,$confname,$phase,$action,$item,$settings) = @_; - $r->print(' - + my $rowtotal = 0; + my $output = + '
- '); + '; # # FIXME - put the help link back in when the help files exist # # '); - if (($action eq 'autoupdate') || ($action eq 'rolecolors')) { + $rowtotal ++; + if (($action eq 'autoupdate') || ($action eq 'rolecolors') || + ($action eq 'usercreation') || ($action eq 'usermodification')) { my $colspan = ($action eq 'rolecolors')?' colspan="2"':''; - $r->print(' + $output .= ' @@ -237,11 +369,27 @@ sub print_config_box { - '); + '; + $rowtotal ++; if ($action eq 'autoupdate') { - $r->print(&print_autoupdate('bottom',$dom,$settings)); + $output .= &print_autoupdate('bottom',$dom,$settings,\$rowtotal); + } elsif ($action eq 'usercreation') { + $output .= &print_usercreation('middle',$dom,$settings,\$rowtotal).' +
'.&mt($item->{text}).' 
'.&mt($item->{text}). + ' 
'.&mt($item->{text}).' '. # &Apache::loncommon::help_open_topic($item->{'help'}).'
- '); + '; + $rowtotal ++; if ($action eq 'autoupdate') { - $r->print(&print_autoupdate('top',$dom,$settings)); + $output .= &print_autoupdate('top',$dom,$settings,\$rowtotal); + } elsif ($action eq 'usercreation') { + $output .= &print_usercreation('top',$dom,$settings,\$rowtotal); + } elsif ($action eq 'usermodification') { + $output .= &print_usermodification('top',$dom,$settings,\$rowtotal); } else { - $r->print(&print_rolecolors($phase,'student',$dom,$confname,$settings)); + $output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal); } - $r->print(' + $output .= '
'.$item->{'header'}->[0]->{'col1'}.' '.$item->{'header'}->[0]->{'col2'}.'
'.$item->{'header'}->[1]->{'col1'}.' '.$item->{'header'}->[1]->{'col2'}.'
+ + + + + + + + '. + &print_usercreation('bottom',$dom,$settings,\$rowtotal); + $rowtotal ++; + } elsif ($action eq 'usermodification') { + $output .= &print_usermodification('bottom',$dom,$settings,\$rowtotal); } else { - $r->print(&print_rolecolors($phase,'coordinator',$dom,$confname,$settings).' + $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).'
'.$item->{'header'}->[2]->{'col1'}.''.$item->{'header'}->[2]->{'col2'}.'
@@ -252,7 +400,7 @@ sub print_config_box { '.$item->{'header'}->[2]->{'col1'}.' '.$item->{'header'}->[2]->{'col2'}.' '. - &print_rolecolors($phase,'author',$dom,$confname,$settings).' + &print_rolecolors($phase,'author',$dom,$confname,$settings,\$rowtotal).' @@ -263,56 +411,99 @@ sub print_config_box { '.$item->{'header'}->[3]->{'col1'}.' '.$item->{'header'}->[3]->{'col2'}.' '. - &print_rolecolors($phase,'admin',$dom,$confname,$settings)); + &print_rolecolors($phase,'admin',$dom,$confname,$settings,\$rowtotal); + $rowtotal += 2; } } else { - $r->print(' + $output .= ' - '); + '; if (($action eq 'login') || ($action eq 'directorysrch')) { - $r->print(' - '); + $output .= ' + '; } else { - $r->print(' - '); + $output .= ' + '; } - $r->print(' + $output .= ' - '); + '; + $rowtotal ++; if ($action eq 'login') { - $r->print(&print_login($dom,$confname,$phase,$settings)); + $output .= &print_login($dom,$confname,$phase,$settings,\$rowtotal); } elsif ($action eq 'quotas') { - $r->print(&print_quotas($dom,$settings)); + $output .= &print_quotas($dom,$settings,\$rowtotal); } elsif ($action eq 'autoenroll') { - $r->print(&print_autoenroll($dom,$settings)); + $output .= &print_autoenroll($dom,$settings,\$rowtotal); } elsif ($action eq 'directorysrch') { - $r->print(&print_directorysrch($dom,$settings)); - } + $output .= &print_directorysrch($dom,$settings,\$rowtotal); + } elsif ($action eq 'contacts') { + $output .= &print_contacts($dom,$settings,\$rowtotal); + } } - $r->print(' + $output .= '
'.$item->{'header'}->[0]->{'col1'}.''.$item->{'header'}->[0]->{'col1'}.''.$item->{'header'}->[0]->{'col1'}.''.$item->{'header'}->[0]->{'col1'}.''.$item->{'header'}->[0]->{'col2'}.'
-
'); - return; +
'; + return ($output,$rowtotal); } sub print_header { my ($r,$phase) = @_; + my $alert = &mt('You must select at least one functionality type to display.'); my $js = ' '; + my $additem; + if ($phase eq 'pickactions') { + my %loaditems = ( + 'onload' => "javascript:getViewportDims(document.$phase.width,document.$phase.height);setDisplayColumns();setFormElements(document.pickactions);", + ); + $additem = {'add_entries' => \%loaditems,}; + } else { + my %loaditems = ( + 'onload' => "javascript:getViewportDims(document.$phase.width,document.$phase.height);", + ); + $additem = {'add_entries' => \%loaditems,}; + } $r->print(&Apache::loncommon::start_page('View/Modify Domain Settings', - $js)); + $js,$additem)); $r->print(&Apache::lonhtmlcommon::breadcrumbs('Domain Settings')); $r->print('
@@ -327,23 +518,42 @@ function changePage(formname,newphase) { } sub print_footer { - my ($r,$phase,$newphase,$button_text) = @_; + my ($r,$phase,$newphase,$button_text,$actions) = @_; $button_text = &mt($button_text); - $r->print(''); + $r->print(''. + ''. + ''); + if (($phase eq 'display') || ($phase eq 'process')) { + if (ref($actions) eq 'ARRAY') { + foreach my $item (@{$actions}) { + $r->print('')."\n"; + } + } + $r->print(''); + } my $dest='"javascript:changePage(document.'.$phase.','."'$newphase'".')"'; if ($phase eq 'process') { - $r->print(''.$button_text.''); + $r->print('

'.$button_text.'

'); } else { - $r->print(''); + my $onclick; + if ($phase eq 'display') { + $onclick = '"javascript:changePage(document.'.$phase.','."'$newphase'".')"'; + } else { + $onclick = '"javascript:changePage(document.'.$phase.','."'$newphase'".')"'; + } + $r->print('

'); + } + if ($phase eq 'process') { + $r->print('
'.&Apache::loncommon::end_page()); } - $r->print(''); - $r->print('
'.&Apache::loncommon::end_page()); return; } sub print_login { - my ($dom,$confname,$phase,$settings) = @_; + my ($dom,$confname,$phase,$settings,$rowtotal) = @_; my %choices = &login_choices(); my ($catalogon,$catalogoff,$adminmailon,$adminmailoff); $catalogon = ' checked="checked" '; @@ -444,7 +654,7 @@ sub print_login { ''; $itemcount ++; - $datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text); + $datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal); $datatable .= ''; return $datatable; } @@ -471,7 +681,7 @@ sub login_choices { } sub print_rolecolors { - my ($phase,$role,$dom,$confname,$settings) = @_; + my ($phase,$role,$dom,$confname,$settings,$rowtotal) = @_; my %choices = &color_font_choices(); my @bgs = ('pgbg','tabbg','sidebg'); my @links = ('link','alink','vlink'); @@ -537,19 +747,19 @@ sub print_rolecolors { } } my $itemcount = 1; - my $datatable = &display_color_options($dom,$confname,$phase,$role,$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text); + my $datatable = &display_color_options($dom,$confname,$phase,$role,$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal); $datatable .= ''; return $datatable; } sub display_color_options { my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs, - $images,$bgs,$links,$alt_text) = @_; + $images,$bgs,$links,$alt_text,$rowtotal) = @_; my $css_class = $itemcount%2?' class="LC_odd_row"':''; my $datatable = ''. ''.$choices->{'font'}.''; if (!$is_custom->{'font'}) { - $datatable .= ''.&mt('Default in use:').' '.$defaults->{'font'}.''; + $datatable .= ''.&mt('Default in use:').' '.$defaults->{'font'}.''; } else { $datatable .= ' '; } @@ -557,6 +767,8 @@ sub display_color_options { $datatable .= ''. ' '.$fontlink. + '    '. ''; my $switchserver = &check_switchserver($dom,$confname); foreach my $img (@{$images}) { @@ -652,7 +864,7 @@ sub display_color_options { my $bgs_def; foreach my $item (@{$bgs}) { if (!$is_custom->{$item}) { - $bgs_def .= ''.$choices->{$item}.'
'.$defaults->{'bgs'}{$item}.''; + $bgs_def .= ''.$choices->{$item}.'    
'.$defaults->{'bgs'}{$item}.''; } } if ($bgs_def) { @@ -666,10 +878,10 @@ sub display_color_options { my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'bgs'}{$item}); $datatable .= ''.$link; if ($designs->{'bgs'}{$item}) { - $datatable .= ' '; + $datatable .= '    '; } $datatable .= '
'; + '" onblur = "javascript:document.display.css_'.$role.'_'.$item.'.style.background-color = document.display.'.$role.'_'.$item.'.value;"/>'; } $datatable .= ''; $itemcount ++; @@ -679,7 +891,7 @@ sub display_color_options { my $links_def; foreach my $item (@{$links}) { if (!$is_custom->{$item}) { - $links_def .= ''.$choices->{$item}.'
'.$defaults->{'links'}{$item}.''; + $links_def .= ''.$choices->{$item}.'
'.$defaults->{'links'}{$item}.''; } } if ($links_def) { @@ -690,17 +902,16 @@ sub display_color_options { $datatable .= ''. ''; foreach my $item (@{$links}) { - $datatable .= ''; } + $$rowtotal += $itemcount; return $datatable; } @@ -740,12 +951,12 @@ ENDCOL } sub print_quotas { - my ($dom,$settings) = @_; + my ($dom,$settings,$rowtotal) = @_; my $datatable; my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom); my $typecount = 0; my $css_class; - if (@{$types} > 0) { + if (ref($types) eq 'ARRAY') { foreach my $type (@{$types}) { if (defined($usertypes->{$type})) { $typecount ++; @@ -768,15 +979,16 @@ sub print_quotas { $typecount ++; $css_class = $typecount%2?' class="LC_odd_row"':''; $datatable .= ''. - ''. + ''. ''; + $$rowtotal += $typecount; return $datatable; } sub print_autoenroll { - my ($dom,$settings) = @_; + my ($dom,$settings,$rowtotal) = @_; my $autorun = &Apache::lonnet::auto_run(undef,$dom), my ($defdom,$runon,$runoff); if (ref($settings) eq 'HASH') { @@ -825,11 +1037,12 @@ sub print_autoenroll { $settings->{'sender_uname'}. '" size="10" />  '.&mt('domain'). ': '.$domform.''; + $$rowtotal += 2; return $datatable; } sub print_autoupdate { - my ($position,$dom,$settings) = @_; + my ($position,$dom,$settings,$rowtotal) = @_; my $datatable; if ($position eq 'top') { my $updateon = ' '; @@ -865,34 +1078,32 @@ sub print_autoupdate { ''. ''; + $$rowtotal += 2; } else { my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom); my @fields = ('lastname','firstname','middlename','gen', 'permanentemail','id'); - my %fieldtitles = &Apache::lonlocal::texthash ( - id => 'Student/Employee ID', - permanentemail => 'E-mail address', - lastname => 'Last Name', - firstname => 'First Name', - middlename => 'Middle Name', - gen => 'Generation', - ); + my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); my $numrows = 0; - if (@{$types} > 0) { - $datatable = - &usertype_update_row($settings,$usertypes,\%fieldtitles, - \@fields,$types,\$numrows); + if (ref($types) eq 'ARRAY') { + if (@{$types} > 0) { + $datatable = + &usertype_update_row($settings,$usertypes,\%fieldtitles, + \@fields,$types,\$numrows); + $$rowtotal += @{$types}; + } } $datatable .= &usertype_update_row($settings,{'default' => $othertitle}, \%fieldtitles,\@fields,['default'], \$numrows); + $$rowtotal ++; } return $datatable; } sub print_directorysrch { - my ($dom,$settings) = @_; + my ($dom,$settings,$rowtotal) = @_; my $srchon = ' '; my $srchoff = ' checked="checked" '; my ($exacton,$containson,$beginson); @@ -932,26 +1143,38 @@ sub print_directorysrch { my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom); my $numinrow = 4; + my $cansrchrow = 0; my $datatable=''. - ''. + ''. ''. ''. - ''. + ''. ''. ''; - $datatable .= &users_cansearch_row($settings,$types,$usertypes,$dom, - $numinrow,$othertitle); - $datatable .= ''. - ''; + $$rowtotal ++; + if ($cansrchrow) { + $datatable .= ''; + } else { + $datatable .= ''; + } + $datatable .= ''. + ''; + $$rowtotal ++; + return $datatable; +} + +sub print_contacts { + my ($dom,$settings,$rowtotal) = @_; + my $datatable; + my @contacts = ('adminemail','supportemail'); + my (%checked,%to,%otheremails); + my @mailings = ('errormail','packagesmail','helpdeskmail'); + foreach my $type (@mailings) { + $otheremails{$type} = ''; + } + if (ref($settings) eq 'HASH') { + foreach my $item (@contacts) { + if (exists($settings->{$item})) { + $to{$item} = $settings->{$item}; + } + } + foreach my $type (@mailings) { + if (exists($settings->{$type})) { + if (ref($settings->{$type}) eq 'HASH') { + foreach my $item (@contacts) { + if ($settings->{$type}{$item}) { + $checked{$type}{$item} = ' checked="checked" '; + } + } + $otheremails{$type} = $settings->{$type}{'others'}; + } + } + } + } else { + $to{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'}; + $to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'}; + $checked{'errormail'}{'adminemail'} = ' checked="checked" '; + $checked{'packagesmail'}{'adminemail'} = ' checked="checked" '; + $checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" '; + } + my ($titles,$short_titles) = &contact_titles(); + my $rownum = 0; + my $css_class; + foreach my $item (@contacts) { + if ($rownum%2) { + $css_class = ''; + } else { + $css_class = ' class="LC_odd_row" '; + } + $datatable .= ''. + ''; + $rownum ++; + } + foreach my $type (@mailings) { + if ($rownum%2) { + $css_class = ''; + } else { + $css_class = ' class="LC_odd_row" '; + } + $datatable .= ''. + ''. + ''."\n"; + $rownum ++; + } + $$rowtotal += $rownum; return $datatable; } +sub contact_titles { + my %titles = &Apache::lonlocal::texthash ( + 'supportemail' => 'Support E-mail address', + 'adminemail' => 'Default Server Admin E-mail address', + 'errormail' => 'Error reports to be e-mailed to', + 'packagesmail' => 'Package update alerts to be e-mailed to', + 'helpdeskmail' => 'Helpdesk requests to be e-mailed to' + ); + my %short_titles = &Apache::lonlocal::texthash ( + adminemail => 'Admin E-mail address', + supportemail => 'Support E-mail', + ); + return (\%titles,\%short_titles); +} + +sub print_usercreation { + my ($position,$dom,$settings,$rowtotal) = @_; + my $numinrow = 4; + my $datatable; + if ($position eq 'top') { + $$rowtotal ++; + my $rowcount = 0; + my ($rules,$ruleorder) = &Apache::lonnet::inst_userrules($dom,'username'); + if (ref($rules) eq 'HASH') { + if (keys(%{$rules}) > 0) { + $datatable .= &user_formats_row('username',$settings,$rules, + $ruleorder,$numinrow,$rowcount); + $$rowtotal ++; + $rowcount ++; + } + } + my ($idrules,$idruleorder) = &Apache::lonnet::inst_userrules($dom,'id'); + if (ref($idrules) eq 'HASH') { + if (keys(%{$idrules}) > 0) { + $datatable .= &user_formats_row('id',$settings,$idrules, + $idruleorder,$numinrow,$rowcount); + $$rowtotal ++; + $rowcount ++; + } + } + } elsif ($position eq 'middle') { + my @creators = ('author','course'); + my %lt = &usercreation_types(); + my %checked; + if (ref($settings) eq 'HASH') { + if (ref($settings->{'cancreate'}) eq 'HASH') { + foreach my $item (@creators) { + $checked{$item} = $settings->{'cancreate'}{$item}; + } + } elsif (ref($settings->{'cancreate'}) eq 'ARRAY') { + foreach my $item (@creators) { + if (grep(/^\Q$item\E$/,@{$settings->{'cancreate'}})) { + $checked{$item} = 'none'; + } + } + } + } + my $rownum = 0; + foreach my $item (@creators) { + $rownum ++; + if ($checked{$item} eq '') { + $checked{$item} = 'any'; + } + my $css_class; + if ($rownum%2) { + $css_class = ''; + } else { + $css_class = ' class="LC_odd_row" '; + } + $datatable .= ''. + ''; + } + } else { + my @contexts = ('author','course','domain'); + my @authtypes = ('int','krb4','krb5','loc'); + my %checked; + if (ref($settings) eq 'HASH') { + if (ref($settings->{'authtypes'}) eq 'HASH') { + foreach my $item (@contexts) { + if (ref($settings->{'authtypes'}{$item}) eq 'HASH') { + foreach my $auth (@authtypes) { + if ($settings->{'authtypes'}{$item}{$auth}) { + $checked{$item}{$auth} = ' checked="checked" '; + } + } + } + } + } + } + my @authtypes = ('int','krb4','krb5','loc'); + my %title = &context_names(); + my %authname = &authtype_names(); + my $rownum = 0; + my $css_class; + foreach my $item (@contexts) { + if ($rownum%2) { + $css_class = ''; + } else { + $css_class = ' class="LC_odd_row" '; + } + $datatable .= ''. + ''; + $rownum ++; + } + $$rowtotal += $rownum; + } + return $datatable; +} + +sub user_formats_row { + my ($type,$settings,$rules,$ruleorder,$numinrow,$rowcount) = @_; + my $output; + my %text = ( + 'username' => 'new usernames', + 'id' => 'IDs', + ); + my $css_class = $rowcount%2?' class="LC_odd_row"':''; + $output = ''. + ''. + ''; + return $output; +} + +sub usercreation_types { + my %lt = &Apache::lonlocal::texthash ( + author => 'When adding a co-author', + course => 'When adding a user to a course', + any => 'Any', + official => 'Institutional only ', + unofficial => 'Non-institutional only', + none => 'None', + ); + return %lt; +} + +sub authtype_names { + my %lt = &Apache::lonlocal::texthash( + int => 'Internal', + krb4 => 'Kerberos 4', + krb5 => 'Kerberos 5', + loc => 'Local', + ); + return %lt; +} + +sub context_names { + my %context_title = &Apache::lonlocal::texthash( + author => 'Creating users when an Author', + course => 'Creating users when in a course', + domain => 'Creating users when a Domain Coordinator', + ); + return %context_title; +} + +sub print_usermodification { + my ($position,$dom,$settings,$rowtotal) = @_; + my $numinrow = 4; + my ($context,$datatable,$rowcount); + if ($position eq 'top') { + $rowcount = 0; + $context = 'author'; + foreach my $role ('ca','aa') { + $datatable .= &modifiable_userdata_row($context,$role,$settings, + $numinrow,$rowcount); + $$rowtotal ++; + $rowcount ++; + } + } else { + $context = 'course'; + $rowcount = 0; + foreach my $role ('st','ep','ta','in','cr') { + $datatable .= &modifiable_userdata_row($context,$role,$settings, + $numinrow,$rowcount); + $$rowtotal ++; + $rowcount ++; + } + } + return $datatable; +} + +sub modifiable_userdata_row { + my ($context,$role,$settings,$numinrow,$rowcount) = @_; + my $rolename; + if ($role eq 'cr') { + $rolename = &mt('Custom role'); + } else { + $rolename = &Apache::lonnet::plaintext($role); + } + my @fields = ('lastname','firstname','middlename','generation', + 'permanentemail','id'); + my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); + my $output; + my $css_class = $rowcount%2?' class="LC_odd_row"':''; + $output = ''. + ''. + ''; + return $output; +} + sub users_cansearch_row { my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle) = @_; my $output = ''. '
'; - my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'links'}{$item}); + $datatable .= ''."\n". + &color_pick($phase,$role,$item,$choices->{$item}, + $designs->{'links'}{$item}); if ($designs->{'links'}{$item}) { - $datatable.=''. - $link.''; - } else { - $datatable .= $link; + $datatable.='    '; } $datatable .= '
'.&mt($othertitle).''.$othertitle.''. ' Mb
'.&mt('Directory search available?').''.&mt('Directory search available?').' '. '
'.&mt('Other domains can search?').''.&mt('Other domains can search?').' '. '
'.&mt('Supported search methods'). - ''; + $$rowtotal += 2; + if (ref($usertypes) eq 'HASH') { + if (keys(%{$usertypes}) > 0) { + $datatable .= &users_cansearch_row($settings,$types,$usertypes,$dom, + $numinrow,$othertitle); + $cansrchrow = 1; + } + } + if ($cansrchrow) { + $$rowtotal ++; + $datatable .= ''; + } else { + $datatable .= ''; + } + $datatable .= ''. - ''. - '
'.&mt('Supported search methods'). + ''; foreach my $title (@{$titleorder}) { if (defined($searchtitles->{$title})) { my $check = ' '; @@ -967,9 +1190,15 @@ sub print_directorysrch { $searchtitles->{$title}.''; } } - $datatable .= '
'.&mt('Search latitude').''. + $datatable .= '
'.&mt('Search latitude').''. '
'.$titles->{$item}. + ''. + '
'. + $titles->{$type}.': '. + ''; + foreach my $item (@contacts) { + $datatable .= ' '; + } + $datatable .= '
'.&mt('Others').':  '. + ''. + '
'.$lt{$item}. + ''; + foreach my $option ('any','official','unofficial','none') { + my $check = ' '; + if ($checked{$item} eq $option) { + $check = ' checked="checked" '; + } + $datatable .= '  '; + } + $datatable .= '
'.$title{$item}. + ''. + ''; + foreach my $auth (@authtypes) { + $datatable .= ' '; + } + $datatable .= '
'. + &mt("Format rules to check for $text{$type}: "). + ''; + my $rem; + if (ref($ruleorder) eq 'ARRAY') { + for (my $i=0; $i<@{$ruleorder}; $i++) { + if (ref($rules->{$ruleorder->[$i]}) eq 'HASH') { + my $rem = $i%($numinrow); + if ($rem == 0) { + if ($i > 0) { + $output .= ''; + } + $output .= ''; + } + my $check = ' '; + if (ref($settings->{$type.'_rule'}) eq 'ARRAY') { + if (grep(/^\Q$ruleorder->[$i]\E$/,@{$settings->{$type.'_rule'}})) { + $check = ' checked="checked" '; + } + } + $output .= ''; + } + } + $rem = @{$ruleorder}%($numinrow); + } + my $colsleft = $numinrow - $rem; + if ($colsleft > 1 ) { + $output .= ''; + } elsif ($colsleft == 1) { + $output .= ''; + } + $output .= '
'. + ''. + '  
'.$rolename.''; + my $rem; + my %checks; + if (ref($settings) eq 'HASH') { + if (ref($settings->{$context}) eq 'HASH') { + if (ref($settings->{$context}->{$role}) eq 'HASH') { + foreach my $field (@fields) { + if ($settings->{$context}->{$role}->{$field}) { + $checks{$field} = ' checked="checked" '; + } + } + } + } + } + for (my $i=0; $i<@fields; $i++) { + my $rem = $i%($numinrow); + if ($rem == 0) { + if ($i > 0) { + $output .= ''; + } + $output .= ''; + } + my $check = ' '; + if (exists($checks{$fields[$i]})) { + $check = $checks{$fields[$i]} + } else { + if ($role eq 'st') { + if (ref($settings) ne 'HASH') { + $check = ' checked="checked" '; + } + } + } + $output .= ''; + $rem = @fields%($numinrow); + } + my $colsleft = $numinrow - $rem; + if ($colsleft > 1 ) { + $output .= ''; + } elsif ($colsleft == 1) { + $output .= ''; + } + $output .= '
'. + ''. + '  
'.&mt('Users allowed to search').' ('.$dom.')'. ''; - for (my $i=0; $i<@{$types}; $i++) { - if (defined($usertypes->{$types->[$i]})) { - my $rem = $i%($numinrow); - if ($rem == 0) { - if ($i > 0) { - $output .= ''; + my $rem; + if (ref($types) eq 'ARRAY') { + for (my $i=0; $i<@{$types}; $i++) { + if (defined($usertypes->{$types->[$i]})) { + my $rem = $i%($numinrow); + if ($rem == 0) { + if ($i > 0) { + $output .= ''; + } + $output .= ''; } - $output .= ''; - } - my $check = ' '; - if (ref($settings->{'cansearch'}) eq 'ARRAY') { - if (grep(/^\Q$types->[$i]\E$/,@{$settings->{'cansearch'}})) { - $check = ' checked="checked" '; + my $check = ' '; + if (ref($settings->{'cansearch'}) eq 'ARRAY') { + if (grep(/^\Q$types->[$i]\E$/,@{$settings->{'cansearch'}})) { + $check = ' checked="checked" '; + } } + $output .= ''; } - $output .= ''; } + + $rem = @{$types}%($numinrow); } - - my $rem = @{$types}%($numinrow); my $colsleft = $numinrow - $rem; if ($colsleft > 1) { $output .= '
'. + ''. - ''; @@ -1020,9 +1633,9 @@ sub users_cansearch_row { } my $defcheck = ' '; if (ref($settings->{'cansearch'}) eq 'ARRAY') { - if (grep(/^default$/,@{$settings->{'cansearch'}})) { - $defcheck = ' checked="checked" '; - } + if (grep(/^default$/,@{$settings->{'cansearch'}})) { + $defcheck = ' checked="checked" '; + } } $output .= '