--- loncom/interface/domainprefs.pm	2012/08/25 21:48:12	1.166
+++ loncom/interface/domainprefs.pm	2012/08/27 06:28:05	1.169
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.166 2012/08/25 21:48:12 raeburn Exp $
+# $Id: domainprefs.pm,v 1.169 2012/08/27 06:28:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -238,10 +238,11 @@ sub handler {
         'login' =>
                     { text => 'Log-in page options',
                       help => 'Domain_Configuration_Login_Page',
-                      header => [{col1 => 'Item',
-                                  col2 => '',}],
+                      header => [{col1 => 'Log-in Page Items',
+                                  col2 => '',},
+                                 {col1 => 'Log-in Help',
+                                  col2 => 'Value'}],
                     },
-
         'defaults' => 
                     { text => 'Default authentication/language/timezone/portal',
                       help => 'Domain_Configuration_LangTZAuth',
@@ -354,8 +355,6 @@ sub handler {
                  {text   => 'Help page settings',
                   help   => 'Domain_Configuration_Help_Settings',
                   header => [{col1 => 'Help Settings (logged-in users)',
-                              col2 => 'Value'},
-                             {col1 => 'Help Settings (before log-in)',
                               col2 => 'Value'}],
                  },
         'coursedefaults' => 
@@ -398,7 +397,9 @@ sub handler {
                             header => [{col1 => 'Log-in Service',
                                         col2 => 'Server Setting',},
                                        {col1 => 'Log-in Page Items',
-                                        col2 => ''}],
+                                        col2 => ''},
+                                       {col1 => 'Log-in Help',
+                                        col2 => 'Value'}],
                            };
     }
     my @roles = ('student','coordinator','author','admin');
@@ -533,7 +534,8 @@ sub print_config_box {
     if ($numheaders > 1) {
         my $colspan = '';
         my $rightcolspan = '';
-        if (($action eq 'rolecolors') || ($action eq 'coursecategories')) {
+        if (($action eq 'rolecolors') || ($action eq 'coursecategories') || 
+            (($action eq 'login') && ($numheaders < 3))) {
             $colspan = ' colspan="2"';
         }
         if ($action eq 'usersessions') {
@@ -557,14 +559,16 @@ sub print_config_box {
         } 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"';
+            if ($numheaders == 3) {
+                $colspan = ' colspan="2"';
+                $output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal);
+            } else {
+                $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal);
+            }
         } elsif ($action eq 'requestcourses') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         } elsif ($action eq 'requestauthor') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
-        } elsif ($action eq 'helpsettings') {
-            $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'usersessions') {
             $output .= &print_usersessions('top',$dom,$settings,\$rowtotal); 
         } elsif ($action eq 'rolecolors') {
@@ -627,13 +631,26 @@ sub print_config_box {
         } 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);
