--- loncom/interface/domainprefs.pm	2015/05/22 14:12:08	1.160.6.64
+++ loncom/interface/domainprefs.pm	2016/09/18 19:24:14	1.160.6.72
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.64 2015/05/22 14:12:08 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.72 2016/09/18 19:24:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -304,9 +304,11 @@ sub handler {
                      modify => \&modify_autocreate,
                   },
         'directorysrch' => 
-                  { text => 'Institutional directory searches',
+                  { text => 'Directory searches',
                     help => 'Domain_Configuration_InstDirectory_Search',
-                    header => [{col1 => 'Setting',
+                    header => [{col1 => 'Institutional Directory Setting',
+                                col2 => 'Value',},
+                               {col1 => 'LON-CAPA Directory Setting',
                                 col2 => 'Value',}],
                     print => \&print_directorysrch,
                     modify => \&modify_directorysrch,
@@ -656,6 +658,7 @@ sub print_config_box {
         my $colspan = '';
         my $rightcolspan = '';
         if (($action eq 'rolecolors') || ($action eq 'defaults') ||
+            ($action eq 'directorysrch') ||
             (($action eq 'login') && ($numheaders < 4))) {
             $colspan = ' colspan="2"';
         }
@@ -673,7 +676,7 @@ sub print_config_box {
         $rowtotal ++;
         if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') ||
             ($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') ||
-            ($action eq 'selfenrollment') || ($action eq 'usersessions')) {
+            ($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'directorysrch')) {
             $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'coursecategories') {
             $output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal);
@@ -728,7 +731,7 @@ sub print_config_box {
             }
             $rowtotal ++;
         } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') ||
-                  ($action eq 'defaults')) {
+                  ($action eq 'defaults') || ($action eq 'directorysrch')) {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
             if ($numheaders == 4) {
@@ -841,7 +844,7 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">';
-        if (($action eq 'login') || ($action eq 'directorysrch')) {
+        if ($action eq 'login') {
             $output .= '  
               <td class="LC_left_item" colspan="2">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
         } elsif ($action eq 'serverstatuses') {
@@ -885,8 +888,9 @@ sub print_config_box {
         $rowtotal ++;
         if ($action eq 'quotas') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
-        } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || ($action eq 'directorysrch') ||
-                 ($action eq 'contacts') || ($action eq 'serverstatuses') || ($action eq 'loadbalancing')) {
+        } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || 
+                 ($action eq 'contacts') || ($action eq 'serverstatuses') ||
+                 ($action eq 'loadbalancing')) {
             $output .= $item->{'print'}->($dom,$settings,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
@@ -2398,7 +2402,7 @@ ENDSCRIPT
 sub print_autoenroll {
     my ($dom,$settings,$rowtotal) = @_;
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
-    my ($defdom,$runon,$runoff,$coownerson,$coownersoff);
+    my ($defdom,$runon,$runoff,$coownerson,$coownersoff,$failsafe);
     if (ref($settings) eq 'HASH') {
         if (exists($settings->{'run'})) {
             if ($settings->{'run'} eq '0') {
@@ -2432,6 +2436,9 @@ sub print_autoenroll {
         if (exists($settings->{'sender_domain'})) {
             $defdom = $settings->{'sender_domain'};
         }
+        if (exists($settings->{'autofailsafe'})) {
+            $failsafe = $settings->{'autofailsafe'};
+        }
     } else {
         if ($autorun) {
             $runon = ' checked="checked" ';
@@ -2467,8 +2474,12 @@ sub print_autoenroll {
                   $coownerson.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
                   '<label><input type="radio" name="autoassign_coowners"'.
                   $coownersoff.' value="0" />'.&mt('No').'</label></span></td>'.
-                  '</tr>';
-    $$rowtotal += 3;
+                  '</tr><tr>'.
+                  '<td>'.&mt('Failsafe for no drops when institutional data missing').'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                  '<input type="text" name="autoenroll_failsafe"'.
+                  ' value="'.$failsafe.'" size="4" /></td></tr>';
+    $$rowtotal += 4;
     return $datatable;
 }
 
@@ -2597,115 +2608,149 @@ sub print_autocreate {
 }
 
 sub print_directorysrch {
-    my ($dom,$settings,$rowtotal) = @_;
-    my $srchon = ' ';
-    my $srchoff = ' checked="checked" ';
-    my ($exacton,$containson,$beginson);
-    my $localon = ' ';
-    my $localoff = ' checked="checked" ';
-    if (ref($settings) eq 'HASH') {
-        if ($settings->{'available'} eq '1') {
-            $srchon = $srchoff;
-            $srchoff = ' ';
-        }
-        if ($settings->{'localonly'} eq '1') {
-            $localon = $localoff;
-            $localoff = ' ';
-        }
-        if (ref($settings->{'searchtypes'}) eq 'ARRAY') {
-            foreach my $type (@{$settings->{'searchtypes'}}) {
-                if ($type eq 'exact') {
+    my ($position,$dom,$settings,$rowtotal) = @_;
+    my $datatable;
+    if ($position eq 'top') {
+        my $instsrchon = ' ';
+        my $instsrchoff = ' checked="checked" ';
+        my ($exacton,$containson,$beginson);
+        my $instlocalon = ' ';
+        my $instlocaloff = ' checked="checked" ';
+        if (ref($settings) eq 'HASH') {
+            if ($settings->{'available'} eq '1') {
+                $instsrchon = $instsrchoff;
+                $instsrchoff = ' ';
+            }
+            if ($settings->{'localonly'} eq '1') {
+                $instlocalon = $instlocaloff;
+                $instlocaloff = ' ';
+            }
+            if (ref($settings->{'searchtypes'}) eq 'ARRAY') {
+                foreach my $type (@{$settings->{'searchtypes'}}) {
+                    if ($type eq 'exact') {
+                        $exacton = ' checked="checked" ';
+                    } elsif ($type eq 'contains') {
+                        $containson = ' checked="checked" ';
+                    } elsif ($type eq 'begins') {
+                        $beginson = ' checked="checked" ';
+                    }
+                }
+            } else {
+                if ($settings->{'searchtypes'} eq 'exact') {
+                    $exacton = ' checked="checked" ';
+                } elsif ($settings->{'searchtypes'} eq 'contains') {
+                    $containson = ' checked="checked" ';
+                } elsif ($settings->{'searchtypes'} eq 'specify') {
                     $exacton = ' checked="checked" ';
-                } elsif ($type eq 'contains') {
                     $containson = ' checked="checked" ';
-                } elsif ($type eq 'begins') {
-                    $beginson = ' checked="checked" ';
                 }
             }
-        } else {
-            if ($settings->{'searchtypes'} eq 'exact') {
-                $exacton = ' checked="checked" ';
-            } elsif ($settings->{'searchtypes'} eq 'contains') {
-                $containson = ' checked="checked" ';
-            } elsif ($settings->{'searchtypes'} eq 'specify') {
-                $exacton = ' checked="checked" ';
-                $containson = ' checked="checked" ';
-            }
         }
-    }
-    my ($searchtitles,$titleorder) = &sorted_searchtitles();
-    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+        my ($searchtitles,$titleorder) = &sorted_searchtitles();
+        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
 
-    my $numinrow = 4;
-    my $cansrchrow = 0;
-    my $datatable='<tr class="LC_odd_row">'.
-                  '<td colspan="2"><span class ="LC_nobreak">'.&mt('Directory search available?').'</span></td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                  '<input type="radio" name="dirsrch_available"'.
-                  $srchon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
-                  '<label><input type="radio" name="dirsrch_available"'.
-                  $srchoff.' value="0" />'.&mt('No').'</label></span></td>'.
-                  '</tr><tr>'.
-                  '<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search?').'</span></td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                  '<input type="radio" name="dirsrch_localonly"'.
-                  $localoff.' value="0" />'.&mt('Yes').'</label>&nbsp;'.
-                  '<label><input type="radio" name="dirsrch_localonly"'.
-                  $localon.' value="1" />'.&mt('No').'</label></span></td>'.
-                  '</tr>';
-    $$rowtotal += 2;
-    if (ref($usertypes) eq 'HASH') {
-        if (keys(%{$usertypes}) > 0) {
-            $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
-                                         $numinrow,$othertitle,'cansearch');
-            $cansrchrow = 1;
+        my $numinrow = 4;
+        my $cansrchrow = 0;
+        $datatable='<tr class="LC_odd_row">'.
+                   '<td colspan="2"><span class ="LC_nobreak">'.&mt('Institutional directory search available?').'</span></td>'.
+                   '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                   '<input type="radio" name="dirsrch_available"'.
+                   $instsrchon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                   '<label><input type="radio" name="dirsrch_available"'.
+                   $instsrchoff.' value="0" />'.&mt('No').'</label></span></td>'.
+                   '</tr><tr>'.
+                   '<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search institution?').'</span></td>'.
+                   '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                   '<input type="radio" name="dirsrch_instlocalonly"'.
+                   $instlocaloff.' value="0" />'.&mt('Yes').'</label>&nbsp;'.
+                   '<label><input type="radio" name="dirsrch_instlocalonly"'.
+                   $instlocalon.' value="1" />'.&mt('No').'</label></span></td>'.
+                   '</tr>';
+        $$rowtotal += 2;
+        if (ref($usertypes) eq 'HASH') {
+            if (keys(%{$usertypes}) > 0) {
+                $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
+                                             $numinrow,$othertitle,'cansearch');
+                $cansrchrow = 1;
+            }
         }
-    }
-    if ($cansrchrow) {
-        $$rowtotal ++;
-        $datatable .= '<tr>';
-    } else {
-        $datatable .= '<tr class="LC_odd_row">';
-    }
-    $datatable .= '<td><span class ="LC_nobreak">'.&mt('Supported search methods').
-                  '</span></td><td class="LC_left_item" colspan="2"><table><tr>';
-    foreach my $title (@{$titleorder}) {
-        if (defined($searchtitles->{$title})) {
-            my $check = ' ';
-            if (ref($settings) eq 'HASH') {
-                if (ref($settings->{'searchby'}) eq 'ARRAY') {
-                    if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {
-                        $check = ' checked="checked" ';
+        if ($cansrchrow) {
+            $$rowtotal ++;
+            $datatable .= '<tr>';
+        } else {
+            $datatable .= '<tr class="LC_odd_row">';
+        }
+        $datatable .= '<td><span class ="LC_nobreak">'.&mt('Supported search methods').
+                      '</span></td><td class="LC_left_item" colspan="2"><table><tr>';
+        foreach my $title (@{$titleorder}) {
+            if (defined($searchtitles->{$title})) {
+                my $check = ' ';
+                if (ref($settings) eq 'HASH') {
+                    if (ref($settings->{'searchby'}) eq 'ARRAY') {
+                        if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {
+                            $check = ' checked="checked" ';
+                        }
                     }
                 }
+                $datatable .= '<td class="LC_left_item">'.
+                              '<span class="LC_nobreak"><label>'.
+                              '<input type="checkbox" name="searchby" '.
+                              'value="'.$title.'"'.$check.'/>'.
+                              $searchtitles->{$title}.'</label></span></td>';
             }
-            $datatable .= '<td class="LC_left_item">'.
-                          '<span class="LC_nobreak"><label>'.
-                          '<input type="checkbox" name="searchby" '.
-                          'value="'.$title.'"'.$check.'/>'.
-                          $searchtitles->{$title}.'</label></span></td>';
         }
-    }
-    $datatable .= '</tr></table></td></tr>';
-    $$rowtotal ++;
-    if ($cansrchrow) {
-        $datatable .= '<tr class="LC_odd_row">';
+        $datatable .= '</tr></table></td></tr>';
+        $$rowtotal ++;
+        if ($cansrchrow) {
+            $datatable .= '<tr class="LC_odd_row">';
+        } else {
+            $datatable .= '<tr>';
+        }
+        $datatable .= '<td><span class ="LC_nobreak">'.&mt('Search latitude').'</span></td>'.   
+                      '<td class="LC_left_item" colspan="2">'.
+                      '<span class="LC_nobreak"><label>'.
+                      '<input type="checkbox" name="searchtypes" '.
+                      $exacton.' value="exact" />'.&mt('Exact match').
+                      '</label>&nbsp;'.
+                      '<label><input type="checkbox" name="searchtypes" '.
+                      $beginson.' value="begins" />'.&mt('Begins with').
+                      '</label>&nbsp;'.
+                      '<label><input type="checkbox" name="searchtypes" '.
+                      $containson.' value="contains" />'.&mt('Contains').
+                      '</label></span></td></tr>';
+        $$rowtotal ++;
     } else {
-        $datatable .= '<tr>';
+        my $domsrchon = ' checked="checked" ';
+        my $domsrchoff = ' ';
+        my $domlocalon = ' ';
+        my $domlocaloff = ' checked="checked" ';
+        if (ref($settings) eq 'HASH') {
+            if ($settings->{'lclocalonly'} eq '1') {
+                $domlocalon = $domlocaloff;
+                $domlocaloff = ' ';
+            }
+            if ($settings->{'lcavailable'} eq '0') {
+                $domsrchoff = $domsrchon;
+                $domsrchon = ' ';
+            }
+        }
+        $datatable='<tr class="LC_odd_row">'.
+                      '<td colspan="2"><span class ="LC_nobreak">'.&mt('LON-CAPA directory search available?').'</span></td>'.
+                      '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                      '<input type="radio" name="dirsrch_domavailable"'.
+                      $domsrchon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                      '<label><input type="radio" name="dirsrch_domavailable"'.
+                      $domsrchoff.' value="0" />'.&mt('No').'</label></span></td>'.
+                      '</tr><tr>'.
+                      '<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search LON-CAPA domain?').'</span></td>'.
+                      '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                      '<input type="radio" name="dirsrch_domlocalonly"'.
+                      $domlocaloff.' value="0" />'.&mt('Yes').'</label>&nbsp;'.
+                      '<label><input type="radio" name="dirsrch_domlocalonly"'.
+                      $domlocalon.' value="1" />'.&mt('No').'</label></span></td>'.
+                      '</tr>';
+        $$rowtotal += 2;
     }
-    $datatable .= '<td><span class ="LC_nobreak">'.&mt('Search latitude').'</span></td>'.   
-                  '<td class="LC_left_item" colspan="2">'.
-                  '<span class="LC_nobreak"><label>'.
-                  '<input type="checkbox" name="searchtypes" '.
-                  $exacton.' value="exact" />'.&mt('Exact match').
-                  '</label>&nbsp;'.
-                  '<label><input type="checkbox" name="searchtypes" '.
-                  $beginson.' value="begins" />'.&mt('Begins with').
-                  '</label>&nbsp;'.
-                  '<label><input type="checkbox" name="searchtypes" '.
-                  $containson.' value="contains" />'.&mt('Contains').
-                  '</label></span></td></tr>';
-    $$rowtotal ++;
     return $datatable;
 }
 
@@ -2892,11 +2937,13 @@ sub print_coursedefaults {
         usejsme              => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
         postsubmit           => 'Disable submit button/keypress following student submission',
         canclone             => "People who may clone a course (besides course's owner and coordinators)",
+        mysqltables          => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver',
     );
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
                            postsubmit           => 60,
+                           mysqltables          => 172800,
                          );
     if ($position eq 'top') {
         %defaultchecked = (
@@ -2980,7 +3027,7 @@ sub print_coursedefaults {
         $itemcount ++;
     } else {
         $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-        my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout);
+        my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql);
         my $currusecredits = 0;
         my $postsubmitclient = 1;
         my @types = ('official','unofficial','community','textbook');
@@ -3024,6 +3071,15 @@ sub print_coursedefaults {
                     $deftimeout{$type} = $staticdefaults{'postsubmit'};
                 }
             }
+            if (ref($settings->{'mysqltables'}) eq 'HASH') {
+                foreach my $type (keys(%{$settings->{'mysqltables'}})) {
+                    $currmysql{$type} = $settings->{'mysqltables'}{$type};
+                }
+            } else {
+                foreach my $type (@types) {
+                    $currmysql{$type} = $staticdefaults{'mysqltables'};
+                }
+            }
         } else {
             foreach my $type (@types) {
                 $deftimeout{$type} = $staticdefaults{'postsubmit'};
@@ -3101,13 +3157,27 @@ sub print_coursedefaults {
         $additional .= '</tr></table></div>'."\n";
         %defaultchecked = ('postsubmit' => 'on');
         @toggles = ('postsubmit');
-        my $current = {
-                        'postsubmit' => $postsubmitclient,
-                      };
+        $current = {
+                       'postsubmit' => $postsubmitclient,
+                   };
         ($table,$itemcount) =
             &radiobutton_prefs($current,\@toggles,\%defaultchecked,
                                \%choices,$itemcount,$onclick,$additional,'left');
         $datatable .= $table;
+        $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
+                      $choices{'mysqltables'}.
+                      '</span></td>'.
+                      '<td align="right" class="LC_right_item">'.
+                      '<table><tr>';
+        foreach my $type (@types) {
+            $datatable .= '<td align="center">'.&mt($type).'<br />'.
+                           '<input type="text" name="mysqltables_'.$type.'"'.
+                           ' value="'.$currmysql{$type}.'" size="5" /></td>';
+        }
+        $datatable .= '</tr></table></td></tr>'."\n";
+        $itemcount ++;
+
     }
     $$rowtotal += $itemcount;
     return $datatable;
@@ -4535,7 +4605,8 @@ sub email_as_username {
 
 sub captcha_choice {
     my ($context,$settings,$itemcount) = @_;
-    my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext);
+    my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext,
+        $vertext,$currver); 
     my %lt = &captcha_phrases();
     $keyentry = 'hidden';
     if ($context eq 'cancreate') {
@@ -4553,6 +4624,11 @@ sub captcha_choice {
             $pubtext = $lt{'pub'};
             $privtext = $lt{'priv'};
             $keyentry = 'text';
+            $vertext = $lt{'ver'};
+            $currver = $settings->{'recaptchaversion'};
+            if ($currver ne '2') {
+                $currver = 1;
+            }
         }
         if (ref($settings->{'recaptchakeys'}) eq 'HASH') {
             $currpub = $settings->{'recaptchakeys'}{'public'};
@@ -4586,7 +4662,11 @@ sub captcha_choice {
                $currpub.'" size="40" /></span><br />'."\n".
                '<span class="LC_nobreak"><span id="'.$context.'_recaptchaprivtxt">'.$privtext.'</span>&nbsp;'."\n".
                '<input type="'.$keyentry.'" id="'.$context.'_recaptchapriv" name="'.$context.'_recaptchapriv" value="'.
-               $currpriv.'" size="40" /></span></td></tr></table>'."\n".
+               $currpriv.'" size="40" /></span><br />'.
+               '<span class="LC_nobreak"><span id="'.$context.'_recaptchavertxt">'.$vertext.'</span>&nbsp;'."\n".
+               '<input type="'.$keyentry.'" id="'.$context.'_recaptchaversion" name="'.$context.'_recaptchaversion" value="'.
+               $currver.'" size="3" /></span><br />'.
+               '</td></tr></table>'."\n".
                '</td></tr>';
     return $output;
 }
@@ -5466,7 +5546,10 @@ sub coursecategories_javascript {
     }
     my $instcode_reserved = &mt('The name: [_1] is a reserved category.','"instcode"');
     my $communities_reserved = &mt('The name: [_1] is a reserved category.','"communities"');
-    my $choose_again = '\\n'.&mt('Please use a different name for the new top level category.'); 
+    my $choose_again = "\n".&mt('Please use a different name for the new top level category.'); 
+    &js_escape(\$instcode_reserved);
+    &js_escape(\$communities_reserved);
+    &js_escape(\$choose_again);
     $output = <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -6144,7 +6227,7 @@ sub modify_login {
                 if ($domservers{$lonhost}) {
                     if (ref($domconfig{'login'}{'headtag'}{$lonhost}) eq 'HASH') {
                         $currheadtagurls{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'url'};
-                        $currexempt{$lonhost} = $domconfig{'login'}{'headtagexempt'}{$lonhost}{'exempt'}
+                        $currexempt{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'exempt'}
                     }
                 }
             }
@@ -6370,6 +6453,13 @@ sub modify_login {
                         $chgtxt .= '</ul>';
                         $resulttext .= '<li>'.$chgtxt.'</li>';
                     }
+                } elsif ($item eq 'recaptchaversion') {
+                    if (ref($loginhash{'login'}) eq 'HASH') {
+                        if ($loginhash{'login'}{'captcha'} eq 'recaptcha') {
+                            $resulttext .= '<li>'.&mt('ReCAPTCHA for helpdesk form set to version [_1]',$loginhash{'login'}{'recaptchaversion'}).
+                                           '</li>';
+                        }
+                    }
                 } else {
                     $resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
                 }
@@ -7395,10 +7485,14 @@ sub modify_quotas {
                         if (@{$confhash{'validation'}{$item}} > 0) {
                             @{$confhash{'validation'}{$item}} = sort(@{$confhash{'validation'}{$item}});
                         }
-                        if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                            if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') {
-                                @changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item},
-                                                                              $domconfig{'requestcourses'}{'validation'}{$item});
+                        if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                            if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                                if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') {
+                                    @changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item},
+                                                                                  $domconfig{'requestcourses'}{'validation'}{$item});
+                                } else {
+                                    @changed = @{$confhash{'validation'}{$item}};
+                                }
                             } else {
                                 @changed = @{$confhash{'validation'}{$item}};
                             }
@@ -7419,9 +7513,15 @@ sub modify_quotas {
                                 $env{'form.requestcourses_validation_'.$item} =~ s/[\n\r\f]+/\s/gs;
                             }
                         }
-                        if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                            if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) {
-                                $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                        if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                            if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                                if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) {
+                                    $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                                }
+                            } else {
+                                if ($confhash{'validation'}{$item} ne '') {
+                                    $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                                }
                             }
                         } else {
                             if ($confhash{'validation'}{$item} ne '') {
@@ -7439,14 +7539,18 @@ sub modify_quotas {
                 }
             }
             if (ref($confhash{'validation'}) eq 'HASH') {
-                if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                    if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
-                        unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) {
-                            if ($confhash{'validation'}{'dc'} eq '') {
-                                $changes{'validation'}{'dc'} = &mt('None');
-                            } else {
-                                $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
+                if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                    if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                        if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                            unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                                if ($confhash{'validation'}{'dc'} eq '') {
+                                    $changes{'validation'}{'dc'} = &mt('None');
+                                } else {
+                                    $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
+                                }
                             }
+                        } elsif ($confhash{'validation'}{'dc'} ne '') {
+                            $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
                         }
                     } elsif ($confhash{'validation'}{'dc'} ne '') {
                         $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
@@ -7454,9 +7558,13 @@ sub modify_quotas {
                 } elsif ($confhash{'validation'}{'dc'} ne '') {
                     $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
                 }
-            } elsif (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
-                    $changes{'validation'}{'dc'} = &mt('None');
+            } else {
+                if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                    if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                        if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                            $changes{'validation'}{'dc'} = &mt('None');
+                        }
+                    }
                 }
             }
         }
@@ -7864,7 +7972,8 @@ sub modify_autoenroll {
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
     my %title = ( run => 'Auto-enrollment active',
                   sender => 'Sender for notification messages',
-                  coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)');
+                  coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)',
+                  failsafe => 'Failsafe for no drops if institutional data missing for a section');
     my @offon = ('off','on');
     my $sender_uname = $env{'form.sender_uname'};
     my $sender_domain = $env{'form.sender_domain'};
@@ -7874,11 +7983,17 @@ sub modify_autoenroll {
         $sender_domain = '';
     }
     my $coowners = $env{'form.autoassign_coowners'};
+    my $failsafe = $env{'form.autoenroll_failsafe'};
+    $failsafe =~ s{^\s+|\s+$}{}g;
+    if ($failsafe =~ /\D/) {
+        undef($failsafe);
+    }
     my %autoenrollhash =  (
                        autoenroll => { 'run' => $env{'form.autoenroll_run'},
                                        'sender_uname' => $sender_uname,
                                        'sender_domain' => $sender_domain,
                                        'co-owners' => $coowners,
+                                       'autofailsafe' => $failsafe,
                                 }
                      );
     my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash,
@@ -7905,7 +8020,10 @@ sub modify_autoenroll {
             }
         } elsif ($coowners) {
             $changes{'coowners'} = 1;
-        }      
+        }
+        if ($currautoenroll{'autofailsafe'} ne $failsafe) {
+            $changes{'autofailsafe'} = 1;
+        }
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'run'}) {
@@ -7925,6 +8043,17 @@ sub modify_autoenroll {
                     $lastactref->{'domainconfig'} = 1;
                 }
             }
+            if ($changes{'autofailsafe'}) {
+                if ($failsafe ne '') {
+                    $resulttext .= '<li>'.&mt("$title{'failsafe'} set to [_1]",$failsafe).'</li>';
+                } else {
+                    $resulttext .= '<li>'.&mt("$title{'failsafe'} deleted");
+                }
+                &Apache::lonnet::get_domain_defaults($dom,1);
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'domdefaults'} = 1;
+                }
+            }
             $resulttext .= '</ul>';
         } else {
             $resulttext = &mt('No changes made to auto-enrollment settings');
@@ -8205,8 +8334,10 @@ sub modify_directorysrch {
             $currdirsrch{$key} = $domconfig{'directorysrch'}{$key};
         }
     }
