[LON-CAPA-cvs] cvs: loncom(GCI_3) /interface lonuserutils.pm

[raeburn]

raeburn		Mon Nov 15 17:57:36 2010 EDT

  Modified files:              (Branch: GCI_3)
    /loncom/interface	lonuserutils.pm 
  Log:
  - Customization for GCI_3
    - Customize message displayed when a CC attempts to add a user with a 
      username which is not an e-mail address.  
  
  
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.109.2.9 loncom/interface/lonuserutils.pm:1.109.2.10
--- loncom/interface/lonuserutils.pm:1.109.2.9	Mon Nov 15 17:37:47 2010
+++ loncom/interface/lonuserutils.pm	Mon Nov 15 17:57:35 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.109.2.9 2010/11/15 17:37:47 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.109.2.10 2010/11/15 17:57:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4401,8 +4401,14 @@
                             }
                         }
                         if (!$cancreate{$usertype}) {
-                            $r->print('<br />'.
-                                      &mt("[_1]: The user does not exist, and you are not permitted to create users of type: $longtypes{$usertype}.",'<b>'.$username.'</b>'));
+                            my $showtype = $longtypes{$usertype};
+                            if ($usertype eq 'unofficial') {
+                                $r->print('<br />'.
+                                          &mt("[_1]: The user does not exist, and the new user's username must be an e-mail address.",'<b>'.$username.'</b>'));
+                            } else {
+                                $r->print('<br />'.
+                                          &mt("[_1]: The user does not exist, and you are not permitted to create users of type: [_2].",'<b>'.$username.'</b>',$showtype));
+                            }
                             next;
                         }
                     } else {