--- loncom/interface/loncreateuser.pm	2017/01/28 03:48:44	1.432
+++ loncom/interface/loncreateuser.pm	2017/03/19 18:06:23	1.435
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.432 2017/01/28 03:48:44 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.435 2017/03/19 18:06:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7207,7 +7207,7 @@ sub print_helpdeskaccess_display {
     my $confname = $cdom.'-domainconfig';
     my $crstype = &Apache::loncommon::course_type();
 
-    my @accesstypes = ('all','none');
+    my @accesstypes = ('all','dh','da','none');
     my ($numstatustypes,@jsarray);
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom);
     if (ref($types) eq 'ARRAY') {
@@ -7416,7 +7416,9 @@ ENDJS
                     'rou'    => 'Role usage',
                     'whi'    => 'Which helpdesk personnel may use this role?',
                     'udd'    => 'Use domain default',
-                    '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',
@@ -7659,6 +7661,10 @@ sub domain_adhoc_access {
                 }
             } elsif ($access eq 'none') {
                 $domusage{$role} = &mt('No one in the domain');
+            } elsif ($access eq 'dh') {
+                $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
+            } elsif ($access eq 'da') {
+                $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('da'));
             } elsif ($access eq 'all') {
                 $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
                                        &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
@@ -7846,7 +7852,7 @@ sub update_helpdeskaccess {
         $r->print('<p class="LC_error">'.&mt('You do not have permission to change helpdesk access.').'</p>');
         return;
     }
-    my @accesstypes = ('all','none','status','inc','exc');
+    my @accesstypes = ('all','dh','da','none','status','inc','exc');
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $confname = $cdom.'-domainconfig';
@@ -8097,6 +8103,12 @@ sub update_helpdeskaccess {
                         if ($env{'form.'.$role.'_incrs'}) {
                             if ($newsettings{$role}{'access'} eq 'all') {
                                 $r->print(&mt('All helpdesk staff can access '.lc($crstype).' with this role.'));
+                            } elsif ($newsettings{$role}{'access'} eq 'dh') {
+                                $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role',
+                                              &Apache::lonnet::plaintext('dh')));
+                            } elsif ($newsettings{$role}{'access'} eq 'da') {
+                                $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role',
+                                              &Apache::lonnet::plaintext('da')));
                             } elsif ($newsettings{$role}{'access'} eq 'none') {
                                 $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.'));
                             } elsif ($newsettings{$role}{'access'} eq 'status') {
@@ -8212,7 +8224,7 @@ sub user_search_result {
             my $domd_chk = &domdirectorysrch_check($srch);
             $response .= '<span class="LC_warning">'.$instd_chk.'</span><br />';
             if ($domd_chk eq 'ok') {
-                $response .= &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.');
+                $response .= &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.');
             }
             $response .= '<br />';
         }
@@ -8223,7 +8235,7 @@ sub user_search_result {
                 my $instd_chk = &instdirectorysrch_check($srch);
                 $response .= '<span class="LC_warning">'.$domd_chk.'</span><br />';
                 if ($instd_chk eq 'ok') {
-                    $response .= &mt('You may want to search in the institutional directory instead of the LON-CAPA domain.');
+                    $response .= &mt('You may want to search in the institutional directory instead of in the LON-CAPA domain.');
                 }
                 $response .= '<br />';
             }
@@ -8324,7 +8336,7 @@ sub user_search_result {
                 $response = '<span class="LC_warning">'.
                     &mt('Institutional directory search is not available in domain: [_1]',$showdom).
                     '</span><br />'.
-                    &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
+                    &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.').
                     '<br />'; 
             }
         }
@@ -8397,7 +8409,7 @@ sub user_search_result {
                 $response = '<span class="LC_warning">'.
                     &mt('Institutional directory search is not available in domain: [_1]',$showdom).
                     '</span><br />'.
-                    &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
+                    &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.').
                     '<br />';
             }
         }