+            if ($numheaders == 3) {
+                $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).'
+           </table>
+          </td>
+         </tr>
+         <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col2'}).'</td>      </tr>'.
+                       &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal);
+                $rowtotal ++;
+            } else {
+                $output .= &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal);
+            }
         } elsif ($action eq 'requestcourses') {
             $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
         } elsif ($action eq 'requestauthor') {
             $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
-        } elsif ($action eq 'helpsettings') {
-            $output .= &print_helpsettings('bottom',$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'usersessions') {
             $output .= &print_usersessions('middle',$dom,$settings,\$rowtotal).'
            </table>
@@ -725,10 +742,7 @@ sub print_config_box {
         }
         $output .= '</tr>';
         $rowtotal ++;
-        if ($action eq 'login') {
-            $output .= &print_login('bottom',$dom,$confname,$phase,$settings,
-                                    \$rowtotal);
-        } elsif ($action eq 'quotas') {
+        if ($action eq 'quotas') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         } elsif ($action eq 'autoenroll') {
             $output .= &print_autoenroll($dom,$settings,\$rowtotal);
@@ -745,7 +759,7 @@ sub print_config_box {
         } elsif ($action eq 'serverstatuses') {
             $output .= &print_serverstatuses($dom,$settings,\$rowtotal);
         } elsif ($action eq 'helpsettings') {
-            $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal);
+            $output .= &print_helpsettings($dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'loadbalancing') {
             $output .= &print_loadbalancing($dom,$settings,\$rowtotal);
         }
@@ -759,11 +773,11 @@ sub print_config_box {
 }
 
 sub print_login {
-    my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_;
+    my ($caller,$dom,$confname,$phase,$settings,$rowtotal) = @_;
     my ($css_class,$datatable);
     my %choices = &login_choices();
 
-    if ($position eq 'top') {
+    if ($caller eq 'service') {
         my %servers = &Apache::lonnet::internet_dom_servers($dom);
         my $choice = $choices{'disallowlogin'};
         $css_class = ' class="LC_odd_row"';
@@ -830,131 +844,220 @@ sub print_login {
         }
         $datatable .= '</table></td></tr>';
         return $datatable;
-    }
-
-    my %defaultchecked = ( 
-                           'coursecatalog' => 'on',
-                           'adminmail'     => 'off',
-                           'newuser'       => 'off',
-                         );
-    my @toggles = ('coursecatalog','adminmail','newuser');
-    my (%checkedon,%checkedoff);
-    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} = ' ';
-        }
-    }
-    my @images = ('img','logo','domlogo','login');
-    my @logintext = ('textcol','bgcol');
-    my @bgs = ('pgbg','mainbg','sidebg');
-    my @links = ('link','alink','vlink');
-    my %designhash = &Apache::loncommon::get_domainconf($dom);
-    my %defaultdesign = %Apache::loncommon::defaultdesign;
-    my (%is_custom,%designs);
-    my %defaults = (
-                   font => $defaultdesign{'login.font'},
-                   );
-    foreach my $item (@images) {
-        $defaults{$item} = $defaultdesign{'login.'.$item};
-        $defaults{'showlogo'}{$item} = 1;
-    }
-    foreach my $item (@bgs) {
-        $defaults{'bgs'}{$item} = $defaultdesign{'login.'.$item};
-    }
-    foreach my $item (@logintext) {
-        $defaults{'logintext'}{$item} = $defaultdesign{'login.'.$item};
-    }
-    foreach my $item (@links) {
-        $defaults{'links'}{$item} = $defaultdesign{'login.'.$item};
-    }
-    if (ref($settings) eq 'HASH') {
+    } elsif ($caller eq 'page') {
+        my %defaultchecked = ( 
+                               'coursecatalog' => 'on',
+                               'adminmail'     => 'off',
+                               'newuser'       => 'off',
+                             );
+        my @toggles = ('coursecatalog','adminmail','newuser');
+        my (%checkedon,%checkedoff);
         foreach my $item (@toggles) {
-            if ($settings->{$item} eq '1') {
-                $checkedon{$item} =  ' checked="checked" ';
+            if ($defaultchecked{$item} eq 'on') { 
+                $checkedon{$item} = ' checked="checked" ';
                 $checkedoff{$item} = ' ';
-            } elsif ($settings->{$item} eq '0') {
-                $checkedoff{$item} =  ' checked="checked" ';
+            } elsif ($defaultchecked{$item} eq 'off') {
+                $checkedoff{$item} = ' checked="checked" ';
                 $checkedon{$item} = ' ';
             }
         }
+        my @images = ('img','logo','domlogo','login');
+        my @logintext = ('textcol','bgcol');
+        my @bgs = ('pgbg','mainbg','sidebg');
+        my @links = ('link','alink','vlink');
+        my %designhash = &Apache::loncommon::get_domainconf($dom);
+        my %defaultdesign = %Apache::loncommon::defaultdesign;
+        my (%is_custom,%designs);
+        my %defaults = (
+                       font => $defaultdesign{'login.font'},
+                       );
         foreach my $item (@images) {
-            if (defined($settings->{$item})) {
-                $designs{$item} = $settings->{$item};
-                $is_custom{$item} = 1;
-            }
-            if (defined($settings->{'showlogo'}{$item})) {
-                $designs{'showlogo'}{$item} = $settings->{'showlogo'}{$item};
-            }
+            $defaults{$item} = $defaultdesign{'login.'.$item};
+            $defaults{'showlogo'}{$item} = 1;
+        }
+        foreach my $item (@bgs) {
+            $defaults{'bgs'}{$item} = $defaultdesign{'login.'.$item};
         }
         foreach my $item (@logintext) {
-            if ($settings->{$item} ne '') {
-                $designs{'logintext'}{$item} = $settings->{$item};
-                $is_custom{$item} = 1;
-            }
+            $defaults{'logintext'}{$item} = $defaultdesign{'login.'.$item};
         }
-        if ($settings->{'font'} ne '') {
-            $designs{'font'} = $settings->{'font'};
-            $is_custom{'font'} = 1;
+        foreach my $item (@links) {
+            $defaults{'links'}{$item} = $defaultdesign{'login.'.$item};
         }
-        foreach my $item (@bgs) {
-            if ($settings->{$item} ne '') {
-                $designs{'bgs'}{$item} = $settings->{$item};
-                $is_custom{$item} = 1;
+        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 (@links) {
-            if ($settings->{$item} ne '') {
-                $designs{'links'}{$item} = $settings->{$item};
-                $is_custom{$item} = 1;
+            foreach my $item (@images) {
+                if (defined($settings->{$item})) {
+                    $designs{$item} = $settings->{$item};
+                    $is_custom{$item} = 1;
+                }
+                if (defined($settings->{'showlogo'}{$item})) {
+                    $designs{'showlogo'}{$item} = $settings->{'showlogo'}{$item};
+                }
+            }
+            foreach my $item (@logintext) {
+                if ($settings->{$item} ne '') {
+                    $designs{'logintext'}{$item} = $settings->{$item};
+                    $is_custom{$item} = 1;
+                }
+            }
+            if ($settings->{'font'} ne '') {
+                $designs{'font'} = $settings->{'font'};
+                $is_custom{'font'} = 1;
+            }
+            foreach my $item (@bgs) {
+                if ($settings->{$item} ne '') {
+                    $designs{'bgs'}{$item} = $settings->{$item};
+                    $is_custom{$item} = 1;
+                }
+            }
+            foreach my $item (@links) {
+                if ($settings->{$item} ne '') {
+                    $designs{'links'}{$item} = $settings->{$item};
+                    $is_custom{$item} = 1;
+                }
+            }
+        } else {
+            if ($designhash{$dom.'.login.font'} ne '') {
+                $designs{'font'} = $designhash{$dom.'.login.font'};
+                $is_custom{'font'} = 1;
+            }
+            foreach my $item (@images) {
+                if ($designhash{$dom.'.login.'.$item} ne '') {
+                    $designs{$item} = $designhash{$dom.'.login.'.$item};
+                    $is_custom{$item} = 1;
+                }
+            }
+            foreach my $item (@bgs) {
+                if ($designhash{$dom.'.login.'.$item} ne '') {
+                    $designs{'bgs'}{$item} = $designhash{$dom.'.login.'.$item};
+                    $is_custom{$item} = 1;
+                }
+            }
+            foreach my $item (@links) {
+                if ($designhash{$dom.'.login.'.$item} ne '') {
+                    $designs{'links'}{$item} = $designhash{$dom.'.login.'.$item};
+                    $is_custom{$item} = 1;
+                }
             }
         }
-    } else {
-        if ($designhash{$dom.'.login.font'} ne '') {
-            $designs{'font'} = $designhash{$dom.'.login.font'};
-            $is_custom{'font'} = 1;
+        my %alt_text = &Apache::lonlocal::texthash  ( img => 'Log-in banner',
+                                                      logo => 'Institution Logo',
+                                                      domlogo => 'Domain Logo',
+                                                      login => 'Login box');
+        my $itemcount = 1;
+        foreach my $item (@toggles) {
+            $css_class = $itemcount%2?' class="LC_odd_row"':'';
+            $datatable .=  
+                '<tr'.$css_class.'><td colspan="2">'.$choices{$item}.
+                '</td><td>'.
+                '<span class="LC_nobreak"><label><input type="radio" name="'.
+                $item.'"'.$checkedon{$item}.' value="1" />'.&mt('Yes').
+                '</label>&nbsp;<label><input type="radio" name="'.$item.'"'.
+                $checkedoff{$item}.' value="0" />'.&mt('No').'</label></span></td>'.
+                '</tr>';
+            $itemcount ++;
         }
-        foreach my $item (@images) {
-            if ($designhash{$dom.'.login.'.$item} ne '') {
-                $designs{$item} = $designhash{$dom.'.login.'.$item};
-                $is_custom{$item} = 1;
+        $datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext);
+        $datatable .= '</tr></table></td></tr>';
+    } elsif ($caller eq 'help') {
+        my ($defaulturl,$defaulttype,%url,%type,%lt,%langchoices);
+        my $switchserver = &check_switchserver($dom,$confname);
+        my $itemcount = 1;
+        $defaulturl = '/adm/loginproblems.html';
+        $defaulttype = 'default';
+        %lt = &Apache::lonlocal::texthash (
+                     del     => 'Delete?',
+                     rep     => 'Replace:',
+                     upl     => 'Upload:',
+                     default => 'Default',
+                     custom  => 'Custom',
+                                             );
+        %langchoices = &Apache::lonlocal::texthash(&get_languages_hash());
+        my @currlangs;
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'helpurl'}) eq 'HASH') {
+                foreach my $key (sort(keys(%{$settings->{'helpurl'}}))) {
+                    next if ($settings->{'helpurl'}{$key} eq '');
+                    $url{$key} = $settings->{'helpurl'}{$key}.'?inhibitmenu=yes';
+                    $type{$key} = 'custom';
+                    unless ($key eq 'nolang') {
+                        push(@currlangs,$key);
+                    }
+                }
+            } elsif ($settings->{'helpurl'} ne '') {
+                $type{'nolang'} = 'custom';
+                $url{'nolang'} = $settings->{'helpurl'}.'?inhibitmenu=yes';
             }
         }
-        foreach my $item (@bgs) {
-            if ($designhash{$dom.'.login.'.$item} ne '') {
-                $designs{'bgs'}{$item} = $designhash{$dom.'.login.'.$item};
-                $is_custom{$item} = 1;
+        foreach my $lang ('nolang',sort(@currlangs)) {
+            $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+            $datatable .= '<tr'.$css_class.'>';
+            if ($url{$lang} eq '') {
+                $url{$lang} = $defaulturl;
+            }
+            if ($type{$lang} eq '') {
+                $type{$lang} = $defaulttype;
+            }
+            $datatable .= '<td colspan="2"><span class="LC_nobreak">';
+            if ($lang eq 'nolang') {
+                $datatable .= &mt('Log-in help page if no specific language file: [_1]',
+                                  &Apache::loncommon::modal_link($url{$lang},$lt{$type{$lang}},600,500));
+            } else {
+                $datatable .= &mt('Log-in help page for language: [_1] is [_2]',
+                                  $langchoices{$lang},
+                                  &Apache::loncommon::modal_link($url{$lang},$lt{$type{$lang}},600,500));
+            }
+            $datatable .= '</span></td>'."\n".
+                          '<td class="LC_left_item">';
+            if ($type{$lang} eq 'custom') {
+                $datatable .= '<span class="LC_nobreak"><label>'.
+                              '<input type="checkbox" name="loginhelpurl_del" value="'.$lang.'" />'.
+                              $lt{'del'}.'</label>&nbsp;'.$lt{'rep'}.'</span>';
+            } else {
+                $datatable .= $lt{'upl'};
+            }
+            $datatable .='<br />';
+            if ($switchserver) {
+                $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+            } else {
+                $datatable .= '<input type="file" name="loginhelpurl_'.$lang.'" />';
             }
+            $datatable .= '</td></tr>';
+            $itemcount ++;
         }
-        foreach my $item (@links) {
-            if ($designhash{$dom.'.login.'.$item} ne '') {
-                $designs{'links'}{$item} = $designhash{$dom.'.login.'.$item};
-                $is_custom{$item} = 1;
+        my @addlangs;
+        foreach my $lang (sort(keys(%langchoices))) {
+            next if ((grep(/^\Q$lang\E$/,@currlangs)) || ($lang eq 'x_chef'));
+            push(@addlangs,$lang);
+        }
+        if (@addlangs > 0) {
+            my %toadd;
+            map { $toadd{$_} = $langchoices{$_} ; } @addlangs;
+            $toadd{''} = &mt('Select');
+            $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+            $datatable .= '<tr'.$css_class.'><td class="LC_left_item" colspan="2">'.
+                          &mt('Add log-in help page for a specific language:').'&nbsp;'.
+                          &Apache::loncommon::select_form('','loginhelpurl_add_lang',\%toadd).
+                          '</td><td class="LC_left_item">'.$lt{'upl'}.'<br />';
+            if ($switchserver) {
+                $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+            } else {
+                $datatable .= '<input type="file" name="loginhelpurl_add_file" />';
             }
+            $datatable .= '</td></tr>';
+            $itemcount ++;
         }
+        $datatable .= &captcha_choice('login',$settings,$itemcount);
     }
-    my %alt_text = &Apache::lonlocal::texthash  ( img => 'Log-in banner',
-                                                  logo => 'Institution Logo',
-                                                  domlogo => 'Domain Logo',
-                                                  login => 'Login box');
-    my $itemcount = 1;
-    foreach my $item (@toggles) {
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .=  
-            '<tr'.$css_class.'><td colspan="2">'.$choices{$item}.
-            '</td><td>'.
-            '<span class="LC_nobreak"><label><input type="radio" name="'.
-            $item.'"'.$checkedon{$item}.' value="1" />'.&mt('Yes').
-            '</label>&nbsp;<label><input type="radio" name="'.$item.'"'.
-            $checkedoff{$item}.' value="0" />'.&mt('No').'</label></span></td>'.
-            '</tr>';
-        $itemcount ++;
-    }
-    $datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext);
-    $datatable .= '</tr></table></td></tr>';
     return $datatable;
 }
 
@@ -2263,61 +2366,18 @@ sub print_contacts {
 }
 
 sub print_helpsettings {
-    my ($position,$dom,$confname,$settings,$rowtotal) = @_;
-    my ($css_class,$datatable,$itemcount);
-    my $switchserver = &check_switchserver($dom,$confname);
+    my ($dom,$confname,$settings,$rowtotal) = @_;
+    my ($datatable,$itemcount);
     $itemcount = 1;
-    if ($position eq 'top') {
-        my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles,$align);
-        $choices{'submitbugs'} = &mt('Display link to: [_1]?',
-                                     &Apache::loncommon::modal_link('http://bugs.loncapa.org',
-                                     &mt('LON-CAPA bug tracker'),600,500));
-        %defaultchecked = ('submitbugs' => 'on');
-        @toggles = ('submitbugs',);
-        $align = 'LC_left_item';
+    my (%choices,%defaultchecked,@toggles);
+    $choices{'submitbugs'} = &mt('Display link to: [_1]?',
+                                 &Apache::loncommon::modal_link('http://bugs.loncapa.org',
+                                 &mt('LON-CAPA bug tracker'),600,500));
+    %defaultchecked = ('submitbugs' => 'on');
+    @toggles = ('submitbugs',);
 
-        ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                                     \%choices,$itemcount);
-    } else {
-        $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-        $datatable .= '<tr'.$css_class.'>';
-        my $url = '/adm/loginproblems.html'; 
-        my $type = 'default';
-        my %lt = &Apache::lonlocal::texthash (
-                     del     => 'Delete?',
-                     rep     => 'Replace:',
-                     upl     => 'Upload:',
-                     default => 'Default',
-                     custom  => 'Custom', 
-                                             ); 
-        if (ref($settings) eq 'HASH') {
-            if (ref($settings->{'loginhelpurl'}) eq 'HASH') {
-
-            } elsif ($settings->{'loginhelpurl'} ne '') {
-                $type = 'custom';
-                $url = $settings->{'loginhelpurl'}.'?inhibitmenu=yes';
-            }
-        }
-        $datatable .= '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      &mt('Log-in help page currently in use: [_1]',
-                          &Apache::loncommon::modal_link($url,$lt{$type},600,500)).
-                      '</span></td>'."\n".
-                      '<td class="LC_left_item">';
-        if ($type eq 'custom') {
-            $datatable .= '<span class="LC_nobreak"><label>'.
-                          '<input type="checkbox" name="loginhelpurl_del" value="1" />'.$lt{'del'}. 
-                          '</label>&nbsp;'.$lt{'rep'}.'</span>';
-        } else {
-            $datatable .= $lt{'upl'};
-        }
-        $datatable .='<br />';
-        if ($switchserver) {
-            $datatable .= &mt('Upload to library server: [_1]',$switchserver);
-        } else {
-            $datatable .= '<input type="file" name="loginhelpurl" />';
-        } 
-        $datatable .= '</td></tr>';
-    }
+    ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
+                                                 \%choices,$itemcount);
     return $datatable;
 }
 
@@ -3241,9 +3301,10 @@ sub print_usercreation {
                                              $dom,$numinrow,$othertitle,
                                              'statustocreate');
                 $$rowtotal ++;
+                $rownum ++;
             }
         }
-        $datatable .= &captcha_choice('cancreate',$createsettings);
+        $datatable .= &captcha_choice('cancreate',$createsettings,$rownum);
     } else {
         my @contexts = ('author','course','domain');
         my @authtypes = ('int','krb4','krb5','loc');
@@ -3296,14 +3357,14 @@ sub print_usercreation {
 }
 
 sub captcha_choice {
-    my ($context,$settings) = @_;
+    my ($context,$settings,$itemcount) = @_;
     my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext);
     my %lt = &captcha_phrases();
     $keyentry = 'hidden';
     if ($context eq 'cancreate') {
         $rowname = &mt('CAPTCHA validation (e-mail as username)');
-    } elsif ($context eq 'help') {
-        $rowname =  &mt('CAPTCHA validation');
+    } elsif ($context eq 'login') {
+        $rowname =  &mt('"Contact helpdesk" CAPTCHA validation');
     }
     if (ref($settings) eq 'HASH') {
         if ($settings->{'captcha'}) {
@@ -3323,8 +3384,9 @@ sub captcha_choice {
     } else {
         $checked{'original'} = ' checked="checked"';
     }
-    my $output = '<tr class="LC_odd_row">'.
-                 '<td class="LC_left_item">'.$rowname.'</td><td class="LC_right_item" colspan="2">'."\n".
+    my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+    my $output = '<tr'.$css_class.'>'.
+                 '<td class="LC_left_item">'.$rowname.'</td><td class="LC_left_item" colspan="2">'."\n".
                  '<table><tr><td>'."\n";
     foreach my $option ('original','recaptcha','notused') {
         $output .= '<span class="LC_nobreak"><label><input type="radio" name="'.$context.'_captcha" value="'.
@@ -3526,6 +3588,12 @@ sub print_defaults {
         } elsif ($item eq 'datelocale_def') {
             my $includeempty = 1;
             $datatable .= &Apache::loncommon::select_datelocale($item,$domdefaults{$item},undef,$includeempty);
+        } elsif ($item eq 'lang_def') {
+            my %langchoices = &get_languages_hash();
+            $langchoices{''} = 'No language preference';
+            %langchoices = &Apache::lonlocal::texthash(%langchoices);
+            $datatable .= &Apache::loncommon::select_form($domdefaults{$item},$item,
+                                                          \%langchoices);
         } else {
             my $size;
             if ($item eq 'portal_def') {
@@ -3541,6 +3609,17 @@ sub print_defaults {
     return $datatable;
 }
 
+sub get_languages_hash {
+    my %langchoices;
+    foreach my $id (&Apache::loncommon::languageids()) {
+        my $code = &Apache::loncommon::supportedlanguagecode($id);
+        if ($code ne '') {
+            $langchoices{$code} =  &Apache::loncommon::plainlanguagedescription($id);
+        }
+    }
+    return %langchoices;
+}
+
 sub defaults_titles {
     my ($dom) = @_;
     my %titles = &Apache::lonlocal::texthash (
@@ -4452,13 +4531,13 @@ sub usertype_update_row {
 
 sub modify_login {
     my ($r,$dom,$confname,%domconfig) = @_;
-    my ($resulttext,$errors,$colchgtext,%changes,%colchanges);
-    my %title = ( coursecatalog => 'Display course catalog',
-                  adminmail => 'Display administrator E-mail address',
-                  newuser => 'Link for visitors to create a user account',
-                  loginheader => 'Log-in box header');
-    my @offon = ('off','on');
-    my %curr_loginvia;
+    my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl,
+        %curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon);
+    %title = ( coursecatalog => 'Display course catalog',
+               adminmail => 'Display administrator E-mail address',
+               newuser => 'Link for visitors to create a user account',
+               loginheader => 'Log-in box header');
+    @offon = ('off','on');
     if (ref($domconfig{login}) eq 'HASH') {
         if (ref($domconfig{login}{loginvia}) eq 'HASH') {
             foreach my $lonhost (keys(%{$domconfig{login}{loginvia}})) {
@@ -4466,7 +4545,6 @@ sub modify_login {
             }
         }
     }
-    my %loginhash;
     ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
                                            \%domconfig,\%loginhash);
     my @toggles = ('coursecatalog','adminmail','newuser');
@@ -4539,7 +4617,6 @@ sub modify_login {
                                 $new = ''; 
                             }
                         }
-
                         $loginhash{login}{loginvia}{$lonhost}{$item} = $new;
                     }
                 }
@@ -4565,6 +4642,96 @@ sub modify_login {
         }
     }
 
+    my $servadm = $r->dir_config('lonAdmEMail');
+    my %langchoices = &Apache::lonlocal::texthash(&get_languages_hash());
+    if (ref($domconfig{'login'}) eq 'HASH') {
+        if (ref($domconfig{'login'}{'helpurl'}) eq 'HASH') {
+            foreach my $lang (sort(keys(%{$domconfig{'login'}{'helpurl'}}))) {
+                if ($lang eq 'nolang') {
+                    push(@currlangs,$lang);
+                } elsif (defined($langchoices{$lang})) {
+                    push(@currlangs,$lang);
+                } else {
+                    next;
+                }
+            }
+        }
+    }
+    my @delurls = &Apache::loncommon::get_env_multiple('form.loginhelpurl_del');
+    if (@currlangs > 0) {
+        foreach my $lang (@currlangs) {
+            if (grep(/^\Q$lang\E$/,@delurls)) {
+                $changes{'helpurl'}{$lang} = 1;
+            } elsif ($env{'form.loginhelpurl_'.$lang.'.filename'}) {
+                $changes{'helpurl'}{$lang} = 1;
+                $newfile{$lang} = $env{'form.loginhelpurl_'.$lang.'.filename'};
+                push(@newlangs,$lang);
+            } else {
+                $loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang};
+            }
+        }
+    }
+    unless (grep(/^nolang$/,@currlangs)) {
+        if ($env{'form.loginhelpurl_nolang.filename'}) {
+            $changes{'helpurl'}{'nolang'} = 1;
+            $newfile{'nolang'} = $env{'form.loginhelpurl_nolang.filename'};
+            push(@newlangs,'nolang');
+        }
+    }
+    if ($env{'form.loginhelpurl_add_lang'}) {
+        if ((defined($langchoices{$env{'form.loginhelpurl_add_lang'}})) &&
+            ($env{'form.loginhelpurl_add_file.filename'})) {
+            $newfile{$env{'form.loginhelpurl_add_lang'}} = $env{'form.loginhelpurl_add_file.filename'};
+            $addedfile = $env{'form.loginhelpurl_add_lang'};
+        }
+    }
+    if ((@newlangs > 0) || ($addedfile)) {
+        my $error;
+        my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
+        if ($configuserok eq 'ok') {
+            if ($switchserver) {
+                $error = &mt("Upload of custom help file is not permitted to this server: [_1]",$switchserver);
+            } elsif ($author_ok eq 'ok') {
+                my @allnew = @newlangs;
+                if ($addedfile ne '') {
+                    push(@allnew,$addedfile);
+                }
+                foreach my $lang (@allnew) {
+                    my $formelem = 'loginhelpurl_'.$lang;
+                    if ($lang eq $env{'form.loginhelpurl_add_lang'}) {
+                        $formelem = 'loginhelpurl_add_file';
+                    }
+                    (my $result,$newurl{$lang}) = &publishlogo($r,'upload',$formelem,$dom,$confname,
+                                                               "help/$lang",'','',$newfile{$lang});
+                    if ($result eq 'ok') {
+                        $loginhash{'login'}{'helpurl'}{$lang} = $newurl{$lang};
+                        $changes{'helpurl'}{$lang} = 1;
+                    } else {
+                        my $puberror = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$newfile{$lang},$result);
+                        $errors .= '<li><span class="LC_error">'.$puberror.'</span></li>';
+                        if ((grep(/^\Q$lang\E$/,@currlangs)) && 
+                            (!grep(/^\Q$lang\E$/,@delurls))) {
+
+                            $loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang};
+                        }
+                    }
+                }
+            } else {
+                $error = &mt("Upload of custom log-in help file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2].  Error was: [_3].",$confname,$dom,$author_ok);
+            }
+        } else {
+            $error = &mt("Upload of custom log-in help file(s) failed because a Domain Configuration user ([_1]) could not be created in domain: [_2].  Error was: [_3].",$confname,$dom,$configuserok);
+        }
+        if ($error) {
+            &Apache::lonnet::logthis($error);
+            $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+        }
+    }
+    &process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'});
+
+    my $defaulthelpfile = '/adm/loginproblems.html';
+    my $defaulttext = &mt('Default in use');
+
     my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash,
                                              $dom);
     if ($putresult eq 'ok') {
@@ -4630,6 +4797,68 @@ sub modify_login {
                         }
                         $resulttext .= '</ul></li>';
                     }
+                } elsif ($item eq 'helpurl') {
+                    if (ref($changes{$item}) eq 'HASH') {
+                        foreach my $lang (sort(keys(%{$changes{$item}}))) {
+                            if (grep(/^\Q$lang\E$/,@delurls)) {
+                                my ($chg,$link);
+                                $link = &Apache::loncommon::modal_link($defaulthelpfile,$defaulttext,600,500);
+                                if ($lang eq 'nolang') {
+                                    $chg = &mt('custom log-in help file removed for no preferred language; [_1]',$link);
+                                } else {
+                                    $chg = &mt('custom log-in help file removed for specific language: [_1]; [_2]',$langchoices{$lang},$link);
+                                }
+                                $resulttext .= '<li>'.$chg.'</li>';
+                            } else {
+                                my $chg;
+                                if ($lang eq 'nolang') {
+                                    $chg = &mt('custom log-in help file for no preferred language');
+                                } else {
+                                    $chg = &mt('custom log-in help file for specific language: [_1]',$langchoices{$lang});
+                                }
+                                $resulttext .= '<li>'.&Apache::loncommon::modal_link(
+                                                      $loginhash{'login'}{'helpurl'}{$lang}.
+                                                      '?inhibitmenu=yes',$chg,600,500).
+                                               '</li>';
+                            }
+                        }
+                    }
+                } elsif ($item eq 'captcha') {
+                    if (ref($loginhash{'login'}) eq 'HASH') {
+                        my $chgtxt; 
+                        if ($loginhash{'login'}{$item} eq 'notused') {
+                            $chgtxt .= &mt('No CAPTCHA validation in use for helpdesk form.');
+                        } else {
+                            my %captchas = &captcha_phrases();
+                            if ($captchas{$loginhash{'login'}{$item}}) {
+                                $chgtxt .= &mt("Validation for helpdesk form set to $captchas{$loginhash{'login'}{$item}}.");
+                            } else {
+                                $chgtxt .= &mt('Validation for helpdesk form set to unknown type.');
+                            }
+                        }
+                        $resulttext .= '<li>'.$chgtxt.'</li>';
+                    }
+                } elsif ($item eq 'recaptchakeys') {
+                    if (ref($loginhash{'login'}) eq 'HASH') {
+                        my ($privkey,$pubkey);
+                        if (ref($loginhash{'login'}{$item}) eq 'HASH') {
+                            $pubkey = $loginhash{'login'}{$item}{'public'};
+                            $privkey = $loginhash{'login'}{$item}{'private'};
+                        }
+                        my $chgtxt .= &mt('ReCAPTCHA keys changes').'<ul>';
+                        if (!$pubkey) {
+                            $chgtxt .= '<li>'.&mt('Public key deleted').'</li>';
+                        } else {
+                            $chgtxt .= '<li>'.&mt('Public key set to [_1]',$pubkey).'</li>';
+                        }
+                        if (!$privkey) {
+                            $chgtxt .= '<li>'.&mt('Private key deleted').'</li>';
+                        } else {
+                            $chgtxt .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>';
+                        }
+                        $chgtxt .= '</ul>';
+                        $resulttext .= '<li>'.$chgtxt.'</li>';
+                    }
                 } else {
                     $resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
                 }
