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

raeburn lon-capa-cvs-allow@mail.lon-capa.org
Fri, 18 Jul 2008 02:12:40 -0000


raeburn		Thu Jul 17 22:12:40 2008 EDT

  Modified files:              
    /loncom/interface	loncreateuser.pm 
  Log:
  - combine blocks for !$newuser.
  - change order of values for join to create $typestr.   
  
  
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.257 loncom/interface/loncreateuser.pm:1.258
--- loncom/interface/loncreateuser.pm:1.257	Thu Jul 17 16:05:14 2008
+++ loncom/interface/loncreateuser.pm	Thu Jul 17 22:12:39 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.257 2008/07/17 20:05:14 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.258 2008/07/18 02:12:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1407,8 +1407,6 @@
         %userenv = &Apache::lonnet::get('environment',
                    ['firstname','middlename','lastname','generation',
                     'permanentemail','id'],$ccdomain,$ccuname);
-    }
-    if (!$newuser) {
         %canmodify =
             &Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,
                                                        \@userinfo,$rolesarray);
@@ -4746,7 +4744,7 @@
                                 if (@{$types} > 0) {
                                     my @esc_types = map { &escape($_); } @{$types};
                                     $othervalue = 'other';
-                                    $typestr = join(',',($othervalue,@esc_types));
+                                    $typestr = join(',',(@esc_types,$othervalue));
                                 }
                                 $typestr = $othervalue;
                             } else {