-    my %title = ( available => 'Directory search available',
-                  localonly => 'Other domains can search',
+    my %title = ( available => 'Institutional directory search available',
+                  localonly => 'Other domains can search institution',
+                  lcavailable => 'LON-CAPA directory search available',
+                  lclocalonly => 'Other domains can search LON-CAPA domain',
                   searchby => 'Search types',
                   searchtypes => 'Search latitude');
     my @offon = ('off','on');
@@ -8280,7 +8411,9 @@ sub modify_directorysrch {
     my %dirsrch_hash =  (
             directorysrch => { available => $env{'form.dirsrch_available'},
                                cansearch => \@cansearch,
-                               localonly => $env{'form.dirsrch_localonly'},
+                               localonly => $env{'form.dirsrch_instlocalonly'},
+                               lclocalonly => $env{'form.dirsrch_domlocalonly'},
+                               lcavailable => $env{'form.dirsrch_domavailable'},
                                searchby => \@searchby,
                                searchtypes => \@searchtypes,
                              }
@@ -8297,24 +8430,47 @@ sub modify_directorysrch {
                 $changes{'available'} = 1;
             }
         }
-        if (exists($currdirsrch{'localonly'})) {
-             if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_localonly'}) {
-                 $changes{'localonly'} = 1;
+        if (exists($currdirsrch{'lcavailable'})) {
+             if ($currdirsrch{'lcavailable'} ne $env{'form.dirsrch_domavailable'}) {
+                 $changes{'lcavailable'} = 1;
              }
         } else {
-            if ($env{'form.dirsrch_localonly'} eq '1') {
+            if ($env{'form.dirsrch_lcavailable'} eq '1') {
+                $changes{'lcavailable'} = 1;
+            }
+        }
+        if (exists($currdirsrch{'localonly'})) {
+            if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_instlocalonly'}) {
+                $changes{'localonly'} = 1;
+            }
+        } else {
+            if ($env{'form.dirsrch_instlocalonly'} eq '1') {
                 $changes{'localonly'} = 1;
             }
         }
+        if (exists($currdirsrch{'lclocalonly'})) {
+            if ($currdirsrch{'lclocalonly'} ne $env{'form.dirsrch_domlocalonly'}) {
+                $changes{'lclocalonly'} = 1;
+            }
+        } else {
+            if ($env{'form.dirsrch_domlocalonly'} eq '1') {
+                $changes{'lclocalonly'} = 1;
+            }
+        }
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'available'}) {
                 $resulttext .= '<li>'.&mt("$title{'available'} set to: $offon[$env{'form.dirsrch_available'}]").'</li>';
             }
+            if ($changes{'lcavailable'}) {
+                $resulttext .= '<li>'.&mt("$title{'lcavailable'} set to: $offon[$env{'form.dirsrch_domavailable'}]").'</li>';
+            }
             if ($changes{'localonly'}) {
-                $resulttext .= '<li>'.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_localonly'}]").'</li>';
+                $resulttext .= '<li>'.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_instlocalonly'}]").'</li>';
+            }
+            if ($changes{'lclocalonly'}) {
+                $resulttext .= '<li>'.&mt("$title{'lclocalonly'} set to: $otherdoms[$env{'form.dirsrch_domlocalonly'}]").'</li>';
             }
-
             if (ref($changes{'cansearch'}) eq 'ARRAY') {
                 my $chgtext;
                 if (ref($usertypes) eq 'HASH') {
@@ -8365,7 +8521,7 @@ sub modify_directorysrch {
             }
             $resulttext .= '</ul>';
         } else {
-            $resulttext = &mt('No changes made to institution directory search settings');
+            $resulttext = &mt('No changes made to directory search settings');
         }
     } else {
         $resulttext = '<span class="LC_error">'.
@@ -8552,7 +8708,8 @@ sub modify_usercreation {
                 if (ref($domconfig{'usercreation'}{$key}) eq 'HASH') {
                     foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) {
                         if (($item eq 'selfcreate') || ($item eq 'statustocreate') ||
-                            ($item eq 'captcha') || ($item eq 'recaptchakeys')) {
+                            ($item eq 'captcha') || ($item eq 'recaptchakeys') ||
+                            ($item eq 'recaptchaversion')) {
                             $save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
                         } else {
                             $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
@@ -8776,6 +8933,7 @@ sub modify_selfcreation {
                     foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) {
                         if (($item eq 'selfcreate') || ($item eq 'statustocreate') ||
                             ($item eq 'captcha') || ($item eq 'recaptchakeys') || 
+                            ($item eq 'recaptchaversion') ||
                             ($item eq 'emailusername') || ($item eq 'notify') ||
                             ($item eq 'selfcreateprocessing') || ($item eq 'shibenv')) {
                             $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
@@ -9105,6 +9263,7 @@ sub modify_selfcreation {
 #
     $save_usercreate{'cancreate'}{'captcha'} = $savecaptcha{'captcha'};
     $save_usercreate{'cancreate'}{'recaptchakeys'} = $savecaptcha{'recaptchakeys'};
+    $save_usercreate{'cancreate'}{'recaptchaversion'} = $savecaptcha{'recaptchaversion'};
     $save_usercreate{'cancreate'}{'selfcreate'} = $cancreate{'selfcreate'};
     if (ref($cancreate{'notify'}) eq 'HASH') {
         $save_usercreate{'cancreate'}{'notify'} = $cancreate{'notify'};
@@ -9266,6 +9425,10 @@ sub modify_selfcreation {
                             $chgtext .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>';
                         }
                         $chgtext .= '</ul>';
+                    } elsif ($type eq 'recaptchaversion') {
+                        if ($savecaptcha{'captcha'} eq 'recaptcha') {
+                            $chgtext .= &mt('ReCAPTCHA set to version [_1]',$savecaptcha{$type});
+                        }
                     } elsif ($type eq 'emailusername') {
                         if (ref($cancreate{'emailusername'}) eq 'HASH') {
                             if (ref($types) eq 'ARRAY') {
@@ -9386,7 +9549,7 @@ sub process_captcha {
             $changes->{'captcha'} = 1;
         }
     }
-    my ($newpub,$newpriv,$currpub,$currpriv);
+    my ($newpub,$newpriv,$currpub,$currpriv,$newversion,$currversion);
     if ($newsettings->{'captcha'} eq 'recaptcha') {
         $newpub = $env{'form.'.$container.'_recaptchapub'};
         $newpriv = $env{'form.'.$container.'_recaptchapriv'};
@@ -9396,6 +9559,12 @@ sub process_captcha {
                                              public  => $newpub,
                                              private => $newpriv,
                                           };
+        $newversion = $env{'form.'.$container.'_recaptchaversion'};
+        $newversion =~ s/\D//g;
+        if ($newversion ne '2') {
+            $newversion = 1;
+        }
+        $newsettings->{'recaptchaversion'} = $newversion;
     }
     if (ref($current->{'recaptchakeys'}) eq 'HASH') {
         $currpub = $current->{'recaptchakeys'}{'public'};
@@ -9407,6 +9576,23 @@ sub process_captcha {
                                               }
         }
     }
+    if ($current->{'captcha'} eq 'recaptcha') {
+        $currversion = $current->{'recaptchaversion'};
+        if ($currversion ne '2') {
+            $currversion = 1;
+        }
+    }
+    if ($currversion ne $newversion) {
+        if ($container eq 'cancreate') {
+            if (ref($changes->{'cancreate'}) eq 'ARRAY') {
+                push(@{$changes->{'cancreate'}},'recaptchaversion');
+            } elsif (!defined($changes->{'cancreate'})) {
+                $changes->{'cancreate'} = ['recaptchaversion'];
+            }
+        } else {
+            $changes->{'recaptchaversion'} = 1;
+        }
+    }
     if (($newpub ne $currpub) || ($newpriv ne $currpriv)) {
         if ($container eq 'cancreate') {
             if (ref($changes->{'cancreate'}) eq 'ARRAY') {
@@ -10304,12 +10490,14 @@ sub modify_coursedefaults {
                          );
     my @toggles = ('uselcmath','usejsme');
     my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial',
-                   'uploadquota_community','uploadquota_textbook');
+                   'uploadquota_community','uploadquota_textbook','mysqltables_official',
+                   'mysqltables_unofficial','mysqltables_community','mysqltables_textbook');
     my @types = ('official','unofficial','community','textbook');
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
                            postsubmit           => 60,
+                           mysqltables          => 172800,
                          );
 
     $defaultshash{'coursedefaults'} = {};
@@ -10350,12 +10538,12 @@ sub modify_coursedefaults {
                 }
                 $defaultshash{'coursedefaults'}{$item} = $newdef;
             } else {
-                my ($type) = ($item =~ /^\Quploadquota_\E(\w+)$/);
-                if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
-                    $currdef = $domconfig{'coursedefaults'}{'uploadquota'}{$type};
+                my ($setting,$type) = ($item =~ /^(uploadquota|mysqltables)_(\w+)$/);
+                if (ref($domconfig{'coursedefaults'}{$setting}) eq 'HASH') {
+                    $currdef = $domconfig{'coursedefaults'}{$setting}{$type};
                 }
                 $newdef =~ s/[^\w.\-]//g;
-                $defaultshash{'coursedefaults'}{'uploadquota'}{$type} = $newdef;
+                $defaultshash{'coursedefaults'}{$setting}{$type} = $newdef;
             }
             if ($currdef ne $newdef) {
                 my $staticdef;
@@ -10363,9 +10551,10 @@ sub modify_coursedefaults {
                     unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) {
                         $changes{$item} = 1;
                     }
-                } else {
-                    unless (($currdef eq '') && ($newdef == $staticdefaults{'uploadquota'})) {
-                        $changes{'uploadquota'} = 1;
+                } elsif ($item =~ /^(uploadquota|mysqltables)_/) {
+                    my $setting = $1;
+                    unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) {
+                        $changes{$setting} = 1;
                     }
                 }
             }
@@ -10490,7 +10679,7 @@ sub modify_coursedefaults {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
             if (($changes{'uploadquota'}) || ($changes{'postsubmit'}) ||
                 ($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) ||
-                ($changes{'canclone'})) {
+                ($changes{'canclone'}) || ($changes{'mysqltables'})) {
                 foreach my $item ('uselcmath','usejsme') {
                     if ($changes{$item}) {
                         $domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};
@@ -10569,6 +10758,18 @@ sub modify_coursedefaults {
                     } else {
                         $resulttext .= '<li>'.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$staticdefaults{'uploadquota'}).'</li>';
                     }
+                } elsif ($item eq 'mysqltables') {
+                    if (ref($defaultshash{'coursedefaults'}{'mysqltables'}) eq 'HASH') {
+                        $resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver').'<ul>'.
+                                       '<li>'.&mt('Official courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'official'}.'</b>').'</li>'.
+                                       '<li>'.&mt('Unofficial courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'unofficial'}.'</b>').'</li>'.
+                                       '<li>'.&mt('Textbook courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'textbook'}.'</b>').'</li>'.
+                                       '<li>'.&mt('Communities: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'community'}.'</b>').'</li>'.
+                                       '</ul>'.
+                                       '</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver remains default: [_1] s',$staticdefaults{'uploadquota'}).'</li>';
+                    }
                 } elsif ($item eq 'postsubmit') {
                     if ($domdefaults{'postsubmit'} eq 'off') {
                         $resulttext .= '<li>'.&mt('Submit button(s) remain enabled on page after student makes submission.');
@@ -12087,6 +12288,8 @@ function updateCaptcha(caller,context) {
     var pubitem;
     var privtext;
     var pubtext;
+    var versionitem;
+    var versiontext;
     if (document.getElementById(context+'_recaptchapub')) {
         pubitem = document.getElementById(context+'_recaptchapub');
     } else {
@@ -12107,6 +12310,16 @@ function updateCaptcha(caller,context) {
     } else {
         return;
     }
+    if (document.getElementById(context+'_recaptchaversion')) {
+        versionitem = document.getElementById(context+'_recaptchaversion');
+    } else {
+        return;
+    }
+    if (document.getElementById(context+'_recaptchavertxt')) {
+        versiontext = document.getElementById(context+'_recaptchavertxt');
+    } else {
+        return;
+    }
     if (caller.checked) {
         if (caller.value == 'recaptcha') {
             pubitem.type = 'text';
@@ -12115,11 +12328,16 @@ function updateCaptcha(caller,context) {
             privitem.size = '40';
             pubtext.innerHTML = "$lt{'pub'}";
             privtext.innerHTML = "$lt{'priv'}";
+            versionitem.type = 'text';
+            versionitem.size = '3';
+            versiontext.innerHTML = "$lt{'ver'}";
         } else {
             pubitem.type = 'hidden';
             privitem.type = 'hidden';
+            versionitem.type = 'hidden';
             pubtext.innerHTML = '';
             privtext.innerHTML = '';
+            versiontext.innerHTML = '';
         }
     }
     return;
@@ -12185,6 +12403,7 @@ sub captcha_phrases {
                  original  => 'original (CAPTCHA)',
                  recaptcha => 'successor (ReCAPTCHA)',
                  notused   => 'unused',
+                 ver => 'ReCAPTCHA version (1 or 2)',
     );
 }