--- loncom/auth/lonroles.pm	2008/05/15 01:00:37	1.192
+++ loncom/auth/lonroles.pm	2008/07/14 10:21:52	1.201
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.192 2008/05/15 01:00:37 raeburn Exp $
+# $Id: lonroles.pm,v 1.201 2008/07/14 10:21:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,6 +43,7 @@ use Apache::lonpageflip();
 use Apache::lonnavdisplay();
 use GDBM_File;
 use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities;
  
 
 sub redirect_user {
@@ -137,59 +138,39 @@ sub handler {
 # Is this an ad-hoc CC-role?
                 if (my ($domain,$coursenum) =
 		    ($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) {
-                   # See if that is even allowed
-                   my %crsenv=&Apache::lonnet::get('environment',['internal.courseowner'],$domain,$coursenum);
-                   # First find course owner
-                   my ($owneruser,$ownerdomain)=split(/\:/,$crsenv{'internal.courseowner'});
-                   # Check if course owner blocked cc-access
-                    if (($owneruser) && ($ownerdomain)) {
-                       my %blocked=&Apache::lonnet::get('environment',['domcoord.cc'],$ownerdomain,$owneruser);
-                       if ($blocked{'domcoord.cc'} eq 'blocked') {
-                          $env{'user.error.msg'}=':::1:Course owner '.$owneruser.' in domain '.$ownerdomain.' blocked domain coordinator access';
-                          last;
-                       }
-                    }
                     if ($dcroles{$domain}) {
                         &check_privs($domain,$coursenum,$then,$now,'cc');
                     }
                     last;
                 }
-# Is this a recent ad-hoc CA-role?
+# Is this an ad-hoc CA-role?
                 if (my ($domain,$user) =
 		    ($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) {
-                   # See if still allowed
+                   # 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}) && (&is_author_homeserver($user,$domain))) {
-                        &check_privs($domain,$user,$then,$now,'ca');
+                    if ($dcroles{$domain}) {
+                        my ($server_status,$home) = &check_author_homeserver($user,$domain);
+                        if (($server_status eq 'ok') || ($server_status eq 'switchserver')) {
+                            &check_privs($domain,$user,$then,$now,'ca');
+                            if ($server_status eq 'switchserver') {
+                                my $trolecode = 'ca./'.$domain.'/'.$user; 
+                                my $switchserver = '/adm/switchserver?'
+                                                  .'otherserver='.$home.'&role='.$trolecode;
+                                $r->internal_redirect($switchserver);
+                            }
+                        } else {
+                            delete($env{$envkey});
+                        }
                     } else {
                         delete($env{$envkey});
                     }
                     last;
                 }
-# Is this a new ad-hoc CA-role?
-                if (my ($domain) =
-                    ($envkey =~ m-^form\.adhocca\./($match_domain)$-)) {
-                    my $user=$env{'form.adhoccauname.'.$domain};
-                    if (!$user) { $user=$env{'form.adhoccaunamerecent.'.$domain} };
-                   # See if that is even allowed
-                    my %blocked=&Apache::lonnet::get('environment',['domcoord.author'],$domain,$user);
-                    if ($blocked{'domcoord.author'} eq 'blocked') {
-                       $env{'user.error.msg'}=':::1:User '.$user.' in domain '.$domain.' blocked domain coordinator access';
-                       last;
-                    }
-                    if ($dcroles{$domain}) {
-                        if (($user) && ($user=~/$match_username/) && (&is_author_homeserver($user,$domain))) { 
-                           &check_privs($domain,$user,$then,$now,'ca');
-                           $env{'form.ca./'.$domain.'/'.$user}=1;
-		       }
-                    }
-                    last;
-                }
             }
         }
 
@@ -521,13 +502,6 @@ ENDHEADER
         $r->print('<input type="hidden" name="selectrole" value="1" />');
         $r->print('<input type="hidden" name="newrole" value="" />');
     }
-    if ($env{'user.adv'}) {
-	$r->print(
-	      '<br /><span class="LC_rolesinfo"><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"');
-	if ($env{'form.showall'}) { $r->print(' checked="checked" '); }
-	$r->print(' /></label><input type="submit" value="'.&mt('Display').'" /></span>');
-    }
-
     my (%roletext,%sortrole,%roleclass);
     my $countactive=0;
     my $countfuture=0;
@@ -694,6 +668,19 @@ ENDHEADER
 	    }
         }
     }
