[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface loncreateuser.pm

[raeburn]

raeburn		Sun Aug 23 13:09:55 2009 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	loncreateuser.pm 
  Log:
  - Backport 1.309.
  
  
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.295.2.9 loncom/interface/loncreateuser.pm:1.295.2.10
--- loncom/interface/loncreateuser.pm:1.295.2.9	Wed Aug 19 19:05:03 2009
+++ loncom/interface/loncreateuser.pm	Sun Aug 23 13:09:54 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.295.2.9 2009/08/19 19:05:03 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.295.2.10 2009/08/23 13:09:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -234,7 +234,7 @@
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                       'requestcourses.official','requestcourses.unofficial');
         @usertools = ('official','unofficial');
-        @options =('norequest','approve','autolimit','validate');
+        @options =('norequest','approval','autolimit','validate');
         %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
         %reqtitles = &courserequest_titles();
         %reqdisplay = &courserequest_display();
@@ -369,7 +369,7 @@
                       'reqcrsotherdom.official','reqcrsotherdom.unofficial',
                       'reqcrsotherdom.community');
     @usertools = ('official','unofficial','community');
-    @options = ('approve','validate','autolimit');
+    @options = ('approval','validate','autolimit');
     %validations = &Apache::lonnet::auto_courserequest_checks($cdom);
     my $optregex = join('|',@options);
     my %reqtitles = &courserequest_titles();
@@ -430,7 +430,7 @@
                                    unofficial => 'Unofficial',
                                    community  => 'Communities',
                                    norequest  => 'Not allowed',
-                                   approve    => 'Approval by Dom. Coord.',
+                                   approval   => 'Approval by Dom. Coord.',
                                    validate   => 'With validation',
                                    autolimit  => 'Numerical limit',
                  );
@@ -439,7 +439,7 @@
     
 sub courserequest_display {
     my %titles = &Apache::lonlocal::texthash (
-                                   approve    => 'Yes, need approval',
+                                   approval   => 'Yes, need approval',
                                    validate   => 'Yes, with validation',
                                    norequest  => 'No',
    );   
@@ -2805,7 +2805,7 @@
         return;
     }
     if ($context eq 'reqcrsotherdom') {
-        my @options = ('approve','validate','autolimit');
+        my @options = ('approval','validate','autolimit');
         my $optregex = join('|',@options);
         my %reqdisplay = &courserequest_display();
         my $cdom = $env{'request.role.domain'};