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

[matthew]

matthew		Mon Jul 28 13:10:12 2003 EDT

  Modified files:              
    /loncom/interface	londropadd.pm 
  Log:
  Bug 1608: More coherent error messages for missing kerberos domain data.
  
  
Index: loncom/interface/londropadd.pm
diff -u loncom/interface/londropadd.pm:1.78 loncom/interface/londropadd.pm:1.79
--- loncom/interface/londropadd.pm:1.78	Fri Jul 25 14:51:18 2003
+++ loncom/interface/londropadd.pm	Mon Jul 28 13:10:12 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.78 2003/07/25 18:51:18 matthew Exp $
+# $Id: londropadd.pm,v 1.79 2003/07/28 17:10:12 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -622,10 +622,14 @@
                 $r->print("unable to enroll: ".$login_result);
             }
 	} else {
-            $r->print('<p><font color="#ff0000">ERROR</font>&nbsp;'.
-                      'Invalid login mode or password.  '.
-                      'Unable to enroll '.$ENV{'form.cuname'}.'.</p>');
-        }          
+            $r->print('<p><font color="#ff0000">ERROR</font>&nbsp;');
+            if ($amode =~ /^krb/) {
+                $r->print('Missing Kerberos domain information.  ');
+            } else {
+                $r->print('Invalid login mode or password.  ');
+            }
+            $r->print('<b>Unable to enroll '.$ENV{'form.cuname'}.'.</b></p>');
+        }
     } else {
         $r->print('Invalid username or domain');
     }    
@@ -1583,6 +1587,14 @@
         $amode='localauth';
         if ((defined($ENV{'form.locarg'})) && ($ENV{'form.locarg'})) {
             $genpwd=$ENV{'form.locarg'};
+        }
+    }
+    if ($amode =~ /^krb/) {
+        if (! defined($genpwd) || $genpwd eq '') {
+            $r->print('<font color="red" size="+1">'.
+                      'Unable to enroll students:'.'</font>  '.
+                      'No Kerberos domain was specified.</p>');
+            $amode = ''; # This causes the loop below to be skipped
         }
     }
     unless (($domain=~/\W/) || ($amode eq '')) {