--- loncom/interface/selfenroll.pm	2009/08/20 22:07:18	1.22
+++ loncom/interface/selfenroll.pm	2012/05/25 03:04:59	1.27.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Allow users to self-enroll in a course
 #
-# $Id: selfenroll.pm,v 1.22 2009/08/20 22:07:18 raeburn Exp $
+# $Id: selfenroll.pm,v 1.27.2.1 2012/05/25 03:04:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,9 +54,11 @@ sub handler {
     &Apache::lonlocal::get_language_handle($r);
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['courseid']);
     my $js = &Apache::createaccount::catreturn_js();
-    my ($coursechk,$courseid) = &validate_course_id($env{'form.courseid'});
-    if ($coursechk ne 'ok') {
-        &page_header($r,$courseid,$js);
+
+    my $courseid = Apache::lonnet::is_course($env{'form.courseid'});
+
+    unless ($courseid) {
+        &page_header($r,$env{'form.courseid'},$js);
         $r->print('<h3>'.&mt('Self-enrollment error').'</h3>'.
                   '<span class="LC_error">'.
                   &mt('Invalid domain or course number').'</span>');
@@ -359,17 +361,6 @@ sub page_footer {
     return;
 }
 
-sub validate_course_id {
-    my ($courseid) = @_;
-    my ($cdom,$cnum) = ($env{'form.courseid'} =~ /^($match_domain)_($match_courseid)$/);
-    if ($cdom ne '' && $cnum ne '') {
-        if (&Apache::lonnet::is_course($cdom,$cnum)) {
-            return ('ok',$courseid);
-        }
-    } 
-    return;
-}
-
 sub user_is_known {
     my $known = 0;
     if ($env{'user.name'} ne '' && $env{'user.name'} ne 'public'
@@ -476,7 +467,7 @@ sub process_self_enroll {
                 }
                 &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,
                                                     $area);
-                &Apache::lonnet::set_userprivs(\%userroles,\%newrole,%newgroups);
+                &Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups);
                 $userroles{'user.role.'.$spec} = $selfenroll_access_start.'.'.$selfenroll_access_end;
                 &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
                 $r->print('<h3>'.&mt('Enrollment process complete').'</h3>');
@@ -543,8 +534,8 @@ sub store_selfenroll_request {
     my %existing = 
         &Apache::lonnet::get($namespace,[$uname.':'.$udom],$cdom,$cnum);
     if ($existing{$uname.':'.$udom}) {
-        my ($timestamp,$sec) = split(/:/,$existing{$uname.':'.$udom});
-        $output = &mt('A self-enrollment request already exists for you for this course.').'<br />'.&mt('Your earlier request was submitted: [_1] and remains in a queue awaiting action by a Course Coordinator.',&Apache::lonlocal::locallocaltime($timestamp));
+        $output = &mt('A self-enrollment request already exists for you for this course.').'<br />'.&mt('Your earlier request is in a queue awaiting action by a Course Coordinator.').
+                  '<br /><br />'.&Apache::loncoursequeueadmin::queued_selfenrollment();
     } else {
         my %selfenroll = (
                             $uname.':'.$udom => $now.':'.$usec,
@@ -576,7 +567,9 @@ sub store_selfenroll_request {
             if ($warning) { 
                 $output .= '<span class="LC_warning">'.$warning.'</span><br />';
             }
-  
+
+            $output .= &Apache::loncoursequeueadmin::queued_selfenrollment();
+
             if ($selfenroll_notifylist) {
                 my $fullname = &Apache::loncommon::plainname($uname,$udom);
                 my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);