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

raeburn raeburn@source.lon-capa.org
Fri, 02 Apr 2010 14:18:50 -0000


raeburn		Fri Apr  2 14:18:50 2010 EDT

  Modified files:              
    /loncom/interface	loncreateuser.pm 
  Log:
  - Retrieval of default quota information needs user's institutional status.
  - Code readability - add a linefeed.
  
  
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.337 loncom/interface/loncreateuser.pm:1.338
--- loncom/interface/loncreateuser.pm:1.337	Sun Mar 21 21:05:42 2010
+++ loncom/interface/loncreateuser.pm	Fri Apr  2 14:18:50 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.337 2010/03/21 21:05:42 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.338 2010/04/02 14:18:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2582,7 +2582,8 @@
             push(@disporder,'reqcrsotherdom');
         }
         push(@disporder,('quota','tools'));
-        my ($defquota,my $settingstatus) = 
+        $oldinststatus = $userenv{'inststatus'};
+        my ($defquota,$settingstatus) = 
             &Apache::loncommon::default_quota($env{'form.ccdomain'},$oldinststatus);
         my %canshow;
         if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
@@ -2600,7 +2601,6 @@
             $canshow{'inststatus'} = 1;
         }
         my (%changeHash,%changed);
-        $oldinststatus = $userenv{'inststatus'};
         if ($oldinststatus eq '') {
             $oldsettings{'inststatus'} = $othertitle; 
         } else {
@@ -6269,7 +6269,8 @@
                             $newnum ++;
                         }
                     }
-                    for (my $j=0; $j<$env{'form.selfenroll_types_total'}; $j++) {                        if ((!grep(/^$j$/,@deletedoms)) && (!grep(/^$j$/,@activations))) {
+                    for (my $j=0; $j<$env{'form.selfenroll_types_total'}; $j++) {
+                        if ((!grep(/^$j$/,@deletedoms)) && (!grep(/^$j$/,@activations))) {
                             my @types = &Apache::loncommon::get_env_multiple('form.selfenroll_types_'.$j);
                             if (@types > 0) {
                                 @types = sort(@types);