+    if ($env{'user.adv'}) {
+        $r->print(
+              '<br /><span class="LC_rolesinfo"><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"');
+        if ($env{'form.showall'}) { $r->print(' checked="checked" '); }
+        $r->print(' /></label><input type="submit" value="'.&mt('Display').'" /></span>');
+    } else {
+        if ($countactive > 0) {
+            my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
+            my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
+            $r->print('<p>'.&mt('[_1]Visit the [_2]Course Catalog[_3] to view all [_4] LON-CAPA courses.','<b>','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a></b>',$domdesc).'<br />'.&mt('If a course is [_1]not[_2] in your list of current courses below, you may be able to enroll if self-enrollment is permitted.','<b>','</b>').'</p>');
+        }
+    }
+
 # No active roles
     if ($countactive==0) {
 	if ($inrole) {
@@ -770,7 +757,8 @@ ENDHEADER
 
     if ($numdc > 0) {
         $r->print(&coursepick_jscript());
-        $r->print(&Apache::loncommon::coursebrowser_javascript());
+        $r->print(&Apache::loncommon::coursebrowser_javascript().
+                  &Apache::loncommon::authorbrowser_javascript());
     }
     &print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,\%roletext);
     my $tremark='';
@@ -805,9 +793,14 @@ ENDHEADER
     }
     $r->print(&Apache::lonnet::getannounce());
     if ($advanced) {
-	$r->print('<p><small><i>This is LON-CAPA '.
-		  $r->dir_config('lonVersion').'</i><br />'.
-		  '<a href="/adm/logout">'.&mt('Logout').'</a></small></p>');
+        my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
+	$r->print('<p><small><i>'
+                 .&mt('This is LON-CAPA [_1]',$r->dir_config('lonVersion'))
+		 .'</i><br />'
+		 .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
+                 .'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
+                 .&mt('Course Catalog')
+                 .'</small></p>');
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;
@@ -877,7 +870,8 @@ sub print_rolerows {
 sub findcourse_advice {
     my ($r) = @_;
     my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
-    if (&check_autoenroll($env{'user.domain'})) {
+    my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
+    if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) {
         $r->print(&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).'
 <ul>
  <li>'.&mt('The course has yet to be created.').'</li>
@@ -889,7 +883,7 @@ sub findcourse_advice {
     } else {
         $r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'<br />');
     }
-    $r->print('<p>'.&mt('The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','<a href="/adm/coursecatalog">','</a>',$domdesc).'<br />');
+    $r->print('<p>'.&mt('The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
     $r->print(&mt('You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.').'</p>');
     return;
 }
@@ -1025,18 +1019,21 @@ sub build_roletext {
     return $roletext;
 }
 
-sub is_author_homeserver {
+sub check_author_homeserver {
     my ($uname,$udom)=@_;
+    if (($uname eq '') || ($udom eq '')) {
+        return ('fail','');
+    }
     my $home = &Apache::lonnet::homeserver($uname,$udom);
+    if (&Apache::lonnet::host_domain($home) ne $udom) {
+        return ('fail',$home);
+    }
     my @ids=&Apache::lonnet::current_machine_ids();
-    foreach my $id (@ids) { 
-       if ($id eq $home) { 
-          if (-e "/home/".$uname."/public_html") {
-             return 1;
-          }
-       }
+    if (grep(/^\Q$home\E$/,@ids)) {
+        return ('ok',$home);
+    } else {
+        return ('switchserver',$home);
     }
-    return 0;
 }
 
 sub check_privs {
@@ -1077,26 +1074,26 @@ sub check_fordc {
 sub adhoc_course_role {
     my ($then) = @_; 
     my ($cdom,$cnum);
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     if (&check_forcc($cdom,$cnum,$then)) {
         my $setprivs;
-        if (!defined($env{'user.role.'.$env{'form.selectrole'}})) {
+        if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
             $setprivs = 1;
         } else {
-            my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.selectrole'}});
+            my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});
             if (($start && ($start>$then || $start == -1)) ||
                 ($end && $end<$then)) {
                 $setprivs = 1;
             }
         } 
         if ($setprivs) {
-            if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E(/?\w*)$-) {
+            if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
                 my $role = $1;
                 my $custom_role = $2;
                 my $usec = $3;
                 if ($role eq 'cr') {
-                    if ($custom_role =~ m-^$match_domain/$match_courseid/\w+$-) {
+                    if ($custom_role =~ m-^/$match_domain/$match_username/\w+$-) {
                         $role .= $custom_role;
                     } else {
                         return;
@@ -1138,7 +1135,7 @@ sub check_forcc {
 }
 
 sub courselink {
-    my ($dcdom,$rowtype,$selecttype) = @_;
+    my ($dcdom,$rowtype) = @_;
     my $courseform=&Apache::loncommon::selectcourse_link
                    ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,
                     'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.
@@ -1190,6 +1187,13 @@ END
     return $verify_script;
 }
 
+sub coauthorlink {
+    my ($dcdom,$rowtype) = @_;
+    my $coauthorform=&Apache::loncommon::selectauthor_link('rolechoice',$dcdom);
+    my $hiddenitems = '<input type="hidden" name="adhoccauname'.$rowtype.'_'.$dcdom.'" value="" />';
+    return $coauthorform.$hiddenitems;
+}
+
 sub display_cc_role {
     my $rolekey = shift;
     my $roletext;
@@ -1228,15 +1232,14 @@ sub adhoc_roles_row {
                  ' <td colspan="5"><table><tr><td><span class="LC_rolesinfo">'
                  .&mt('[_1]Ad hoc[_2] roles in domain [_3] --',
                  '<span class="LC_cusr_emph">','</span>',$dcdom).'</span></td><td>';
-    my $selectlink = &courselink($dcdom,$rowtype);
+    my $selectcclink = &courselink($dcdom,$rowtype);
     my $ccrole = &Apache::lonnet::plaintext('cc');
     my $carole = &Apache::lonnet::plaintext('ca');
-    my $inputlink='<input type="text" size="10" name="adhoccauname'.$rowtype.'.'.$dcdom.'" />';
-    my $gobutton='<input type="submit" name="adhocca./'.$dcdom.'" value="'.&mt('Go').'" />';
+    my $selectcalink = &coauthorlink($dcdom,$rowtype);
     $output.= '<span class="LC_rolesinfo">'.
-            &mt('[_1]: [_2]',$ccrole,$selectlink).
+            &mt('[_1]: [_2]',$ccrole,$selectcclink).
             '</span><br /></td><td>&nbsp;&nbsp;</td><td><span class="LC_rolesinfo">'.
-            &mt('[_1]: [_2] [_3]',$carole,$inputlink,$gobutton).
+            &mt('[_1]: [_2]',$carole,$selectcalink).
             '</span><br /></td></tr></table></td></tr>'.
             '<tr><td colspan="5" height="3"></td></tr>'."\n";
     return $output;
@@ -1290,24 +1293,6 @@ sub courseloadpage {
     return $startpage;
 }
 
-sub check_autoenroll {
-    my ($dom) = @_;
-    my $run_enroll = 0;
-    my $settings;
-    my %domconfig =
-        &Apache::lonnet::get_dom('configuration',['autoenroll'],$dom);
-    if (ref($domconfig{'autoenroll'}) eq 'HASH') {
-        $settings = $domconfig{'autoenroll'};
-        if ($settings->{'run'} eq '1') {
-            $run_enroll = 1;
-        }
-    } else {
-        $run_enroll = &localenroll::run($dom);
-    }
-    return $run_enroll;
-}
-
-
 1;
 __END__