--- loncom/interface/domainprefs.pm	2014/05/30 01:39:48	1.246
+++ loncom/interface/domainprefs.pm	2015/04/01 23:22:10	1.261
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.246 2014/05/30 01:39:48 raeburn Exp $
+# $Id: domainprefs.pm,v 1.261 2015/04/01 23:22:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -250,6 +250,8 @@ sub handler {
                       header => [{col1 => 'Log-in Page Items',
                                   col2 => '',},
                                  {col1 => 'Log-in Help',
+                                  col2 => 'Value'},
+                                 {col1 => 'Custom HTML in document head',
                                   col2 => 'Value'}],
                       print => \&print_login,
                       modify => \&modify_login,
@@ -479,6 +481,8 @@ sub handler {
                                        {col1 => 'Log-in Page Items',
                                         col2 => ''},
                                        {col1 => 'Log-in Help',
+                                        col2 => 'Value'},
+                                       {col1 => 'Custom HTML in document head',
                                         col2 => 'Value'}],
                             print => \&print_login,
                             modify => \&modify_login,
@@ -670,7 +674,7 @@ sub print_config_box {
         my $colspan = '';
         my $rightcolspan = '';
         if (($action eq 'rolecolors') || ($action eq 'defaults') ||
-            (($action eq 'login') && ($numheaders < 3))) {
+            (($action eq 'login') && ($numheaders < 4))) {
             $colspan = ' colspan="2"';
         }
         if ($action eq 'usersessions') {
@@ -692,7 +696,7 @@ sub print_config_box {
         } elsif ($action eq 'coursecategories') {
             $output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
-            if ($numheaders == 3) {
+            if ($numheaders == 4) {
                 $colspan = ' colspan="2"';
                 $output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal);
             } else {
@@ -745,7 +749,7 @@ sub print_config_box {
                   ($action eq 'defaults')) {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
-            if ($numheaders == 3) {
+            if ($numheaders == 4) {
                 $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).'
            </table>
           </td>
@@ -761,9 +765,31 @@ sub print_config_box {
             } else {
                 $output .= &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal);
             }
+            $output .= '
+           </table>
+          </td>
+         </tr>
+         <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">';
+            if ($numheaders == 4) {
+                $output .= '
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td>
+             </tr>';
+            } else {
+                $output .= '
+              <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>';
+            }
+            $rowtotal ++;
+            $output .= &print_login('headtag',$dom,$confname,$phase,$settings,\$rowtotal);
         } elsif ($action eq 'requestcourses') {
-            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal).
-                       &print_studentcode($settings,\$rowtotal).'
+            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+            $rowtotal ++;
+            $output .= &print_studentcode($settings,\$rowtotal).'
            </table>
           </td>
          </tr>
@@ -798,6 +824,7 @@ sub print_config_box {
             &print_validation_rows('requestcourses',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'requestauthor') {
             $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+            $rowtotal ++;
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).'
            </table>
@@ -1179,6 +1206,57 @@ sub print_login {
             $itemcount ++;
         }
         $datatable .= &captcha_choice('login',$settings,$itemcount);
+    } elsif ($caller eq 'headtag') {
+        my %domservers = &Apache::lonnet::get_servers($dom);
+        my $choice = $choices{'headtag'};
+        $css_class = ' class="LC_odd_row"';
+        $datatable .= '<tr'.$css_class.'><td colspan="2">'.$choice.'</td>'.
+                      '<td align="left"><table><tr><th>'.$choices{'hostid'}.'</th>'.
+                      '<th>'.$choices{'current'}.'</th>'.
+                      '<th>'.$choices{'action'}.'</th>'.
+                      '<th>'.$choices{'exempt'}.'</th></tr>'."\n";
+        my (%currurls,%currexempt);
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'headtag'}) eq 'HASH') {
+                foreach my $lonhost (keys(%{$settings->{'headtag'}})) {
+                    if (ref($settings->{'headtag'}{$lonhost}) eq 'HASH') {
+                        $currurls{$lonhost} = $settings->{'headtag'}{$lonhost}{'url'};
+                        $currexempt{$lonhost} = $settings->{'headtag'}{$lonhost}{'exempt'};
+                    }
+                }
+            }
+        }
+        my %lt = &Apache::lonlocal::texthash(
+                                               del  => 'Delete?',
+                                               rep  => 'Replace:',
+                                               upl  => 'Upload:',
+                                               curr => 'View contents',
+                                               none => 'None',
+        );
+        my $switchserver = &check_switchserver($dom,$confname);
+        foreach my $lonhost (sort(keys(%domservers))) {
+            my $exempt = &check_exempt_addresses($currexempt{$lonhost});
+            $datatable .= '<tr><td>'.$domservers{$lonhost}.'</td>';
+            if ($currurls{$lonhost}) {
+                $datatable .= '<td class="LC_right_item"><a href="'.
+                              "javascript:void(open('$currurls{$lonhost}?inhibitmenu=yes','Custom_HeadTag',
+                              'menubar=0,toolbar=1,scrollbars=1,width=600,height=500,resizable=yes'))".
+                              '">'.$lt{'curr'}.'</a></td>'.
+                              '<td><span class="LC_nobreak"><label>'.
+                              '<input type="checkbox" name="loginheadtag_del" value="'.$lonhost.'" />'.
+                              $lt{'del'}.'</label>&nbsp;'.$lt{'rep'}.'</span>';
+            } else {
+                $datatable .= '<td class="LC_right_item">'.$lt{'none'}.'</td><td>'.$lt{'upl'};
+            }
+            $datatable .='<br />';
+            if ($switchserver) {
+                $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+            } else {
+                $datatable .= '<input type="file" name="loginheadtag_'.$lonhost.'" />';
+            }
+            $datatable .= '</td><td><input type="textbox" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>';
+        }
+        $datatable .= '</table></td></tr>';
     }
     return $datatable;
 }
@@ -1212,6 +1290,9 @@ sub login_choices {
             link          => "Link",
             alink         => "Active link",
             vlink         => "Visited link",
+            headtag       => "Custom markup",
+            action        => "Action",
+            current       => "Current",
         );
     return %choices;
 }
@@ -2074,7 +2155,6 @@ sub print_requestmail {
         $datatable .= &mt('There are no active Domain Coordinators');
     }
     $datatable .='</td></tr>';
-    $$rowtotal += $rows;
     return $datatable;
 }
 
