[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface domainprefs.pm

raeburn raeburn at source.lon-capa.org
Sat Sep 1 05:13:53 EDT 2012


raeburn		Sat Sep  1 09:13:53 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - For 2.11
    - backport 1.163, 1.164, 1.165, 1.166, 1.167, 1.168. 1.169 
  
  
-------------- next part --------------
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.160.6.4 loncom/interface/domainprefs.pm:1.160.6.5
--- loncom/interface/domainprefs.pm:1.160.6.4	Fri Jun  1 12:15:23 2012
+++ loncom/interface/domainprefs.pm	Sat Sep  1 09:13:53 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.4 2012/06/01 12:15:23 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.5 2012/09/01 09:13:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,8 +86,8 @@
 
 $dom is the domain, $settings is a reference to a hash of current settings for
 the current context, $rowtotal is a reference to the scalar used to record the 
-number of rows displayed on the page, and $action is the context (either quotas 
-or requestcourses).
+number of rows displayed on the page, and $action is the context (quotas,
+requestcourses or requestauthor).
 
 The print_quotas routine was orginally created to display/store information
 about default quota sizes for portfolio spaces for the different types of 
@@ -211,12 +211,12 @@
                 'directorysrch','usercreation','usermodification',
                 'contacts','defaults','scantron','coursecategories',
                 'serverstatuses','requestcourses','usersessions',
-                'loadbalancing'],$dom);
+                'loadbalancing','requestauthor'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','autocreate','directorysrch','contacts',
                        'usercreation','usermodification','scantron',
-                       'requestcourses','coursecategories','serverstatuses',
-                       'usersessions');
+                       'requestcourses','requestauthor','coursecategories',
+                       'serverstatuses','usersessions');
     if (keys(%servers) > 1) {
         push(@prefs_order,'loadbalancing');
     }
@@ -236,10 +236,11 @@
         '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',
@@ -323,6 +324,14 @@
                              {col1 => 'Setting',
                               col2 => 'Value'}],
                  },
+        'requestauthor' =>
+                 {text => 'Request authoring space',
+                  help => 'Domain_Configuration_Request_Author',
+                  header => [{col1 => 'User affiliation',
+                              col2 => 'Availability/Processing of requests',},
+                             {col1 => 'Setting',
+                              col2 => 'Value'}],
+                 },
         'coursecategories' =>
                   { text => 'Cataloging of courses/communities',
                     help => 'Domain_Configuration_Cataloging_Courses',
@@ -366,7 +375,9 @@
                             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');
@@ -378,7 +389,7 @@
     if ($phase eq 'process') {
         &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles);
     } elsif ($phase eq 'display') {
-        my $js;
+        my $js = &recaptcha_js();
         if (keys(%servers) > 1) {
             my ($othertitle,$usertypes,$types) =
                 &Apache::loncommon::sorted_inst_types($dom);
@@ -465,6 +476,8 @@
         $output = &modify_serverstatuses($dom,%domconfig);
     } elsif ($action eq 'requestcourses') {
         $output = &modify_quotas($dom,$action,%domconfig);
+    } elsif ($action eq 'requestauthor') {
+        $output = &modify_quotas($dom,$action,%domconfig);
     } elsif ($action eq 'usersessions') {
         $output = &modify_usersessions($dom,%domconfig);
     } elsif ($action eq 'loadbalancing') {
@@ -495,7 +508,8 @@
     if ($numheaders > 1) {
         my $colspan = '';
         my $rightcolspan = '';
-        if (($action eq 'rolecolors') || ($action eq 'coursecategories') || ($action eq 'helpsettings')) {
+        if (($action eq 'rolecolors') || ($action eq 'coursecategories') ||
+            (($action eq 'login') && ($numheaders < 3))) {
             $colspan = ' colspan="2"';
         }
         if ($action eq 'usersessions') {
@@ -519,10 +533,16 @@
         } 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 'usersessions') {
             $output .= &print_usersessions('top',$dom,$settings,\$rowtotal); 
         } elsif ($action eq 'rolecolors') {
@@ -583,11 +603,26 @@
         } 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_courserequestmail($dom,$settings,\$rowtotal);
-        } elsif ($action eq 'helpsettings') {
-            $output .= &print_helpsettings('bottom',$dom,$confname,$settings,\$rowtotal);
+            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+        } elsif ($action eq 'requestauthor') {
+            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
         } elsif ($action eq 'usersessions') {
             $output .= &print_usersessions('middle',$dom,$settings,\$rowtotal).'
            </table>
@@ -679,10 +714,7 @@
         }
         $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);
@@ -699,7 +731,7 @@
         } 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);
         }
@@ -713,11 +745,11 @@
 }
 
 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"';
@@ -784,131 +816,220 @@
         }
         $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> <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> '.$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$/, at 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:').' '.
+                          &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> <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;
 }
 
@@ -1346,6 +1467,10 @@
         @options =('norequest','approval','validate','autolimit');
         %validations = &Apache::lonnet::auto_courserequest_checks($dom);
         %titles = &courserequest_titles();
