--- loncom/auth/lonroles.pm	2007/10/22 22:16:30	1.180
+++ 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.180 2007/10/22 22:16:30 raeburn Exp $
+# $Id: lonroles.pm,v 1.184 2008/03/04 22:44:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -122,13 +122,37 @@ sub handler {
                                 "request.role.adv"    => $env{'user.adv'},
 				"request.role.domain" => $env{'user.domain'});
 
-# Check if user is a DC trying to enter a course and needs privs to be created
+# Check if user is a DC trying to enter a course or author space and needs privs to be created
         if ($numdc > 0) {
             foreach my $envkey (keys %env) {
+# Is this an ad-hoc CC-role?
                 if (my ($domain,$coursenum) =
 		    ($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) {
                     if ($dcroles{$domain}) {
-                        &check_privs($domain,$coursenum,$then,$now);
+                        &check_privs($domain,$coursenum,$then,$now,'cc');
+                    }
+                    last;
+                }
+# Is this a recent ad-hoc CA-role?
+                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;
+                }
+# Is this a new ad-hoc CA-role?
+                if (my ($domain) =
+                    ($envkey =~ m-^form\.adhocca\./($match_domain)$-)) {
+                    if ($dcroles{$domain}) {
+                        my $user=$env{'form.adhoccauname.'.$domain};
+                        if (!$user) { $user=$env{'form.adhoccaunamerecent.'.$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;
                 }
@@ -365,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
@@ -642,7 +666,7 @@ ENDHEADER
     }
 # More than one possible role
 # ----------------------------------------------------------------------- Table
-    unless (($advanced) || ($nochoose)) {
+    unless ((!&Apache::lonmenu::show_course()) || ($nochoose)) {
 	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
     }
     $r->print('<br /><table id="LC_rolesmenu"><tr>');
@@ -669,7 +693,8 @@ ENDHEADER
 		$output.=$roletext{'user.role.'.$_};
                 if ($_ =~ m-dc\./($match_domain)/- 
 		    && $dcroles{$1}) {
-		    $output .= &allcourses_row($1,'recent');
+		    $output .= &allcourses_row($1,'recent').
+                               &allcoauthors_row($1,'recent');
                 }
 	    } elsif ($numdc > 0) {
                 unless ($_ =~/^error\:/) {
@@ -697,7 +722,8 @@ ENDHEADER
 		$output.=$roletext{$sortrole{$which}};
                 if ($sortrole{$which} =~ m-dc\./($match_domain)/-) {
                     if ($dcroles{$1}) {
-                        $output .= &allcourses_row($1,'');
+                        $output .= &allcourses_row($1,'').
+                                   &allcoauthors_row($1,'');
                     }
                 }
 	    }
@@ -881,17 +907,31 @@ 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) = @_;
-    my $cckey = 'user.role.cc./'.$cdom.'/'.$cnum; 
+    my ($cdom,$cnum,$then,$now,$checkrole) = @_;
+    my $cckey = 'user.role.'.$checkrole.'./'.$cdom.'/'.$cnum; 
     if ($env{$cckey}) {
         my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend,$tfont);
         &role_status($cckey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
         unless (($tstatus eq 'is') || ($tstatus eq 'will_not')) {
-            &set_privileges($cdom,$cnum);
+            &set_privileges($cdom,$cnum,$checkrole);
         }
     } else {
-        &set_privileges($cdom,$cnum);
+        &set_privileges($cdom,$cnum,$checkrole);
     }
 }
 
@@ -930,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) {
@@ -945,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) {
@@ -1005,6 +1049,19 @@ sub allcourses_row {
     my $ccrole = &Apache::lonnet::plaintext('cc');
     $output.= '<span class="LC_rolesinfo">'.
             &mt('[_1]: [_2] from domain [_3]',$ccrole,$selectlink,$dcdom).
+            '</span><br /></tr>'."\n";
+    return $output;
+}
+
+sub allcoauthors_row {
+    my ($dcdom,$rowtype) = @_;
+    my $output = '<tr bgcolor="#77FF77">'.
+                 ' <td colspan="5">';
+    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').'" />';
+    $output.= '<span class="LC_rolesinfo">'.
+            &mt('[_1]: [_2] in domain [_3] [_4]',$carole,$inputlink,$dcdom,$gobutton).
             '</span><br /></tr><tr><td colspan="5" height="3"></td></tr>'."\n";
     return $output;
 }
@@ -1015,9 +1072,9 @@ sub recent_filename {
 }
 
 sub set_privileges {
-    my ($dcdom,$pickedcourse) = @_;
+# role can be cc or ca
+    my ($dcdom,$pickedcourse,$role) = @_;
     my $area = '/'.$dcdom.'/'.$pickedcourse;
-    my $role = 'cc';
     my $spec = $role.'.'.$area;
     my %userroles = &Apache::lonnet::set_arearole($role,$area,'','',
 						  $env{'user.domain'},
@@ -1026,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'},