@@ -2083,9 +2163,11 @@ sub print_studentcode {
     my $rownum = 0; 
     my ($output,%current);
     my @crstypes = ('official','unofficial','community','textbook');
-    if (ref($settings->{'uniquecode'}) eq 'HASH') {
-        foreach my $type (@crstypes) {
-            $current{$type} = $settings->{'uniquecode'}{$type};
+    if (ref($settings) eq 'HASH') {
+        if (ref($settings->{'uniquecode'}) eq 'HASH') {
+            foreach my $type (@crstypes) {
+                $current{$type} = $settings->{'uniquecode'}{$type};
+            }
         }
     }
     $output .= '<tr>'.
@@ -2519,13 +2601,15 @@ sub print_autocreate {
                   $createoff{'req'}.' value="0" />'.&mt('No').'</label></span>';
     my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
                                                    'autocreate_xmldc',%currhash);
+    $datatable .= '</td></tr><tr class="LC_odd_row"><td>';
     if ($numdc > 1) {
-        $datatable .= '</td></tr><tr class="LC_odd_row"><td>'.
-                      &mt('Course creation processed as: (choose Dom. Coord.)').
-                      '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
+        $datatable .= &mt('Course creation processed as: (choose Dom. Coord.)').
+                      '</td><td class="LC_left_item">';
     } else {
-        $datatable .= $dctable.'</td></tr>';
+        $datatable .= &mt('Course creation processed as:').
+                      '</td><td class="LC_right_item">';
     }
+    $datatable .= $dctable.'</td></tr>';
     $$rowtotal += $rows;
     return $datatable;
 }
@@ -2760,7 +2844,7 @@ sub print_helpsettings {
 
 sub radiobutton_prefs {
     my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick,
-        $additional) = @_;
+        $additional,$align) = @_;
     return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') &&
                    (ref($choices) eq 'HASH'));
 
@@ -2794,8 +2878,14 @@ sub radiobutton_prefs {
         $datatable .=
             '<tr'.$css_class.'><td valign="top">'.
             '<span class="LC_nobreak">'.$choices->{$item}.
-            '</span></td>'.
-            '<td class="LC_right_item"><span class="LC_nobreak">'.
+            '</span></td>';
+        if ($align eq 'left') {
+            $datatable .= '<td class="LC_left_item">';
+        } else {
+            $datatable .= '<td class="LC_right_item">';
+        }
+        $datatable .= 
+            '<span class="LC_nobreak">'.
             '<label><input type="radio" name="'.
             $item.'" '.$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes').
             '</label>&nbsp;<label><input type="radio" name="'.$item.'" '.
@@ -2817,21 +2907,29 @@ sub print_coursedefaults {
         uploadquota          => 'Default quota for files uploaded directly to course/community using Course Editor (MB)',
         anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys',
         coursecredits        => 'Credits can be specified for courses',
+        uselcmath            => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)',
+        usejsme              => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
+        postsubmit           => 'Disable submit button/keypress following student submission',
     );
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
+                           postsubmit           => 60,
                          );
     if ($position eq 'top') {
-        %defaultchecked = ('canuse_pdfforms' => 'off');
-        @toggles = ('canuse_pdfforms');
+        %defaultchecked = (
+                            'canuse_pdfforms' => 'off',
+                            'uselcmath'       => 'on',
+                            'usejsme'         => 'on',
+                          );
+        @toggles = ('canuse_pdfforms','uselcmath','usejsme');
         ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                                 \%choices,$itemcount);
+                                                     \%choices,$itemcount);
     } else {
         $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-        my ($currdefresponder,$def_official_credits,$def_unofficial_credits,$def_textbook_credits,
-            %curruploadquota);
+        my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout);
         my $currusecredits = 0;