+    } elsif ($context eq 'requestauthor') {
+        @usertools = ('author');
+        @options = ('norequest','approval','automatic');
+        %titles = &authorrequest_titles();
     } else {
         @usertools = ('aboutme','blog','webdav','portfolio');
         %titles = &tool_titles();
@@ -1353,7 +1478,8 @@
     if (ref($types) eq 'ARRAY') {
         foreach my $type (@{$types}) {
             my $currdefquota;
-            unless ($context eq 'requestcourses') {
+            unless (($context eq 'requestcourses') ||
+                    ($context eq 'requestauthor')) {
                 if (ref($settings) eq 'HASH') {
                     if (ref($settings->{defaultquota}) eq 'HASH') {
                         $currdefquota = $settings->{defaultquota}->{$type}; 
@@ -1423,6 +1549,28 @@
                                 $cell{$item} .= $titles{'unlimited'};
                             }
                         }
+                    } elsif ($context eq 'requestauthor') {
+                        my $curroption;
+                        if (ref($settings) eq 'HASH') {
+                            $curroption = $settings->{$type};
+                        }
+                        if (!$curroption) {
+                            $curroption = 'norequest';
+                        }
+                        foreach my $option (@options) {
+                            my $val = $option;
+                            if ($option eq 'norequest') {
+                                $val = 0;
+                            }
+                            my $checked = '';
+                            if ($option eq $curroption) {
+                                $checked = ' checked="checked"';
+                            }
+                            $datatable .= '<span class="LC_nobreak"><label>'.
+                                  '<input type="radio" name="authorreq_'.$type.
+                                  '" value="'.$val.'"'.$checked.' />'.
+                                  $titles{$option}.'</label></span>  ';
+                        }
                     } else {
                         my $checked = 'checked="checked" ';
                         if (ref($settings) eq 'HASH') {
@@ -1448,7 +1596,8 @@
                     $datatable .= '</tr></table>';
                 }
                 $datatable .= '</td>';
-                unless ($context eq 'requestcourses') {
+                unless (($context eq 'requestcourses') ||
+                        ($context eq 'requestauthor')) {
                     $datatable .= 
                               '<td class="LC_right_item"><span class="LC_nobreak">'.
                               '<input type="text" name="quota_'.$type.
@@ -1459,7 +1608,7 @@
             }
         }
     }
-    unless ($context eq 'requestcourses') {
+    unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
         $defaultquota = '20';
         if (ref($settings) eq 'HASH') {
             if (ref($settings->{'defaultquota'}) eq 'HASH') {
@@ -1529,6 +1678,30 @@
                     $defcell{$item} .= $titles{'unlimited'};
                 }
             }
+        } elsif ($context eq 'requestauthor') {
+            my $curroption;
+            if (ref($settings) eq 'HASH') {
+                if (ref($settings->{'requestauthor'}) eq 'HASH') {
+                    $curroption = $settings->{'requestauthor'};
+                }
+            }
+            if (!$curroption) {
+                $curroption = 'norequest';
+            }
+            foreach my $option (@options) {
+                my $val = $option;
+                if ($option eq 'norequest') {
+                    $val = 0;
+                }
+                my $checked = '';
+                if ($option eq $curroption) {
+                    $checked = ' checked="checked"';
+                }
+                $datatable .= '<span class="LC_nobreak"><label>'.
+                              '<input type="radio" name="authorreq_default"'.
+                              ' value="'.$val.'"'.$checked.' />'.
+                              $titles{$option}.'</label></span>  ';
+            }
         } else {
             my $checked = 'checked="checked" ';
             if (ref($settings) eq 'HASH') {
@@ -1554,7 +1727,7 @@
         $datatable .= '</tr></table>';
     }
     $datatable .= '</td>';
-    unless ($context eq 'requestcourses') {
+    unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
         $datatable .= '<td class="LC_right_item"><span class="LC_nobreak">'.
                       '<input type="text" name="defaultquota" value="'.
                       $defaultquota.'" size="5" /> Mb</span></td>';
@@ -1632,6 +1805,33 @@
                     $advcell{$item} .= $titles{'unlimited'};
                 }
             }
+        } elsif ($context eq 'requestauthor') {
+            my $curroption;
+            if (ref($settings) eq 'HASH') {
+                $curroption = $settings->{'_LC_adv'};
+            }
+            my $checked = '';
+            if ($curroption eq '') {
+                $checked = ' checked="checked"';
+            }
+            $datatable .= '<span class="LC_nobreak"><label>'.
+                          '<input type="radio" name="authorreq__LC_adv"'.
+                          ' value=""'.$checked.' />'.
+                          &mt('No override set').'</label></span>  ';
+            foreach my $option (@options) {
+                my $val = $option;
+                if ($option eq 'norequest') {
+                    $val = 0;
+                }
+                my $checked = '';
+                if ($val eq $curroption) {
+                    $checked = ' checked="checked"';
+                }
+                $datatable .= '<span class="LC_nobreak"><label>'.
+                              '<input type="radio" name="crsreq_'.$item.
+                              '__LC_adv" value="'.$val.'"'.$checked.' />'.
+                              $titles{$option}.'</label></span>  ';
+            }
         } else {
             my $checked = 'checked="checked" ';
             if (ref($settings) eq 'HASH') {
@@ -1661,8 +1861,8 @@
     return $datatable;
 }
 
-sub print_courserequestmail {
-    my ($dom,$settings,$rowtotal) = @_;
+sub print_requestmail {
+    my ($dom,$action,$settings,$rowtotal) = @_;
     my ($now,$datatable,%dompersonnel, at domcoord, at currapproval,$rows);
     $now = time;
     $rows = 0;
@@ -1693,9 +1893,14 @@
     my $numinrow = 4;
     my $numdc = @domcoord;
     my $css_class = 'class="LC_odd_row"';
-    $datatable = '<tr'.$css_class.'>'.
-                 ' <td>'.&mt('Receive notification of course requests requiring approval.').
-                 ' </td>'.
+    my $text;
+    if ($action eq 'requestcourses') {
+        $text = &mt('Receive notification of course requests requiring approval');
+    } else {
+        $text = &mt('Receive notification of authoring space requests requiring approval')
+    }
+    $datatable = '<tr '.$css_class.'>'.
+                 ' <td>'.$text.'</td>'.
                  ' <td class="LC_left_item">';
     if (@domcoord > 0) {
         $datatable .= '<table>';
@@ -2133,99 +2338,21 @@
 }
 
 sub print_helpsettings {
+    my ($dom,$confname,$settings,$rowtotal) = @_;
+    my ($datatable,$itemcount);
+    $itemcount = 1;
+    my (%choices,%defaultchecked, at 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',);
 
-	my ($position,$dom,$confname,$settings,$rowtotal) = @_;
-	my ($css_class,$datatable);
-	
-	my $switchserver = &check_switchserver($dom,$confname);
-	
-	my $itemcount = 1;
-	
-	if ($position eq 'top') {
-		
-		my (%checkedon,%checkedoff,%choices,%defaultchecked, at toggles);
-		
-		%choices =
-			&Apache::lonlocal::texthash (
-				submitbugs => 'Display "Submit a bug" link?',
-		);
-		
-		%defaultchecked = ('submitbugs' => 'on');
-		
-		@toggles = ('submitbugs',);
-		
-		foreach my $item (@toggles) {
-			if ($defaultchecked{$item} eq 'on') { 
-				$checkedon{$item} = ' checked="checked" ';
-				$checkedoff{$item} = ' ';
-			} elsif ($defaultchecked{$item} eq 'off') {
-				$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 .=  
-				'<tr'.$css_class.'>
-				<td><span class="LC_nobreak">'.$choices{$item}.'</span></td>
-				<td><span class="LC_nobreak"> </span></td>
-				<td class="LC_right_item"><span class="LC_nobreak">
-				<label><input type="radio" name="'.$item.'" '.$checkedon{$item}.' value="1" />'.&mt('Yes').'</label> 
-				<label><input type="radio" name="'.$item.'" '.$checkedoff{$item}.' value="0" />'.&mt('No').'</label>'.
-				'</span></td>'.
-				'</tr>';
-			$itemcount ++;
-		 }
-     
-     } else {
-     
-     	$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-     	
-     	$datatable .= '<tr'.$css_class.'>';
-     	
-     	if (ref($settings) eq 'HASH') {
-			if ($settings->{'loginhelpurl'} ne '') {
-				my($directory, $filename) = $settings->{'loginhelpurl'} =~ m/(.*\/)(.*)$/;
-				$datatable .= '<td width="33%"><span class="LC_left_item"><label><a href="'.$settings->{'loginhelpurl'}.'" target="_blank">'.&mt('Custom Login Page Help File In Use').'</a></label></span></td>';
-				$datatable .= '<td width="33%"><span class="LC_right_item"><label><input type="checkbox" name="loginhelpurl_del" value="1" />'.&mt('Delete?').'</label></span></td>'
-			} else {
-				$datatable .= '<td width="33%"><span class="LC_left_item"><label>'.&mt('Default Login Page Help File In Use').'</label></span></td>';
-				$datatable .= '<td width="33%"><span class="LC_right_item"> </span></td>';
-			}
-		} else {
-			$datatable .= '<td><span class="LC_left_item"> </span></td>';
-			$datatable .= '<td><span class="LC_right_item"> </span></td>';
-		}
-    	
-     	$datatable .= '<td width="33%"><span class="LC_right_item">';
-     	if ($switchserver) {
-            $datatable .= &mt('Upload to library server: [_1]',$switchserver);
-        } else {
-        	$datatable .= &mt('Upload Custom Login Page Help File:');
-            $datatable .='<input type="file" name="loginhelpurl" />';
-        }
-        $datatable .= '</span></td></tr>';
-        
-     }
-     
-     return $datatable;
-	
+    ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
+                                                 \%choices,$itemcount);
+    return $datatable;
 }
 
-
 sub radiobutton_prefs {
     my ($settings,$toggles,$defaultchecked,$choices,$itemcount) = @_;
     return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') &&
@@ -2998,6 +3125,15 @@
     return %titles;
 }
 
+sub authorrequest_titles {
+    my %titles = &Apache::lonlocal::texthash (
+                                   norequest  => 'Not allowed',
+                                   approval   => 'Approval by Dom. Coord.',
+                                   automatic  => 'Automatic approval',
+                 );
+    return %titles;
+}
+
 sub courserequest_conditions {
     my %conditions = &Apache::lonlocal::texthash (
        approval    => '(Processing of request subject to approval by Domain Coordinator).',
@@ -3127,18 +3263,20 @@
         }
         my ($othertitle,$usertypes,$types) =
             &Apache::loncommon::sorted_inst_types($dom);
+        my $createsettings;
+        if (ref($settings) eq 'HASH') {
+            $createsettings = $settings->{cancreate};
+        }
         if (ref($usertypes) eq 'HASH') {
             if (keys(%{$usertypes}) > 0) {
-                my $createsettings;
-                if (ref($settings) eq 'HASH') {
-                    $createsettings = $settings->{cancreate};
-                }
                 $datatable .= &insttypes_row($createsettings,$types,$usertypes,
                                              $dom,$numinrow,$othertitle,
                                              'statustocreate');
                 $$rowtotal ++;
+                $rownum ++;
             }
         }
+        $datatable .= &captcha_choice('cancreate',$createsettings,$rownum);
     } else {
         my @contexts = ('author','course','domain');
         my @authtypes = ('int','krb4','krb5','loc');
@@ -3190,6 +3328,64 @@
     return $datatable;
 }
 
+sub captcha_choice {
+    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 'login') {
+        $rowname =  &mt('"Contact helpdesk" CAPTCHA validation');
+    }
+    if (ref($settings) eq 'HASH') {
+        if ($settings->{'captcha'}) {
+            $checked{$settings->{'captcha'}} = ' checked="checked"';
+        } else {
+            $checked{'original'} = ' checked="checked"';
+        }
+        if ($settings->{'captcha'} eq 'recaptcha') {
+            $pubtext = $lt{'pub'};
+            $privtext = $lt{'priv'};
+            $keyentry = 'text';
+        }
+        if (ref($settings->{'recaptchakeys'}) eq 'HASH') {
+            $currpub = $settings->{'recaptchakeys'}{'public'};
+            $currpriv = $settings->{'recaptchakeys'}{'private'};
+        }
+    } else {
+        $checked{'original'} = ' checked="checked"';
+    }
+    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="'.
+                   $option.'" '.$checked{$option}.' onchange="javascript:updateCaptcha('."this,'$context'".');" />'.
+                   $lt{$option}.'</label></span>';
+        unless ($option eq 'notused') {
+            $output .= (' 'x2)."\n";
+        }
+    }
+#
+# Note: If reCAPTCHA is to be used for LON-CAPA servers in a domain, a domain coordinator should visit:
+# https://www.google.com/recaptcha and generate a Public and Private key. For domains with multiple
+# servers a single key pair will be used for all servers, so the internet domain (e.g., yourcollege.edu)
+# specified for use with the key should be broad enough to accommodate all servers in the LON-CAPA domain.
+#
+    $output .= '</td></tr>'."\n".
+               '<tr><td>'."\n".
+               '<span class="LC_nobreak"><span id="'.$context.'_recaptchapubtxt">'.$pubtext.'</span> '."\n".
+               '<input type="'.$keyentry.'" id="'.$context.'_recaptchapub" name="'.$context.'_recaptchapub" value="'.
+               $currpub.'" size="40" /></span><br />'."\n".
+               '<span class="LC_nobreak"><span id="'.$context.'_recaptchaprivtxt">'.$privtext.'</span> '."\n".
+               '<input type="'.$keyentry.'" id="'.$context.'_recaptchapriv" name="'.$context.'_recaptchapriv" value="'.
+               $currpriv.'" size="40" /></span></td></tr></table>'."\n".
+               '</td></tr>';
+    return $output;
+}
+
 sub user_formats_row {
     my ($type,$settings,$rules,$ruleorder,$numinrow,$rowcount) = @_;
     my $output;
@@ -3364,6 +3560,12 @@
         } 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') {
@@ -3379,6 +3581,17 @@
     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 (
@@ -4154,9 +4367,13 @@
     if ($context eq 'cansearch') {
         $showdom = ' ('.$dom.')';
     }
+    my $class = 'LC_left_item';
+    if ($context eq 'statustocreate') {
+        $class = 'LC_right_item';
+    }
     my $output =  '<tr class="LC_odd_row">'.
                   '<td>'.$lt{$context}.$showdom.
-                  '</td><td class="LC_left_item" colspan="2"><table>';
+                  '</td><td class="'.$class.'" colspan="2"><table>';
     my $rem;
     if (ref($types) eq 'ARRAY') {
         for (my $i=0; $i<@{$types}; $i++) {
@@ -4286,13 +4503,13 @@
 
 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, at currlangs, at newlangs,$addedfile,%title, at 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}})) {
@@ -4300,7 +4517,6 @@
             }
         }
     }
-    my %loginhash;
     ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
                                            \%domconfig,\%loginhash);
     my @toggles = ('coursecatalog','adminmail','newuser');
@@ -4373,7 +4589,6 @@
                                 $new = ''; 
                             }
                         }
