--- loncom/interface/loncoursequeueadmin.pm	2013/07/24 18:21:39	1.36
+++ loncom/interface/loncoursequeueadmin.pm	2015/06/04 18:57:54	1.52
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Utilities to administer domain course requests and course self-enroll requests
 #
-# $Id: loncoursequeueadmin.pm,v 1.36 2013/07/24 18:21:39 bisitz Exp $
+# $Id: loncoursequeueadmin.pm,v 1.52 2015/06/04 18:57:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -90,6 +90,7 @@ use Apache::loncommon;
 use Apache::lonmsg;
 use Apache::lonlocal;
 use Apache::lonuserutils;
+use LONCAPA::batchcreatecourse;
 use LONCAPA qw(:DEFAULT :match);
 
 sub send_selfserve_notification {
@@ -116,7 +117,7 @@ sub send_selfserve_notification {
             push(@rawmsg,@{$textstr});
         }
     } elsif ($context eq 'authormanagers') {
-        $rawsubj = 'Authoring space requests reviewed';
+        $rawsubj = 'Authoring Space requests reviewed';
         push(@rawmsg,{
                       mt  => 'Authoring requests in the following domain: "[_1]" have been reviewed.',
                       args => ["\n$contextdesc"],
@@ -124,6 +125,15 @@ sub send_selfserve_notification {
         if (ref($textstr) eq 'ARRAY') {
             push(@rawmsg,@{$textstr});
         }
+    } 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"],
+                     });
+        if (ref($textstr) eq 'ARRAY') {
+            push(@rawmsg,@{$textstr});
+        }
     } elsif ($context eq 'enroller') {
         $rawsubj = 'Enrollment request';
         if ($crstype eq 'community') {
@@ -203,20 +213,19 @@ sub send_selfserve_notification {
                       args => ["  \n\n","\n"],
                      });
     } elsif ($context eq 'authorreq') {
-        $rawsubj = 'Authoring space request to review';
+        $rawsubj = 'Authoring Space request to review';
         $msgtxt = 'Assignment of an author role in the [_1] domain[_2]was requested by [_3] on [_4].';
         push(@rawmsg,{
                       mt  => $msgtxt,
                       args => [$contextdesc,"\n",$textstr,$timestamp],
                      },
                      {
-                      mt =>'[_1]As Domain Coordinator, use: [_2]Main Menu -> Create users or modify the roles and privileges of users -> Authoring space reqests[_3]to display a list of pending requests, which you can either approve or reject.',
+                      mt =>'[_1]As Domain Coordinator, use: [_2]Main Menu -> Create users or modify the roles and privileges of users -> Authoring Space 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 'requestauthor') {
-        $rawsubj = 'Authoring space request';
-        $msgtxt = 'Your request for an authoring space requested on [_1]has been reviewed by a Domain Coordinator.';
+        $rawsubj = 'Authoring Space request';
+        $msgtxt = 'Your request for an Authoring Space requested on [_1]has been reviewed by a Domain Coordinator.';
         push(@rawmsg,{
                       mt  => $msgtxt,
                       args => [$timestamp."\n"],
@@ -224,6 +233,43 @@ sub send_selfserve_notification {
         if (ref($textstr) eq 'ARRAY') {
             push(@rawmsg,@{$textstr});
         }
+    } elsif ($context eq 'usernamereq') {
+        $rawsubj = 'LON-CAPA account request';
+        $msgtxt = 'Creation of a LON-CAPA account in the [_1] domain[_2]was requested by [_3] on [_4].';
+        push(@rawmsg,{
+                      mt  => $msgtxt,
+                      args => [$contextdesc,"\n",$textstr,$timestamp],
+                     },
+                     {
+                      mt =>'[_1]As Domain Coordinator, use: [_2]Main Menu -> Create users or modify the roles and privileges of users
+ -> LON-CAPA account 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 'requestusername') {
+        $rawsubj = 'LON-CAPA account request';
+        $msgtxt = 'Your request for a LON-CAPA account requested on [_1]has been reviewed by a Domain Coordinator.';
+        push(@rawmsg,{
+                      mt  => $msgtxt,
+                      args => [$timestamp."\n"],
+                     });
+        if (ref($textstr) eq 'ARRAY') {
+            push(@rawmsg,@{$textstr});
+        }
+    } elsif ($context eq 'uniquecode') {
+        $rawsubj = 'Course Identifier';
+        if (ref($textstr) eq 'ARRAY') {
+            push(@rawmsg,@{$textstr});
+        }
+    } elsif ($context eq 'queuedcrsreq') {
+        $rawsubj = 'Course Request Queued';
+        if (ref($textstr) eq 'ARRAY') {
+            push(@rawmsg,@{$textstr});
+        }
+    } elsif ($context eq 'createdcrsreq') {
+        $rawsubj = 'Course Creation Information';
+        if (ref($textstr) eq 'ARRAY') {
+            push(@rawmsg,@{$textstr});
+        }
     }
     my @to_notify = split(/,/,$notifylist);
     my $numsent = 0;
@@ -241,9 +287,14 @@ sub send_selfserve_notification {
     my %reciphash = (
                      cc => $msgcc,
     );
-    my ($uname,$udom);
+    my ($uname,$udom,$need_temp_env);
     if ($sender =~ /:/) {
         ($uname,$udom) = split(/:/,$sender);
+        if ($context eq 'usernamereq') {
+            unless ($env{'user.name'} && $env{'user.domain'}) {
+                $need_temp_env = 1;
+            }
+        }
     } elsif ($context eq 'course') {
         $uname = $sender;
         my %courseinfo = &Apache::lonnet::coursedescription($cid);
@@ -260,9 +311,14 @@ sub send_selfserve_notification {
             $message .= &Apache::lonlocal::mt_user($sender_lh,$item->{mt},@{$item->{args}})."\n";
         }
     }
-    &Apache::lonmsg::process_sent_mail($subject,'',$numsent,$stamp,$uname,$udom,$msgcount,$cid,$$,$message,\@recusers,\@recudoms,undef,undef,undef,undef,$senderuname,$senderudom);
+    &Apache::lonmsg::process_sent_mail($subject,'',$numsent,$stamp,$uname,$udom,$msgcount,$cid,$$,$message,
+                                       \@recusers,\@recudoms,undef,undef,undef,undef,$senderuname,$senderudom);
     my ($recipid,$recipstatus) = &Apache::lonmsg::store_recipients($subject,$uname,$udom,\%reciphash);
     my $status;
+    if ($need_temp_env) {
+        $env{'user.name'} = $uname;
+        $env{'user.domain'} = $udom;
+    }
     foreach my $recip (sort(keys(%{$msgcc}))) {
         my ($ccname,$ccdom) = split(/:/,$recip);
         my $recip_lh = &Apache::loncommon::user_lang($ccname,$ccdom,$cid);
@@ -295,10 +351,22 @@ sub send_selfserve_notification {
             if ($rejectedlist) {
                 $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Rejected author role requests:')."\n".$rejectedlist;
             }
+        } elsif ($context eq 'usernamemanagers') {
+            if ($approvedlist) {
+                $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Approved LON-CAPA account requests:')."\n".$approvedlist;
+            }
+            if ($rejectedlist) {
+                $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Rejected LON-CAPA account requests:')."\n".$rejectedlist;
+            }
         }
-        $status .= &Apache::lonmsg::user_normal_msg($ccname,$ccdom,$subject,$message,undef,undef,undef,1,\%sentmessage,undef,undef,undef,1,$recipid).',';
+        $status .= &Apache::lonmsg::user_normal_msg($ccname,$ccdom,$subject,$message,undef,undef,undef,1,
+                                                    \%sentmessage,undef,undef,undef,1,$recipid).',';
     }
     $status =~ s/,$//;
+    if ($need_temp_env) {
+        undef($env{'user.name'});
+        undef($env{'user.domain'});
+    }
     return ($recipstatus,$status);
 }
 
@@ -315,6 +383,11 @@ sub display_queued_requests {
         $namespace = 'requestauthorqueue';
         %requesthash = &Apache::lonnet::dump_dom($namespace,$dom);
         $nextelement = '<input type="hidden" name="state" value="done" />';
+    } elsif ($context eq 'requestusername') {
+        $formaction = '/adm/createuser';
+        $namespace = 'usernamequeue';
+        %requesthash = &Apache::lonnet::dump_dom($namespace,$dom);
+        $nextelement = '<input type="hidden" name="state" value="done" />';
     } else {
         $formaction = '/adm/createcourse';
         $namespace = 'courserequestqueue';
@@ -340,6 +413,9 @@ sub display_queued_requests {
             } elsif ($context eq 'requestauthor') {
                 $timestamp = $requesthash{$item};
                 ($entry) = ($item =~ /^($match_username)_approval$/);
+            } elsif ($context eq 'requestusername') {
+                $timestamp = $requesthash{$item};
+                ($entry) = (&unescape($item) =~ /^($match_username)_approval$/);
             } else {
                 $timestamp = $requesthash{$item}{'timestamp'};
                 if (ref($requesthash{$item}) eq 'HASH') {
@@ -370,7 +446,9 @@ sub display_queued_requests {
                            '<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>';
             } elsif ($context eq 'requestauthor') {
-                $output .= '<h3>'.&mt('Requests for authoring space queued pending approval by a Domain Coordinator').'</h3>';
+                $output .= '<h3>'.&mt('Requests for Authoring Space queued pending approval by a Domain Coordinator').'</h3>';
+            } elsif ($context eq 'requestusername') {
+                $output .= '<h3>'.&mt('Requests for LON-CAPA accounts queued pending approval by a Domain Coordinator').'</h3>';
             } else {
                 $output .= '<h3>'.&mt('Course/Community requests queued pending approval by a Domain Coordinator').'</h3>';
             } 
@@ -383,7 +461,9 @@ sub display_queued_requests {
             } 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.');
+                $output .= &mt('There are currently no requests for Authoring Space awaiting approval.');
+            } elsif ($context eq 'requestusername') {
+                $output .= &mt('There are currently no requests for LON-CAPA accounts awaiting approval.');
             } elsif ($context eq 'domain') {
                 $output .= &mt('There are currently no course or community requests awaiting approval.');
             }
@@ -403,6 +483,10 @@ sub display_queued_requests {
             $output .= &mt('There are currently no enrollment requests awaiting approval.');
         } 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.');
+        } elsif ($context eq 'requestusername') {
+            $output .= &mt('There are currently no requests for LON-CAPA accounts awaiting approval.');
         } else {
             $output .= &mt('There are currently no course or community requests awaiting approval.');
         }
@@ -426,6 +510,9 @@ sub build_queue_display {
                    '<th>'.&mt('Date requested').'</th>';
     } elsif ($context eq 'requestauthor') {
         $output .= '<th>'.&mt('Date requested').'</th>';
+    } elsif ($context eq 'requestusername') {
+        $output .= '<th>'.&mt('Date requested').'</th>'.
+                   '<th>'.&mt('Details').'</th>';
     } elsif ($context eq 'pending' || $context eq 'stillpending') {
         $output .= '<th>'.&mt('Institutional code').'</th>'.
                    '<th>'.&mt('Date requested').'</th>'.
@@ -435,6 +522,7 @@ sub build_queue_display {
                         official   => 'Official course',
                         unofficial => 'Unofficial course',
                         community  => 'Community',
+                        textbook   => 'Textbook course',
                     );
         $output .= '<th>'.&mt('Type').'</th>'.
                    '<th>'.&mt('Date requested').'</th>'.
@@ -468,12 +556,21 @@ sub build_queue_display {
                                     &Apache::loncommon::plainname($request,$dom),
                                     $request,$dom);
                     }
+                } elsif ($context eq 'requestusername') {
+                    if (&Apache::lonnet::homeserver($request,$dom) eq 'no_host') {
+                        my $queued = 'approval';
+                        $approve = $count.':'.$request;
+                        $reject = $request;
+                        $detailslink='<a href="javascript:openusernamereqdisplay('.
+                                     "'$dom','$request','$queued'".');">'.$request.'</a>';
+                        $namelink = $request;
+                    }
                 } else {
                     my ($cnum,$ownername,$ownerdom,$type,$cdesc);
-                    my $queue = 'approval'; 
+                    my $queued = 'approval'; 
                     if ($context eq 'pending' || $context eq 'stillpending') {
                         ($cnum,$ownername,$ownerdom,$instcode,$cdesc)=split(/:/,$request,5);
-                        $queue = 'pending';                        
+                        $queued = 'pending';                        
                     } else {
                         ($cnum,$ownername,$ownerdom,$type,$cdesc)=split(/:/,$request,5);
                         $crstype = $type;
@@ -482,7 +579,7 @@ sub build_queue_display {
                         }
                     }
                     $detailslink='<a href="javascript:opencoursereqdisplay('.
-                                  "'$dom','$cnum','$queue'".');">'.$cdesc.'</a>';
+                                  "'$dom','$cnum','$queued'".');">'.$cdesc.'</a>';
                     $approve = $count.':'.$cnum;
                     $reject = $cnum;
                     $namelink = &Apache::loncommon::aboutmewrapper(
@@ -504,6 +601,9 @@ sub build_queue_display {
                             '<td>'.$showtime.'</td>'."\n";
                 } elsif ($context eq 'requestauthor') {
                     $row .= '<td>'.$showtime.'</td>'."\n";
+                } elsif ($context eq 'requestusername') {
+                    $row .= '<td>'.$showtime.'</td>'."\n".
+                            '<td>'.$detailslink.'</td>'."\n";
                 } else { 
                     if ($context eq 'pending' || $context eq 'stillpending') {
                         $row .= '<td>'.$instcode.'</td>'."\n";
@@ -533,17 +633,15 @@ sub update_request_queue {
         @processing_errors,@warn_approves,@warn_rejects,@approvals,@warn_dels,
         @rejections,@rejectionerrors,@nopermissions,%courseroles,@toremove,
         %communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype,$queue,
-        $firsturl);
+        $firsturl,$uniquecode,%codes);
     my $count=0;
-    while (my @course = &Apache::loncommon::get_env_multiple('form.'.$count.'radioreq')) {
-        if ($course[0] =~ /^\d+:.*/) {
-            push(@approvals,$course[0]);
-        } elsif ($course[0] =~ /^later:.*/) {
-            #decide later
-        } else {
-            push(@rejections,$course[0]);
+    while (my $item = $env{'form.'.$count.'radioreq'}) {
+        if ($item =~ /^\d+:/) {
+            push(@approvals,$item);
+        } elsif ($item !~ /^later:/) {
+            push(@rejections,$item);
         }
-        $count+=1;
+        $count ++;
     }
 
     $now = time;
@@ -584,14 +682,39 @@ sub update_request_queue {
         my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom);
         $firsturl = &course_portal_url($domconfiguser,$cdom);
         $approvedmsg = [{
-                            mt => 'Your request for authoring space has been approved.',
+                            mt => 'Your request for Authoring Space has been approved.',
                         },
                         {
                             mt   => 'Visit [_1] to log-in and select your author role',
                             args => [$firsturl],
                         }];
         $rejectedmsg =  [{
-                            mt => 'Your request for authoring space has not been approved.',
+                            mt => 'Your request for Authoring Space has not been approved.',
+                        }];
+        $domdesc = &Apache::lonnet::domain($cdom);
+    } elsif ($context eq 'requestusername') {
+        $namespace = 'usernamequeue';
+        $beneficiary = 'requestusername';
+        %requesthash = &Apache::lonnet::dump_dom($namespace,$cdom);
+        my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$cdom);
+        if (ref($domconfig{'usercreation'}) eq 'HASH') {
+            if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') {
+                if (ref($domconfig{'usercreation'}{'cancreate'}{'notify'}) eq 'HASH') {
+                    $notifylist = $domconfig{'usercreation'}{'cancreate'}{'notify'}{'approval'};
+                }
+            }
+        }
+        my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom);
+        $firsturl = &course_portal_url($domconfiguser,$cdom);
+        $approvedmsg = [{
+                            mt => 'Your request for a LON-CAPA account has been approved.',
+                        },
+                        {
+                            mt   => 'Visit [_1] to log-in.',
+                            args => [$firsturl],
+                        }];
+        $rejectedmsg =  [{
+                            mt => 'Your request for a LON-CAPA account has not been approved.',
                         }];
         $domdesc = &Apache::lonnet::domain($cdom);
     } else {
@@ -717,9 +840,6 @@ sub update_request_queue {
                     if (&Apache::lonnet::allowed('cau',$cdom)) {
                         if (&Apache::lonnet::assignrole($cdom,$uname,'/'.$cdom.'/','au',undef,time,undef,undef,'requestauthor') eq 'ok') {
                             push(@completed,$uname);
-                            unless (&Apache::lonnet::del_dom($namespace,[$uname.'_approval'],$cdom) eq 'ok') {
-                                push(@warn_dels,$uname);
-                            }
                             &send_selfserve_notification($uname.':'.$cdom,
                                                          $approvedmsg,undef,undef,$now,
                                                          $beneficiary,$sender);
@@ -734,7 +854,7 @@ sub update_request_queue {
                             my $userresult =
                                 &Apache::lonnet::put('requestauthor',\%userrequest,$cdom,$uname);
                             if ($userresult ne 'ok') {
-                                push(@warn_approves,$item);
+                                push(@warn_approves,$uname.':'.$cdom);
                             }
                         } else {
                             push(@processing_errors,$uname);
@@ -749,6 +869,60 @@ sub update_request_queue {
                 push(@invalidusers,$uname.':'.$cdom);
             }
             push(@toremove,(@invalidusers,@nopermissions));
+        } elsif ($context eq 'requestusername') {
+            my ($num,$uname) = split(/:/,$item);
+            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 ($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'};
+                $id         = $curr{$uname}{'id'};
+                $firstname  = $curr{$uname}{'firstname'};
+                $middlename = $curr{$uname}{'middlename'};
+                $lastname   = $curr{$uname}{'lastname'};
+                $generation = $curr{$uname}{'generation'};
+                $inststatus = $curr{$uname}{'inststatus'};
+
+                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,$uname);
+                    if ($result eq 'ok') {
+                        $curr{$uname}{'status'} = 'created';
+                        push(@completed,$uname); 
+                        my $uhome = &Apache::lonnet::homeserver($uname,$cdom);
+                        if ($uhome eq 'no_host') {
+                            push(@warn_approves,$uname);
+                        } else {
+                            unless (($inststatus eq 'default') || ($inststatus eq '')) {
+                                &Apache::lonnet::put('environment',{inststatus => $inststatus},$cdom,$uname);
+                            }
+                            &send_selfserve_notification($uname.':'.$cdom,
+                                                         $approvedmsg,undef,undef,$now,
+                                                         $beneficiary,$sender);
+                            if (&Apache::lonnet::put($dbname,\%curr,$cdom,$domconfiguser) ne 'ok') {
+                                push(@warn_approves,$uname);
+                            }
+                        }
+                    } else {
+                        push(@processing_errors,$uname);
+                    }
+                } else {
+                    push(@processing_errors,$uname);
+                }
+            } else {
+                push(@invalidusers,$uname);
+            }
+            push(@toremove,@invalidusers);
         } else {
             my ($num,$cnum) = split(':',$item);
             if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') {
@@ -783,10 +957,23 @@ sub update_request_queue {
                                                      $ownerdom,$ownername);
                         if ((ref($history{'details'}) eq 'HASH') && 
                             ($history{'disposition'} eq $queue)) {
-                            my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg);
-                            my $result = &course_creation($cdom,$cnum,$context,$history{'details'},\$logmsg,
-                                                      \$newusermsg,\$addresult,\$enrollcount,
-                                                      \$response,\$keysmsg,\%domdefs,$longroles);
+                            my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,$code,%customitems);
+                            my $fullname = '';
+                            my $inprocess = &Apache::lonnet::auto_crsreq_update($cdom,$cnum,$crstype,'process',$ownername,
+                                                                                $ownerdom,$fullname,$coursedesc);
+                            if (ref($inprocess) eq 'HASH') {
+                                foreach my $key (keys(%{$inprocess})) {
+                                    if (exists($history{'details'}{$key})) { 
+                                        $customitems{$key} = $history{'details'}{$key};
+                                    }
+                                }
+                            }
+                            if ($history{'details'}{'clonecrs'}) {
+                                $customitems{'_LC_clonefrom'} = $history{'details'}{'clonedom'}.'_'.$history{'details'}{'clonecrs'};
+                            }
+                            my ($result,$postprocess) = &course_creation($cdom,$cnum,$context,$history{'details'},\$logmsg,
+                                                        \$newusermsg,\$addresult,\$enrollcount,
+                                                        \$response,\$keysmsg,\%domdefs,$longroles,\$code,\%customitems);
                             if ($result eq 'created') {
                                 if ($crstype eq 'community') {
                                     $approvedmsg = $approvalmsg{'community'};
@@ -798,6 +985,25 @@ sub update_request_queue {
                                     if (ref($approvedmsg->[1]) eq 'HASH') {
                                         $approvedmsg->[1]->{'args'} = [$firsturl];
                                     }
+                                    if ($code) {
+                                        push(@{$approvedmsg},
+                                            {
+                                              mt   => 'Students can automatically select your course by entering this code: [_1]',
+                                              args => [$code],
+                                            });
+                                        $codes{$cnum} = $code;
+                                    }
+                                    if (ref($postprocess) eq 'HASH') {
+                                        if (ref($postprocess->{'createdmsg'}) eq 'ARRAY') {
+                                            foreach my $item (@{$postprocess->{'createdmsg'}}) {
+                                                if (ref($item) eq 'HASH') {
+                                                    if ($item->{'mt'} ne '') {
+                                                        push(@{$approvedmsg},$item);
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
                                 }
                                 push(@completed,$cnum);
                                 
@@ -855,20 +1061,24 @@ sub update_request_queue {
         @changes = map {$_.'_'.$queue} (@changes);
     } elsif ($context eq 'requestauthor') {
         @changes = map {$_.'_approval'} (@changes);
+    } elsif ($context eq 'requestusername') {
+        @changes = map {&escape($_).'_approval'} (@changes);
     }
     if (@rejections) {
         foreach my $item (@rejections) {
             if (($context eq 'course') || ($context eq 'requestauthor')) {
-                my ($user,$uname,$udom,%userrequest,$key);
+                my ($user,$uname,$udom,%userrequest,$key,$dbname);
                 if ($context eq 'requestauthor') {
                     $uname = $item;
                     $udom = $cdom;
                     $user = $uname.':'.$udom;
                     $key = 'author';
+                    $dbname = 'requestauthor';
                 } else {
                     $user = $item;
                     ($uname,$udom) = split(/:/,$user);
                     $key = $cdom.'_'.$cnum;
+                    $dbname = $namespace;
                 }
                 &send_selfserve_notification($user,$rejectedmsg,$cid,$coursedesc,
                                              $now,$beneficiary,$sender,undef,undef,
@@ -884,10 +1094,29 @@ sub update_request_queue {
                     $userrequest{'author_status'} = 'rejection';  
                 }
                 my $userresult =
-                    &Apache::lonnet::put('requestauthor',\%userrequest,$udom,$uname);
+                    &Apache::lonnet::put($dbname,\%userrequest,$udom,$uname);
                 if ($userresult ne 'ok') {
                     push(@warn_rejects,$item);
                 }
+            } elsif ($context eq 'requestusername') {
+                my ($uname,$udom,$dbname);
+                $uname = $item;
+                $udom = $cdom;
+                $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') {
+                     $curr{$uname}{'status'} = 'rejected';
+                     $curr{$uname}{'timestamp'} = $now;
+                     $curr{$uname}{'adjudicator'} =  $env{'user.name'}.':'.$env{'user.domain'};
+                     undef($curr{$uname}{'tmpinfo'});
+                     undef($curr{$uname}{'upass'}); 
+                }
+                my $userresult =
+                    &Apache::lonnet::put($dbname,\%curr,$cdom,$domconfiguser);
+                if ($userresult ne 'ok') {
+                    push(@warn_rejects,$uname);
+                }
             } else {
                 my $cnum = $item;
                 if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') {
@@ -950,16 +1179,29 @@ sub update_request_queue {
         }
     }
     if (@toremove) {
+        my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom);
         foreach my $item (@toremove) {
-            my %userrequest = (
-                author => {
-                            timestamp   => $now,
-                            adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
-                            status      => 'deleted',
-                          },
-                          author_status => 'deleted',
-            );
-            &Apache::lonnet::put('requestauthor',\%userrequest,$cdom,$item);
+            if ($context eq 'requestauthor') {
+                my %userrequest = (
+                    author => {
+                                timestamp   => $now,
+                                adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
+                                status      => 'deleted',
+                              },
+                              author_status => 'deleted',
+                );
+                &Apache::lonnet::put('requestauthor',\%userrequest,$cdom,$item);
+            } elsif ($context eq 'requestusername') {
+                my $dbname = 'nohist_requestedusernames';
+                my %curr = &Apache::lonnet::get($dbname,[$item],$cdom,$domconfiguser);
+                if (ref($curr{$item}) eq 'HASH') {
+                    $curr{$item}{'status'} = 'deleted';
+                    $curr{$item}{'timestamp'} = $now;
+                    $curr{$item}{'adjudicator'} = $env{'user.name'}.':'.$env{'user.domain'};
+                    undef($curr{$item}{'upass'});
+                    undef($curr{$item}{'tmpinfo'}); 
+                }
+            }
         }
         @toremove = map {$_.'_approval'} (@toremove);
         my $delresult = &Apache::lonnet::del_dom($namespace,\@toremove,$cdom);
@@ -1006,7 +1248,7 @@ sub update_request_queue {
                                                  $approvedlist,$rejectedlist,$crstype);
                 }
             } elsif ($context eq 'requestauthor') {
-                $chgmsg = "'Action was taken on the following authoring space requests by [_1].',$namelink";
+                $chgmsg = "'Action was taken on the following Authoring Space requests by [_1].',$namelink";
                 if (@completed) {
                     $approvedlist = join("\n",@completed);
                     $output .= '<p>'.&mt('The following requests were approved:').'<ul>';
@@ -1033,6 +1275,30 @@ sub update_request_queue {
                                                  $now,'authormanagers',$sender,
                                                  $approvedlist,$rejectedlist);
                 }
+            } elsif ($context eq 'requestusername') {
+                $chgmsg = "'Action was taken on the following LON-CAPA account requests by [_1].',$namelink";
+                if (@completed) {
+                    $approvedlist = join("\n",@completed);
+                    $output .= '<p>'.&mt('The following requests were approved:').'<ul>';
+                    foreach my $uname (@completed) {
+                        $output .= '<li>'.$uname.'</li>';
+
+                    }
+                    $output .= '</ul></p>';
+                }
+                if (@rejections) {
+                    $rejectedlist = join("\n",@rejections);
+                    $output .= '<p>'.&mt('The following requests were rejected:').'<ul>';
+                    foreach my $uname (@rejections) {
+                        $output .= '<li>'.$uname.'</li>';
+                    }
+                    $output .= '</ul></p>';
+                }
+                if ($notifylist ne '') {
+                    &send_selfserve_notification($notifylist,$chgmsg,undef,$domdesc,
+                                                 $now,'usernamemanagers',$sender,
+                                                 $approvedlist,$rejectedlist);
+                }
             } else {
                 $chgmsg = "'Action was taken on the following course and community requests by [_1].',$namelink";
                 if (@completed) {
@@ -1047,6 +1313,9 @@ sub update_request_queue {
                         }
                         my $syllabuslink =
                             &Apache::loncommon::syllabuswrapper($showcourse,$cnum,$cdom);
+                        if ($codes{$cnum}) {
+                            $syllabuslink .= ' '.&mt('Unique code: [_1]',$codes{$cnum});
+                        }
                         $output .= '<li>'.$syllabuslink.'</li>';
                     }
                     $output .= '</ul></p>';
@@ -1071,6 +1340,10 @@ sub update_request_queue {
                                                  $approvedlist,$rejectedlist,$crstype);
                 }
             }
+        } else {
+            if (($context eq 'requestauthor') || ($context eq 'requestusername')) {
+                push(@warn_dels,@changes);
+            }
         }
     }
     if (@existing) {
@@ -1081,7 +1354,7 @@ sub update_request_queue {
             }
             $output .= '</ul></p>';
         } elsif ($context eq 'requestauthor') {
-            $output .= '<p>'.&mt('Authoring space requests from the following users were deleted because one already exists:').'<ul>';
+            $output .= '<p>'.&mt('Authoring Space requests from the following users were deleted because one already exists:').'<ul>';
             foreach my $uname (@existing) {
                 my $userlink =
                     &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
@@ -1134,7 +1407,7 @@ sub update_request_queue {
             }
             $output .= '</ul></p>';
         } elsif ($context eq 'requestauthor') {
-            $output .= '<p>'.&mt('The following authoring space requests were deleted because the requestor does not have a LON-CAPA account:').'<ul>';
+            $output .= '<p>'.&mt('The following Authoring Space requests were deleted because the requestor does not have a LON-CAPA account:').'<ul>';
             foreach my $uname (@invalidusers) {
                 my $userlink =
                     &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
@@ -1166,7 +1439,7 @@ sub update_request_queue {
             }
             $output .= '</ul></p>';
         } elsif ($context eq 'requestauthor') {
-            $output .= '<p>'.&mt('The following requests could not be processed because the requestor does not have rights to request an authoring space:').'<ul>';
+            $output .= '<p>'.&mt('The following requests could not be processed because the requestor does not have rights to request an Authoring Space:').'<ul>';
             foreach my $uname (@nopermissions) {
                 my $userlink =
                     &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
@@ -1190,6 +1463,12 @@ sub update_request_queue {
                 $output .= '<li>'.$userlink.'</li>';
             }
             $output .= '</ul></p>';
+        } elsif ($context eq 'requestusername') {
+            $output .= '<p>'.&mt('The following requests could not be processed because an error occurred:').'<ul>';
+            foreach my $uname (@processing_errors) {
+                $output .= '<li>'.$uname.'</li>';
+            }
+            $output .= '</ul></p>';
         } else {
             $output .= '<p>'.&mt('The following course/community creation requests could not be processed because an error occurred:').'<ul>';
             foreach my $cnum (@processing_errors) {
@@ -1232,6 +1511,12 @@ sub update_request_queue {
                 $output .= '<li>'.$userlink.'</li>';
             }
             $output .= '</ul></p>';
+        } elsif ($context eq 'requestusername') {
+            $output .= '<p>'.&mt("For the following users, an error occurred when updating the account request record for the user:").'<ul>';
+            foreach my $uname (@warn_approves,@warn_rejects) {
+                $output .= '<li>'.$uname.'</li>';
+            }
+            $output .= '</ul></p>';
         } else {
             $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) {
@@ -1255,6 +1540,13 @@ sub update_request_queue {
                 $output .= '<li>'.$userlink.'</li>';
             }
             $output .= '</ul></p>';
+        } elsif ($context eq 'requestusername') {
+            $output .= '<p>'.&mt("For the following requests an error occurred when removing the request from the queue:").'<ul>';
+            foreach my $item (@warn_dels) {
+                my ($escuname) = split(/_/,$item);
+                $output .= '<li>'.&unescape($escuname).'</li>';
+            }
+            $output .= '</ul></p>';            
         } else {
             $output .= '<p>'.&mt("For the following course/community requests an error occurred when removing requests from the pending queue:").'<ul>';
             foreach my $cnum (@warn_dels) {
@@ -1308,13 +1600,24 @@ sub get_student_counts {
 
 sub course_creation {
     my ($dom,$cnum,$context,$details,$logmsg,$newusermsg,$addresult,$enrollcount,$output,
-        $keysmsg,$domdefs,$longroles) =  @_;
+        $keysmsg,$domdefs,$longroles,$coderef,$customhash) =  @_;
     unless ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH') && 
             (ref($longroles) eq 'HASH')) {
         return 'error: Invalid request';
     }
     my ($result,$ownername,$ownerdom);
     my $crstype = $details->{'crstype'};
+    my $coursedesc = $details->{'cdescr'};
+    my $accessstart = $details->{'accessstart'};
+    my $accessend = $details->{'accessend'};
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
+    if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+        if (ref($domconfig{'requestcourses'}{'uniquecode'}) eq 'HASH') {
+            if ($domconfig{'requestcourses'}{'uniquecode'}{$crstype}) {
+                $details->{'uniquecode'} = 1;
+            }
+        }
+    }
     if ($context eq 'domain') {
         $ownername = $details->{'owner'};
         $ownerdom  = $details->{'domain'};
@@ -1322,6 +1625,7 @@ sub course_creation {
         $ownername = $env{'user.name'};
         $ownerdom  = $env{'user.domain'};
     }
+    my $fullname = &Apache::loncommon::plainname($ownername,$ownerdom);
     my $owneremail;
     my %emails = &Apache::loncommon::getemails($ownername,$ownerdom);
     foreach my $email ('permanentemail','critnotification','notification') {
@@ -1331,19 +1635,27 @@ sub course_creation {
     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);
+                  $enrollcount,$output,$keysmsg,$ownerdom,$ownername,$cnum,$crstype,$coderef);
+    my $postprocess;
     if ($cid eq "/$dom/$cnum") {
         $result = 'created';
+        my $code;
+        if (ref($coderef)) {
+            $code = $$coderef;
+        }
+        $postprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,$result,$ownername,
+                                                           $ownerdom,$fullname,$coursedesc,$code,
+                                                           $accessstart,$accessend,$customhash);
     } else {
         $result = 'error: '.$cid;
     }
-    return $result;
+    return ($result,$postprocess);
 }
 
 sub build_batchcreatehash {
     my ($dom,$context,$details,$owneremail,$domdefs) = @_;
     my %batchhash;
-    my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users};
+    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'};
@@ -1363,6 +1675,12 @@ sub build_batchcreatehash {
         if ($details->{'crstype'} eq 'community') {
             $batchhash{'crstype'} = 'Community';
         } else {
+            if ($details->{'crstype'} eq 'textbook') {
+                if ($details->{'clonecrs'} && $details->{'clonedom'}) {
+                    my %clonedfrom = &Apache::lonnet::coursedescription($details->{'clonedom'}.'_'.$details->{'clonecrs'});
+                    $batchhash{'textbook'} = $clonedfrom{'description'};
+                }
+            }
             $batchhash{'crstype'} = 'Course';
         }
         my ($owner_firstname,$owner_lastname);
@@ -1406,7 +1724,7 @@ sub build_batchcreatehash {
 }
 
 sub can_clone_course {
-    my ($uname,$udom,$clonecrs,$clonedom,$crstype) = @_;
+    my ($uname,$udom,$clonecrs,$clonedom,$crstype,$dom,$instcode) = @_;
     my $canclone;
     my $ccrole = 'cc';
     if ($crstype eq 'community') {
@@ -1417,19 +1735,70 @@ sub can_clone_course {
     if (exists($roleshash{$clonecrs.':'.$clonedom.':'.$ccrole})) {
         $canclone = 1;
     } else {
-        my %courseenv = &Apache::lonnet::userenvironment($clonedom,$clonecrs,('cloners'));
+        my %courseenv = &Apache::lonnet::userenvironment($clonedom,$clonecrs,
+                                                         ('cloners','internal.coursecode'));
         my $cloners = $courseenv{'cloners'};
+        my $clonefromcode = $courseenv{'internal.coursecode'};
         if ($cloners ne '') {
             my @cloneable = split(',',$cloners);
             if (grep(/^\*$/,@cloneable)) {
                 $canclone = 1;
-            }
-            if (grep(/^\*:\Q$udom\E$/,@cloneable)) {
+            } elsif (grep(/^\*:\Q$udom\E$/,@cloneable)) {
                 $canclone = 1;
-            }
-            if (grep(/^\Q$uname\E:\Q$udom\E$/,@cloneable)) {
+            } elsif (grep(/^\Q$uname\E:\Q$udom\E$/,@cloneable)) {
                 $canclone = 1;
             }
+            unless ($canclone) {
+                if (($clonefromcode) && ($instcode) && ($clonedom eq $dom)) {
+                    my (%gotdomdefaults,%gotcodedefaults);
+                    foreach my $cloner (@cloneable) {
+                        if (($cloner ne '*') && ($cloner !~ /^\*\:$match_domain$/) &&
+                            ($cloner !~ /^$match_username\:$match_domain$/) && ($cloner ne '')) {
+                            if ($cloner =~ /\=/) {
+                                my (%codedefaults,@code_order);
+                                if (ref($gotcodedefaults{$clonedom}) eq 'HASH') {
+                                    if (ref($gotcodedefaults{$clonedom}{'defaults'}) eq 'HASH') {
+                                        %codedefaults = %{$gotcodedefaults{$clonedom}{'defaults'}};
+                                    }
+                                    if (ref($gotcodedefaults{$clonedom}{'order'}) eq 'ARRAY') {
+                                        @code_order = @{$gotcodedefaults{$dom}{'order'}};
+                                    }
+                                } else {
+                                    &Apache::lonnet::auto_instcode_defaults($clonedom,
+                                                                            \%codedefaults,
+                                                                            \@code_order);
+                                    $gotcodedefaults{$clonedom}{'defaults'} = \%codedefaults;
+                                    $gotcodedefaults{$clonedom}{'order'} = \@code_order;
+                                }
+                                if (@code_order > 0) {
+                                    if (&Apache::lonnet::check_instcode_cloning(\%codedefaults,\@code_order,
+                                                                                $cloner,$clonefromcode,$instcode)) {
+                                        $canclone = 1;
+                                        last; 
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            my %domdefs = &Apache::lonnet::get_domain_defaults($clonedom);
+            if ($domdefs{'canclone'}) {
+                unless ($domdefs{'canclone'} eq 'none') {
+                    if ($domdefs{'canclone'} eq 'domain') {
+                        if ($udom eq $clonedom) {
+                            $canclone = 1;
+                        }
+                    } elsif (($clonefromcode) && ($instcode) &&
+                             ($clonedom eq $dom)) {
+                        if (&Apache::lonnet::default_instcode_cloning($clonedom,$domdefs{'canclone'},
+                                                                      $clonefromcode,$instcode)) {
+                            $canclone = 1;
+                        }
+                    }
+                }
+            }
         }
         unless ($canclone) {
             if (&Apache::lonnet::is_course_owner($clonedom,$clonecrs,$uname,$udom)) {
@@ -1699,8 +2068,24 @@ sub process_official_reqs {
                 }
                 $reqstatus = $disposition;
                 if ($disposition eq 'process') {
-                    my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg);
-                    my $result = &course_creation($dom,$cnum,'domain',$history{'details'},\$logmsg,\$newusermsg,\$addresult,\$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles);
+                    my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,$code);
+                    my %customitems;
+                    my $fullname = &Apache::loncommon::plainname($ownername,$ownerdom);
+                    my $inprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,'process',$ownername,
+                                                                        $ownerdom,$fullname,$cdescr);
+                    if (ref($inprocess) eq 'HASH') {
+                        foreach my $key (keys(%{$inprocess})) {
+                            if (exists($history{'details'}{$key})) {
+                                $customitems{$key} = $history{'details'}{$key};
+                            }
+                        }
+                    }
+                    if ($history{'details'}{'clonecrs'}) {
+                        $customitems{'_LC_clonefrom'} = $history{'details'}{'clonedom'}.'_'.$history{'details'}{'clonecrs'};
+                    }
+                    my ($result,$postprocess) = 
+                        &course_creation($dom,$cnum,'domain',$history{'details'},\$logmsg,\$newusermsg,\$addresult,
+                                         \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles,\$code,\%customitems);
                     if ($result eq 'created') {
                         $disposition = 'created';
                         $reqstatus = 'created';
@@ -1724,6 +2109,22 @@ sub process_official_reqs {
                                     mt => 'If currently logged-in to LON-CAPA, log-out and log-in again to select your new course role.'
                                  }];
                             my $sender = $dcname.':'.$dcdom;
+                            if (ref($postprocess) eq 'HASH') {
+                                if (ref($postprocess->{'createdmsg'}) eq 'ARRAY') {
+                                    foreach my $item (@{$postprocess->{'createdmsg'}}) {
+                                        if (ref($item) eq 'HASH') {
+                                             if ($item->{'mt'} ne '') {
+                                                 push(@{$approvedmsg},$item);
+                                             }
+                                        }
+                                    }
+                                }
+                                if (ref($postprocess->{'createdactions'}) eq 'HASH') {
+                                    if (ref($postprocess->{'createdactions'}{'environment'}) eq 'HASH') {
+                                        &postprocess_crsenv($dom,$cnum,$postprocess->{'createdactions'}{'environment'});
+                                    }
+                                }
+                            }
                             &send_selfserve_notification($owner,$approvedmsg,
                                                          $cid,$cdescr,$now,
                                                          $beneficiary,$sender,
@@ -1794,6 +2195,68 @@ sub process_official_reqs {
     return $output;
 }
 
+sub postprocess_crsenv {
+    my ($dom,$cnum,$postprocessenv) = @_;
+    if (ref($postprocessenv) eq 'HASH') {    
+        my $cid = $dom.'_'.$cnum;
+        my %settablecrsenv = (
+                              'internal.selfenroll_types'        => 1,
+                              'internal.selfenroll_registered'   => 1,
+                              'internal.selfenroll_section'      => 1,
+                              'internal.selfenroll_start_access' => 1,
+                              'internal.selfenroll_end_access'   => 1,
+                              'internal.selfenroll_limit'        => 1,
+                              'internal.selfenroll_cap'          => 1,
+                              'internal.selfenroll_approval'     => 1,
+                              'internal.selfenroll_notifylist'   => 1,
+                             );
+        my %needcrsidput = (
+                              'internal.selfenroll_types'      => 1,
+                              'internal.selfenroll_start_date' => 1,
+                              'internal. selfenroll_end_date'  => 1,
+                           );
+        my (@needupdate,%newcrsenv);
+        foreach my $key (keys(%{$postprocessenv})) { 
+            if ($settablecrsenv{$key}) {
+                $newcrsenv{$key} = $postprocessenv->{$key};
+                if ($needcrsidput{$key}) {
+                    push(@needupdate,$key); 
+                }
+            }
+            if (keys(%newcrsenv)) {
+                my $putresult = &Apache::lonnet::put('environment',\%newcrsenv,$dom,$cnum);
+                if ($putresult eq 'ok') {
+                    if (@needupdate) {
+                        my %crsinfo =
+                            &Apache::lonnet::courseiddump($dom,'.',1,'.','.',$cnum,undef,undef,'.');
+                        if (ref($crsinfo{$cid}) eq 'HASH') {
+                            foreach my $key (@needupdate) {
+                                $crsinfo{$cid}{$key} = $newcrsenv{$key};
+                            }
+                            my $chome = &Apache::lonnet::homeserver($cnum,$dom);
+                            &Apache::lonnet::courseidput($dom,\%crsinfo,$chome,'notime');
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+
+sub requestcourses_validation_types {
+    my @items = ('url','fields','button','markup');
+    my %names =  &Apache::lonlocal::texthash (
+            url      => 'Web address of validation server/script',
+            fields   => 'Form fields to send to validator',
+            button   => 'Text for validation button',
+            markup   => 'Validation description (HTML)',
+    );
+    my @fields = ('owner','course','coursetype','description');
+    return (\@items,\%names,\@fields);
+}
+
 sub is_active_author {
     if ($env{'user.role.au./'.$env{'user.domain'}.'/'} =~ /^(\d*)\.(\d*)$/) {
         if ((!$1 || $1 < time) &&
@@ -1836,21 +2299,21 @@ sub process_reqauthor {
     my ($dispositionref,$updateref) = @_;
     if (&is_active_author()) {
         return '<span class="LC_warning">'.
-                &mt('An authoring space has already been assigned to you.').'<br />'.
+                &mt('An Authoring Space has already been assigned to you.').'<br />'.
                 &mt('Please select the Author role from your [_1]roles page[_2].','<a href="/adm/roles">',
                 '</a>').'</span>';
     }
     unless ($env{'environment.canrequest.author'}) {
         return '<span class="LC_warning">'.
-                &mt('You do not currently have rights to request an authoring space.').'<br />'.
-                &mt('Please contact the [_1]helpdesk[_2].','<a href="/adm/helpdesk">',
+                &mt('You do not currently have rights to request an Authoring Space.').'<br />'.
+                &mt('Please contact the [_1]helpdesk[_2] for assistance.','<a href="/adm/helpdesk">',
                 '</a>').'</span>';
     }
     my $queued = &reqauthor_check();
     if ($queued =~ /^approval:(\d+)$/) {
         my $timestamp = $1;
         return '<span class="LC_info">'.
-               &mt('A request for authoring space submitted on [_1] is awaiting approval',
+               &mt('A request for Authoring Space submitted on [_1] is awaiting approval',
                &Apache::lonlocal::locallocaltime($timestamp)).
                '</span>';
     } elsif ($queued =~ /^approved:(\d+)$/) {
@@ -1859,7 +2322,7 @@ sub process_reqauthor {
                                                       ['active'],['au'],[$env{'user.domain'}]);
         if (keys(%roleshash) > 0) {
             return '<span class="LC_info">'.
-                   &mt('A request for authoring space submitted on [_1] has been approved.',
+                   &mt('A request for Authoring Space submitted on [_1] has been approved.',
                    &Apache::lonlocal::locallocaltime($timestamp)).
                    '</span>';
         }
@@ -1876,7 +2339,7 @@ sub process_reqauthor {
         if (&Apache::lonnet::assignrole($env{'user.domain'},$env{'user.name'},'/'.$env{'user.domain'}.'/',
                                         'au',undef,$start,undef,undef,'requestauthor') eq 'ok') {
             $output = '<span class="LC_info">'.
-                      &mt('Access to authoring space has been activated').'</span><br />';
+                      &mt('Access to Authoring Space has been activated').'</span><br />';
                       &Apache::lonroles::update_session_roles();
             &Apache::lonnet::appenv({'user.update.time'  => $now});
             if (ref($updateref)) {
@@ -1887,7 +2350,7 @@ sub process_reqauthor {
             }
         } else {
             $output = '<span class="LC_info">'.
-                      &mt('An error occurred while activating your access to authoring space');
+                      &mt('An error occurred while activating your access to Authoring Space');
         }
     } elsif ($val eq 'approval') {
         my $domconfiguser = &Apache::lonnet::get_domainconfiguser($env{'user.domain'});
@@ -1918,12 +2381,12 @@ sub process_reqauthor {
             my $userresult =
                 &Apache::lonnet::put('requestauthor',\%userrequest,$env{'user.domain'},$env{'user.name'});
             $output = '<span class="LC_info">'.
-                      &mt('Your request for authoring space has been submitted for approval.').
+                      &mt('Your request for Authoring Space has been submitted for approval.').
                       '</span>';
             &Apache::lonnet::appenv({'environment.requestauthorqueued' => $val.':'.$now});
         } else {
             $output = '<span class="LC_info">'.
-                      &mt('An error occurred saving your request for authoring space.').
+                      &mt('An error occurred saving your request for Authoring Space.').
                       '</span>';
         }
     }