--- loncom/auth/lonroles.pm	2008/01/26 21:12:32	1.182
+++ loncom/auth/lonroles.pm	2008/03/04 22:44:21	1.184
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.182 2008/01/26 21:12:32 www Exp $
+# $Id: lonroles.pm,v 1.184 2008/03/04 22:44:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -134,10 +134,12 @@ sub handler {
                     last;
                 }
 # Is this a recent ad-hoc CA-role?
-                if (my ($domain,$coursenum) =
-		    ($envkey =~ m-^form\.ca\./($match_domain)/($match_courseid)$-)) {
-                    if ($dcroles{$domain}) {
-                        &check_privs($domain,$coursenum,$then,$now,'ca');
+                if (my ($domain,$user) =
+		    ($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) {
+                    if (($dcroles{$domain}) && (&is_author_homeserver($user,$domain))) {
+                        &check_privs($domain,$user,$then,$now,'ca');
+                    } else {
+                        delete($env{$envkey});
                     }
                     last;
                 }
@@ -147,7 +149,7 @@ sub handler {
                     if ($dcroles{$domain}) {
                         my $user=$env{'form.adhoccauname.'.$domain};
                         if (!$user) { $user=$env{'form.adhoccaunamerecent.'.$domain} };
-                        if (($user) && ($user=~/$match_username/)) { 
+                        if (($user) && ($user=~/$match_username/) && (&is_author_homeserver($user,$domain))) { 
                            &check_privs($domain,$user,$then,$now,'ca');
                            $env{'form.ca./'.$domain.'/'.$user}=1;
 		       }
@@ -387,7 +389,7 @@ ENDENTERKEY
     my $start_page=&Apache::loncommon::start_page('User Roles');
     my $standby=&mt('Role selected. Please stand by.');
     $standby=~s/\n/\\n/g;
-    my $noscript='<span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will ba unavailable.').'</span><br />';
+    my $noscript='<span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
 
     $r->print(<<ENDHEADER);
 $start_page
@@ -905,6 +907,20 @@ sub build_roletext {
     return $roletext;
 }
 
+sub is_author_homeserver {
+    my ($uname,$udom)=@_;
+    my $home = &Apache::lonnet::homeserver($uname,$udom);
+    my @ids=&Apache::lonnet::current_machine_ids();
+    foreach my $id (@ids) { 
+       if ($id eq $home) { 
+          if (-e "/home/".$uname."/public_html") {
+             return 1;
+          }
+       }
+    }
+    return 0;
+}
+
 sub check_privs {
     my ($cdom,$cnum,$then,$now,$checkrole) = @_;
     my $cckey = 'user.role.'.$checkrole.'./'.$cdom.'/'.$cnum; 
@@ -954,6 +970,10 @@ sub courselink {
 }
 
 sub coursepick_jscript {
+    my %lt = &Apache::lonlocal::texthash(
+                  plsu => "Please use the 'Select Course' link to open a separate pick course window where you may select the course you wish to enter.",
+                  youc => 'You can only use this screen to select courses in the current domain.',
+             );
     my $verify_script = <<"END";
 <script type="text/javascript">
 function verifyCoursePick(caller) {
@@ -969,11 +989,11 @@ function verifyCoursePick(caller) {
             }
         }
         else {
-            alert("Please use the 'Select Course' link to open a separate pick course window where you may select the course you wish to enter.");
+            alert("$lt{'plsu'}");
         }
     }
     else {
-        alert("You can only use this screen to select courses in the current domain")
+        alert("$lt{'youc'}")
     }
 }
 function getIndex(caller) {
@@ -1063,6 +1083,7 @@ sub set_privileges {
     &Apache::lonnet::standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area);
     my ($author,$adv)= &Apache::lonnet::set_userprivs(\%userroles,\%ccrole);
     &Apache::lonnet::appenv(%userroles);
+
     &Apache::lonnet::log($env{'user.domain'},
                          $env{'user.name'},
                          $env{'user.home'},