--- loncom/interface/loncoursequeueadmin.pm	2009/09/04 23:01:58	1.8
+++ loncom/interface/loncoursequeueadmin.pm	2009/12/07 04:48:04	1.12.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Utilities to administer domain course requests and course self-enroll requests 
 #
-# $Id: loncoursequeueadmin.pm,v 1.8 2009/09/04 23:01:58 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.12.2.2 2009/12/07 04:48:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,22 +67,22 @@ use LONCAPA;
 
 sub send_selfserve_notification {
     my ($notifylist,$textstr,$cid,$contextdesc,$timestamp,$context,$sender,
-        $approvedlist,$rejectedlist) = @_;
+        $approvedlist,$rejectedlist,$crstype) = @_;
 # FIXME locallocaltime needs to be able to take $sender_lh as an argument
 #       so this can be localized to the recipients date display format/time zone
     $timestamp =&Apache::lonlocal::locallocaltime($timestamp);
     my $msgcc;
-    my ($rawsubj,@rawmsg,$subject,$message,$reviewer);
+    my ($rawsubj,@rawmsg,$subject,$message,$reviewer,$msgtxt);
     if ($context eq 'coursemanagers') {
         $rawsubj = 'Self-enrollment requests processed';
         push(@rawmsg,{
-                      mt => 'Enrollment requests in the following course: [_1]have been processed.',
+                      mt => 'Enrollment requests in the following course: [_1] have been processed.',
                       args => ["\n  $contextdesc"],
                      });
     } elsif ($context eq 'domainmanagers') {
-        $rawsubj = 'Course requests reviewed';
+        $rawsubj = 'Course/Community requests reviewed';
         push(@rawmsg,{
-                      mt  => 'Course creation requests in the following domain: [_1]have been reviewed.',
+                      mt  => 'Course/Community creation requests in the following domain: [_1] have been reviewed.',
                       args => ["\n  $contextdesc"],
                      });
         if (ref($textstr) eq 'ARRAY') {
@@ -90,8 +90,13 @@ sub send_selfserve_notification {
         }
     } elsif ($context eq 'enroller') {
         $rawsubj = 'Enrollment request';
+        if ($crstype eq 'community') {
+            $msgtxt = 'Your request for enrollment in the following community: [_1]requested on [_2]has been reviewed by a Coordinator.'
+        } else {
+            $msgtxt = 'Your request for enrollment in the following course: [_1]requested on [_2]has been reviewed by a Course Coordinator.';
+        } 
         push(@rawmsg,{
-                      mt  => 'Your request for enrollment in the following course: [_1]requested on [_2]has been reviewed by a Course Coordinator.',
+                      mt  => $msgtxt,
                       args => ["\n  ".$contextdesc.",\n",$timestamp.",\n"],
 
                      });
@@ -99,9 +104,15 @@ sub send_selfserve_notification {
             push(@rawmsg,@{$textstr});
         }
     } elsif ($context eq 'courserequestor') {
-        $rawsubj = 'Course request';
+        if ($crstype eq 'Community') {
+            $rawsubj = 'Community request';
+            $msgtxt = 'Your request for creation of the following community: [_1]requested on [_2]has been reviewed by a Domain Coordinator.';
+        } else {
+            $rawsubj = 'Course request';
+            $msgtxt = 'Your request for creation of the following course: [_1]requested on [_2]has been reviewed by a Domain Coordinator.';
+        }
         push(@rawmsg,{
-                      mt  => 'Your request for creation of the following course: [_1]requested on [_2]has been reviewed by a Domain Coordinator.',
+                      mt  => $msgtxt,
                       args => ["\n".$contextdesc.",\n",$timestamp.",\n"],
 
                      });
@@ -109,35 +120,44 @@ sub send_selfserve_notification {
             push(@rawmsg,@{$textstr});
         }
     } elsif ($context eq 'coursereq') {
-        $rawsubj = 'Course request to review', 
+        if ($crstype eq 'community') {
+            $rawsubj = 'Community request to review';
+            $msgtxt = 'Creation of the following community: [_1]was requested by [_2] on [_3].';
+        } else {
+            $rawsubj = 'Course request to review';
+            $msgtxt = 'Creation of the following course: [_1]was requested by [_2] on [_3].';
+        }
         push(@rawmsg,{
-                      mt  => 'Creation of the following course: [_1]was requested by [_2] on [_3].',
+                      mt  => $msgtxt,
                       args => ["\n  $contextdesc\n",$textstr,$timestamp],
                      },
                      {
-                      mt =>'[_1]As Domain Coordinator, use: [_2]Main Menu -> Create a new course -> Approve or reject course requests[_3]to display a list of pending requests, which you can either approve or reject.',
+                      mt =>'[_1]As Domain Coordinator, use: [_2]Main Menu -> Course and community creation -> Approve or reject requests[_3]to display a list of pending requests, which you can either approve or reject.',
                       args => ["\n","\n\n  ","\n\n"],
                      });
     } elsif ($context eq 'selfenrollreq') {
         $rawsubj = 'Self-enrollment request';
+        if ($crstype eq 'community') {
+            $msgtxt = 'Enrollment in the following community: [_1] was requested by [_2] on [_3].'
+        } else {
+            $msgtxt = 'Enrollment in the following course: [_1] was requested by [_2] on [_3].'
+        }
         push(@rawmsg,{
-                      mt  => 'Enrollment in the following course: [_1] was requested by [_2] on [_3].',
+                      mt  => $msgtxt,
                       args => ["\n  $contextdesc\n",$textstr,$timestamp."\n"],
                      });
-        if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
-            push(@rawmsg,
-                     {
-                      mt =>'As Coordinator, use: [_1]Main Menu -> Manage Course Users -> Enrollment Requests[_2]to display a list of pending enrollment requests, which you can either approve or reject.',
-                      args => ["  \n\n","\n"],
-                     });
+        my $directions;  
+        if ($crstype eq 'community') {
+            $directions = 'As Coordinator, use: [_1]Main Menu -> Manage Community Users -> Enrollment Requests[_2]to display a list of pending enrollment requests, which you can either approve or reject.';
         } else {
-            push(@rawmsg,
+            $directions = 'As Course Coordinator, use: [_1]Main Menu -> Manage Course Users -> Enrollment Requests[_2]to display a list of pending enrollment requests, which you can either approve or reject.';
+        }
+        push(@rawmsg,
                      {
-                      mt =>'As Course Coordinator, use: [_1]Main Menu -> Manage Course Users -> Enrollment Requests[_2]to display a list of pending enrollment requests, which you can either approve or reject.',
+                      mt   => $directions,
                       args => ["  \n\n","\n"],
                      });
 
-        }
     }
     my @to_notify = split(/,/,$notifylist);
     my $numsent = 0;
@@ -188,7 +208,7 @@ sub send_selfserve_notification {
                                                        @{$item->{args}})."\n";
             }
         }