-
                         $loginhash{login}{loginvia}{$lonhost}{$item} = $new;
                     }
                 }
@@ -4399,6 +4614,96 @@
         }
     }
 
+    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$/, at 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$/, at 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$/, at currlangs)) &&
+                            (!grep(/^\Q$lang\E$/, at 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') {
@@ -4464,6 +4769,68 @@
                         }
                         $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$/, at 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>';
                 }
@@ -4908,15 +5275,17 @@
 # See if there is anything left
     unless ($fname) { return ('error: no uploaded file'); }
     $fname="$subdir/$fname";
-    my $filepath=$r->dir_config('lonDocRoot')."/priv/$dom/$confname";
+    my $docroot=$r->dir_config('lonDocRoot');
+    my $filepath="$docroot/priv";
+    my $relpath = "$dom/$confname";
     my ($fnamepath,$file,$fetchthumb);
     $file=$fname;
     if ($fname=~m|/|) {
         ($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|);
     }
-    my @parts=split(/\//,$filepath.'/'.$fnamepath);
+    my @parts=split(/\//,"$filepath/$relpath/$fnamepath");  
     my $count;
-    for ($count=4;$count<=$#parts;$count++) {
+    for ($count=5;$count<=$#parts;$count++) {
         $filepath.="/$parts[$count]";
         if ((-e $filepath)!=1) {
             mkdir($filepath,02770);
@@ -4963,7 +5332,6 @@
         close(FH);
         chmod(0660, $source); # Permissions to rw-rw---.
 
-        my $docroot=$r->dir_config('lonDocRoot');
         my $targetdir=$docroot.'/res/'.$dom.'/'.$confname .'/'.$fnamepath;
         my $copyfile=$targetdir.'/'.$file;
 
@@ -5191,6 +5559,9 @@
         %titles = &courserequest_titles();
         $toolregexp = join('|', at usertools);
         %conditions = &courserequest_conditions();
+    } elsif ($context eq 'requestauthor') {
+        @usertools = ('author');
+        %titles = &authorrequest_titles();
     } else {
         @usertools = ('aboutme','blog','webdav','portfolio');
         %titles = &tool_titles();
@@ -5208,6 +5579,10 @@
                     $confhash{$item}{$type} = $env{$key};
                 }
             }
+        } elsif ($context eq 'requestauthor') {
+            if ($key =~ /^\Qform.authorreq_\E(.+)$/) {
+                $confhash{$1} = $env{$key};
+            }
         } else {
             if ($key =~ /^form\.quota_(.+)$/) {
                 $confhash{'defaultquota'}{$1} = $env{$key};
@@ -5217,7 +5592,7 @@
             }
         }
     }
-    if ($context eq 'requestcourses') {
+    if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
         my @approvalnotify = &Apache::loncommon::get_env_multiple('form.reqapprovalnotify');
         @approvalnotify = sort(@approvalnotify);
         $confhash{'notify'}{'approval'} = join(',', at approvalnotify);
@@ -5253,6 +5628,11 @@
                         $confhash{$item}{$type} .= $limithash{$item}{$type};
                     }
                 }
