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

[raeburn]

raeburn		Sat Nov  4 16:13:31 2017 EDT

  Modified files:              
    /loncom/interface	lonuserutils.pm 
  Log:
  - Need closing form tag in case of early return from &upfile_drop_add(),
    but end_page() call is not needed since it is called in loncreateuser.pm.
  
  
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.190 loncom/interface/lonuserutils.pm:1.191
--- loncom/interface/lonuserutils.pm:1.190	Fri Aug 11 20:14:44 2017
+++ loncom/interface/lonuserutils.pm	Sat Nov  4 16:13:31 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.190 2017/08/11 20:14:44 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.191 2017/11/04 16:13:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4183,7 +4183,9 @@
                     $r->print('<span class="LC_error">'.&mt('Error').
                               &mt('Enrollment of users not permitted for specified default domain: [_1].',
                                   &Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'</span>');
-                    $r->print(&Apache::loncommon::end_page());
+                    if ($env{'form.fullup'} ne 'yes') {
+                        $r->print('</form>');
+                    }
                     return;
                 }
             }
@@ -4198,7 +4200,9 @@
                     $r->print('<span class="LC_error">'.&mt('Error').
                               &mt('Addition of users not permitted for specified default domain: [_1].',
                                   &Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'</span>');
-                    $r->print(&Apache::loncommon::end_page());
+                    if ($env{'form.fullup'} ne 'yes') {
+                        $r->print('</form>');
+                    }
                     return;
                 }
             }
@@ -4212,7 +4216,9 @@
                     $r->print('<span class="LC_error">'.&mt('Error').
                               &mt('Addition of users not permitted for specified default domain: [_1].',
                                   &Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'</span>');
-                    $r->print(&Apache::loncommon::end_page());
+                    if ($env{'form.fullup'} ne 'yes') {
+                        $r->print('</form>');
+                    }
                     return;
                 }
             }
@@ -4228,7 +4234,9 @@
         if (! exists($home_servers{$desiredhost})) {
             $r->print('<span class="LC_error">'.&mt('Error').
                       &mt('Invalid home server specified').'</span>');
-            $r->print(&Apache::loncommon::end_page());
+            if ($env{'form.fullup'} ne 'yes') {
+                $r->print('</form>');
+            }
             return;
         }
     }