--- loncom/interface/loncoursequeueadmin.pm	2021/12/09 18:14:44	1.52.2.5
+++ loncom/interface/loncoursequeueadmin.pm	2016/04/04 01:09:48	1.53
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Utilities to administer domain course requests and course self-enroll requests
 #
-# $Id: loncoursequeueadmin.pm,v 1.52.2.5 2021/12/09 18:14:44 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.53 2016/04/04 01:09:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -105,13 +105,13 @@ sub send_selfserve_notification {
         $rawsubj = 'Self-enrollment requests processed';
         push(@rawmsg,{
                       mt => 'Enrollment requests in the following course: [_1] have been processed.',
-                      args => ["\n$contextdesc\n"],
+                      args => ["\n$contextdesc"],
                      });
     } elsif ($context eq 'domainmanagers') {
         $rawsubj = 'Course/Community requests reviewed';
         push(@rawmsg,{
-                      mt  => 'Course/Community creation requests in the following domain: [_1] have been reviewed.',
-                      args => ["\n$contextdesc\n"],
+                      mt  => 'Course/Community creation requests in the following domain: "[_1]" have been reviewed.',
+                      args => ["\n$contextdesc"],
                      });
         if (ref($textstr) eq 'ARRAY') {
             push(@rawmsg,@{$textstr});
@@ -119,8 +119,8 @@ sub send_selfserve_notification {
     } elsif ($context eq 'authormanagers') {
         $rawsubj = 'Authoring Space requests reviewed';
         push(@rawmsg,{
-                      mt  => 'Authoring requests in the following domain: [_1] have been reviewed.',
-                      args => ["\n$contextdesc\n"],
+                      mt  => 'Authoring requests in the following domain: "[_1]" have been reviewed.',
+                      args => ["\n$contextdesc"],
                      });
         if (ref($textstr) eq 'ARRAY') {
             push(@rawmsg,@{$textstr});
@@ -128,8 +128,8 @@ sub send_selfserve_notification {
     } elsif ($context eq 'usernamemanagers') {
         $rawsubj = 'LON-CAPA account requests reviewed';
         push(@rawmsg,{
-                      mt  => 'Account requests in the following domain: [_1] have been reviewed.',
-                      args => ["\n$contextdesc\n"],
+                      mt  => 'Account requests in the following domain: "[_1]" have been reviewed.',
+                      args => ["\n$contextdesc"],
                      });
         if (ref($textstr) eq 'ARRAY') {
             push(@rawmsg,@{$textstr});
@@ -396,8 +396,6 @@ sub display_queued_requests {
         if ($context eq 'pending') {
             $disposition = 'pending';
             $nextphase = 'requestvalidation';
-        } elsif ($context eq 'displaypending') {
-            $disposition = 'pending';
         }
         %requesthash = &Apache::lonnet::dump_dom($namespace,$dom,'_'.$disposition);
         $nextelement = '<input type="hidden" name="phase" value="'.$nextphase.'" />';
@@ -424,7 +422,7 @@ sub display_queued_requests {
                     my ($cnum,$disposition) = split('_',$item);
                     $entry = $cnum.':'.$requesthash{$item}{'ownername'}.':'.
                              $requesthash{$item}{'ownerdom'}.':';
-                    if (($context eq 'pending') || ($context eq 'displaypending')) {
+                    if ($context eq 'pending') {
                         $entry .= $requesthash{$item}{'instcode'};
                     } else {
                         $entry .= $requesthash{$item}{'crstype'};
@@ -443,12 +441,10 @@ sub display_queued_requests {
         if (keys(%queue_by_date) > 0) {
             if ($context eq 'course') {
                 $output .=  '<h3>'.&mt('Self-enrollment requests queued pending approval by a Coordinator').'</h3>';
-            } elsif (($context eq 'pending') || ($context eq 'displaypending')) {
+            } elsif ($context eq 'pending') {
                 $output .= '<h3>'.&mt('Requests for official courses queued pending validation').'</h3>'.
                            '<p>'.&mt('Requests are validated against institutional data to confirm that the requestor is an instructor of record.').'<br />'.
-                           &mt('Validation is attempted when the request is submitted.').' '.
-                           &mt('If unvalidated, the request will be held in a queue.').' '.
-                           &mt('Validation of pending requests is automatically repeated daily.').'</p>';
+                           &mt('Validation is attempted when the request is submitted.').' '.&mt('If unvalidated, the request will be held in a queue.').' '.&mt('Validation of pending requests is automatically repeated daily.').'</p>';
             } elsif ($context eq 'requestauthor') {
                 $output .= '<h3>'.&mt('Requests for Authoring Space queued pending approval by a Domain Coordinator').'</h3>';
             } elsif ($context eq 'requestusername') {
@@ -476,9 +472,8 @@ sub display_queued_requests {
         if ($context eq 'pending') {
             $output .= '<br /><input type="submit" name="validationcheck" value="'.
                        &mt('Validate').'" /><br />'."\n".
-                       '<p>'.&mt('Any course/community requests which are successfully validated will be created immediately.').' '.
-                             &mt('Unvalidated requests will be listed for manual approval/rejection.').'</p>';
-        } elsif (($context ne 'helpdesk') && ($context ne 'displaypending')) {
+                       '<p>'.&mt('Any course/community requests which are successfully validated will be created immediately.').' '.&mt('Unvalidated requests will be listed for manual approval/rejection.').'</p>';
+        } else {
             $output .= '<br /><input type="submit" name="processqueue" value="'.&mt('Save').'" />';
         }
         $output .= '</form>';
@@ -486,7 +481,7 @@ sub display_queued_requests {
         $output .= '<div class="LC_info">';
         if ($context eq 'course') {
             $output .= &mt('There are currently no enrollment requests awaiting approval.');
-        } elsif (($context eq 'pending') || ($context eq 'displaypending')) {
+        } elsif ($context eq 'pending') {
             $output .= &mt('There are currently no requests for official courses awaiting validation.');
         } elsif ($context eq 'requestauthor') {
             $output .= &mt('There are currently no requests for Authoring Space awaiting approval.');
@@ -506,7 +501,7 @@ sub build_queue_display {
     my %crstypes;
     my $output =  &Apache::loncommon::start_data_table().
                   &Apache::loncommon::start_data_table_header_row();
-    unless (($context eq 'pending') || ($context eq 'displaypending') || ($context eq 'helpdesk')) {
+    unless ($context eq 'pending') { 
         $output .= '<th>'.&mt('Action').'</th>';
     }
     $output .= '<th>'.&mt('Requestor').'</th>';
@@ -518,7 +513,7 @@ sub build_queue_display {
     } elsif ($context eq 'requestusername') {
         $output .= '<th>'.&mt('Date requested').'</th>'.
                    '<th>'.&mt('Details').'</th>';
-    } elsif ($context eq 'pending' || $context eq 'displaypending' || $context eq 'stillpending') {
+    } elsif ($context eq 'pending' || $context eq 'stillpending') {
         $output .= '<th>'.&mt('Institutional code').'</th>'.
                    '<th>'.&mt('Date requested').'</th>'.
                    '<th>'.&mt('Details').'</th>';
@@ -528,6 +523,7 @@ sub build_queue_display {
                         unofficial => 'Unofficial course',
                         community  => 'Community',
                         textbook   => 'Textbook course',
+                        placement  => 'Placement test',
                     );
         $output .= '<th>'.&mt('Type').'</th>'.
                    '<th>'.&mt('Date requested').'</th>'.
@@ -573,7 +569,7 @@ sub build_queue_display {
                 } else {
                     my ($cnum,$ownername,$ownerdom,$type,$cdesc);
                     my $queued = 'approval'; 
-                    if ($context eq 'pending' || $context eq 'displaypending' || $context eq 'stillpending') {
+                    if ($context eq 'pending' || $context eq 'stillpending') {
                         ($cnum,$ownername,$ownerdom,$instcode,$cdesc)=split(/:/,$request,5);
                         $queued = 'pending';                        
                     } else {
@@ -591,7 +587,7 @@ sub build_queue_display {
                                 &Apache::loncommon::plainname($ownername,$ownerdom),
                                 $ownername,$ownerdom);
                 }
-                unless (($context eq 'pending') || ($context eq 'displaypending') || ($context eq 'helpdesk')) {
+                unless ($context eq 'pending') {
                     $row = '<td><span class="LC_nobreak"><label>'.
                            '<input type="radio" value="'.$approve.'" name="'.$count.'radioreq" />'.&mt('Approve').'</label>'.
                            '<label>'.('&nbsp;'x2).
@@ -609,8 +605,8 @@ sub build_queue_display {
                 } elsif ($context eq 'requestusername') {
                     $row .= '<td>'.$showtime.'</td>'."\n".
                             '<td>'.$detailslink.'</td>'."\n";
-                } else {
-                    if ($context eq 'pending' || $context eq 'displaypending' || $context eq 'stillpending') {
+                } else { 
+                    if ($context eq 'pending' || $context eq 'stillpending') {
                         $row .= '<td>'.$instcode.'</td>'."\n";
                     } else {
                         $row .= '<td>'.$crstype.'</td>'."\n";
@@ -879,10 +875,10 @@ sub update_request_queue {
             my $dbname = 'nohist_requestedusernames';
             my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom);
             my %curr = &Apache::lonnet::get($dbname,[$uname],$cdom,$domconfiguser);
-
+            
             if (ref($curr{$uname}) eq 'HASH') {
-                my ($logtoken,$serverid,$encpass,$courseid,$id,$firstname,
-                    $middlename,$lastname,$generation,$inststatus,$email);
+                my ($username,$logtoken,$serverid,$encpass,$courseid,$id,$firstname,
+                    $middlename,$lastname,$generation,$inststatus);
                 $curr{$uname}{'timestamp'} = $now;
                 $curr{$uname}{'adjudicator'} = $env{'user.name'}.':'.$env{'user.domain'};
                 $courseid   = $curr{$uname}{'courseid'};
@@ -893,35 +889,14 @@ sub update_request_queue {
                 $generation = $curr{$uname}{'generation'};
                 $inststatus = $curr{$uname}{'inststatus'};
 
-                if ($curr{$uname}{'email'} ne '') {
-                    $email = $curr{$uname}{'email'};
-                } elsif ($uname =~ /^[^\@]+\@[^\@]+$/) {
-                    $email = $uname;
-                }
-
-                my $upass;
-                if ($curr{$uname}{'tmpinfo'}) {
-                    my ($key,$caller)=split(/&/,$curr{$uname}{'tmpinfo'});
-                    if ($caller eq 'createaccount') {
-                        if ($curr{$uname}{'upass'} eq '') {
-                            $upass = $curr{$uname}{'upass'};
-                        } else {
-                            $upass = &Apache::loncommon::des_decrypt($key,$curr{$uname}{'upass'});
-                        }
-                    } else {
-                        push(@processing_errors,$uname);
-                    }
-                } else {
-                    $upass = $curr{$uname}{'upass'};
-                }
-                if ($upass eq '') {
-                    push(@processing_errors,$uname);
-                } else {
+                my ($key,$caller)=split(/&/,$curr{$uname}{'tmpinfo'});
+                if ($caller eq 'createaccount') {
+                    my $upass = &Apache::loncommon::des_decrypt($key,$curr{$uname}{'upass'});
                     undef($curr{$uname}{'upass'});
                     my $result =
                         &Apache::lonnet::modifyuser($cdom,$uname,$id,'internal',$upass,
                                                     $firstname,$middlename,$lastname,
-                                                    $generation,undef,undef,$email);
+                                                    $generation,undef,undef,$uname);
                     if ($result eq 'ok') {
                         $curr{$uname}{'status'} = 'created';
                         push(@completed,$uname); 
@@ -942,6 +917,8 @@ sub update_request_queue {
                     } else {
                         push(@processing_errors,$uname);
                     }
+                } else {
+                    push(@processing_errors,$uname);
                 }
             } else {
                 push(@invalidusers,$uname);
@@ -1656,7 +1633,7 @@ sub course_creation {
         $owneremail = $emails{$email};
         last if ($owneremail ne '');
     }
-    my %reqdetails = &build_batchcreatehash($dom,$cnum,$context,$details,$owneremail,$domdefs);
+    my %reqdetails = &build_batchcreatehash($dom,$context,$details,$owneremail,$domdefs);
     my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'requestcourses',
                   \%reqdetails,$longroles,$logmsg,$newusermsg,$addresult,
                   $enrollcount,$output,$keysmsg,$ownerdom,$ownername,$cnum,$crstype,$coderef);
@@ -1677,30 +1654,15 @@ sub course_creation {
 }
 
 sub build_batchcreatehash {
-    my ($dom,$cnum,$context,$details,$owneremail,$domdefs) = @_;
+    my ($dom,$context,$details,$owneremail,$domdefs) = @_;
     my %batchhash;
-    my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections users uniquecode};
+    my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users uniquecode};
     if ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH')) {
         my $emailenc = &escape($owneremail);
         my $owner = $details->{'owner'}.':'.$details->{'domain'};
         foreach my $item (@items) {
             $batchhash{$item} = $details->{$item};
         }
-        if (ref($details->{'crosslists'}) eq 'HASH') {
-            foreach my $key (keys(%{$details->{'crosslists'}})) {
-                if (ref($details->{'crosslists'}->{$key}) eq 'HASH') {
-                    my $instsec = $details->{crosslists}->{$key}->{instsec};
-                    $batchhash{'crosslists'}{$key}{'inst'} = $details->{crosslists}->{$key}->{instcode};
-                    my $crskey = $cnum.':'.$batchhash{'crosslists'}{$key}{'inst'};
-                    my %formatted = &Apache::lonnet::auto_instsec_reformat($dom,'clutter',
-                                                                           {$crskey => [$instsec]});
-                    if (ref($formatted{$crskey}) eq 'ARRAY') {
-                        $batchhash{'crosslists'}{$key}{'inst'} .= $formatted{$crskey}->[0];
-                    }
-                    $batchhash{'crosslists'}{$key}{'loncapa'} = $details->{crosslists}->{$key}->{loncapa};
-                }
-            }
-        }
         $batchhash{'title'} = $details->{'cdescr'};
         $batchhash{'coursecode'} = $details->{'instcode'};
         if ($domdefs->{'officialcredits'} || $domdefs->{'unofficialcredits'}) {
@@ -1713,6 +1675,8 @@ sub build_batchcreatehash {
         $batchhash{'authparam'} = $domdefs->{'auth_arg_def'};
         if ($details->{'crstype'} eq 'community') {
             $batchhash{'crstype'} = 'Community';
+        } elsif ($details->{'crstype'} eq 'placement') {
+            $batchhash{'crstype'} = 'Placement';
         } else {
             if ($details->{'crstype'} eq 'textbook') {
                 if ($details->{'clonecrs'} && $details->{'clonedom'}) {
@@ -1758,7 +1722,6 @@ sub build_batchcreatehash {
         $batchhash{'users'}{$owner}{lastname} = $owner_lastname;
         $batchhash{'users'}{$owner}{emailenc} = $emailenc;
         $batchhash{'users'}{$owner}{owneremail} = $owneremail;
-        $batchhash{'setcomment'} = 1;
     }
     return %batchhash;
 }