--- loncom/interface/lonpickauthor.pm	2008/10/15 09:49:52	1.2
+++ loncom/interface/lonpickauthor.pm	2017/03/15 20:18:06	1.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Display authors in domain for selection of ad loc co-author role by Domain Coordinator. 
 #
-# $Id: lonpickauthor.pm,v 1.2 2008/10/15 09:49:52 bisitz Exp $
+# $Id: lonpickauthor.pm,v 1.7 2017/03/15 20:18:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,8 +53,12 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['form','roledom','sortby']);
     my $then=$env{'user.login.time'};
-    my (%dcroles,%dom_roles,$earlyout,$domdesc);
-    my $numdc = &Apache::lonroles::check_fordc(\%dcroles,$then);
+    my $update=$env{'user.update.time'};
+    if (!$update) {
+        $update = $then;
+    }
+    my (%dcroles,%helpdeskroles,%dom_roles,$earlyout,$domdesc);
+    my ($numdc) = &Apache::lonroles::check_for_adhoc(\%dcroles,\%helpdeskroles,$update,$then);
     if ($env{'form.roledom'} ne '') {
         $domdesc = &Apache::lonnet::domain($env{'form.roledom'});
         if ($domdesc eq '') {
@@ -63,13 +67,13 @@ sub handler {
             if ($dcroles{$env{'form.roledom'}}) {
                 %dom_roles = &Apache::lonnet::get_domain_roles($env{'form.roledom'},['au']);
                 if (keys(%dom_roles) == 0) {
-                    $earlyout = &mt('There are no library servers containing Construction spaces currently in domain: [_1], so you can not assume a co-author role.',$domdesc); 
+                    $earlyout = &mt('There are no library servers containing Authoring Spaces currently in domain: [_1], so you can not assume a co-author role.',$domdesc); 
                 }
             } else {
-                $earlyout = &mt('You do not have a domain coordinator role in domain: [_1], so you cannot choose a Construction space for which you can assume a co-author role.',$domdesc);
+                $earlyout = &mt('You do not have a domain coordinator role in domain: [_1], so you cannot choose an Authoring Space for which you can assume a co-author role.',$domdesc);
             }
         } else {
-            $earlyout = &mt('You do not have a domain coordinator role, so you cannot choose a Construction space for which you can assume a co-author role.');
+            $earlyout = &mt('You do not have a domain coordinator role, so you cannot choose an Authoring Space for which you can assume a co-author role.');
         }
     } else {
         $earlyout = &mt('Invalid domain'); 
@@ -118,7 +122,7 @@ ENDSCRIPT
         $r->print('<input type="hidden" name="roledom" value="'.$env{'form.roledom'}.'" />'."\n".
                   '<input type="hidden" name="form" value="'.$env{'form.form'}.'" /></form>');
     } else {
-       $r->print(&mt('There are no author roles currently in domain: [_1], so there are no Construction spaces for which you can assume a co-author role.',$domdesc));
+       $r->print(&mt('There are no author roles currently in domain: [_1], so there are no Authoring Spaces for which you can assume a co-author role.',$domdesc));
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;