[LON-CAPA-cvs] cvs: loncom /html/adm/helper course.initialization.helper

raeburn lon-capa-cvs-allow@mail.lon-capa.org
Wed, 05 Sep 2007 12:46:23 -0000


raeburn		Wed Sep  5 08:46:23 2007 EDT

  Modified files:              
    /loncom/html/adm/helper	course.initialization.helper 
  Log:
  Fixing domain checking broken in rev 1.19.
  
  
Index: loncom/html/adm/helper/course.initialization.helper
diff -u loncom/html/adm/helper/course.initialization.helper:1.19 loncom/html/adm/helper/course.initialization.helper:1.20
--- loncom/html/adm/helper/course.initialization.helper:1.19	Tue Sep  4 20:59:51 2007
+++ loncom/html/adm/helper/course.initialization.helper	Wed Sep  5 08:46:21 2007
@@ -256,7 +256,7 @@
               my ($clname,$cldom) = split(/:/,$item);
               if ($clname eq '*') {
                   if ($cldom =~ /^$match_dom$/) {
-                      if (!&Apache::lonnet::domain($udom)) {
+                      if (!&Apache::lonnet::domain($cldom)) {
                           $disallowed{'domain'} .= $item.',';
                       }
                   } else {
@@ -265,7 +265,7 @@
               } elsif ($item !~/^($match_uname)\:($match_dom)$/) {
                   $disallowed{'format'} .= $item.',';
               } else {
-                  if (!grep(/^\Q$cldom\E$/,@alldoms)) {
+                  if (!&Apache::lonnet::domain($cldom)) {
                       $disallowed{'domain'} .= $item.','; 
                   } elsif (&Apache::lonnet::homeserver($clname,$cldom) eq 'no_host') {
                       $disallowed{'newuser'} .= $item.',';