--- loncom/interface/domainprefs.pm	2017/01/18 21:24:39	1.286
+++ loncom/interface/domainprefs.pm	2017/02/25 20:30:52	1.293
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.286 2017/01/18 21:24:39 raeburn Exp $
+# $Id: domainprefs.pm,v 1.293 2017/02/25 20:30:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -499,6 +499,8 @@ sub handler {
                               col2 => 'Certificate Status'},
                              {col1 => 'Connections to other servers',
                               col2 => 'Rules'},
+                             {col1 => 'Connections from other servers',
+                              col2 => 'Rules'},
                              {col1 => "Replicating domain's published content",
                               col2 => 'Rules'}],
                   print => \&print_ssl,
@@ -806,7 +808,7 @@ sub print_config_box {
         if (($action eq 'autoupdate') || ($action eq 'usercreation') ||
             ($action eq 'selfcreation') || ($action eq 'selfenrollment') ||
             ($action eq 'usersessions') || ($action eq 'coursecategories') || 
-            ($action eq 'ssl') || ($action eq 'trust') || ($action eq 'contacts')) {
+            ($action eq 'trust') || ($action eq 'contacts')) {
             if ($action eq 'coursecategories') {
                 $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal);
                 $colspan = ' colspan="2"';
@@ -866,6 +868,28 @@ sub print_config_box {
                  ($action eq 'defaults') || ($action eq 'directorysrch') ||
                  ($action eq 'helpsettings')) {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
+        } elsif ($action eq 'ssl') {
+            $output .= $item->{'print'}->('connto',$dom,$settings,\$rowtotal).'
+            </table>
+          </td>
+         </tr>
+         <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col2'}).'</td></tr>'.
+                           $item->{'print'}->('connfrom',$dom,$settings,\$rowtotal).'
+            </table>
+          </td>
+         </tr>
+         <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'.
+                           $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
             if ($numheaders == 4) {
                 $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).'
@@ -2958,9 +2982,6 @@ sub print_contacts {
     my @contacts = ('adminemail','supportemail');
     my (%checked,%to,%otheremails,%bccemails,%includestr,%includeloc,%currfield,
         $maxsize,$fields,$fieldtitles,$fieldoptions,$possoptions,@mailings);
-    foreach my $type (@mailings) {
-        $otheremails{$type} = '';
-    }
     if ($position eq 'top') {
         if (ref($settings) eq 'HASH') {
             foreach my $item (@contacts) {
@@ -2972,8 +2993,14 @@ sub print_contacts {
     } elsif ($position eq 'middle') {
         @mailings = ('errormail','packagesmail','lonstatusmail','requestsmail',
                      'updatesmail','idconflictsmail');
+        foreach my $type (@mailings) {
+            $otheremails{$type} = '';
+        }
     } else {
         @mailings = ('helpdeskmail','otherdomsmail');
+        foreach my $type (@mailings) {
+            $otheremails{$type} = '';
+        }
         $bccemails{'helpdeskmail'} = '';
         $bccemails{'otherdomsmail'} = '';
         $includestr{'helpdeskmail'} = '';
@@ -3021,7 +3048,7 @@ sub print_contacts {
                 if (exists($settings->{'helpform'}{'maxsize'})) {
                     $maxsize = $settings->{'helpform'}{'maxsize'};
                 } else {
-                    $maxsize = '1.0'; 
+                    $maxsize = '1.0';
                 }
             } else {
                 if (ref($fields) eq 'ARRAY') {
@@ -3038,7 +3065,7 @@ sub print_contacts {
             $to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'};
             $checked{'errormail'}{'adminemail'} = ' checked="checked" ';
             $checked{'packagesmail'}{'adminemail'} = ' checked="checked" ';
-            $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; 
+            $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
             $checked{'requestsmail'}{'adminemail'} = ' checked="checked" ';
             $checked{'updatesmail'}{'adminemail'} = ' checked="checked" ';
             $checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" ';
@@ -3114,8 +3141,8 @@ sub print_contacts {
     if ($position eq 'middle') {
         my %choices;
         $choices{'reporterrors'} = &mt('E-mail error reports to [_1]',
-                                    &Apache::loncommon::modal_link('http://loncapa.org/core.html',
-                                    &mt('LON-CAPA core group - MSU'),600,500));
+                                       &Apache::loncommon::modal_link('http://loncapa.org/core.html',
+                                       &mt('LON-CAPA core group - MSU'),600,500));
         $choices{'reportupdates'} = &mt('E-mail record of completed LON-CAPA updates to [_1]',
                                         &Apache::loncommon::modal_link('http://loncapa.org/core.html',
                                         &mt('LON-CAPA core group - MSU'),600,500));
@@ -3131,7 +3158,7 @@ sub print_contacts {
                       '<td>'.&mt('Extra helpdesk form fields:').'<br />'.
                       &mt('(e-mail, subject, and description always shown)').
                       '</td><td class="LC_left_item">';
-        if ((ref($fields) eq 'ARRAY') && (ref($fieldtitles) eq 'HASH') && 
+        if ((ref($fields) eq 'ARRAY') && (ref($fieldtitles) eq 'HASH') &&
             (ref($fieldoptions) eq 'HASH') && (ref($possoptions) eq 'HASH')) {
             $datatable .= '<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Status').'</th></tr>';
             foreach my $field (@{$fields}) {
@@ -3185,7 +3212,7 @@ sub contacts_javascript {
 function screenshotSize(field) {
     if (document.getElementById('help_screenshotsize')) {
         if (field.value == 'no') {
-            document.getElementById('help_screenshotsize').style.display="none"; 
+            document.getElementById('help_screenshotsize').style.display="none";
         } else {
             document.getElementById('help_screenshotsize').style.display="";
         }
@@ -3247,7 +3274,7 @@ sub print_helpsettings {
         my $context = 'domprefs';
         my $crstype = 'Course';
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-        my @accesstypes = ('all','none');
+        my @accesstypes = ('all','dh','da','none');
         my ($numstatustypes,@jsarray);
         if (ref($types) eq 'ARRAY') {
             if (@{$types} > 0) {
@@ -3256,7 +3283,7 @@ sub print_helpsettings {
                 @jsarray = ('bystatus');
             }
         }
-        my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh']);
+        my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']);
         if (keys(%domhelpdesk)) {
             push(@accesstypes,('inc','exc'));
             push(@jsarray,('notinc','notexc'));
@@ -3465,7 +3492,7 @@ function helpdeskAccess(num) {
                 shown = Array('notinc');
                 hidden = Array('notexc','bystatus');
             }
-            if (curraccess == 'all') {
+            if ((curraccess == 'all') || (curraccess == 'dh') || (curraccess == 'da')) {
                 hidden = Array('notinc','notexc','bystatus');
             }
         }
@@ -3494,7 +3521,7 @@ function helpdeskAccess(num) {
 function toggleHelpdeskItem(num,field) {
     if (document.getElementById('helproles_'+num+'_'+field)) {
         if (document.getElementById('helproles_'+num+'_'+field).className.match(/(?:^|\\s)LC_hidden(?!\\S)/)) {
-            document.getElementById('helproles_'+num+'_'+field).className = 
+            document.getElementById('helproles_'+num+'_'+field).className =
                 document.getElementById('helproles_'+num+'_'+field).className.replace(/(?:^|\\s)LC_hidden(?!\\S)/g ,'');
             if (document.getElementById('helproles_'+num+'_'+field+'_vis')) {
                 document.getElementById('helproles_'+num+'_'+field+'_vis').value = '$html_js_lt{hide}';
@@ -3522,7 +3549,9 @@ sub helpdeskroles_access {
     my %lt = &Apache::lonlocal::texthash(
                     'rou'    => 'Role usage',
                     'whi'    => 'Which helpdesk personnel may use this role?',
-                    'all'    => 'All',
+                    'all'    => 'All with domain helpdesk or helpdesk assistant role',
+                    'dh'     => 'All with domain helpdesk role',
+                    'da'     => 'All with domain helpdesk assistant role',
                     'none'   => 'None',
                     'status' => 'Determined based on institutional status',
                     'inc'    => 'Include all, but exclude specific personnel',
@@ -3620,7 +3649,7 @@ sub radiobutton_prefs {
         } else {
             $datatable .= '<td class="LC_right_item">';
         }
-        $datatable .= 
+        $datatable .=
             '<span class="LC_nobreak">'.
             '<label><input type="radio" name="'.
             $item.'" '.$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes').
@@ -4006,7 +4035,7 @@ sub print_coursedefaults {
                             'canuse_pdfforms' => 'off',
                             'uselcmath'       => 'on',
                             'usejsme'         => 'on',
-                            'canclone'        => 'none', 
+                            'canclone'        => 'none',
                           );
         @toggles = ('canuse_pdfforms','uselcmath','usejsme');
         ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
@@ -4045,7 +4074,7 @@ sub print_coursedefaults {
                     $currcanclone = $settings->{'canclone'};
                 }
             }
-        } 
+        }
         foreach my $option (@cloneoptions) {
             my ($checked,$additional);
             if ($currcanclone eq $option) {
@@ -4114,7 +4143,7 @@ sub print_coursedefaults {
                     foreach my $type (@types) {
                         if (ref($settings->{'postsubmit'}->{'timeout'}) eq 'HASH') {
                             if ($settings->{'postsubmit'}->{'timeout'}->{$type} =~ /^\d+$/) {
-                                $deftimeout{$type} = $settings->{'postsubmit'}->{'timeout'}->{$type}; 
+                                $deftimeout{$type} = $settings->{'postsubmit'}->{'timeout'}->{$type};
                             } else {
                                 $deftimeout{$type} = $staticdefaults{'postsubmit'};
                             }
@@ -4652,7 +4681,32 @@ sub print_ssl {
         my @domservers = &Apache::lonnet::get_servers($dom);
         my %servers = &Apache::lonnet::internet_dom_servers($dom);
         my %altids = &id_for_thisdom(%servers);
-        if ($position eq 'middle') {
+        if (($position eq 'connto') || ($position eq 'connfrom')) {
+            my $legacy;
+            unless (ref($settings) eq 'HASH') {
+                my $name;
+                if ($position eq 'connto') {
+                    $name = 'loncAllowInsecure';
+                } else {
+                    $name = 'londAllowInsecure';
+                }
+                my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
+                my @ids=&Apache::lonnet::current_machine_ids();
+                if (($primarylibserv ne '') && (!grep(/^\Q$primarylibserv\E$/,@ids))) {
+                    my %what = (
+                                   $name => 1,
+                               );
+                    my ($result,$returnhash) =
+                        &Apache::lonnet::get_remote_globals($primarylibserv,\%what);
+                    if ($result eq 'ok') {
+                        if (ref($returnhash) eq 'HASH') {
+                            $legacy = $returnhash->{$name};
+                        }
+                    }
+                } else {
+                    $legacy = $Apache::lonnet::perlvar{$name};
+                }
+            }
             foreach my $type ('dom','intdom','other') {
                 my %checked;
                 $css_class = $itemcount%2?' class="LC_odd_row"':'';
@@ -4679,16 +4733,21 @@ sub print_ssl {
                 unless ($skip) {
                     $checked{'yes'} = ' checked="checked"'; 
                     if (ref($settings) eq 'HASH') {
-                        if (ref($settings->{'connect'}) eq 'HASH') {
-                            if ($settings->{'connect'}->{$type} =~ /^(no|req)$/) {
+                        if (ref($settings->{$position}) eq 'HASH') {
+                            if ($settings->{$position}->{$type} =~ /^(no|req)$/) {
                                 $checked{$1} = $checked{'yes'};
                                 delete($checked{'yes'}); 
                             }
                         }
+                    } else {
+                        if ($legacy == 0) {
+                            $checked{'req'} = $checked{'yes'};
+                            delete($checked{'yes'});    
+                        }
                     }
                     foreach my $option ('no','yes','req') {
                         $datatable .= '<span class="LC_nobreak"><label>'.
-                                      '<input type="radio" name="connect_'.$type.'" '.
+                                      '<input type="radio" name="'.$position.'_'.$type.'" '.
                                       'value="'.$option.'"'.$checked{$option}.' />'.$titles{$option}.
                                       '</label></span>'.('&nbsp;'x2);
                     }
@@ -4719,7 +4778,8 @@ sub ssl_titles {
                dom           => 'LON-CAPA servers/VMs from same domain',
                intdom        => 'LON-CAPA servers/VMs from same "internet" domain',
                other         => 'External LON-CAPA servers/VMs',
-               connect       => 'Connections to other servers',
+               connto        => 'Connections to other servers',
+               connfrom      => 'Connections from other servers',
                replication   => 'Replicating content to other institutions',
                certreq       => 'Client certificate required, but specific domains exempt',
                nocertreq     => 'No client certificate required, except for specific domains',
@@ -4929,7 +4989,7 @@ sub spares_row {
                             <span class="LC_nobreak">'.
                           &mt('[_1] when busy, offloads to:'
                               ,'<b>'.$server.'</b>').'</span><br />'.
-                          '<span class="LC_nobreak">'."\n". 
+                          '<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";
@@ -5423,7 +5483,7 @@ sub contact_titles {
                    'errormail'       => 'Error reports to be e-mailed to',
                    'packagesmail'    => 'Package update alerts to be e-mailed to',
                    'helpdeskmail'    => "Helpdesk requests for this domain's users",
-                   'otherdomsmail'   => 'Helpdesk requests for other (unconfigured) domains',  
+                   'otherdomsmail'   => 'Helpdesk requests for other (unconfigured) domains',
                    'lonstatusmail'   => 'E-mail from nightly status check (warnings/errors)',
                    'requestsmail'    => 'E-mail from course requests requiring approval',
                    'updatesmail'     => 'E-mail from nightly check of LON-CAPA module integrity/updates',
@@ -5444,14 +5504,14 @@ sub helpform_fields {
                        'cc'         => 'Cc e-mail',
                        'course'     => 'Course Details',
                        'section'    => 'Sections',
-                       'screenshot' => 'File upload', 
+                       'screenshot' => 'File upload',
     );
     my @fields = ('username','phone','user','course','section','cc','screenshot');
     my %possoptions = (
                         username     => ['yes','no','req'],
-                        phone        => ['yes','no','req'],   
+                        phone        => ['yes','no','req'],
                         user         => ['yes','no'],
-                        cc           => ['yes','no'], 
+                        cc           => ['yes','no'],
                         course       => ['yes','no'],
                         section      => ['yes','no'],
                         screenshot   => ['yes','no'],
@@ -6763,7 +6823,7 @@ sub serverstatus_pages {
 
 sub defaults_javascript {
     my ($settings) = @_;
-    return unless (ref($settings) eq 'HASH'); 
+    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 '') {
@@ -7554,7 +7614,7 @@ sub modify_login {
             } elsif ($currheadtagurls{$lonhost}) {
                 $loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $currheadtagurls{$lonhost};
                 if ($currexempt{$lonhost}) {
-                    if ((!exists($possexempt{$lonhost})) || ($possexempt{$lonhost} ne $currexempt{$lonhost})) { 
+                    if ((!exists($possexempt{$lonhost})) || ($possexempt{$lonhost} ne $currexempt{$lonhost})) {
                         $changes{'headtag'}{$lonhost} = 1;
                     }
                 } elsif ($possexempt{$lonhost}) {
@@ -7786,7 +7846,6 @@ sub modify_login {
     return $resulttext;
 }
 
-
 sub check_exempt_addresses {
     my ($iplist) = @_;
     $iplist =~ s/^\s+//;
@@ -8697,7 +8756,7 @@ sub modify_quotas {
                                     my $newpos = $env{'form.'.$itemid};
                                     $newpos =~ s/\D+//g;
                                     foreach my $item ('subject','title','publisher','author') {
-                                        next if ((($item eq 'author') || ($item eq 'publisher')) && 
+                                        next if ((($item eq 'author') || ($item eq 'publisher')) &&
                                                  ($type eq 'templates'));
                                         $confhash{$type}{$key}{$item} = $env{'form.'.$type.'_'.$item.'_'.$i};
                                         if ($domconfig{$action}{$type}{$key}{$item} ne $confhash{$type}{$key}{$item}) {
@@ -8866,7 +8925,7 @@ sub modify_quotas {
                     }
                 } elsif ($confhash{'validation'}{'dc'} ne '') {
                     $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
-                }  
+                }
             } else {
                 if (ref($domconfig{'requestcourses'}) eq 'HASH') {
                     if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
@@ -10167,7 +10226,7 @@ sub modify_directorysrch {
     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', 
+                  lclocalonly => 'Other domains can search LON-CAPA domain',
                   searchby => 'Search types',
                   searchtypes => 'Search latitude');
     my @offon = ('off','on');
@@ -10261,27 +10320,27 @@ sub modify_directorysrch {
             }
         }
         if (exists($currdirsrch{'lcavailable'})) {
-             if ($currdirsrch{'lcavailable'} ne $env{'form.dirsrch_domavailable'}) {
-                 $changes{'lcavailable'} = 1;
-             }
+            if ($currdirsrch{'lcavailable'} ne $env{'form.dirsrch_domavailable'}) {
+                $changes{'lcavailable'} = 1;
+            }
         } else {
             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;
-             }
+            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;
-             }
+            if ($currdirsrch{'lclocalonly'} ne $env{'form.dirsrch_domlocalonly'}) {
+                $changes{'lclocalonly'} = 1;
+            }
         } else {
             if ($env{'form.dirsrch_domlocalonly'} eq '1') {
                 $changes{'lclocalonly'} = 1;
@@ -10300,7 +10359,7 @@ sub modify_directorysrch {
             }
             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') {
@@ -10383,7 +10442,7 @@ sub modify_contacts {
             } else {
                 $contacts_hash{contacts}{$type}{$item} = 0;
             }
-        }  
+        }
         $others{$type} = $env{'form.'.$type.'_others'};
         $contacts_hash{contacts}{$type}{'others'} = $others{$type};
         if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
@@ -10441,7 +10500,7 @@ sub modify_contacts {
             if ($others{$type} ne $currsetting{$type}{'others'}) {
                 push(@{$changes{$type}},'others');
             }
-            if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {   
+            if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
                 if ($bcc{$type} ne $currsetting{$type}{'bcc'}) {
                     push(@{$changes{$type}},'bcc'); 
                 }
@@ -10519,7 +10578,7 @@ sub modify_contacts {
                     }
                 }
             }
-        }   
+        }
     }
     foreach my $item (@toggles) {
         if (($env{'form.'.$item} == 1) && ($currsetting{$item} == 0)) {
@@ -10550,7 +10609,7 @@ sub modify_contacts {
             foreach my $type (@mailings) {
                 if (ref($changes{$type}) eq 'ARRAY') {
                     if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
-                        $resulttext .= '<li>'.$titles->{$type}.' -- '.&mt('sent to').': '; 
+                        $resulttext .= '<li>'.$titles->{$type}.' -- '.&mt('sent to').': ';
                     } else {
                         $resulttext .= '<li>'.$titles->{$type}.': ';
                     }
@@ -10569,7 +10628,7 @@ sub modify_contacts {
                         if ($bcc{$type} ne '') {
                             my $bcctext;
                             if (@text) {
-                                $bcctext = '&nbsp;'.&mt('with Bcc to'); 
+                                $bcctext = '&nbsp;'.&mt('with Bcc to');
                             } else {
                                 $bcctext = '(Bcc)';
                             }
@@ -10577,7 +10636,7 @@ sub modify_contacts {
                         } elsif (!@text) {
                             $resulttext .= &mt('No one');
                         }   
-                        if ($includestr{$type} ne '') { 
+                        if ($includestr{$type} ne '') {
                             if ($includeloc{$type} eq 'b') {
                                 $resulttext .= '<br />'.&mt('Text automatically added to e-mail body:').' '.$includestr{$type};
                             } elsif ($includeloc{$type} eq 's') {
@@ -10615,11 +10674,11 @@ sub modify_contacts {
                         next;
                     }
                     if ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'yes') {
-                        push(@optional,$field);    
+                        push(@optional,$field);
                     } elsif ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'no') {
                         push(@unused,$field);
                     } elsif ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'req') {
-                        push(@required,$field);   
+                        push(@required,$field);
                     }
                 }
                 if (@optional) {
@@ -10650,7 +10709,7 @@ sub modify_contacts {
             }
             $resulttext .= '</ul>';
         } else {
-            $resulttext = &mt('No changes made to contact information');
+            $resulttext = &mt('No changes made to contacts and form settings');
         }
     } else {
         $resulttext = '<span class="LC_error">'.
@@ -12455,14 +12514,16 @@ sub modify_helpsettings {
     my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_');
     my (@allpos,%newsettings,%changedprivs,$newrole);
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-    my @accesstypes = ('all','none','status','inc','exc');
-    my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh']);
+    my @accesstypes = ('all','dh','da','none','status','inc','exc');
+    my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']);
     my %lt = &Apache::lonlocal::texthash(
                     s      => 'system',
                     d      => 'domain',
                     order  => 'Display order',
                     access => 'Role usage',
-                    all    => 'All',
+                    all    => 'All with domain helpdesk or helpdesk assistant role',
+                    dh     => 'All with domain helpdesk role',
+                    da     => 'All with domain helpdesk assistant role',
                     none   => 'None',
                     status => 'Determined based on institutional status',
                     inc    => 'Include all, but exclude specific personnel',
@@ -12498,7 +12559,7 @@ sub modify_helpsettings {
             $identifier = 'custhelp'.$num;
             my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$identifier);
             my %currprivs;
-            ($currprivs{'s'},$currprivs{'d'},$currprivs{'c'}) = 
+            ($currprivs{'s'},$currprivs{'d'},$currprivs{'c'}) =
                 split(/\_/,$existing{'rolesdef_'.$rolename});
             foreach my $level ('c','d','s') {
                 if ($newprivs{$level} ne $currprivs{$level}) {
@@ -12540,7 +12601,7 @@ sub modify_helpsettings {
             if ($access eq 'status') {
                 my @statuses = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_status');
                 if (scalar(@statuses) == 0) {
-                    $helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = 'none'; 
+                    $helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = 'none';
                 } else {
                     my (@shownstatus,$numtypes);
                     $helphash{'helpsettings'}{'adhoc'}{$rolename}{$access} = [];
@@ -12613,7 +12674,7 @@ sub modify_helpsettings {
                     if (ref($current{'adhoc'}{$rolename}) eq 'HASH') {
                         if ($current{'adhoc'}{$rolename}{'order'} ne $idx) {
                             $changes{'customrole'}{$rolename}{'order'} = 1;
-                            $newsettings{$rolename}{'order'} = $idx+1; 
+                            $newsettings{$rolename}{'order'} = $idx+1;
                         }
                     }
                 }
@@ -12811,7 +12872,7 @@ sub modify_coursedefaults {
                         $changes{$item} = 1;
                     }
                 } elsif ($item =~ /^(uploadquota|mysqltables)_/) {
-                    my $setting = $1; 
+                    my $setting = $1;
                     unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) {
                         $changes{$setting} = 1;
                     }
@@ -12826,7 +12887,7 @@ sub modify_coursedefaults {
             }
         }
         my $newclone;
-        if ($env{'form.canclone'} =~ /^(none|domain|instcode)$/) { 
+        if ($env{'form.canclone'} =~ /^(none|domain|instcode)$/) {
             $newclone = $env{'form.canclone'};
         }
         if ($newclone eq 'instcode') {
@@ -12849,8 +12910,8 @@ sub modify_coursedefaults {
                 $newclone eq '';
             }
         } elsif ($newclone ne '') {
-            $defaultshash{'coursedefaults'}{'canclone'} = $newclone; 
-        } 
+            $defaultshash{'coursedefaults'}{'canclone'} = $newclone;
+        }
         if ($newclone ne $currclone) {
             $changes{'canclone'} = 1;
         }
@@ -12868,10 +12929,10 @@ sub modify_coursedefaults {
                 $defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type};
             }
         } else {
-            if ($env{'form.coursecredits'} eq '1') { 
+            if ($env{'form.coursecredits'} eq '1') {
                 foreach my $type (@types) {
                     unless ($type eq 'community') {
-                        if ($domconfig{'coursedefaults'}{'coursecredits'}{$type} ne $credits{$type}) {        
+                        if ($domconfig{'coursedefaults'}{'coursecredits'}{$type} ne $credits{$type}) {
                             $changes{'coursecredits'} = 1;
                         }
                         $defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type};
@@ -12914,7 +12975,7 @@ sub modify_coursedefaults {
                 }
                 if (exists($currtimeout{$type})) {
                     if ($timeout ne $currtimeout{$type}) {
-                        $changes{'postsubmit'} = 1; 
+                        $changes{'postsubmit'} = 1;
                     }
                 } elsif ($timeout ne '') {
                     $changes{'postsubmit'} = 1;
@@ -12943,7 +13004,7 @@ sub modify_coursedefaults {
                     if ($changes{$item}) {
                         $domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};
                     }
-                } 
+                }
                 if ($changes{'coursecredits'}) {
                     if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
                         foreach my $type (keys(%{$defaultshash{'coursedefaults'}{'coursecredits'}})) {
@@ -13006,7 +13067,7 @@ sub modify_coursedefaults {
                     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>'; 
+                        $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>';
@@ -13041,7 +13102,7 @@ sub modify_coursedefaults {
                         $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') { 
+                        if (ref($defaultshash{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
                             $resulttext .= &mt('durations:').'<ul>';
                             foreach my $type (@types) {
                                 $resulttext .= '<li>';
@@ -13072,7 +13133,7 @@ sub modify_coursedefaults {
                             }
                             $resulttext .= '</ul>';
                         }
-                        $resulttext .= '</li>';    
+                        $resulttext .= '</li>';
                     }
                 } elsif ($item eq 'coursecredits') {
                     if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
@@ -13100,7 +13161,7 @@ sub modify_coursedefaults {
                     } elsif ($defaultshash{'coursedefaults'}{'canclone'} eq 'domain') {
                         $resulttext .= '<li>'.&mt('By default, a course requester can clone any course from his/her domain.').'</li>';
                     } else {
-                        $resulttext .= '<li>'.&mt('By default, only course owner and coordinators may clone a course.').'</li>'; 
+                        $resulttext .= '<li>'.&mt('By default, only course owner and coordinators may clone a course.').'</li>';
                     }
                 }
             }
@@ -13555,7 +13616,7 @@ sub modify_usersessions {
                 }
             }
             unless ($changes{'offloadnow'}) {
-                foreach my $lonhost (keys(%{$defaultshash{'usersessions'}{'offloadnow'}})) { 
+                foreach my $lonhost (keys(%{$defaultshash{'usersessions'}{'offloadnow'}})) {
                     unless ($domconfig{'usersessions'}{'offloadnow'}{$lonhost}) {
                         $changes{'offloadnow'} = 1;
                         last;
@@ -13688,7 +13749,7 @@ sub modify_ssl {
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
     my (%defaultshash,%changes);
     my $action = 'ssl';
-    my @prefixes = ('connect','replication');
+    my @prefixes = ('connto','connfrom','replication');
     foreach my $prefix (@prefixes) {
         $defaultshash{$action}{$prefix} = {};
     }
@@ -13698,12 +13759,13 @@ sub modify_ssl {
     my @reptypes = ('certreq','nocertreq');
     my @connecttypes = ('dom','intdom','other');
     my %types = (
-                  connect      => \@connecttypes,
-                  replication  => \@reptypes,
+                  connto      => \@connecttypes,
+                  connfrom    => \@connecttypes,
+                  replication => \@reptypes,
                 );
     foreach my $prefix (sort(keys(%types))) {
         foreach my $type (@{$types{$prefix}}) {
-            if ($prefix eq 'connect') {
+            if (($prefix eq 'connto') || ($prefix eq 'connfrom')) {
                 my $value = 'yes';
                 if ($env{'form.'.$prefix.'_'.$type} =~ /^(no|req)$/) {
                     $value = $env{'form.'.$prefix.'_'.$type};
@@ -13792,8 +13854,11 @@ sub modify_ssl {
                 if (ref($defaultshash{$action}{'replication'}) eq 'HASH') {
                     $domdefaults{'replication'} = $defaultshash{$action}{'replication'};
                 }
-                if (ref($defaultshash{$action}{'connect'}) eq 'HASH') {
-                    $domdefaults{'connect'} = $domconfig{$action}{'connect'};
+                if (ref($defaultshash{$action}{'connto'}) eq 'HASH') {
+                    $domdefaults{'connto'} = $domconfig{$action}{'connto'};
+                }
+                if (ref($defaultshash{$action}{'connfrom'}) eq 'HASH') {
+                    $domdefaults{'connfrom'} = $domconfig{$action}{'connfrom'};
                 }
             }
             my $cachetime = 24*60*60;
@@ -13812,7 +13877,7 @@ sub modify_ssl {
                                 my $newvalue;
                                 if (ref($defaultshash{$action}) eq 'HASH') {
                                     if (ref($defaultshash{$action}{$prefix})) {
-                                        if ($prefix eq 'connect') {
+                                        if (($prefix eq 'connto') || ($prefix eq 'connfrom')) {
                                             $newvalue = $titles{$defaultshash{$action}{$prefix}{$type}};
                                         } elsif (ref($defaultshash{$action}{$prefix}{$type}) eq 'ARRAY') {
                                             if (@{$defaultshash{$action}{$prefix}{$type}} > 0) {
@@ -14073,7 +14138,7 @@ sub modify_loadbalancing {
                 }
                 if ($rule eq 'specific') {
                     my $specifiedhost = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type};
-                    if (exists($servers{$specifiedhost})) { 
+                    if (exists($servers{$specifiedhost})) {
                         $rule = $specifiedhost;
                     }
                 }
@@ -14149,7 +14214,7 @@ sub modify_loadbalancing {
                                         if ($rule eq '') {
                                             $balancetext =  $ruletitles{'default'};
                                         } elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer') ||
-                                                 ($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) { 
+                                                 ($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') {
@@ -14270,7 +14335,7 @@ sub recurse_cat_deletes {
 
 sub active_dc_picker {
     my ($dom,$numinrow,$inputtype,$name,%currhash) = @_;
-    my %domcoords = &get_active_dcs($dom);
+    my %domcoords = &Apache::lonnet::get_active_domroles($dom,['dc']);
     my @domcoord = keys(%domcoords);
     if (keys(%currhash)) {
         foreach my $dc (keys(%currhash)) {
@@ -14876,7 +14941,7 @@ function updateCaptcha(caller,context) {
             privtext.innerHTML = "$lt{'priv'}";
             versionitem.type = 'text';
             versionitem.size = '3';
-            versiontext.innerHTML = "$lt{'ver'}"; 
+            versiontext.innerHTML = "$lt{'ver'}";
         } else {
             pubitem.type = 'hidden';
             privitem.type = 'hidden';
@@ -14949,7 +15014,7 @@ sub captcha_phrases {
                  original  => 'original (CAPTCHA)',
                  recaptcha => 'successor (ReCAPTCHA)',
                  notused   => 'unused',
-                 ver => 'ReCAPTCHA version (1 or 2)', 
+                 ver => 'ReCAPTCHA version (1 or 2)',
     );
 }