--- loncom/auth/lonroles.pm	2016/10/20 19:53:58	1.318
+++ loncom/auth/lonroles.pm	2016/10/27 21:06:00	1.319
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.318 2016/10/20 19:53:58 raeburn Exp $
+# $Id: lonroles.pm,v 1.319 2016/10/27 21:06:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -322,78 +322,113 @@ sub handler {
                     }
                 }
             }
-        } elsif ($numdc > 0) {
+        } elsif (($numdc > 0) || ($numdh > 0)) {
 # Check if user is a DC trying to enter a course or author space and needs privs to be created
+# Check if user is a DH trying to enter a course and needs privs to be created
             foreach my $envkey (keys(%env)) {
 # Is this an ad-hoc Coordinator role?
-                if (my ($ccrole,$domain,$coursenum) =
-		    ($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) {
-                    if ($dcroles{$domain}) {
-                        if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum,
-                                                           $update,$refresh,$now,$ccrole)) {
-                            &Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.$ccrole.adhoc" => time});
-                        }
-                    }
-                    last;
-                }
-# Is this an ad-hoc CA-role?
-                if (my ($domain,$user) =
-		    ($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) {
-                    if (($domain eq $env{'user.domain'}) && ($user eq $env{'user.name'})) {
-                        delete($env{$envkey});
-                        $env{'form.au./'.$domain.'/'} = 1;
-                        my ($server_status,$home) = &check_author_homeserver($user,$domain);
-                        if ($server_status eq 'switchserver') {
-                            my $trolecode = 'au./'.$domain.'/';
-                            my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;
-                            $r->internal_redirect($switchserver);
-                            return OK;
+                if ($numdc) {
+                    if (my ($ccrole,$domain,$coursenum) =
+		        ($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) {
+                        if ($dcroles{$domain}) {
+                            if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum,
+                                                                   $update,$refresh,$now,$ccrole)) {
+                                &Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.$ccrole.adhoc" => time});
+                            }
                         }
                         last;
                     }
-                    if (my ($castart,$caend) = ($env{'user.role.ca./'.$domain.'/'.$user} =~ /^(\d*)\.(\d*)$/)) {
-                        if (((($castart) && ($castart < $now)) || !$castart) && 
-                            ((!$caend) || (($caend) && ($caend > $now)))) {
+# Is this an ad-hoc CA-role?
+                    if (my ($domain,$user) =
+		        ($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) {
+                        if (($domain eq $env{'user.domain'}) && ($user eq $env{'user.name'})) {
+                            delete($env{$envkey});
+                            $env{'form.au./'.$domain.'/'} = 1;
                             my ($server_status,$home) = &check_author_homeserver($user,$domain);
                             if ($server_status eq 'switchserver') {
-                                my $trolecode = 'ca./'.$domain.'/'.$user;
+                                my $trolecode = 'au./'.$domain.'/';
                                 my $switchserver = '/adm/switchserver?otherserver='.$home.'&amp;role='.$trolecode;
                                 $r->internal_redirect($switchserver);
                                 return OK;
                             }
                             last;
                         }
-                    }
-                    # Check if author blocked ca-access
-                    my %blocked=&Apache::lonnet::get('environment',['domcoord.author'],$domain,$user);
-                    if ($blocked{'domcoord.author'} eq 'blocked') {
-                        delete($env{$envkey});
-                        $env{'user.error.msg'}=':::1:User '.$user.' in domain '.$domain.' blocked domain coordinator access';
-                        last;
-                    }
-                    if ($dcroles{$domain}) {
-                        my ($server_status,$home) = &check_author_homeserver($user,$domain);
-                        if (($server_status eq 'ok') || ($server_status eq 'switchserver')) {
-                            &Apache::lonnet::check_adhoc_privs($domain,$user,$update,
-                                                               $refresh,$now,'ca');
-                            if ($server_status eq 'switchserver') {
-                                my $trolecode = 'ca./'.$domain.'/'.$user; 
-                                my $switchserver = '/adm/switchserver?'
-                                                  .'otherserver='.$home.'&amp;role='.$trolecode;
-                                $r->internal_redirect($switchserver);
-                                return OK;
+                        if (my ($castart,$caend) = ($env{'user.role.ca./'.$domain.'/'.$user} =~ /^(\d*)\.(\d*)$/)) {
+                            if (((($castart) && ($castart < $now)) || !$castart) && 
+                                ((!$caend) || (($caend) && ($caend > $now)))) {
+                                my ($server_status,$home) = &check_author_homeserver($user,$domain);
+                                if ($server_status eq 'switchserver') {
+                                    my $trolecode = 'ca./'.$domain.'/'.$user;
+                                    my $switchserver = '/adm/switchserver?otherserver='.$home.'&amp;role='.$trolecode;
+                                    $r->internal_redirect($switchserver);
+                                    return OK;
+                                }
+                                last;
+                            }
+                        }
+                        # Check if author blocked ca-access
+                        my %blocked=&Apache::lonnet::get('environment',['domcoord.author'],$domain,$user);
+                        if ($blocked{'domcoord.author'} eq 'blocked') {
+                            delete($env{$envkey});
+                            $env{'user.error.msg'}=':::1:User '.$user.' in domain '.$domain.' blocked domain coordinator access';
+                            last;
+                        }
+                        if ($dcroles{$domain}) {
+                            my ($server_status,$home) = &check_author_homeserver($user,$domain);
+                            if (($server_status eq 'ok') || ($server_status eq 'switchserver')) {
+                                &Apache::lonnet::check_adhoc_privs($domain,$user,$update,
+                                                                   $refresh,$now,'ca');
+                                if ($server_status eq 'switchserver') {
+                                    my $trolecode = 'ca./'.$domain.'/'.$user; 
+                                    my $switchserver = '/adm/switchserver?'
+                                                      .'otherserver='.$home.'&amp;role='.$trolecode;
+                                    $r->internal_redirect($switchserver);
+                                    return OK;
+                                }
+                            } else {
+                                delete($env{$envkey});
                             }
                         } else {
                             delete($env{$envkey});
                         }
-                    } else {
-                        delete($env{$envkey});
+                        last;
                     }
-                    last;
                 }
-            }
+                if ($numdh) {
+# Is this an ad hoc custom role in a course/community?
+                   if (my ($domain,$rolename,$coursenum) = ($envkey =~ m{^form\.cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)$})) {
+                       if ($dhroles{$domain}) { 
+                           my @adhoc; 
+                           if ($env{'environment.adhocroles.'.$domain}) {
+                               @adhoc = split(',',$env{'environment.adhocroles.'.$domain});
+                           } else {
+                               my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
+                                                                                 'adhocroles.'.$domain);
+                               if (keys(%adhocroles)) {
+                                   @adhoc = split(',',$adhocroles{'adhocroles.'.$domain});
+                               };
+                           }
+                           if ((@adhoc > 0) && ($rolename ne '')) {
+                               if (grep(/^\Q$rolename\E$/,@adhoc)) {
+                                   if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum,$update,$refresh,$now,
+                                                                          "cr/$domain/$domain".'-domainconfig/'.$rolename)) {
+                                       &Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.cr/$domain/$domain".
+                                                                '-domainconfig/'."$rolename.adhoc" => time});
+                                   }
+                               } else {
+                                   delete($env{$envkey});
+                               }
+                           } else {
+                               delete($env{$envkey});
+                           }
+                       } else {
+                           delete($env{$envkey});
+                       }
+                       last;
+                   }
+               }
+           }
         }
-
         foreach $envkey (keys(%env)) {
             next if ($envkey!~/^user\.role\./);
             my ($where,$trolecode,$role,$tstatus,$tend,$tstart);