+        my $postsubmitclient = 1;
         my @types = ('official','unofficial','community','textbook');
         if (ref($settings) eq 'HASH') {
             $currdefresponder = $settings->{'anonsurvey_threshold'};
@@ -2841,14 +2939,42 @@ sub print_coursedefaults {
                 }
             }
             if (ref($settings->{'coursecredits'}) eq 'HASH') {
-                $def_official_credits = $settings->{'coursecredits'}->{'official'};
-                $def_unofficial_credits = $settings->{'coursecredits'}->{'unofficial'};
-                $def_textbook_credits = $settings->{'coursecredits'}->{'textbook'};
-                if (($def_official_credits ne '') || ($def_unofficial_credits ne '') ||
-                    ($def_textbook_credits ne '')) {
-                    $currusecredits = 1;
+                foreach my $type (@types) {
+                    next if ($type eq 'community');
+                    $defcredits{$type} = $settings->{'coursecredits'}->{$type};
+                    if ($defcredits{$type} ne '') {
+                        $currusecredits = 1;
+                    }
+                }
+            }
+            if (ref($settings->{'postsubmit'}) eq 'HASH') {
+                if ($settings->{'postsubmit'}->{'client'} eq 'off') {
+                    $postsubmitclient = 0;
+                    foreach my $type (@types) {
+                        $deftimeout{$type} = $staticdefaults{'postsubmit'};
+                    }
+                } else {
+                    foreach my $type (@types) {
+                        if (ref($settings->{'postsubmit'}->{'timeout'}) eq 'HASH') {
+                            if ($settings->{'postsubmit'}->{'timeout'}->{$type} =~ /^\d+$/) {
+                                $deftimeout{$type} = $settings->{'postsubmit'}->{'timeout'}->{$type}; 
+                            } else {
+                                $deftimeout{$type} = $staticdefaults{'postsubmit'};
+                            }
+                        } else {
+                            $deftimeout{$type} = $staticdefaults{'postsubmit'};
+                        }
+                    }
+                }
+            } else {
+                foreach my $type (@types) {
+                    $deftimeout{$type} = $staticdefaults{'postsubmit'};
                 }
             }
+        } else {
+            foreach my $type (@types) {
+                $deftimeout{$type} = $staticdefaults{'postsubmit'};
+            }
         }
         if (!$currdefresponder) {
             $currdefresponder = $staticdefaults{'anonsurvey_threshold'};
@@ -2888,21 +3014,14 @@ sub print_coursedefaults {
             $display = 'block';
         }
         my $additional = '<div id="credits" style="display: '.$display.'">'.
-                         '<span class="LC_nobreak">'.
-                         &mt('Default credits for official courses [_1]',
-                         '<input type="text" name="official_credits" value="'.
-                         $def_official_credits.'" size="3" />').
-                         '</span><br />'.
-                         '<span class="LC_nobreak">'.
-                         &mt('Default credits for unofficial courses [_1]',
-                         '<input type="text" name="unofficial_credits" value="'.
-                         $def_unofficial_credits.'" size="3" />').
-                         '</span><br />'.
-                         '<span class="LC_nobreak">'.
-                         &mt('Default credits for textbook courses [_1]',
-                         '<input type="text" name="textbook_credits" value="'.
-                         $def_textbook_credits.'" size="3" />').
-                         '</span></div>'."\n";
+                         '<i>'.&mt('Default credits').'</i><br /><table><tr>';
+        foreach my $type (@types) {
+            next if ($type eq 'community');
+            $additional .= '<td align="center">'.&mt($type).'<br />'.
+                           '<input type="text" name="'.$type.'_credits"'.
+                           ' value="'.$defcredits{$type}.'" size="3" /></td>';
+        }
+        $additional .= '</tr></table></div>'."\n";
         %defaultchecked = ('coursecredits' => 'off');
         @toggles = ('coursecredits');
         my $current = {
@@ -2910,9 +3029,32 @@ sub print_coursedefaults {
                       };
         (my $table,$itemcount) =
             &radiobutton_prefs($current,\@toggles,\%defaultchecked,
-                               \%choices,$itemcount,$onclick,$additional);
+                               \%choices,$itemcount,$onclick,$additional,'left');
+        $datatable .= $table;
+        $onclick = "toggleDisplay(this.form,'studentsubmission');";
+        my $display = 'none';
+        if ($postsubmitclient) {
+            $display = 'block';
+        }
+        $additional = '<div id="studentsubmission" style="display: '.$display.'">'.
+                      &mt('Number of seconds submit is disabled').'<br />'.
+                      '<i>'.&mt('Enter 0 to remain disabled until page reload.').'</i><br />'.
+                      '<table><tr>';
+        foreach my $type (@types) {
+            $additional .= '<td align="center">'.&mt($type).'<br />'.
+                           '<input type="text" name="'.$type.'_timeout" value="'.
+                           $deftimeout{$type}.'" size="5" /></td>';
+        }
+        $additional .= '</tr></table></div>'."\n";
+        %defaultchecked = ('postsubmit' => 'on');
+        @toggles = ('postsubmit');
+        my $current = {
+                        'postsubmit' => $postsubmitclient,
+                      };
+        ($table,$itemcount) =
+            &radiobutton_prefs($current,\@toggles,\%defaultchecked,
+                               \%choices,$itemcount,$onclick,$additional,'left');
         $datatable .= $table;
-        $itemcount ++;
     }
     $$rowtotal += $itemcount;
     return $datatable;
@@ -3117,21 +3259,24 @@ sub print_validation_rows {
     }
     if ($caller eq 'requestcourses') {
         my %currhash;
-        if (ref($settings->{'validation'}) eq 'HASH') {
-            if ($settings->{'validation'}{'dc'} ne '') {
-                $currhash{$settings->{'validation'}{'dc'}} = 1;
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'validation'}) eq 'HASH') {
+                if ($settings->{'validation'}{'dc'} ne '') {
+                    $currhash{$settings->{'validation'}{'dc'}} = 1;
+                }
             }
         }
         my $numinrow = 2;
         my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
                                                        'validationdc',%currhash);
+        my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable .= '</td></tr><tr'.$css_class.'><td>';
         if ($numdc > 1) {
-            $datatable .= '</td></tr><tr class="LC_odd_row"><td>'.
-                          &mt('Course creation processed as: (choose Dom. Coord.)').
-                          '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
+            $datatable .= &mt('Course creation processed as: (choose Dom. Coord.)');
         } else {
-            $datatable .= $dctable.'</td></tr>';
+            $datatable .=  &mt('Course creation processed as: ');
         }
