--- loncom/interface/loncreateuser.pm	2004/12/07 00:49:27	1.91
+++ loncom/interface/loncreateuser.pm	2005/01/11 22:08:08	1.97
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.91 2004/12/07 00:49:27 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.97 2005/01/11 22:08:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,10 +73,9 @@ my $authformint;
 my $authformfsys;
 my $authformloc;
 
-BEGIN {
-    $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
-    my $krbdefdom=$1;
-    $krbdefdom=~tr/a-z/A-Z/;
+sub initialize_authen_forms {
+    my ($krbdefdom)=( $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/);
+    $krbdefdom= uc($krbdefdom);
     my %param = ( formname => 'document.cu',
                   kerb_def_dom => $krbdefdom 
                   );
@@ -397,6 +396,7 @@ ENDFORMINFO
                     'lg'   => "Login Data"
 				       );
 	my $genhelp=&Apache::loncommon::help_open_topic('Generation');
+        &initialize_authen_forms();
 	$r->print(<<ENDNEWUSER);
 $dochead
 <h1>$lt{'cnu'}</h1>
@@ -674,6 +674,7 @@ END
 		$currentauth=~/^localauth:/
 		) { # bad authentication scheme
 	    if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
+                &initialize_authen_forms();
 		my %lt=&Apache::lonlocal::texthash(
                                'err'   => "ERROR",
 			       'uuas'  => "This user has an unrecognized authentication scheme",
@@ -715,6 +716,7 @@ ENDBADAUTH
         } else { # Authentication type is valid
 	    my $authformcurrent='';
 	    my $authform_other='';
+            &initialize_authen_forms();
 	    if ($currentauth=~/^krb(4|5):/) {
 		$authformcurrent=$authformkrb;
 		$authform_other="<p>$authformint</p>\n".
@@ -1235,14 +1237,6 @@ END
                         $r->print(&commit_standardrole($url,$2,$start,$end,$1,undef,''));
                     }
                 }
-		# Assign the role and report it.
-		$r->print(&mt('Assigning').' '.$2.' in '.$url.': '.
-                         ($start?', '.&mt('starting').' '.localtime($start):'').
-                         ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
-                          &Apache::lonnet::assignrole(
-                              $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
-                              $url,$2,$end,$start)
-			  .'</b><br>');
 	    } else {
 		$r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$_.'</tt></p><br>');
             }
@@ -1254,7 +1248,7 @@ END
 }
 
 sub commit_customrole {
-    my ($url,$three,$four,$five,$end,$start) = @_;
+    my ($url,$three,$four,$five,$start,$end) = @_;
     my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url.
                          ($start?', '.&mt('starting').' '.localtime($start):'').
                          ($end?', ending '.localtime($end):'').': <b>'.
@@ -1280,13 +1274,13 @@ sub commit_standardrole {
                &mt('Add to classlist').': <b>ok</b><br />';
         }
     } else {
-        $output = (&mt('Assigning').' '.$three.' in '.$url.
+        $output = &mt('Assigning').' '.$three.' in '.$url.
                ($start?', '.&mt('starting').' '.localtime($start):'').
                ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
                &Apache::lonnet::assignrole(
                    $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
                    $url,$three,$end,$start).
-                   '</b><br>');
+                   '</b><br>';
     }
     return $output;
 }
@@ -1611,7 +1605,12 @@ sub course_level_table {
 	$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
 	my ($domain,$cnum)=split(/\//,$thiscourse);
         my %sections_count = ();
-        my $num_sections = &Apache::loncommon::get_sections($domain,$cnum,\%sections_count);
+        my $num_sections = 0;
+        if (defined($ENV{'request.course.id'})) {
+            if ($ENV{'request.course.id'} eq $domain.'_'.$cnum) {
+                $num_sections = &Apache::loncommon::get_sections($domain,$cnum,\%sections_count);
+            }
+        }
 	foreach  ('st','ta','ep','ad','in','cc') {
 	    if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {
 		my $plrole=&Apache::lonnet::plaintext($_);
@@ -1706,12 +1705,19 @@ sub course_sections {
     my ($num_sections,$sections_count,$role) = @_;
     my $output = '';
     my @sections = (sort {$a <=> $b} keys %{$sections_count});
-    $output = '<select name="currsec_'.$role.'" ';
-    my $multiple = 4;
-    if ($num_sections <4) { $multiple = $num_sections; }
-    $output .= '"multiple size="'.$multiple.'" >'."\n";
-    foreach (@sections) {
-        $output .= '<option value="'.$_.'" />'.$_."\n";
+    if ($num_sections == 1) {
+        $output = '<select name="currsec_'.$role.'" >'."\n".
+                  '  <option value="">Select</option>'."\n".
+                  '  <option value="">No section</option>'."\n".
+                  '  <option value="'.$sections[0].'" >'.$sections[0].'</option>'."\n";
+    } else {
+        $output = '<select name="currsec_'.$role.'" ';
+        my $multiple = 4;
+        if ($num_sections <4) { $multiple = $num_sections; }
+        $output .= '"multiple" size="'.$multiple.'">'."\n";
+        foreach (@sections) {
+            $output .= '<option value="'.$_.'">'.$_."</option>\n";
+        }
     }
     $output .= '</select>'; 
     return $output;