-        if ($context eq 'managers') {
+        if ($context eq 'coursemanagers') {
             if ($approvedlist) {
                 $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Approved enrollments:')."\n".$approvedlist;
             }
@@ -235,12 +255,12 @@ sub display_queued_requests {
         if ($context eq 'course') {
             $output .= '<th>'.&mt('Section').'</th>'.
                        '<th>'.&mt('Date requested').'</th>';
+        } else {
             %crstypes = &Apache::lonlocal::texthash (
                             official   => 'Official course',
                             unofficial => 'Unofficial course',
                             community  => 'Community',
                         );
-        } else {
             $output .= '<th>'.&mt('Type').'</th>'.
                        '<th>'.&mt('Date requested').'</th>'.
                        '<th>'.&mt('Details').'</th>';
@@ -332,7 +352,7 @@ sub display_queued_requests {
         if ($context eq 'course') {
             $output .= &mt('There are currently no enrollment requests.');
         } else {
-            $output .= &mt('There are currently no course requests awaiting approval.');
+            $output .= &mt('There are currently no course or community requests awaiting approval.');
         }
     }
     return $output;
@@ -346,7 +366,8 @@ sub update_request_queue {
         @existing,@missingreq,@invalidusers,@limitexceeded,@completed,
         @processing_errors,@warn_approves,@warn_rejects,@approvals,
         @rejections,@rejectionerrors,@nopermissions,%courseroles,
-        %communityroles,%domdefs);
+        %communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype,
+        @warn_coursereqs);
     @approvals = &Apache::loncommon::get_env_multiple('form.approvereq');
     @rejections = &Apache::loncommon::get_env_multiple('form.rejectreq');
     $now = time;
@@ -355,6 +376,7 @@ sub update_request_queue {
         $namespace = 'selfenrollrequests';
         $beneficiary = 'enroller';
         $cid = $env{'request.course.id'};
+        $crstype = lc(&Apache::loncommon::course_type());
         my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
         $hostname = &Apache::lonnet::hostname($chome);
         $protocol = $Apache::lonnet::protocol{$chome};
@@ -391,16 +413,33 @@ sub update_request_queue {
                 $notifylist = $domconfig{'requestcourses'}{'notify'}{'approval'};
             }
         }
-        $approvedmsg = [{
+        $approvalmsg{'course'} = 
+                        [{
                             mt => 'Your course request has been approved.',
                         },
                         {
                             mt   => 'Visit [_1], to log-in and access the course',
                             args => [$protocol.'://'.$hostname],
                         }];
-        $rejectedmsg =  [{
+        $rejectionmsg{'course'} =
+                        [{
                             mt => 'Your course request has not been approved.',
                         }];
+
+        $approvalmsg{'community'} = 
+                        [{
+                            mt => 'Your community request has been approved.',
+                        },
+                        {
+                            mt   => 'Visit [_1], to log-in and access the community',
+                            args => [$protocol.'://'.$hostname],
+                        }];
+
+        $rejectionmsg{'community'} = 
+                        [{
+                            mt => 'Your community request has not been approved.',
+                        }];
+
         %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
         my @roles = &Apache::lonuserutils::roles_by_context('course');
         foreach my $role (@roles) {
@@ -417,7 +456,10 @@ sub update_request_queue {
             my $uhome = &Apache::lonnet::homeserver($uname,$udom);
             if ($uhome ne 'no_host') {
                 if (exists($requesthash{$uname.':'.$udom})) {
-
+                    if ($cdom eq 'gci' && $cnum eq '9615072b469884921gcil1') {
+                        my $enresult = &enable_gci_submission($uname,$udom,
+                                                   $access_start,$access_end);
+                    }
                     if (exists($classlist->{$uname.':'.$udom})) {
                         if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') {
                             if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') ||
@@ -450,7 +492,7 @@ sub update_request_queue {
                         $stucounts->{'allstudents'} ++;
                         $stucounts->{'selfenrolled'} ++;
                         &send_selfserve_notification($uname.':'.$udom,$approvedmsg,
-                                       $cid,$coursedesc,$now,$beneficiary,$sender);
+                                       $cid,$coursedesc,$now,$beneficiary,$sender,undef,undef,$crstype);
                         my %userrequest = (
                             $cdom.'_'.$cnum => {
                                 timestamp   => $now,
@@ -463,6 +505,15 @@ sub update_request_queue {
                             &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
                         if ($userresult ne 'ok') {
                             push(@warn_approves,$uname.':'.$udom);
+                        } elsif ($udom eq 'gci') {
+                            my %changehash = (
+                                'reqcrsotherdom.unofficial' => 'gcitest:autolimit=',
+                            );
+                            my $reqresult = &Apache::lonnet::put('environment',\%changehash,
+                                                                 $udom,$uname);
+                            if ($reqresult ne 'ok') {
+                                push(@warn_coursereqs,$uname.':'.$udom);
+                            }
                         }
                     } else {
                         push(@processing_errors,$uname.':'.$udom);
@@ -477,7 +528,7 @@ sub update_request_queue {
                 if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
                     my $ownername = $requesthash{$cnum.'_approval'}{'ownername'};
                     my $ownerdom = $requesthash{$cnum.'_approval'}{'ownerdom'};
-                    my $crstype = $requesthash{$cnum.'_approval'}{'crstype'};
+                    $crstype = $requesthash{$cnum.'_approval'}{'crstype'};
                     my $coursedesc = $requesthash{$cnum.'_approval'}{'description'};
                     my $longroles = \%courseroles;
                     if ($crstype eq 'community') {
@@ -510,9 +561,14 @@ sub update_request_queue {
                                                       \$newusermsg,\$addresult,\$enrollcount,
                                                       \$response,\$keysmsg,\%domdefs,$longroles);
                             if ($result eq 'created') {
+                                if ($crstype eq 'community') {
+                                    $approvedmsg = $approvalmsg{'community'};
+                                } else {
+                                    $approvedmsg = $approvalmsg{'course'};
+                                }
                                 push(@completed,$cnum);
                                 &send_selfserve_notification($ownername.':'.$ownerdom,$approvedmsg,
-                                              $cid,$coursedesc,$now,$beneficiary,$sender);
+                                              $cid,$coursedesc,$now,$beneficiary,$sender,undef,undef,$crstype);
                                 my %reqhash = (
                                                 reqtime     => $history{'reqtime'},
                                                 crstype     => $history{'crstype'},
@@ -565,7 +621,7 @@ sub update_request_queue {
             if ($context eq 'course') {
                 my $user = $item;
                 &send_selfserve_notification($user,$rejectedmsg,$cid,$coursedesc,
-                                             $now,$beneficiary,$sender);
+                                             $now,$beneficiary,$sender,undef,undef,$crstype);
                 my ($uname,$udom) = split(/:/,$user);
                 my %userrequest = (
                     $cdom.'_'.$cnum => {
@@ -587,9 +643,15 @@ sub update_request_queue {
                         my $ownername = $requesthash{$cnum.'_approval'}{'ownername'};
                         my $ownerdom = $requesthash{$cnum.'_approval'}{'ownerdom'};
                         my $coursedesc = $requesthash{$cnum.'_approval'}{'description'};
+                        $crstype = $requesthash{$cnum.'_approval'}{'crstype'};
+                        if ($crstype eq 'community') {
+                            $rejectedmsg = $rejectionmsg{'community'};
+                        } else {
+                            $rejectedmsg = $rejectionmsg{'course'};
+                        }
                         &send_selfserve_notification($ownername.':'.$ownerdom,$rejectedmsg,
                                                      $cid,$coursedesc,$now,$beneficiary,
-                                                     $sender);
+                                                     $sender,undef,undef,$crstype);
                         my %history =
                             &Apache::lonnet::restore($requestkey,'courserequests',
                                                      $ownerdom,$ownername);
@@ -646,7 +708,11 @@ sub update_request_queue {
                 $chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink";
                 if (@completed) {
                     $approvedlist = join("\n",@completed);
-                    $output .= '<p>'.&mt('The following were enrolled in the course:').'<ul>';
+                    if ($crstype eq 'community') {
+                        $output .= '<p>'.&mt('The following were enrolled in the community:').'<ul>';
+                    } else {
+                        $output .= '<p>'.&mt('The following were enrolled in the course:').'<ul>';
+                    }
                     foreach my $user (@completed) {
                         my ($uname,$udom) = split(/:/,$user);
                         my $userlink =
@@ -666,13 +732,13 @@ sub update_request_queue {
                 if ($notifylist ne '') {
                     &send_selfserve_notification($notifylist,$chgmsg,$cid,$coursedesc,
                                                  $now,'coursemanagers',$sender,
-                                                 $approvedlist,$rejectedlist);
+                                                 $approvedlist,$rejectedlist,$crstype);
                 }
             } else {
-                $chgmsg = "'Action was taken on the following course requests by [_1].',$namelink";
+                $chgmsg = "'Action was taken on the following course and community requests by [_1].',$namelink";
                 if (@completed) {
                     $approvedlist = join("\n",@completed);
-                    $output .= '<p>'.&mt('The following courses were created:').'<ul>';
+                    $output .= '<p>'.&mt('The following courses/communities were created:').'<ul>';
                     foreach my $cnum (@completed) {
                         my $showcourse;
                         if (ref($requesthash{$cnum.'_approval'})) {
@@ -703,7 +769,7 @@ sub update_request_queue {
                 if ($notifylist ne '') {
                     &send_selfserve_notification($notifylist,$chgmsg,$cid,$domdesc,
                                                  $now,'domainmanagers',$sender,
-                                                 $approvedlist,$rejectedlist);
+                                                 $approvedlist,$rejectedlist,$crstype);
                 }
             }
         }
@@ -716,7 +782,7 @@ sub update_request_queue {
             }
             $output .= '</ul></p>';
         } else {
-            $output .= '<p>'.&mt('The following course creation requests were deleted because the course has already been created:').'<ul>';
+            $output .= '<p>'.&mt('The following course/community creation requests were deleted because the course or community has already been created:').'<ul>';
             foreach my $cnum (@existing) {
                 my $showcourse;
                 my %coursehash = &Apache::lonnet::coursedescription($cdom.'/'.$cnum);
@@ -738,7 +804,7 @@ sub update_request_queue {
             }
             $output .= '</ul></p>';
         } else {
-            $output .= '<p>'.&mt('The following course creation requests were ignored because the request is no longer in the course request queue:').'<ul>';
+            $output .= '<p>'.&mt('The following course/community creation requests were ignored because the request is no longer in the queue:').'<ul>';
             foreach my $cnum (@missingreq) {
                 $output .= '<li>'.$cnum.'</li>';
             }
@@ -765,7 +831,7 @@ sub update_request_queue {
         }
     }
     if (@nopermissions) {
-        $output .= '<p>'.&mt('The following course creation requests could not be processed because the course owner does hot have rights to create this type of course:').'<ul>';
+        $output .= '<p>'.&mt('The following course/community creation requests could not be processed because the owner does not have rights to create this type of course:').'<ul>';
         foreach my $cnum (@nopermissions) {
             my $showcourse;
             if (ref($requesthash{$cnum.'_approval'})) {
@@ -785,7 +851,7 @@ sub update_request_queue {
             }
             $output .= '</ul></p>';
         } else {
-            $output .= '<p>'.&mt('The following course creation requests could not be processed because an error occurred:').'<ul>';
+            $output .= '<p>'.&mt('The following course/community creation requests could not be processed because an error occurred:').'<ul>';
             foreach my $cnum (@processing_errors) {
                 my $showcourse;
                 if (ref($requesthash{$cnum.'_approval'})) {
@@ -799,7 +865,7 @@ sub update_request_queue {
         }
     }
     if (@rejectionerrors) {
-        $output .= '<p>'.&mt('The following course creation request rejections could not be fully processed because an error occurred:').'<ul>';
+        $output .= '<p>'.&mt('The following course/community creation request rejections could not be fully processed because an error occurred:').'<ul>';
         foreach my $cnum (@rejectionerrors) {
             my $showcourse;
             if (ref($requesthash{$cnum.'_approval'})) {
@@ -819,7 +885,7 @@ sub update_request_queue {
             }
             $output .= '</ul></p>';
         } else {
-            $output .= '<p>'.&mt("For the following course requests an error occurred when updating the requestor's own course requests record:").'<ul>';
+            $output .= '<p>'.&mt("For the following course/community requests an error occurred when updating the requestor's own requests record:").'<ul>';
             foreach my $cnum (@warn_approves,@warn_rejects) {
                 my $showcourse;
                 if (ref($requesthash{$cnum.'_approval'})) {
@@ -832,9 +898,33 @@ sub update_request_queue {
             $output .= '</ul></p>';
         }
     }
+    if (@warn_coursereqs) {
+        $output .= '<p>'..&mt("For the following users, an error occurred when setting rights to request creation of Concept Test courses:").'<ul>';
+            foreach my $user (@warn_coursereqs) {
+                $output .= '<li>'.$user.'</li>';
+            }
+            $output .= '</ul></p>';
+    }
     return $output;
 }
 
+sub enable_gci_submission {
+    my ($udom,$uname,$access_end,$access_start) = @_;
+    my $cdom = 'gci';
+    my $cnum = '1H96711d710194bfegcil1';
+    my ($stucounts,$idx,$classlist) = &get_student_counts($cdom,$cnum);
+    if (exists($classlist->{$uname.':'.$udom})) {
+        if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') {
+            if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') ||
+                ($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Future')) {
+                return;
+            }
+        }
+    }
+    return
+        &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$access_end,$access_start,'selfenroll',undef,$cdom.'_'.$cnum,1);
+}
+
 sub get_student_counts {
     my ($cdom,$cnum) = @_;
     my (%idx,%stucounts);
@@ -869,10 +959,6 @@ sub course_creation {
         $ownername = $env{'user.name'};
         $ownerdom  = $env{'user.domain'};
     }
-    my $type = 'Course';
-    if ($crstype eq 'community') {
-        $type = 'Community';
-    }
     my $owneremail;
     my %emails = &Apache::loncommon::getemails($ownername,$ownerdom);
     foreach my $email ('permanentemail','critnotification','notification') {
@@ -954,11 +1040,15 @@ sub build_batchcreatehash {
 }
 
 sub can_clone_course {
-    my ($uname,$udom,$clonecrs,$clonedom) = @_;
+    my ($uname,$udom,$clonecrs,$clonedom,$crstype) = @_;
     my $canclone;
+    my $ccrole = 'cc';
+    if ($crstype eq 'community') {
+        $ccrole = 'co';
+    }
     my %roleshash = &Apache::lonnet::get_my_roles($uname,$udom,'userroles',['active'],
-                                                  ['cc'],[$clonedom]);
-    if (exists($roleshash{$clonedom.':'.$clonecrs.':cc'})) {
+                                                  [$ccrole],[$clonedom]);
+    if (exists($roleshash{$clonecrs.':'.$clonedom.':'.$ccrole})) {
         $canclone = 1;
     } else {
         my %courseenv = &Apache::lonnet::userenvironment($clonedom,$clonecrs,('cloners'));