+            } elsif ($context eq 'requestauthor') {
+                $unset = '0';
+                if ($type eq '_LC_adv') {
+                    $unset = '';
+                }
             } else {
                 if (grep(/^\Q$type\E$/,@{$toolshash{$item}})) {
                     $confhash{$item}{$type} = 1;
@@ -5261,7 +5641,11 @@
                 }
             }
             if (ref($domconfig{$action}) eq 'HASH') {
-                if (ref($domconfig{$action}{$item}) eq 'HASH') {
+                if ($action eq 'requestauthor') {
+                    if ($domconfig{$action}{$type} ne $confhash{$type}) {
+                        $changes{$type} = 1;
+                    }
+                } elsif (ref($domconfig{$action}{$item}) eq 'HASH') {
                     if ($domconfig{$action}{$item}{$type} ne $confhash{$item}{$type}) {
                         $changes{$item}{$type} = 1;
                     }
@@ -5281,6 +5665,10 @@
                     if ($confhash{$item}{$type} ne $unset) {
                         $changes{$item}{$type} = 1;
                     }
+                } elsif ($context eq 'requestauthor') {
+                    if ($confhash{$type} ne $unset) {
+                        $changes{$type} = 1;
+                    }
                 } else {
                     if (!$confhash{$item}{$type}) {
                         $changes{$item}{$type} = 1;
@@ -5289,7 +5677,7 @@
             }
         }
     }
-    unless ($context eq 'requestcourses') {
+    unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
         if (ref($domconfig{'quotas'}) eq 'HASH') {
             if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') {
                 foreach my $key (keys(%{$domconfig{'quotas'}{'defaultquota'}})) {
@@ -5332,10 +5720,14 @@
         }
     }
 
-    foreach my $key (keys(%confhash)) {
-        $domdefaults{$key} = $confhash{$key};
+    if ($context eq 'requestauthor') {
+        $domdefaults{'requestauthor'} = \%confhash;
+    } else {
+        foreach my $key (keys(%confhash)) {
+            $domdefaults{$key} = $confhash{$key};
+        }
     }
-   
+
     my %quotahash = (
                       $action => { %confhash }
                     );
@@ -5347,7 +5739,8 @@
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
 
             $resulttext = &mt('Changes made:').'<ul>';
-            unless ($context eq 'requestcourses') {
+            unless (($context eq 'requestcourses') ||
+                    ($context eq 'requestauthor')) {
                 if (ref($changes{'defaultquota'}) eq 'HASH') {
                     $resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>';
                     foreach my $type (@{$types},'default') {
@@ -5364,12 +5757,25 @@
             }
             my %newenv;
             foreach my $item (@usertools) {
-                if (ref($changes{$item}) eq 'HASH') {
+                my (%haschgs,%inconf);
+                if ($context eq 'requestauthor') {
+                    %haschgs = %changes;
+                    %inconf = %confhash;
+                } else {
+                    if (ref($changes{$item}) eq 'HASH') {
+                        %haschgs = %{$changes{$item}};
+                    }
+                    if (ref($confhash{$item}) eq 'HASH') {
+                        %inconf = %{$confhash{$item}};
+                    }
+                }
+                if (keys(%haschgs) > 0) {
                     my $newacc = 
                         &Apache::lonnet::usertools_access($env{'user.name'},
                                                           $env{'user.domain'},
                                                           $item,'reload',$context);
-                    if ($context eq 'requestcourses') {
+                    if (($context eq 'requestcourses') ||
+                        ($context eq 'requestauthor')) {
                         if ($env{'environment.canrequest.'.$item} ne $newacc) {
                             $newenv{'environment.canrequest.'.$item} = $newacc;
                         }
@@ -5378,26 +5784,28 @@
                             $newenv{'environment.availabletools.'.$item} = $newacc;
                         }
                     }
-                    $resulttext .= '<li>'.$titles{$item}.'<ul>';
+                    unless ($context eq 'requestauthor') {
+                        $resulttext .= '<li>'.$titles{$item}.'<ul>';
+                    }
                     foreach my $type (@{$types},'default','_LC_adv') {
-                        if ($changes{$item}{$type}) {
+                        if ($haschgs{$type}) {
                             my $typetitle = $usertypes->{$type};
                             if ($type eq 'default') {
                                 $typetitle = $othertitle;
                             } elsif ($type eq '_LC_adv') {
                                 $typetitle = 'LON-CAPA Advanced Users'; 
                             }
-                            if ($confhash{$item}{$type}) {
+                            if ($inconf{$type}) {
                                 if ($context eq 'requestcourses') {
                                     my $cond;
-                                    if ($confhash{$item}{$type} =~ /^autolimit=(\d*)$/) {
+                                    if ($inconf{$type} =~ /^autolimit=(\d*)$/) {
                                         if ($1 eq '') {
                                             $cond = &mt('(Automatic processing of any request).');
                                         } else {
                                             $cond = &mt('(Automatic processing of requests up to limit of [quant,_1,request] per user).',$1);
                                         }
                                     } else { 
-                                        $cond = $conditions{$confhash{$item}{$type}};
+                                        $cond = $conditions{$inconf{$type}};
                                     }
                                     $resulttext .= '<li>'.&mt('Set to be available to [_1].',$typetitle).' '.$cond.'</li>';
                                 } else {
@@ -5405,7 +5813,7 @@
                                 }
                             } else {
                                 if ($type eq '_LC_adv') {
-                                    if ($confhash{$item}{$type} eq '0') {
+                                    if ($inconf{$type} eq '0') {
                                         $resulttext .= '<li>'.&mt('Set to be unavailable to [_1]',$typetitle).'</li>';
                                     } else { 
                                         $resulttext .= '<li>'.&mt('No override set for [_1]',$typetitle).'</li>';
@@ -5416,17 +5824,19 @@
                             }
                         }
                     }
-                    $resulttext .= '</ul></li>';
+                    unless ($context eq 'requestauthor') {
+                        $resulttext .= '</ul></li>';
+                    }
                 }
             }
-            if ($action eq 'requestcourses') {
+            if (($action eq 'requestcourses') || ($action eq 'requestauthor')) {
                 if (ref($changes{'notify'}) eq 'HASH') {
                     if ($changes{'notify'}{'approval'}) {
                         if (ref($confhash{'notify'}) eq 'HASH') {
                             if ($confhash{'notify'}{'approval'}) {
                                 $resulttext .= '<li>'.&mt('Notification of requests requiring approval will be sent to: ').$confhash{'notify'}{'approval'}.'</li>';
                             } else {
-                                $resulttext .= '<li>'.&mt('No Domain Coordinators will receive notification of course requests requiring approval.').'</li>';
+                                $resulttext .= '<li>'.&mt('No Domain Coordinators will receive notification of requests requiring approval.').'</li>';
                             }
                         }
                     }
@@ -5439,6 +5849,8 @@
         } else {
             if ($context eq 'requestcourses') {
                 $resulttext = &mt('No changes made to rights to request creation of courses.');
+            } elsif ($context eq 'requestauthor') {
+                $resulttext = &mt('No changes made to rights to request author space.');
             } else {
                 $resulttext = &mt('No changes made to availability of personal information pages, blogs, portfolios or default quotas');
             }
@@ -6133,6 +6545,7 @@
         }
         push(@contexts,'statustocreate');
     }
+    &process_captcha('cancreate',\%changes,\%cancreate,\%curr_usercreation);
     if (ref($curr_usercreation{'cancreate'}) eq 'HASH') {
         foreach my $item (@contexts) {
             if (($item eq 'selfcreate') || ($item eq 'statustocreate')) {
@@ -6315,7 +6728,7 @@
                 my %lt = &usercreation_types();
                 foreach my $type (@{$changes{'cancreate'}}) {
                     my $chgtext;
-                    unless ($type eq 'statustocreate') {
+                    unless (($type eq 'statustocreate') || ($type eq 'captcha') || ($type eq 'recaptchakeys')) {
                         $chgtext = $lt{$type}.', ';
                     }
                     if ($type eq 'selfcreate') {
@@ -6374,6 +6787,35 @@
                                 }
                             }
                         }
+                    } elsif ($type eq 'captcha') {
+                        if ($cancreate{$type} eq 'notused') {
+                            $chgtext .= &mt('No CAPTCHA validation in use for self-creation screen.');
+                        } else {
+                            my %captchas = &captcha_phrases();
+                            if ($captchas{$cancreate{$type}}) {
+                                $chgtext .= &mt("Validation for self-creation screen set to $captchas{$cancreate{$type}}.");
+                            } else {
+                                $chgtext .= &mt('Validation for self-creation screen set to unknown type.');
+                            }
+                        }
+                    } elsif ($type eq 'recaptchakeys') {
+                        my ($privkey,$pubkey);
+                        if (ref($cancreate{$type}) eq 'HASH') {
+                            $pubkey = $cancreate{$type}{'public'};
+                            $privkey = $cancreate{$type}{'private'};
+                        }
+                        $chgtext .= &mt('ReCAPTCHA keys changes').'<ul>';
+                        if (!$pubkey) {
+                            $chgtext .= '<li>'.&mt('Public key deleted').'</li>';
+                        } else {
+                            $chgtext .= '<li>'.&mt('Public key set to [_1]',$pubkey).'</li>';
+                        }
+                        if (!$privkey) {
+                            $chgtext .= '<li>'.&mt('Private key deleted').'</li>';
+                        } else {
+                            $chgtext .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>';
+                        }
+                        $chgtext .= '</ul>';
                     } else {
                         if ($cancreate{$type} eq 'none') {
                             $chgtext .= &mt('creation of new users is not permitted, except by a Domain Coordinator.');
@@ -6473,6 +6915,57 @@
     return $resulttext;
 }
 
+sub process_captcha {
+    my ($container,$changes,$newsettings,$current) = @_;
+    return unless ((ref($changes) eq 'HASH') && (ref($newsettings) eq 'HASH') || (ref($current) eq 'HASH'));
+    $newsettings->{'captcha'} = $env{'form.'.$container.'_captcha'};
+    unless ($newsettings->{'captcha'} eq 'recaptcha' || $newsettings->{'captcha'} eq 'notused') {
+        $newsettings->{'captcha'} = 'original';
+    }
+    if ($current->{'captcha'} ne $newsettings->{'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,
+                                          };
+    }
+    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 ($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;
+}
+
 sub modify_usermodification {
     my ($dom,%domconfig) = @_;
     my ($resulttext,%curr_usermodification,%changes);
@@ -7129,122 +7622,56 @@
 
 sub modify_helpsettings {
     my ($r,$dom,$confname,%domconfig) = @_;
- 	my ($resulttext,$errors,%changes,%helphash);
- 	
- 	my $customhelpfile  = $env{'form.loginhelpurl.filename'};
-    my $defaulthelpfile = 'defaulthelp.html';
- 	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 ($resulttext,$errors,%changes,%helphash);
+    my %defaultchecked = ('submitbugs' => 'on');
+    my @offon = ('off','on');
     my @toggles = ('submitbugs');
-
-    $helphash{'helpsettings'} = {};
-    
-    if (ref($domconfig{'helpsettings'}) ne 'HASH') {
-        if ($domconfig{'helpsettings'} eq '') {
-            $domconfig{'helpsettings'} = {};
-        }
-    }
-    
     if (ref($domconfig{'helpsettings'}) eq 'HASH') {
-    	
         foreach my $item (@toggles) {
-        	
-			if ($defaultchecked{$item} eq 'on') { 
-				if (($domconfig{'helpsettings'}{$item} eq '') &&
-					 ($env{'form.'.$item} eq '0')) {
-					$changes{$item} = 1;
-				} elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
-					$changes{$item} = 1;
-				}
-			} elsif ($defaultchecked{$item} eq 'off') {
-				if (($domconfig{'helpsettings'}{$item} eq '') &&
-					 ($env{'form.'.$item} eq '1')) {
-					$changes{$item} = 1;
-				} elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
-					$changes{$item} = 1;
-				}
-			}
-			$helphash{'helpsettings'}{$item} = $env{'form.'.$item};
-		}
-		
-		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;
+            if ($defaultchecked{$item} eq 'on') { 
+                if ($domconfig{'helpsettings'}{$item} eq '') {
+                    if ($env{'form.'.$item} eq '0') {
+                        $changes{$item} = 1;
+                    }
+                } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
+                    $changes{$item} = 1;
+                }
+            } elsif ($defaultchecked{$item} eq 'off') {
+                if ($domconfig{'helpsettings'}{$item} eq '') {
+                    if ($env{'form.'.$item} eq '1') {
+                        $changes{$item} = 1;
+                    }
+                } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
+                    $changes{$item} = 1;
+                }
+	    }
+            if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) {
+                $helphash{'helpsettings'}{$item} = $env{'form.'.$item};
             }
         }
     }
-    
-    
     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) {
-			$resulttext = &mt('Changes made:').'<ul>';
-			foreach my $item (sort(keys(%changes))) {
-				if ($item eq 'submitbugs') {
-					$resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
-				}
-				if ($item eq 'loginhelpurl') {
-					if ($helphash{'helpsettings'}{'loginhelpurl'} eq '') {
-                        $resulttext .= '<li>'.&mt('[_1] help file removed; [_2] file will be used for the unathorized help page in this domain.',$customhelpfile,$defaulthelpfile).'</li>';
-                    } else {
-                        $resulttext .= '<li>'.&mt("$title{$item} [_1]",$customhelpfile).'</li>';
-                    }
-				}
-			}
-			$resulttext .= '</ul>';
-		} else {
-			$resulttext = &mt('No changes made to help settings');
-		}
-    } else {
-        $resulttext = '<span class="LC_error">'.
-	    &mt('An error occurred: [_1]',$putresult).'</span>';
+        $putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom);
+        if ($putresult eq 'ok') {
+            $resulttext = &mt('Changes made:').'<ul>';
+            foreach my $item (sort(keys(%changes))) {
+                if ($item eq 'submitbugs') {
+                    $resulttext .= '<li>'.&mt('Display link to: [_1] set to "'.$offon[$env{'form.'.$item}].'".',
+                                              &Apache::loncommon::modal_link('http://bugs.loncapa.org',
+                                              &mt('LON-CAPA bug tracker'),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>';
+        }
     }
     if ($errors) {
-        $resulttext .= &mt('The following errors occurred: ').'<ul>'.
+        $resulttext .= '<br />'.&mt('The following errors occurred: ').'<ul>'.
                        $errors.'</ul>';
     }
     return $resulttext;
@@ -8238,4 +8665,71 @@
 
 }
 
+sub recaptcha_js {
+    my %lt = &captcha_phrases();
+    return <<"END";
+
+<script type="text/javascript">
+// <![CDATA[
+
+function updateCaptcha(caller,context) {
+    var privitem;
+    var pubitem;
+    var privtext;
+    var pubtext;
+    if (document.getElementById(context+'_recaptchapub')) {
+        pubitem = document.getElementById(context+'_recaptchapub');
+    } else {
+        return;
+    }
+    if (document.getElementById(context+'_recaptchapriv')) {
+        privitem = document.getElementById(context+'_recaptchapriv');
+    } else {
+        return;
+    }
+    if (document.getElementById(context+'_recaptchapubtxt')) {
+        pubtext = document.getElementById(context+'_recaptchapubtxt');
+    } else {
+        return;
+    }
+    if (document.getElementById(context+'_recaptchaprivtxt')) {
+        privtext = document.getElementById(context+'_recaptchaprivtxt');
+    } else {
+        return;
+    }
+    if (caller.checked) {
+        if (caller.value == 'recaptcha') {
+            pubitem.type = 'text';
+            privitem.type = 'text';
+            pubitem.size = '40';
+            privitem.size = '40';
+            pubtext.innerHTML = "$lt{'pub'}";
+            privtext.innerHTML = "$lt{'priv'}";
+        } else {
+            pubitem.type = 'hidden';
+            privitem.type = 'hidden';
+            pubtext.innerHTML = '';
+            privtext.innerHTML = '';
+        }
+    }
+    return;
+}
+
+// ]]>
+</script>
+
+END
+
+}
+
+sub captcha_phrases {
+    return &Apache::lonlocal::texthash (
+                 priv => 'Private key',
+                 pub  => 'Public key',
+                 original  => 'original (CAPTCHA)',
+                 recaptcha => 'successor (ReCAPTCHA)',
+                 notused   => 'unused',
+    );
+}
+
 1;


More information about the LON-CAPA-cvs mailing list