--- loncom/interface/loncoursequeueadmin.pm	2020/01/13 17:19:09	1.52.2.3.2.1
+++ loncom/interface/loncoursequeueadmin.pm	2017/08/03 16:11:46	1.57
@@ -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.3.2.1 2020/01/13 17:19:09 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.57 2017/08/03 16:11:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -506,7 +506,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') || ($context eq 'displaypending') || ($context eq 'helpdesk')) { 
         $output .= '<th>'.&mt('Action').'</th>';
     }
     $output .= '<th>'.&mt('Requestor').'</th>';
@@ -528,6 +528,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>'.
@@ -609,7 +610,7 @@ sub build_queue_display {
                 } elsif ($context eq 'requestusername') {
                     $row .= '<td>'.$showtime.'</td>'."\n".
                             '<td>'.$detailslink.'</td>'."\n";
-                } else {
+                } else { 
                     if ($context eq 'pending' || $context eq 'displaypending' || $context eq 'stillpending') {
                         $row .= '<td>'.$instcode.'</td>'."\n";
                     } else {
@@ -879,10 +880,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 +894,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 +922,8 @@ sub update_request_queue {
                     } else {
                         push(@processing_errors,$uname);
                     }
+                } else {
+                    push(@processing_errors,$uname);
                 }
             } else {
                 push(@invalidusers,$uname);
@@ -1682,6 +1664,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'}) {