[LON-CAPA-cvs] cvs: loncom /interface lonrequestcourse.pm

[raeburn]

raeburn		Wed Apr  9 10:50:07 2014 EDT

  Modified files:              
    /loncom/interface	lonrequestcourse.pm 
  Log:
  - Consistent naming for $context arg passed to loncoursequeuadmin::send_selfserve_notification()
    via &notification_information().
  - Eliminate duplication of output to screen from two calls to &notification_information()
    (second to accommodate $postprocess) in case where request is queued for approval. 
  
  
Index: loncom/interface/lonrequestcourse.pm
diff -u loncom/interface/lonrequestcourse.pm:1.76 loncom/interface/lonrequestcourse.pm:1.77
--- loncom/interface/lonrequestcourse.pm:1.76	Wed Jan  8 17:18:12 2014
+++ loncom/interface/lonrequestcourse.pm	Wed Apr  9 10:50:07 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.76 2014/01/08 17:18:12 bisitz Exp $
+# $Id: lonrequestcourse.pm,v 1.77 2014/04/09 10:50:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3800,8 +3800,7 @@
                                                         $env{'user.domain'},$fullname,$env{'form.cdescr'});
                 if ((ref($postprocess) eq 'HASH') && 
                     ((ref($postprocess->{'queuedmsg'}) eq 'HASH') || ($postprocess->{'queuedweb'}))) { 
-                    my $recipient = $env{'user.name'}.':'.$env{'user.domain'};
-                    $output .= &notification_information($disposition,$recipient,$dom,$cnum,$now,undef,$postprocess);
+                    &notification_information($disposition,undef,$dom,$cnum,$now,undef,$postprocess);
                 }
             }
         }
@@ -3994,7 +3993,7 @@
                     if (scalar(@{$addmsg}) > 0) {
                         &Apache::loncoursequeueadmin::send_selfserve_notification($recipient,$addmsg,undef,
                                                                                   $env{'form.cdescr'},$now,
-                                                                                  'queuedreq',$sender);
+                                                                                  'queuedcrsreq',$sender);
                     }
                 }
             }
@@ -4043,7 +4042,7 @@
                 }
             }
             if (scalar(@{$addmsg}) > 0) {
-                my $type = 'createdreq';
+                my $type = 'createdcrsreq';
                 if ($code) {
                     $type = 'uniquecode';
                 }