+        $datatable .= '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
         $itemcount ++;
     }
     if (ref($rowtotal)) {
@@ -3154,7 +3299,13 @@ sub print_usersessions {
     if ($position eq 'top') {
         if (keys(%serverhomes) > 1) {
             my %spareid = &current_offloads_to($dom,$settings,\%servers);
-            $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$rowtotal);
+            my $curroffloadnow;
+            if (ref($settings) eq 'HASH') {
+                if (ref($settings->{'offloadnow'}) eq 'HASH') {
+                    $curroffloadnow = $settings->{'offloadnow'};
+                }
+            }
+            $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$curroffloadnow,$rowtotal);
         } else {
             $datatable .= '<tr'.$css_class.'><td colspan="2">'.
                           &mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.');
@@ -3404,7 +3555,7 @@ sub current_offloads_to {
 }
 
 sub spares_row {
-    my ($dom,$servers,$spareid,$serverhomes,$altids,$rowtotal) = @_;
+    my ($dom,$servers,$spareid,$serverhomes,$altids,$curroffloadnow,$rowtotal) = @_;
     my $css_class;
     my $numinrow = 4;
     my $itemcount = 1;
@@ -3424,12 +3575,21 @@ sub spares_row {
                 }
             }
             next unless (ref($spareid->{$server}) eq 'HASH');
+            my $checkednow;
+            if (ref($curroffloadnow) eq 'HASH') {
+                if ($curroffloadnow->{$server}) {
+                    $checkednow = ' checked="checked"';
+                }
+            }
             $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
             $datatable .= '<tr'.$css_class.'>
                            <td rowspan="2">
                             <span class="LC_nobreak">'.
                           &mt('[_1] when busy, offloads to:'
-                              ,'<b>'.$server.'</b>').
+                              ,'<b>'.$server.'</b>').'</span><br />'.
+                          '<span class="LC_nobreak">'."\n". 
+                          '<label><input type="checkbox" name="offloadnow" value="'.$server.'"'.$checkednow.' />'.
+                          '&nbsp;'.&mt('Switch active users on next access').'</label></span>'.
                           "\n";
             my (%current,%canselect);
             my @choices = 
@@ -3653,9 +3813,10 @@ sub print_loadbalancing {
                     $disabled = ' disabled="disabled"';
                 }
                 $targettable .=
-                    '<td><label><input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'.
+                    '<td><span class="LC_nobreak"><label>'.
+                    '<input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'.
                     $checked.$disabled.' value="'.$chkboxval.'" id="loadbalancing_target_'.$balnum.'_'.$sparetype.'_'.$i.'" onclick="checkOffloads('."this,'$balnum','$sparetype'".');" /><span id="loadbalancing_targettxt_'.$balnum.'_'.$sparetype.'_'.$i.'">&nbsp;'.$chkboxval.
-                    '</span></label></td>';
+                    '</span></label></span></td>';
                 my $rem = $i%($numinrow);
                 if ($rem == 0) {
                     if (($i > 0) && ($i < $numspares-1)) {
@@ -3745,7 +3906,7 @@ sub loadbalancing_rules {
             if (ref($currrules) eq 'HASH') {
                 $current = $currrules->{$type};
             }
-            if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) {
+            if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
                 if ($dom ne &Apache::lonnet::host_domain($lonhost)) {
                     $current = '';
                 }
@@ -3797,7 +3958,7 @@ sub loadbalance_rule_row {
     my @rulenames;
     my %ruletitles = &offloadtype_text();
     if (($type eq '_LC_ipchangesso') || ($type eq '_LC_ipchange')) {
-        @rulenames = ('balancer','offloadedto');
+        @rulenames = ('balancer','offloadedto','specific');
     } else {
         @rulenames = ('default','homeserver');
         if ($type eq '_LC_external') {
@@ -3808,7 +3969,7 @@ sub loadbalance_rule_row {
         push(@rulenames,'none');
     }
     my $style = $targets_div_style;
-    if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) {
+    if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
         $style = $homedom_div_style;
     }
     my $space;
@@ -3859,8 +4020,13 @@ sub loadbalance_rule_row {
                    '<input type="radio" name="loadbalancing_rules_'.$balnum.'_'.$type.
                    '" id="loadbalancing_rules_'.$balnum.'_'.$type.'_'.$i.'" value="'.
                    $rule.'" onclick="balanceruleChange('."this.form,'$balnum','$type'".
-                   ')"'.$checked.' />&nbsp;'.$ruletitles{$rulenames[$i]}.
-                   '</label>'.$extra.'</span><br />'."\n";
+                   ')"'.$checked.' />&nbsp;';
+        if (($rulenames[$i] eq 'specific') && ($type =~ /^_LC_ipchange/)) {
+            $output .= $ruletitles{'particular'};
+        } else {
+            $output .= $ruletitles{$rulenames[$i]};
+        }
+        $output .= '</label>'.$extra.'</span><br />'."\n";
     }
     $output .= '</div></td></tr>'."\n";
     return $output;
@@ -3875,6 +4041,7 @@ sub offloadtype_text {
            'none'             => 'No offload',
            'balancer'         => 'Session hosted on Load Balancer, after re-authentication',
            'offloadedto'      => 'Session hosted on offload server, after re-authentication',
+           'particular'       => 'Session hosted (after re-auth) on server:',
     );
     return %ruletitles;
 }
@@ -4157,8 +4324,10 @@ sub print_selfcreation {
                 $datatable .= '<tr>';
             }
             my $currval;
-            if (ref($createsettings->{'shibenv'}) eq 'HASH') {
-                $currval = $createsettings->{'shibenv'}{$fields[$i]};
+            if (ref($createsettings) eq 'HASH') {
+                if (ref($createsettings->{'shibenv'}) eq 'HASH') {
+                    $currval = $createsettings->{'shibenv'}{$fields[$i]};
+                }
             }
             $datatable .= '<td class="LC_left_item">'.
                           '<span class="LC_nobreak">'.
@@ -5162,14 +5331,14 @@ sub serverstatus_pages {
 
 sub defaults_javascript {
     my ($settings) = @_;
-    my ($output,$jstext); 
+    return unless (ref($settings) eq 'HASH'); 
     if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
         my $maxnum = scalar(@{$settings->{'inststatusorder'}});
         if ($maxnum eq '') {
             $maxnum = 0;
         }
         $maxnum ++;
-        $jstext = '    var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');';  
+        my $jstext = '    var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');';  
         return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -5762,6 +5931,7 @@ sub modify_login {
     }
 
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
+    my %domservers = &Apache::lonnet::get_servers($dom);
     my @loginvia_attribs = ('serverpath','custompath','exempt');
     if (keys(%servers) > 1) {
         foreach my $lonhost (keys(%servers)) {
@@ -5804,22 +5974,7 @@ sub modify_login {
                             $changes{'loginvia'}{$lonhost} = 1;
                         }
                         if ($item eq 'exempt') {
-                            $new =~ s/^\s+//;
-                            $new =~ s/\s+$//;
-                            my @poss_ips = split(/\s*[,:]\s*/,$new);
-                            my @okips;
-                            foreach my $ip (@poss_ips) {
-                                if ($ip =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) {
-                                    if (($1 <= 255) && ($2 <= 255) && ($3 <= 255) && ($4 <= 255)) {
-                                        push(@okips,$ip); 
-                                    }
-                                }
-                            }
-                            if (@okips > 0) {
-                                $new = join(',',@okips); 
-                            } else {
-                                $new = ''; 
-                            }
+                            $new = &check_exempt_addresses($new);
                         }
                         $loginhash{login}{loginvia}{$lonhost}{$item} = $new;
                     }
@@ -5915,7 +6070,6 @@ sub modify_login {
                         $errors .= '<li><span class="LC_error">'.$puberror.'</span></li>';
                         if ((grep(/^\Q$lang\E$/,@currlangs)) &&
                             (!grep(/^\Q$lang\E$/,@delurls))) {
-
                             $loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang};
                         }
                     }
@@ -5931,6 +6085,84 @@ sub modify_login {
             $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
         }
     }
+
+    my (%currheadtagurls,%currexempt,@newhosts,%newheadtagurls,%possexempt);
+    if (ref($domconfig{'login'}) eq 'HASH') {
+        if (ref($domconfig{'login'}{'headtag'}) eq 'HASH') {
+            foreach my $lonhost (keys(%{$domconfig{'login'}{'headtag'}})) {
+                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'}
+                    }
+                }
+            }
+        }
+    }
+    my @delheadtagurls = &Apache::loncommon::get_env_multiple('form.loginheadtag_del');
+    foreach my $lonhost (sort(keys(%domservers))) {
+        if (grep(/^\Q$lonhost\E$/,@delheadtagurls)) {
+            $changes{'headtag'}{$lonhost} = 1;
+        } else {
+            if ($env{'form.loginheadtagexempt_'.$lonhost}) {
+                $possexempt{$lonhost} = &check_exempt_addresses($env{'form.loginheadtagexempt_'.$lonhost});
+            }
+            if ($env{'form.loginheadtag_'.$lonhost.'.filename'}) {
+                push(@newhosts,$lonhost);
+            } elsif ($currheadtagurls{$lonhost}) {
+                $loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $currheadtagurls{$lonhost};
+                if ($currexempt{$lonhost}) {
+                    if ((!exists($possexempt{$lonhost})) || ($possexempt{$lonhost} ne $currexempt{$lonhost})) { 
+                        $changes{'headtag'}{$lonhost} = 1;
+                    }
+                } elsif ($possexempt{$lonhost}) {
+                    $changes{'headtag'}{$lonhost} = 1;
+                }
+                if ($possexempt{$lonhost}) {
+                    $loginhash{'login'}{'headtag'}{$lonhost}{'exempt'} = $possexempt{$lonhost};
+                }
+            }
+        }
+    }
+    if (@newhosts) {
+        my $error;
+        my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
+        if ($configuserok eq 'ok') {
+            if ($switchserver) {
+                $error = &mt("Upload of custom markup is not permitted to this server: [_1]",$switchserver);
+            } elsif ($author_ok eq 'ok') {
+                foreach my $lonhost (@newhosts) {
+                    my $formelem = 'loginheadtag_'.$lonhost;
+                    (my $result,$newheadtagurls{$lonhost}) = &publishlogo($r,'upload',$formelem,$dom,$confname,
+                                                                          "login/headtag/$lonhost",'','',
+                                                                          $env{'form.loginheadtag_'.$lonhost.'.filename'});
+                    if ($result eq 'ok') {
+                        $loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $newheadtagurls{$lonhost};
+                        $changes{'headtag'}{$lonhost} = 1;
+                        if ($possexempt{$lonhost}) {
+                            $loginhash{'login'}{'headtag'}{$lonhost}{'exempt'} = $possexempt{$lonhost};
+                        }
+                    } else {
+                        my $puberror = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",
+                                           $newheadtagurls{$lonhost},$result);
+                        $errors .= '<li><span class="LC_error">'.$puberror.'</span></li>';
+                        if ((grep(/^\Q$lonhost\E$/,keys(%currheadtagurls))) &&
+                            (!grep(/^\Q$lonhost\E$/,@delheadtagurls))) {
+                            $loginhash{'login'}{'headtag'}{$lonhost} = $currheadtagurls{$lonhost};
+                        }
+                    }
+                }
+            } else {
+                $error = &mt("Upload of custom markup 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 markup 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';
@@ -6031,6 +6263,25 @@ sub modify_login {
                             }
                         }
                     }
+                } elsif ($item eq 'headtag') {
+                    if (ref($changes{$item}) eq 'HASH') {
+                        foreach my $lonhost (sort(keys(%{$changes{$item}}))) {
+                            if (grep(/^\Q$lonhost\E$/,@delheadtagurls)) {
+                                $resulttext .= '<li>'.&mt('custom markup file removed for [_1]',$domservers{$lonhost}).'</li>';
+                            } elsif (ref($loginhash{'login'}{'headtag'}{$lonhost}) eq 'HASH') {
+                                $resulttext .= '<li><a href="'.
+                                               "javascript:void(open('$loginhash{'login'}{'headtag'}{$lonhost}{'url'}?inhibitmenu=yes','Custom_HeadTag',
+                                               'menubar=0,toolbar=1,scrollbars=1,width=600,height=500,resizable=yes'))".
+                                               '">'.&mt('custom markup').'</a> '.&mt('(for [_1])',$servers{$lonhost}).' ';
+                                if ($possexempt{$lonhost}) {
+                                    $resulttext .= &mt('not included for client IP(s): [_1]',$possexempt{$lonhost});
+                                } else {
+                                    $resulttext .= &mt('included for any client IP');
+                                }
+                                $resulttext .= '</li>';
+                            }
+                        }
+                    }
                 } elsif ($item eq 'captcha') {
                     if (ref($loginhash{'login'}) eq 'HASH') {
                         my $chgtxt;
@@ -6062,7 +6313,7 @@ sub modify_login {
                         if (!$privkey) {
                             $chgtxt .= '<li>'.&mt('Private key deleted').'</li>';
                         } else {
-                            $chgtxt .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>';
+                            $chgtxt .= '<li>'.&mt('Private key set to [_1]',$privkey).'</li>';
                         }
                         $chgtxt .= '</ul>';
                         $resulttext .= '<li>'.$chgtxt.'</li>';
@@ -6086,6 +6337,28 @@ sub modify_login {
     return $resulttext;
 }
 
+
+sub check_exempt_addresses {
+    my ($iplist) = @_;
+    $iplist =~ s/^\s+//;
+    $iplist =~ s/\s+$//;
+    my @poss_ips = split(/\s*[,:]\s*/,$iplist);
+    my (@okips,$new);
+    foreach my $ip (@poss_ips) {
+        if ($ip =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) {
+            if (($1 <= 255) && ($2 <= 255) && ($3 <= 255) && ($4 <= 255)) {
+                push(@okips,$ip);
+            }
+        }
+    }
+    if (@okips > 0) {
+        $new = join(',',@okips);
+    } else {
+        $new = '';
+    }
+    return $new;
+}
+
 sub color_font_choices {
     my %choices =
         &Apache::lonlocal::texthash (
@@ -9066,8 +9339,8 @@ sub process_captcha {
     if ($newsettings->{'captcha'} eq 'recaptcha') {
         $newpub = $env{'form.'.$container.'_recaptchapub'};
         $newpriv = $env{'form.'.$container.'_recaptchapriv'};
-        $newpub =~ s/\W//g;
-        $newpriv =~ s/\W//g;
+        $newpub =~ s/[^\w\-]//g;
+        $newpriv =~ s/[^\w\-]//g;
         $newsettings->{'recaptchakeys'} = {
                                              public  => $newpub,
                                              private => $newpriv,
@@ -9974,14 +10247,19 @@ sub modify_helpsettings {
 sub modify_coursedefaults {
     my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,$errors,%changes,%defaultshash);
-    my %defaultchecked = ('canuse_pdfforms' => 'off');
-    my @toggles = ('canuse_pdfforms');
+    my %defaultchecked = (
+                           'canuse_pdfforms' => 'off',
+                           'uselcmath'       => 'on',
+                           'usejsme'         => 'on'
+                         );
+    my @toggles = ('canuse_pdfforms','uselcmath','usejsme');
     my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial',
                    'uploadquota_community','uploadquota_textbook');
     my @types = ('official','unofficial','community','textbook');
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
+                           postsubmit           => 60,
                          );
 
     $defaultshash{'coursedefaults'} = {};
@@ -10043,26 +10321,81 @@ sub modify_coursedefaults {
             }
         }
 
-        my $officialcreds = $env{'form.official_credits'};
-        $officialcreds =~ s/[^\d.]+//g;
-        my $unofficialcreds = $env{'form.unofficial_credits'};
-        $unofficialcreds =~ s/[^\d.]+//g;
-        my $textbookcreds = $env{'form.textbook_credits'};
-        $textbookcreds =~ s/[^\d.]+//g;
-        if (ref($domconfig{'coursedefaults'}{'coursecredits'} ne 'HASH') &&
-                ($env{'form.coursecredits'} eq '1')) {
-                $changes{'coursecredits'} = 1;
-        } else {
-            if (($domconfig{'coursedefaults'}{'coursecredits'}{'official'} ne $officialcreds)  ||
-                ($domconfig{'coursedefaults'}{'coursecredits'}{'unofficial'} ne $unofficialcreds) ||
-                ($domconfig{'coursedefaults'}{'coursecredits'}{'textbook'} ne $textbookcreds)) {
-                $changes{'coursecredits'} = 1;
-            }
-        }
-        $defaultshash{'coursedefaults'}{'coursecredits'} = {
-            official   => $officialcreds,
-            unofficial => $unofficialcreds,
-            textbook   => $textbookcreds,
+        my %credits;
+        foreach my $type (@types) {
+            unless ($type eq 'community') {
+                $credits{$type} = $env{'form.'.$type.'_credits'};
+                $credits{$type} =~ s/[^\d.]+//g;
+            }
+        }
+        if ((ref($domconfig{'coursedefaults'}{'coursecredits'}) ne 'HASH') &&
+            ($env{'form.coursecredits'} eq '1')) {
+            $changes{'coursecredits'} = 1;
+            foreach my $type (keys(%credits)) {
+                $defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type};
+            }
+        } else {
+            if ($env{'form.coursecredits'} eq '1') { 
+                foreach my $type (@types) {
+                    unless ($type eq 'community') {
+                        if ($domconfig{'coursedefaults'}{'coursecredits'}{$type} ne $credits{$type}) {        
+                            $changes{'coursecredits'} = 1;
+                        }
+                        $defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type};
+                    }
+                }
+            } elsif (ref($domconfig{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
+                foreach my $type (@types) {
+                    unless ($type eq 'community') {
+                        if ($domconfig{'coursedefaults'}{'coursecredits'}{$type}) {
+                            $changes{'coursecredits'} = 1;
+                            last;
+                        }
+                    }
+                }
+            }
+        }
+        if ($env{'form.postsubmit'} eq '1') {
+            $defaultshash{'coursedefaults'}{'postsubmit'}{'client'} = 'on';
+            my %currtimeout;
+            if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
+                if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') {
+                    $changes{'postsubmit'} = 1;
+                }
+                if (ref($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') {
+                    %currtimeout = %{$domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}};
+                }
+            } else {
+                $changes{'postsubmit'} = 1;
+            }
+            foreach my $type (@types) {
+                my $timeout = $env{'form.'.$type.'_timeout'};
+                $timeout =~ s/\D//g;
+                if ($timeout == $staticdefaults{'postsubmit'}) {
+                    $timeout = '';
+                } elsif (($timeout eq '') || ($timeout =~ /^0+$/)) {
+                    $timeout = '0';
+                }
+                unless ($timeout eq '') {
+                    $defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type} = $timeout;
+                }
+                if (exists($currtimeout{$type})) {
+                    if ($timeout ne $currtimeout{$type}) {
+                        $changes{'postsubmit'} = 1; 
+                    }
+                } elsif ($timeout ne '') {
+                    $changes{'postsubmit'} = 1;
+                }
+            }
+        } else {
+            $defaultshash{'coursedefaults'}{'postsubmit'}{'client'} = 'off';
+            if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
+                if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'on') {
+                    $changes{'postsubmit'} = 1;
+                }
+            } else {
+                $changes{'postsubmit'} = 1;
+            }
         }
     }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
@@ -10070,19 +10403,30 @@ sub modify_coursedefaults {
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-            if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || 
-                ($changes{'uploadquota'})) { 
-                if ($changes{'canuse_pdfforms'}) {
-                    $domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'};
-                }
+            if (($changes{'canuse_pdfforms'}) || ($changes{'uploadquota'}) || ($changes{'postsubmit'}) ||
+                ($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'})) { 
+                foreach my $item ('canuse_pdfforms','uselcmath','usejsme') { 
+                    if ($changes{$item}) {
+                        $domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};
+                    }
+                } 
                 if ($changes{'coursecredits'}) {
                     if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
-                        $domdefaults{'officialcredits'} =
-                            $defaultshash{'coursedefaults'}{'coursecredits'}{'official'};
-                        $domdefaults{'unofficialcredits'} =
-                            $defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'};
-                        $domdefaults{'textbookcredits'} =
-                            $domdefaults{'coursedefaults'}{'coursecredits'}{'textbook'};
+                        foreach my $type (keys(%{$defaultshash{'coursedefaults'}{'coursecredits'}})) {
+                            $domdefaults{$type.'credits'} =
+                                $defaultshash{'coursedefaults'}{'coursecredits'}{$type};
+                        }
+                    }
+                }
+                if ($changes{'postsubmit'}) {
+                    if (ref($defaultshash{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
+                        $domdefaults{'postsubmit'} = $defaultshash{'coursedefaults'}{'postsubmit'}{'client'};
+                        if (ref($defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') {
+                            foreach my $type (keys(%{$defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}})) {
+                                $domdefaults{$type.'postsubtimeout'} =
+                                    $defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type};
+                            }
+                        }
                     }
                 }
                 if ($changes{'uploadquota'}) {
@@ -10106,6 +10450,18 @@ sub modify_coursedefaults {
                     } else {
                         $resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>';
                     }
+                } elsif ($item eq 'uselcmath') {
+                    if ($env{'form.'.$item} eq '1') {
+                        $resulttext .= '<li>'.&mt('Math preview uses LON-CAPA previewer (javascript), if supported by browser.').'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('Math preview uses DragMath (Java), if supported by client OS.').'</li>';
+                    }
+                } elsif ($item eq 'usejsme') {
+                    if ($env{'form.'.$item} eq '1') {
+                        $resulttext .= '<li>'.&mt('Molecule editor uses JSME (HTML5), if supported by browser.').'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>'; 
+                    }
                 } elsif ($item eq 'anonsurvey_threshold') {
                     $resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>';
                 } elsif ($item eq 'uploadquota') {
@@ -10121,6 +10477,42 @@ 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 'postsubmit') {
+                    if ($domdefaults{'postsubmit'} eq 'off') {
+                        $resulttext .= '<li>'.&mt('Submit button(s) remain enabled on page after student makes submission.');
+                    } else {
+                        $resulttext .= '<li>'.&mt('Submit button(s) disabled on page after student makes submission').'; ';
+                        if (ref($defaultshash{'coursedefaults'}{'postsubmit'}) eq 'HASH') { 
+                            $resulttext .= &mt('durations:').'<ul>';
+                            foreach my $type (@types) {
+                                $resulttext .= '<li>';
+                                my $timeout;
+                                if (ref($defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') {
+                                    $timeout = $defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type};
+                                }
+                                my $display;
+                                if ($timeout eq '0') {
+                                    $display = &mt('unlimited');
+                                } elsif ($timeout eq '') {
+                                    $display = &mt('[quant,_1,second] (default)',$staticdefaults{'postsubmit'});
+                                } else {
+                                    $display = &mt('[quant,_1,second]',$timeout);
+                                }
+                                if ($type eq 'community') {
+                                    $resulttext .= &mt('Communities');
+                                } elsif ($type eq 'official') {
+                                    $resulttext .= &mt('Official courses');
+                                } elsif ($type eq 'unofficial') {
+                                    $resulttext .= &mt('Unofficial courses');
+                                } elsif ($type eq 'textbook') {
+                                    $resulttext .= &mt('Textbook courses');
+                                }
+                                $resulttext .= ' -- '.$display.'</li>';
+                            }
+                            $resulttext .= '</ul>';
+                        }
+                        $resulttext .= '</li>';    
+                    }
                 } elsif ($item eq 'coursecredits') {
                     if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
                         if (($domdefaults{'officialcredits'} eq '') &&
@@ -10556,7 +10948,23 @@ sub modify_usersessions {
             $changes{'spares'}{$lonhost} = \%spareschg;
         }
     }
-
+    $defaultshash{'usersessions'}{'offloadnow'} = {};
+    my @offloadnow = &Apache::loncommon::get_env_multiple('form.offloadnow');
+    my @okoffload;
+    if (@offloadnow) {
+        foreach my $server (@offloadnow) {
+            if (&Apache::lonnet::hostname($server) ne '') {
+                unless (grep(/^\Q$server\E$/,@okoffload)) {
+                    push(@okoffload,$server);
+                }
+            }
+        }
+        if (@okoffload) {
+            foreach my $lonhost (@okoffload) {
+                $defaultshash{'usersessions'}{'offloadnow'}{$lonhost} = 1;
+            }
+        }
+    }
     if (ref($domconfig{'usersessions'}) eq 'HASH') {
         if (ref($domconfig{'usersessions'}{'spares'}) eq 'HASH') {
             if (ref($changes{'spares'}) eq 'HASH') {
@@ -10567,8 +10975,27 @@ sub modify_usersessions {
         } else {
             $savespares = 1;
         }
+        if (ref($domconfig{'usersessions'}{'offloadnow'}) eq 'HASH') {
+            foreach my $lonhost (keys(%{$domconfig{'usersessions'}{'offloadnow'}})) {
+                unless ($defaultshash{'usersessions'}{'offloadnow'}{$lonhost}) {
+                    $changes{'offloadnow'} = 1;
+                    last;
+                }
+            }
+            unless ($changes{'offloadnow'}) {
+                foreach my $lonhost (keys(%{$defaultshash{'usersessions'}{'offloadnow'}})) { 
+                    unless ($domconfig{'usersessions'}{'offloadnow'}{$lonhost}) {
+                        $changes{'offloadnow'} = 1;
+                        last;
+                    }
+                }
+            }
+        } elsif (@okoffload) {
+            $changes{'offloadnow'} = 1;
+        }
+    } elsif (@okoffload) {
+        $changes{'offloadnow'} = 1;
     }
-
     my $nochgmsg = &mt('No changes made to settings for user session hosting/offloading.');
     if ((keys(%changes) > 0) || ($savespares)) {
         my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
@@ -10581,6 +11008,9 @@ sub modify_usersessions {
                 if (ref($defaultshash{'usersessions'}{'hosted'}) eq 'HASH') {
                     $domdefaults{'hostedsessions'} = $defaultshash{'usersessions'}{'hosted'};
                 }
+                if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') {
+                    $domdefaults{'offloadnow'} = $defaultshash{'usersessions'}{'offloadnow'};
+                }
             }
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
@@ -10649,6 +11079,21 @@ sub modify_usersessions {
                         $resulttext .= '</ul>';
                     }
                 }
+                if ($changes{'offloadnow'}) {
+                    if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') {
+                        if (keys(%{$defaultshash{'usersessions'}{'offloadnow'}}) > 0) {
+                            $resulttext .= '<li>'.&mt('Switch active users on next access, for server(s):').'<ul>';
+                            foreach my $lonhost (sort(keys(%{$defaultshash{'usersessions'}{'offloadnow'}}))) {
+                                $resulttext .= '<li>'.$lonhost.'</li>';
+                            }
+                            $resulttext .= '</ul>';
+                        } else {
+                            $resulttext .= '<li>'.&mt('No servers now set to switch active users on next access.');
+                        }
+                    } else {
+                        $resulttext .= '<li>'.&mt('No servers now set to switch active users on next access.').'</li>';
+                    }
+                }
                 $resulttext .= '</ul>';
             } else {
                 $resulttext = $nochgmsg;
@@ -10670,6 +11115,7 @@ sub modify_loadbalancing {
     my ($othertitle,$usertypes,$types) =
         &Apache::loncommon::sorted_inst_types($dom);
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
+    my %libraryservers = &Apache::lonnet::get_servers($dom,'library');
     my @sparestypes = ('primary','default');
     my %typetitles = &sparestype_titles();
     my $resulttext;
@@ -10761,7 +11207,10 @@ sub modify_loadbalancing {
                     $rule = $env{'form.loadbalancing_rules_'.$i.'_'.$type};
                 }
                 if ($rule eq 'specific') {
-                    $rule = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type};
+                    my $specifiedhost = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type};
+                    if (exists($servers{$specifiedhost})) { 
+                        $rule = $specifiedhost;
+                    }
                 }
                 $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type} = $rule;
                 if (ref($currrules{$balancer}) eq 'HASH') {
@@ -10783,20 +11232,22 @@ sub modify_loadbalancing {
                                                  \%defaultshash,$dom);
         if ($putresult eq 'ok') {
             if (keys(%changes) > 0) {
+                my %toupdate;
                 if (ref($changes{'delete'}) eq 'ARRAY') {
                     foreach my $balancer (sort(@{$changes{'delete'}})) {
                         $resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>';
-                        my $cachekey = &escape('loadbalancing').':'.&escape($dom);
-                        &Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]);
+                        $toupdate{$balancer} = 1;
                     }
                 }
                 if (ref($changes{'add'}) eq 'ARRAY') {
                     foreach my $balancer (sort(@{$changes{'add'}})) {
                         $resulttext .= '<li>'.&mt('Load Balancing enabled for: [_1]',$balancer);
+                        $toupdate{$balancer} = 1;
                     }
                 }
                 if (ref($changes{'curr'}) eq 'HASH') {
                     foreach my $balancer (sort(keys(%{$changes{'curr'}}))) {
+                        $toupdate{$balancer} = 1;
                         if (ref($changes{'curr'}{$balancer}) eq 'HASH') {
                             if ($changes{'curr'}{$balancer}{'targets'}) {
                                 my %offloadstr;
@@ -10833,8 +11284,38 @@ sub modify_loadbalancing {
                                         if ($rule eq '') {
                                             $balancetext =  $ruletitles{'default'};
                                         } elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer') ||
-                                                 ($rule eq 'balancer') || ($rule eq 'offloadedto')) {
-                                            $balancetext =  $ruletitles{$rule};
+                                                 ($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) { 
+                                            if (($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) {
+                                                foreach my $sparetype (@sparestypes) {
+                                                    if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') {
+                                                        map { $toupdate{$_} = 1; } (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}});
+                                                    }
+                                                }
+                                                foreach my $item (@{$alltypes}) {
+                                                    next if ($item =~  /^_LC_ipchange/);
+                                                    my $hasrule = $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$item};
+                                                    if ($hasrule eq 'homeserver') {
+                                                        map { $toupdate{$_} = 1; } (keys(%libraryservers));
+                                                    } else {
+                                                        unless (($hasrule eq 'default') || ($hasrule eq 'none') || ($hasrule eq 'externalbalancer')) {
+                                                            if ($servers{$hasrule}) {
+                                                                $toupdate{$hasrule} = 1;
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                                if (($rule eq 'balancer') || ($rule eq 'offloadedto')) {
+                                                    $balancetext =  $ruletitles{$rule};
+                                                } else {
+                                                    my $receiver = $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type};
+                                                    $balancetext = $ruletitles{'particular'}.' '.$receiver;
+                                                    if ($receiver) {
+                                                        $toupdate{$receiver};
+                                                    }
+                                                }
+                                            } else {
+                                                $balancetext =  $ruletitles{$rule};
+                                            }
                                         } else {
                                             $balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type});
                                         }
@@ -10843,8 +11324,25 @@ sub modify_loadbalancing {
                                 }
                             }
                         }
-                        my $cachekey = &escape('loadbalancing').':'.&escape($dom);
-                        &Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]);
+                        if (keys(%toupdate)) {
+                            my %thismachine;
+                            my $updatedhere;
+                            my $cachetime = 60*60*24;
+                            map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
+                            foreach my $lonhost (keys(%toupdate)) {
+                                if ($thismachine{$lonhost}) {
+                                    unless ($updatedhere) {
+                                        &Apache::lonnet::do_cache_new('loadbalancing',$dom,
+                                                                      $defaultshash{'loadbalancing'},
+                                                                      $cachetime);
+                                        $updatedhere = 1;
+                                    }
+                                } else {
+                                    my $cachekey = &escape('loadbalancing').':'.&escape($dom);
+                                    &Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]);
+                                }
+                            }
+                        }
                     }
                 }
                 if ($resulttext ne '') {
@@ -10985,7 +11483,7 @@ sub active_dc_picker {
         my ($dcname,$dcdom) = split(':',$domcoord[0]);
         my $user = &Apache::loncommon::plainname($dcname,$dcdom);
         if ($inputtype eq 'radio') {
-            $table .= '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user;
+            $table = '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user;
             if ($user ne $dcname.':'.$dcdom) {
                 $table .=  ' ('.$dcname.':'.$dcdom.')';
             }
@@ -10994,9 +11492,9 @@ sub active_dc_picker {
             if (exists($currhash{$domcoord[0]})) {
                 $check = ' checked="checked"';
             }
-            $table .= '<span class="LC_nobreak"><label>'.
-                      '<input type="checkbox" name="'.$name.'" '.
-                      'value="'.$domcoord[0].'"'.$check.' />'.$user;
+            $table = '<span class="LC_nobreak"><label>'.
+                     '<input type="checkbox" name="'.$name.'" '.
+                     'value="'.$domcoord[0].'"'.$check.' />'.$user;
             if ($user ne $dcname.':'.$dcdom) {
                 $table .=  ' ('.$dcname.':'.$dcdom.')';
             }
@@ -11544,6 +12042,9 @@ function toggleDisplay(domForm,caller) {
         if (caller == 'emailoptions') {
             optionsElement = domForm.cancreate_email; 
         }
+        if (caller == 'studentsubmission') {
+            optionsElement = domForm.postsubmit;
+        }
         if (optionsElement.length) {
             var currval;
             for (var i=0; i<optionsElement.length; i++) {
@@ -11585,7 +12086,7 @@ sub devalidate_remote_domconfs {
     my %thismachine;
     map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
     my @posscached = ('domainconfig','domdefaults');
-    if (keys(%servers) > 1) {
+    if (keys(%servers)) {
         foreach my $server (keys(%servers)) {
             next if ($thismachine{$server});
             my @cached;