@@ -6722,30 +6951,44 @@ sub process_captcha {
         $newsettings->{'captcha'} = 'original';
     }
     if ($current->{'captcha'} ne $newsettings->{'captcha'}) {
-        if (ref($changes->{'cancreate'}) eq 'ARRAY') {
-            push(@{$changes->{'cancreate'}},'captcha');
-        } elsif (!defined($changes->{'cancreate'})) {
-            $changes->{'cancreate'} = ['captcha'];
+        if ($container eq 'cancreate') { 
+            if (ref($changes->{'cancreate'}) eq 'ARRAY') {
+                push(@{$changes->{'cancreate'}},'captcha');
+            } elsif (!defined($changes->{'cancreate'})) {
+                $changes->{'cancreate'} = ['captcha'];
+            }
+        } else {
+            $changes->{'captcha'} = 1;
         }
     }
     my ($newpub,$newpriv,$currpub,$currpriv);
     if ($newsettings->{'captcha'} eq 'recaptcha') {
         $newpub = $env{'form.'.$container.'_recaptchapub'};
         $newpriv = $env{'form.'.$container.'_recaptchapriv'};
+        $newpub =~ s/\W//g;
+        $newpriv =~ s/\W//g;
+        $newsettings->{'recaptchakeys'} = {
+                                             public  => $newpub,
+                                             private => $newpriv,
+                                          };
     }
-    $newsettings->{'recaptchakeys'} = {
-                                         public  => $newpub,
-                                         private => $newpriv,
-                                      };
     if (ref($current->{'recaptchakeys'}) eq 'HASH') {
         $currpub = $current->{'recaptchakeys'}{'public'};
         $currpriv = $current->{'recaptchakeys'}{'private'};
+        $newsettings->{'recaptchakeys'} = {
+                                             public  => '',
+                                             private => '',
+                                          }
     }
     if (($newpub ne $currpub) || ($newpriv ne $currpriv)) {
-        if (ref($changes->{'cancreate'}) eq 'ARRAY') {
-            push(@{$changes->{'cancreate'}},'recaptchakeys');
-        } elsif (!defined($changes->{'cancreate'})) {
-            $changes->{'cancreate'} = ['recaptchakeys'];
+        if ($container eq 'cancreate') {
+            if (ref($changes->{'cancreate'}) eq 'ARRAY') {
+                push(@{$changes->{'cancreate'}},'recaptchakeys');
+            } elsif (!defined($changes->{'cancreate'})) {
+                $changes->{'cancreate'} = ['recaptchakeys'];
+            }
+        } else {
+            $changes->{'recaptchakeys'} = 1; 
         }
     }
     return;
@@ -7408,24 +7651,9 @@ sub modify_serverstatuses {
 sub modify_helpsettings {
     my ($r,$dom,$confname,%domconfig) = @_;
     my ($resulttext,$errors,%changes,%helphash);
-    my $customhelpfile = $env{'form.loginhelpurl.filename'};
-    my $defaulthelpfile = '/adm/loginproblems.html';
-    my $defaulttext = &mt('Default in use');
-    my $servadm = $r->dir_config('lonAdmEMail');
-    my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
     my %defaultchecked = ('submitbugs' => 'on');
     my @offon = ('off','on');
-    my %title = (
-                    submitbugs    => 'Display link for users to submit a bug', 
-                    loginhelpurl  => 'Unauthenticated login help page set to custom file'
-                );
     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') { 
@@ -7449,48 +7677,11 @@ sub modify_helpsettings {
                 $helphash{'helpsettings'}{$item} = $env{'form.'.$item};
             }
         }
-        if ($customhelpfile ne '') {
-            my $error;
-            if ($configuserok eq 'ok') {
-                if ($switchserver) {
-                    $error = &mt("Upload of custom help file is not permitted to this server: [_1]",$switchserver);
-                } else {
-                    if ($author_ok eq 'ok') {
-                        my ($result,$loginhelpurl) = &publishlogo($r,'upload','loginhelpurl',$dom,
-                                                                  $confname,'help','','',$customhelpfile);
-                        if ($result eq 'ok') {
-                            $helphash{'helpsettings'}{'loginhelpurl'} = $loginhelpurl;
-                            $changes{'loginhelpurl'} = 1;
-                        } else {
-                            $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$customhelpfile,$result);
-                        }
-                    } else {
-                        $error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3].  Error was: [_4].",$customhelpfile,$confname,$dom,$author_ok);
-                    }
-                }
-            } else {
-                $error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3].  Error was: [_4].",$customhelpfile,$confname,$dom,$configuserok);
-            }
-            if ($error) {
-                &Apache::lonnet::logthis($error);
-                $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
-            }
-        }
-        if ($domconfig{'helpsettings'}{'loginhelpurl'} ne '') {
-            if ($env{'form.loginhelpurl_del'}) {
-                $helphash{'helpsettings'}{'loginhelpurl'} = '';
-                $changes{'loginhelpurl'} = 1;
-            }
-        }
     }
     my $putresult;
     if (keys(%changes) > 0) {
         $putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom);
-    } else {
-        $putresult = 'ok';
-    }
-    if ($putresult eq 'ok') {
-        if (keys(%changes) > 0) {
+        if ($putresult eq 'ok') {
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (sort(keys(%changes))) {
                 if ($item eq 'submitbugs') {
@@ -7498,30 +7689,17 @@ sub modify_helpsettings {
                                               &Apache::loncommon::modal_link('http://bugs.loncapa.org',
                                               &mt('LON-CAPA bug tracker'),600,500)).'</li>';
                 }
-                if ($item eq 'loginhelpurl') {
-                    if ($helphash{'helpsettings'}{'loginhelpurl'} eq '') {
-                        $resulttext .= '<li>'.&mt('custom log-in help file removed.').'&nbsp;'.
-                                              &Apache::loncommon::modal_link($defaulthelpfile,
-                                              $defaulttext,600,500).'</li>';
-                    } else {
-                        $resulttext .= '<li>'.&Apache::loncommon::modal_link(
-                                                  $helphash{'helpsettings'}{'loginhelpurl'}.
-                                                  '?inhibitmenu=yes',
-                                                  &mt('custom log-in help file'),600,500).
-                                       '</li>';
-                    }
-                }
             }
             $resulttext .= '</ul>';
         } else {
             $resulttext = &mt('No changes made to help settings');
+            $errors .= '<li><span class="LC_error">'.
+                       &mt('An error occurred storing the settings: [_1]',
+                           $putresult).'</span></li>';
         }
-    } else {
-        $errors .= '<li><span class="LC_error">'.&mt('An error occurred storing the settings: [_1]',
-                                                     $putresult).'</span></li>';
     }
     if ($errors) {
-        $resulttext .= &mt('The following errors occurred: ').'<ul>'.
+        $resulttext .= '<br />'.&mt('The following errors occurred: ').'<ul>'.
                        $errors.'</ul>';
     }
     return $resulttext;
@@ -8104,7 +8282,7 @@ sub recurse_cat_deletes {
                 delete($coursecategories->{$subitem});
                 $deletions->{$subitem} = 1;
                 &recurse_cat_deletes($subitem,$coursecategories,$deletions);
-            }  
+            }
         }
     }
     return;