--- loncom/interface/lonuserutils.pm	2010/11/14 21:19:08	1.97.2.22
+++ loncom/interface/lonuserutils.pm	2009/11/12 15:58:22	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.97.2.22 2010/11/14 21:19:08 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.104 2009/11/12 15:58:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,8 +47,7 @@ sub modifystudent {
     # this one.  If $csec is defined, drop them from all other sections of
     # this course and add them to section $csec
     my ($cnum,$cdom) = &get_course_identity($courseid);
-    my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
-    my %roles = &Apache::lonnet::dump('roles',$udom,$unam,'.',undef,$extra);
+    my %roles = &Apache::lonnet::dump('roles',$udom,$unam);
     my ($tmp) = keys(%roles);
     # Bail out if we were unable to get the students roles
     return "$1" if ($tmp =~ /^(con_lost|error|no_such_host)/i);
@@ -296,8 +295,7 @@ sub hidden_input {
 }
 
 sub print_upload_manager_header {
-    my ($r,$datatoken,$distotal,$krbdefdom,$context,$permission,$crstype,
-        $can_assign)=@_;
+    my ($r,$datatoken,$distotal,$krbdefdom,$context,$permission,$crstype)=@_;
     my $javascript;
     #
     if (! exists($env{'form.upfile_associate'})) {
@@ -311,9 +309,9 @@ sub print_upload_manager_header {
         }
     }
     if ($env{'form.upfile_associate'} eq 'reverse') {
-        $javascript=&upload_manager_javascript_reverse_associate($can_assign);
+        $javascript=&upload_manager_javascript_reverse_associate();
     } else {
-        $javascript=&upload_manager_javascript_forward_associate($can_assign);
+        $javascript=&upload_manager_javascript_forward_associate();
     }
     #
     # Deal with restored settings
@@ -388,7 +386,7 @@ sub javascript_validations {
         if (($context eq 'course') || ($context eq 'domain')) {
             if ($context eq 'course') {
                 if ($env{'request.course.sec'} eq '') {
-                    $setsection_call = 'setSections(document.'.$param{'formname'}.",'$crstype'".');';
+                    $setsection_call = 'setSections(document.'.$param{'formname'}."'$crstype'".');';
                     $setsections_js =
                         &setsections_javascript($param{'formname'},$groupslist,
                                                 $mode,'',$crstype);
@@ -534,7 +532,6 @@ END
         if (message!='') {
             message+='\\n';
         }
-        message+='$alert{'section'}';
     }
     if (foundemail==0) {
         if (message!='') {
@@ -588,46 +585,6 @@ END
 ###############################################################
 ###############################################################
 sub upload_manager_javascript_forward_associate {
-    my ($can_assign) = @_;
-    my ($auth_update,$numbuttons,$argreset);
-    if (ref($can_assign) eq 'HASH') {
-        if ($can_assign->{'krb4'} || $can_assign->{'krb5'}) {
-            $argreset .= "      vf.krbarg.value='';\n";
-            $numbuttons ++ ;
-        }
-        if ($can_assign->{'int'}) {
-            $argreset .= "      vf.intarg.value='';\n";
-            $numbuttons ++;
-        }
-        if ($can_assign->{'loc'}) {
-            $argreset .= "      vf.locarg.value='';\n";
-            $numbuttons ++;
-        }
-        if (!$can_assign->{'int'}) {
-            my $warning = &mt('You may not specify an initial password for each user, as this is only available when new users use LON-CAPA internal authentication.\n').
-                          &mt('Your current role does not have rights to create users with that authentication type.');
-            $auth_update = <<"END";
-   // Currently the initial password field is only supported for internal auth
-   // (see bug 6368).
-   if (nw==9) {
-       eval('vf.f'+tf+'.selectedIndex=0;')
-       alert('$warning');
-   }
-END
-        } elsif ($numbuttons > 1) {
-            $auth_update = <<"END";
-   // If we set the password, make the password form below correspond to
-   // the new value.
-   if (nw==9) {
-      changed_radio('int',document.studentform);
-      set_auth_radio_buttons('int',document.studentform);
-$argreset
-   }
-
-END
-        }
-    }
-
     return(<<ENDPICK);
 function verify(vf,sec_caller) {
     var founduname=0;
@@ -704,7 +661,15 @@ function flip(vf,tf) {
          }
       }
    }
-   $auth_update
+   // If we set the password, make the password form below correspond to
+   // the new value.
+   if (nw==9) {
+       changed_radio('int',document.studentform);
+       set_auth_radio_buttons('int',document.studentform);
+       vf.intarg.value='';
+       vf.krbarg.value='';
+       vf.locarg.value='';
+   }
 }
 
 function clearpwd(vf) {
@@ -722,45 +687,6 @@ ENDPICK
 ###############################################################
 ###############################################################
 sub upload_manager_javascript_reverse_associate {
-    my ($can_assign) = @_;
-    my ($auth_update,$numbuttons,$argreset);
-    if (ref($can_assign) eq 'HASH') {
-        if ($can_assign->{'krb4'} || $can_assign->{'krb5'}) {
-            $argreset .= "      vf.krbarg.value='';\n";
-            $numbuttons ++ ;
-        }
-        if ($can_assign->{'int'}) {
-            $argreset .= "      vf.intarg.value='';\n";
-            $numbuttons ++;
-        }
-        if ($can_assign->{'loc'}) {
-            $argreset .= "      vf.locarg.value='';\n";
-            $numbuttons ++;
-        }
-        if (!$can_assign->{'int'}) {
-            my $warning = &mt('You may not specify an initial password, as this is only available when new users use LON-CAPA internal authentication.\n').
-                          &mt('Your current role does not have rights to create users with that authentication type.');
-            $auth_update = <<"END";
-   // Currently the initial password field is only supported for internal auth
-   // (see bug 6368).
-   if (tf==8 && nw!=0) {
-       eval('vf.f'+tf+'.selectedIndex=0;')
-       alert('$warning');
-   }
-END
-        } elsif ($numbuttons > 1) {
-            $auth_update = <<"END";
-   // initial password specified, pick internal authentication
-   if (tf==8 && nw!=0) {
-      changed_radio('int',document.studentform);
-      set_auth_radio_buttons('int',document.studentform);
-$argreset
-   }
-
-END
-        }
-    }
-
     return(<<ENDPICK);
 function verify(vf,sec_caller) {
     var founduname=0;
@@ -768,7 +694,6 @@ function verify(vf,sec_caller) {
     var foundname=0;
     var foundid=0;
     var foundsec=0;
-    var foundemail=0;
     var foundrole=0;
     var founddomain=0;
     var foundinststatus=0;
@@ -780,12 +705,11 @@ function verify(vf,sec_caller) {
         if (i==6 && tw!=0) { foundid=1; }
         if (i==7 && tw!=0) { foundsec=1; }
         if (i==8 && tw!=0) { foundpwd=1; }
-        if (i==9 && tw!=0) { foundemail=1; }
-        if (i==10 && tw!=0) { foundrole=1; }
-        if (i==11 && tw!=0) { founddomain=1; }
-        if (i==12 && tw!=0) { foundinstatus=1; }
+        if (i==9 && tw!=0) { foundrole=1; }
+        if (i==10 && tw!=0) { founddomain=1; }
+        if (i==13 && tw!=0) { foundinstatus=1; }
     }
-    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain,foundinststatus);
+    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundrole,founddomain,foundinststatus);
 }
 
 function flip(vf,tf) {
@@ -810,7 +734,6 @@ function flip(vf,tf) {
        vf.intarg.value='';
        vf.locarg.value='';
    }
-   $auth_update
 }
 
 function clearpwd(vf) {
@@ -1055,9 +978,8 @@ sub print_upload_manager_form {
     my ($krbdef,$krbdefdom) =
         &Apache::loncommon::get_kerberos_defaults($defdom);
     #
-    my ($authnum,%can_assign) =  &Apache::loncommon::get_assignable_auth($defdom);
     &print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom,$context,
-                                 $permission,$crstype,\%can_assign);
+                                 $permission,$crstype);
     my $i;
     my $keyfields;
     if ($total>=0) {
@@ -1524,19 +1446,14 @@ sub print_userlist {
                   '<input type="hidden" name="phase" value="" /></form>');
         return;
     }
-    if (!(($context eq 'domain') && 
-        (($env{'form.roletype'} eq 'course') || ($env{'form.roletype'} eq 'community')))) {
-        $r->print(
-            "\n</p>\n"
-           .'<p>'
-           .&list_submit_button(&mt('Update Display'))
-           ."</p>\n"
-        );
+    if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) {
+        $r->print('&nbsp;'.&list_submit_button(&mt('Update Display')).
+                  "\n</p>\n");
     }
     my ($indexhash,$keylist) = &make_keylist_array();
-    my (%userlist,%userinfo,$clearcoursepick);
+    my (%userlist,%userinfo);
     if (($context eq 'domain') && 
-        ($env{'form.roletype'} eq 'course') ||
+        ($env{'form.roletype'} eq 'course') || 
         ($env{'form.roletype'} eq 'community')) {
         my ($crstype,$numcodes,$title,$warning);
         if ($env{'form.roletype'} eq 'course') {
@@ -1559,15 +1476,9 @@ sub print_userlist {
                   $courseform."\n".
                   &Apache::lonhtmlcommon::row_closure(1).
                   &Apache::lonhtmlcommon::end_pick_box().'</p>'.
-                  '<p><input type="hidden" name="origroletype" value="'.$env{'form.roletype'}.'" />'.
-                  &list_submit_button(&mt('Update Display')).
+                  '<p>'.&list_submit_button(&mt('Update Display')).
                   "\n".'</p><span class="LC_warning">'.$warning.'</span>'."\n");
-        $clearcoursepick = 0;
-        if (($env{'form.origroletype'} ne '') &&
-            ($env{'form.origroletype'} ne $env{'form.roletype'})) {
-            $clearcoursepick = 1;
-        }
-        if (($env{'form.coursepick'}) && (!$clearcoursepick)) {
+        if ($env{'form.coursepick'}) {
             $r->print('<hr />'.&mt('Searching').' ...<br />&nbsp;<br />');
         }
     } else {
@@ -1642,7 +1553,7 @@ sub print_userlist {
                 }
             } elsif (($env{'form.roletype'} eq 'course') ||
                      ($env{'form.roletype'} eq 'community')) {
-                if (($env{'form.coursepick'}) && (!$clearcoursepick)) {
+                if ($env{'form.coursepick'}) {
                     my %courses = &process_coursepick();
                     my %allusers;
                     my $hidepriv = 1;
@@ -1810,7 +1721,7 @@ sub section_group_filter {
         }
         if (@options > 0) {
             my $currsel;
-            $markup = '<select name="'.$name{$item}.'">'."\n";
+            $markup = '<select name="'.$name{$item}.'" />'."\n";
             foreach my $option ('all','none',@options) { 
                 $currsel = '';
                 if ($env{'form.'.$name{$item}} eq $option) {
@@ -1825,9 +1736,7 @@ sub section_group_filter {
                 $markup .= '</option>'."\n";
             }
             $markup .= '</select>'."\n";
-            $output .= ('&nbsp;'x3).'<span class="LC_nobreak">'
-                      .'<label>'.$title{$item}.': '.$markup.'</label>'
-                      .'</span> ';
+            $output .= ('&nbsp;'x3).'<label>'.$title{$item}.': '.$markup.'</label>';
         }
     }
     return $output;
@@ -2047,17 +1956,13 @@ sub process_coursepick {
     my $coursefilter = $env{'form.coursepick'};
     my $cdom = $env{'request.role.domain'};
     my %courses;
-    my $crssrch = 'Course';
-    if ($env{'form.roletype'} eq 'community') {
-        $crssrch = 'Community';
-    }
     if ($coursefilter eq 'all') {
         %courses = &Apache::lonnet::courseiddump($cdom,'.','.','.','.','.',
-                                                 undef,undef,$crssrch);
+                                                 undef,undef,'Course');
     } elsif ($coursefilter eq 'category') {
         my $instcode = &instcode_from_coursefilter();
         %courses = &Apache::lonnet::courseiddump($cdom,'.','.',$instcode,'.','.',
-                                                 undef,undef,$crssrch);
+                                                 undef,undef,'Course');
     } elsif ($coursefilter eq 'specific') {
         if ($env{'form.coursetotal'} > 1) {
             my @course_ids = split(/&&/,$env{'form.courselist'});
@@ -2242,7 +2147,7 @@ END
     } elsif ($context eq 'domain') {
         if ($setting eq 'community') {
             $crstype = 'Community';
-        } elsif ($setting eq 'course') {
+        } elsif ($crstype eq 'course') {
             $crstype = 'Course';
         }
     }
@@ -2355,7 +2260,7 @@ END
             push(@cols,'section');
         }
         if (!($context eq 'domain' && ($env{'form.roletype'} eq 'course')
-                              && ($env{'form.roletype'} eq 'community'))) {
+                              && ($env{'form.roletype'} eq 'community'))) { 
             push(@cols,('start','end'));
         }
         if ($env{'form.showrole'} eq 'Any' || $env{'form.showrole'} eq 'cr') {
@@ -2366,7 +2271,7 @@ END
                                     $env{'form.roletype'} eq 'community')) {
             push (@cols,'extent');
         }
-        if (($statusmode eq 'Any') &&
+        if (($statusmode eq 'Any') && 
             (!($context eq 'domain' && (($env{'form.roletype'} eq 'course')
              || ($env{'form.roletype'} eq 'community'))))) {
             push(@cols,'status');
@@ -2387,18 +2292,13 @@ END
     if ($mode ne 'autoenroll') {
         $results_description = &results_header_row($rolefilter,$statusmode,
                                                    $context,$permission,$mode,$crstype);
-
         $r->print('<b>'.$results_description.'</b><br /><br />');
     }
     my ($output,$actionselect,%canchange,%canchangesec);
     if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll' || $mode eq 'pickauthor') {
         if ($mode ne 'autoenroll' && $mode ne 'pickauthor') {
             if ($permission->{'cusr'}) {
-                unless (($context eq 'domain') && 
-                        (($setting eq 'course') || ($setting eq 'community'))) {
-                    $actionselect = 
-                        &select_actions($context,$setting,$statusmode,$formname);
-                }
+                $actionselect = &select_actions($context,$setting,$statusmode,$formname);
             }
             $r->print(<<END);
 <input type="hidden" name="srchby"  value="uname" />
@@ -2409,7 +2309,7 @@ END
 END
             if ($actionselect) {
                 $output .= <<"END";
-<div class="LC_left_float"><fieldset><legend><b>$lt{'ac'}</b></legend>
+<div class="LC_left_float"><fieldset><legend>$lt{'ac'}</legend>
 $actionselect
 <br/><br /><input type="button" value="$lt{'ca'}" onclick="javascript:checkAll(document.$formname.actionlist)" /> &nbsp;
 <input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.$formname.actionlist)" /><br /><input type="button" value="$lt{'pr'}" onclick="javascript:verify_action('actionlist')" /></fieldset></div>
@@ -2454,7 +2354,7 @@ END
                     }
                 }
             }
-            $output .= '<div class="LC_left_float"><fieldset><legend><b>'.$lt{'link'}.'</b></legend>'.
+            $output .= '<div class="LC_left_float"><fieldset><legend>'.$lt{'link'}.'</legend>'.
                        '<table><tr>';
             my @linkdests = ('aboutme');
             if ($permission->{'cusr'}) {
@@ -2465,6 +2365,7 @@ END
                                          $env{'request.course.sec'})) {
                 push(@linkdests,'track');
             }
+
             $output .= '<td>';
             my $usernamelink = $env{'form.usernamelink'};
             if ($usernamelink eq '') {
@@ -2481,7 +2382,7 @@ END
             if ($env{'form.userwin'}) {
                 $checkwin = ' checked="checked"';
             }
-            $output .= '</td><td valign="top" style="border-left: 1px solid;><span class="LC_nobreak"><input type="checkbox" name="userwin" value="1"'.$checkwin.' />'.$lt{'owin'}.'</span></td></tr></table></fieldset></div>';
+            $output .= '</td><td valign="top"><span class="LC_nobreak"><input type="checkbox" name="userwin" value="1"'.$checkwin.' />'.$lt{'owin'}.'</span></td></tr></table></fieldset></div>';
         }
         $output .= "\n".'<div class="LC_clear_float_footer">&nbsp;</div>'."\n".
                   &Apache::loncommon::start_data_table().
@@ -2491,7 +2392,11 @@ END
  <th><a href=\"javascript:document.$formname.sortby.value='type';document.$formname.submit();\">$lt{'type'}</a></th>
             ";
         } else {
-            $output .= "\n".'<th>&nbsp;</th>'."\n";
+            if ($mode eq 'pickauthor') {
+                $output .= "\n".'<th>&nbsp;</th>'."\n";
+            } else { 
+                $output .= "\n".'<th>'.&mt('Count').'</th>'."\n";
+            }
             if ($actionselect) {
                 $output .= '<th>'.&mt('Select').'</th>'."\n";
             }
@@ -2546,13 +2451,9 @@ END
                        time.'_'.rand(1000000000).'.csv';
         unless ($CSVfile = Apache::File->new('>/home/httpd'.$CSVfilename)) {
             $r->log_error("Couldn't open $CSVfilename for output $!");
-            $r->print(
-                '<p class="LC_error">'
-               .&mt('Problems occurred in writing the CSV file.')
-               .' '.&mt('This error has been logged.')
-               .' '.&mt('Please alert your LON-CAPA administrator.')
-               .'</p>'
-            );
+            $r->print(&mt('Problems occurred in writing the CSV file. '
+                         .'This error has been logged. '
+                         .'Please alert your LON-CAPA administrator.'));
             $CSVfile = undef;
         }
         #
@@ -2734,7 +2635,7 @@ END
         if ($clickers!~/\w/) { $clickers='-'; }
         $in{'clicker'} = $clickers; 
 	my $role = $in{'role'};
-        $in{'role'}=&Apache::lonnet::plaintext($sdata->[$index{'role'}],$crstype); 
+        $in{'role'}=&Apache::lonnet::plaintext($sdata->[$index{'role'}],$crstype);
         if (! defined($in{'start'}) || $in{'start'} == 0) {
             $in{'start'} = &mt('none');
         } else {
@@ -3021,7 +2922,7 @@ sub print_username_link {
         $output = $in->{'username'};
     } else {
         $output = '<a href="javascript:username_display_launch('.
-                  "'$in->{'username'}','$in->{'domain'}'".')">'.
+                  "'$in->{'username'}','$in->{'domain'}'".')" />'.
                   $in->{'username'}.'</a>';
     }
     return $output;
@@ -3251,8 +3152,8 @@ ENDJS
     my %lt = &Apache::lonlocal::texthash (
                  chac => 'Access dates to apply for selected users',
                  chse => 'Changes in section affiliation to apply to selected users',
-                 fors => 'For student roles, changing the section will result in a section switch as students may only be in one section of a course at a time.',
-                 forn => 'For a course role that is not "student", users may have roles in more than one section at a time.',
+                 fors => 'For student roles changing the section, will result in a section switch as students may only be in one section of a course at a time.',
+                 forn => 'For a role in a course that is not a student role, a user may have roles in more than one section of a course at a time.',
                  reta => "Retain each user's current section affiliations?", 
                  dnap => '(Does not apply to student roles).',
             );
@@ -3271,13 +3172,14 @@ ENDJS
                                           $permission,$crstype);
     }
     $output .= '<h3>'.$headertext.'</h3>'.
-               '<form name="'.$formname.'" method="post" action="">'."\n".
+               '<form name="'.$formname.'" method="post">'."\n".
                 $date_items;
     if ($context eq 'course' && $env{'form.bulkaction'} eq 'chgsec') {
         my ($cnum,$cdom) = &get_course_identity();
+        my $crstype = &Apache::loncommon::course_type();
         if ($crstype eq 'Community') {
-            $lt{'fors'} = &mt('For member roles, changing the section will result in a section switch, as members may only be in one section of a community at a time.');
-            $lt{'forn'} = &mt('For a community role that is not "member", users may have roles in more than one section at a time.');
+            $lt{'fors'} = &mt('For member roles changing the section, will result in a section switch as members may only be in one section of a community at a time.');
+            $lt{'forn'} = &mt('For a role in a community that is not a member role, a user may have roles in more than one section of a community at a time.');
             $lt{'dnap'} = &mt('(Does not apply to member roles).'); 
         }
         my $info;
@@ -3318,7 +3220,7 @@ sub section_picker {
     my ($cdom,$cnum,$role,$rowtitle,$permission,$context,$mode,$crstype) = @_;
     my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
     my $sections_select .= &course_sections(\%sections_count,$role);
-    my $secbox = '<div>'.&Apache::lonhtmlcommon::start_pick_box()."\n";
+    my $secbox = '<p>'.&Apache::lonhtmlcommon::start_pick_box()."\n";
     if ($mode eq 'upload') {
         my ($options,$cb_script,$coursepick) =
             &default_role_selector($context,1,$crstype);
@@ -3331,7 +3233,7 @@ sub section_picker {
                    '<td align="center">'.&mt('Existing sections')."\n".
                    '<br />'.$sections_select.'</td><td align="center">'.
                    &mt('New section').'<br />'."\n".
-                   '<input type="text" name="newsec" size="15" value="" />'."\n".
+                   '<input type="text" name="newsec" size="15" />'."\n".
                    '<input type="hidden" name="sections" value="" />'."\n".
                    '</td></tr></table>'."\n";
     } else {
@@ -3340,7 +3242,7 @@ sub section_picker {
                    $env{'request.course.sec'};
     }
     $secbox .= &Apache::lonhtmlcommon::row_closure(1)."\n".
-               &Apache::lonhtmlcommon::end_pick_box().'</div>';
+               &Apache::lonhtmlcommon::end_pick_box().'</p>';
     return $secbox;
 }
 
@@ -3481,12 +3383,11 @@ sub results_header_row {
                 if ($rolefilter eq 'Any') {
                     $description .= &mt('All users with co-author roles in domain',$showfilter);
                 } else {
-                    $description .= &mt('All co-authors in domain with [_1] roles',$rolefilter);
+                    $description .= &mt('All co-authors in domain  with [_1] roles',$rolefilter);
                 }
             }
         } elsif (($env{'form.roletype'} eq 'course') || 
                  ($env{'form.roletype'} eq 'community')) {
-
             my $coursefilter = $env{'form.coursepick'};
             if ($env{'form.roletype'} eq 'course') {
                 if ($coursefilter eq 'category') {
@@ -3742,16 +3643,24 @@ sub print_first_users_upload_form {
     $str .= '<h2>'.&mt('Upload a file containing information about users').'</h2>'."\n";
 
     # Excel and CSV Help
-    $str .= '<div class="LC_left_float">'
+    $str .= '<p>'
            .&Apache::loncommon::help_open_topic("Course_Create_Class_List",
                 &mt("How do I create a users list from a spreadsheet"))
-           .'</div><div class="LC_left_float">'."\n"
+           ."<br />\n"
            .&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
                 &mt("How do I create a CSV file from a spreadsheet"))
-           .'</div><br clear="all" />'."\n";
+           ."</p>\n";
+
     $str .= &Apache::lonhtmlcommon::start_pick_box()
-           .&Apache::lonhtmlcommon::row_title(&mt('File'))
-           .&Apache::loncommon::upfile_select_html()
+           .&Apache::lonhtmlcommon::row_title(&mt('File'));
+    if (&Apache::lonlocal::current_language() ne 'en') {
+        if ($context eq 'course') { 
+            $str .= '<p class="LC_info">'."\n"
+                   .&mt('Please upload an UTF8 encoded file to ensure a correct character encoding in your classlist.')."\n"
+                   .'</p>'."\n";
+        }
+    }
+    $str .= &Apache::loncommon::upfile_select_html()
            .&Apache::lonhtmlcommon::row_closure()
            .&Apache::lonhtmlcommon::row_title(
                 '<label for="noFirstLine">'
@@ -3765,6 +3674,8 @@ sub print_first_users_upload_form {
            .'<input type="submit" name="fileupload" value="'.&mt('Next').'" />'
            .'</p>';
 
+    $str .= &Apache::loncommon::end_page();
+
     $r->print($str);
     return;
 }
@@ -3885,7 +3796,7 @@ sub upfile_drop_add {
         } elsif ($setting eq 'course') {
             $defaultrole = $env{'form.courserole'};
             $defaultsec = $env{'form.sections'};
-        }
+        }  
     } elsif ($context eq 'author') {
         $defaultrole = $env{'form.defaultrole'};
     } elsif ($context eq 'course') {
@@ -4001,7 +3912,6 @@ sub upfile_drop_add {
             my @secs;
             my %entries=&Apache::loncommon::record_sep($line);
             # Determine user name
-            $entries{$fields{'username'}} =~ s/^\s+|\s+$//g;
             unless (($entries{$fields{'username'}} eq '') ||
                     (!defined($entries{$fields{'username'}}))) {
                 my ($fname, $mname, $lname,$gen) = ('','','','');
@@ -4024,17 +3934,11 @@ sub upfile_drop_add {
                 }
                 if ($entries{$fields{'username'}}
                     ne &LONCAPA::clean_username($entries{$fields{'username'}})) {
-                    my $nowhitespace;
-                    if ($entries{$fields{'username'}} =~ /\s/) {
-                        $nowhitespace = ' - '.&mt('usernames may not contain spaces.');
-                    }
                     $r->print('<br />'.
       &mt('[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]',
-          '<b>'.$entries{$fields{'username'}}.'</b>',$fname,$mname,$lname,$gen).
-                              $nowhitespace);
+          '<b>'.$entries{$fields{'username'}}.'</b>',$fname,$mname,$lname,$gen));
                     next;
                 } else {
-                    $entries{$fields{'domain'}} =~ s/^\s+|\s+$//g;
                     if ($entries{$fields{'domain'}} 
                         ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) {
                         $r->print('<br />'. '<b>'.$entries{$fields{'domain'}}.
@@ -4093,7 +3997,6 @@ sub upfile_drop_add {
                     # determine email address
                     my $email='';
                     if (defined($fields{'email'})) {
-                        $entries{$fields{'email'}} =~ s/^\s+|\s+$//g;
                         if (defined($entries{$fields{'email'}})) {
                             $email=$entries{$fields{'email'}};
                             unless ($email=~/^[^\@]+\@[^\@]+$/) { $email=''; }
@@ -4140,7 +4043,7 @@ sub upfile_drop_add {
                         $role = $defaultrole;
                     }
                     # Clean up whitespace
-                    foreach (\$id,\$fname,\$mname,\$lname,\$gen,\$inststatus) {
+                    foreach (\$id,\$fname,\$mname,\$lname,\$gen) {
                         $$_ =~ s/(\s+$|^\s+)//g;
                     }
                     # check against rules
@@ -4245,7 +4148,7 @@ sub upfile_drop_add {
                                         $role = 'cr_'.$env{'user.domain'}.'_'.
                                                 $env{'user.name'}.'_'.$role;
                                     }
-                                    if (($role ne 'cc') && ($role ne 'co')) {
+                                    if (($role ne 'cc') && ($role ne 'co')) { 
                                         if (@secs > 1) {
                                             $multiple = 1;
                                             foreach my $sec (@secs) {
@@ -4308,7 +4211,7 @@ sub upfile_drop_add {
             }
         } # end of foreach (@userdata)
         # Flush the course logs so reverse user roles immediately updated
-        $r->register_cleanup(\&Apache::lonnet::flushcourselogs);
+        &Apache::lonnet::flushcourselogs();
         $r->print("</p>\n<p>\n".&mt('Processed [quant,_1,user].',$counts{'user'}).
                   "</p>\n");
         if ($counts{'role'} > 0) {
@@ -4472,9 +4375,10 @@ sub print_drop_menu {
 # ================================================================== Phase four
 
 sub update_user_list {
-    my ($r,$context,$setting,$choice,$crstype) = @_;
+    my ($r,$context,$setting,$choice) = @_;
     my $now = time;
     my $count=0;
+    my $crstype;
     if ($context eq 'course') {
         $crstype = &Apache::loncommon::course_type();
     }
@@ -4489,7 +4393,7 @@ sub update_user_list {
                                    'reenable' => 'Re-enabled',
                                    'activate' => 'Activated',
                                    'chgdates' => 'Changed Access Dates for',
-                                   'chgsec'   => 'Changed section(s) for',
+                                   'chgsec'   => 'Changed section for',
                                    'drop'     => 'Dropped',
                                  },
                         error => {'revoke'    => 'revoking',
@@ -4506,9 +4410,8 @@ sub update_user_list {
         ($startdate,$enddate) = &get_dates_from_form();
     }
     foreach my $item (@changelist) {
-        my ($role,$uname,$udom,$cid,$sec,$scope,$result,$type,$locktype,
-            @sections,$scopestem,$singlesec,$showsecs,$warn_singlesec,
-            $nothingtodo,$keepnosection);
+        my ($role,$uname,$udom,$cid,$sec,$scope,$result,$type,$locktype,@sections,
+            $scopestem);
         if ($choice eq 'drop') {
             ($uname,$udom,$sec) = split(/:/,$item,-1);
             $role = 'st';
@@ -4607,23 +4510,14 @@ sub update_user_list {
             } elsif ($choice eq 'chgsec') {
                 my (@newsecs,$revresult,$nochg,@retained);
                 if (($role ne 'cc') && ($role ne 'co')) {
-                    my @secs = sort(split(/,/,$env{'form.newsecs'}));
-                    if (@secs) {
-                        my %curr_groups = &Apache::longroup::coursegroups();
-                        foreach my $sec (@secs) {
-                            next if (($sec =~ /\W/) || ($sec eq 'none') ||
-                            (exists($curr_groups{$sec})));
-                            push(@newsecs,$sec);
-                        }
-                    }
+                    @newsecs = split(/,/,$env{'form.newsecs'});
                 }
                 # remove existing section if not to be retained.   
-                if (!$env{'form.retainsec'} || ($role eq 'st')) {
+                if (!$env{'form.retainsec'}) {
                     if ($sec eq '') {
                         if (@newsecs == 0) {
-                            $result = 'ok';
+                            $result = &mt('No change in section assignment (none)');
                             $nochg = 1;
-                            $nothingtodo = 1;
                         } else {
                             $revresult =
                                 &Apache::lonnet::revokerole($udom,$uname,
@@ -4650,23 +4544,13 @@ sub update_user_list {
                 } else {
                     if ($sec eq '') {
                         $nochg = 1;
-                        $keepnosection = 1;
                     } else { 
                         push(@retained,$sec);
                     }
                 }
                 # add new sections
-                my (@diffs,@shownew);
-                if (@retained) {
-                    @diffs = &Apache::loncommon::compare_arrays(\@retained,\@newsecs);
-                } else {
-                    @diffs = @newsecs;
-                }
                 if (@newsecs == 0) {
-                    if ($nochg) {
-                        $result = 'ok';
-                        $nothingtodo = 1;
-                    } else {
+                    if (!$nochg) {
                         if ($role eq 'st') {
                             $result = 
                                 &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid,'',$context);
@@ -4675,41 +4559,15 @@ sub update_user_list {
                             $result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start,'','',$context);
                         }
                     }
-                    $showsecs = &mt('No section');
-                } elsif (@diffs == 0) {
-                    $result = 'ok';
-                    $nothingtodo = 1;
                 } else {
                     foreach my $newsec (@newsecs) { 
                         if (!grep(/^\Q$newsec\E$/,@retained)) {
                             if ($role eq 'st') {
                                 $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid,'',$context);
-                                if (@newsecs > 1) {
-                                    my $showsingle;
-                                    if ($newsec eq '') {
-                                        $showsingle = &mt('No section');
-                                    } else {
-                                        $showsingle = $newsec;
-                                    }
-                                    if ($crstype eq 'Community') {
-                                        $warn_singlesec = &mt('Although more than one section was indicated, a role was only added for the first section - [_1], as each community member may only be in one section at a time.','<i>'.$showsingle.'</i>');
-                                    } else {
-                                        $warn_singlesec = &mt('Although more than one section was indicated, a role was only added for the first section - [_1], as each student may only be in one section of a course at a time.','<i>'.$showsingle.'</i>');
-                                    }
-                                    $showsecs = $showsingle;
-                                    last;
-                                } else {
-                                    if ($newsec eq '') {
-                                        $showsecs = &mt('No section');
-                                    } else {
-                                        $showsecs = $newsec;
-                                    }
-                                }
                             } else {
                                 my $newscope = $scopestem;
                                 if ($newsec ne '') {
                                    $newscope .= '/'.$newsec;
-                                   push(@shownew,$newsec);
                                 }
                                 $result = &Apache::lonnet::assignrole($udom,$uname,
                                                         $newscope,$role,$end,$start);
@@ -4717,15 +4575,6 @@ sub update_user_list {
                         }
                     }
                 }
-                unless ($role eq 'st') {
-                    unless ($showsecs) {
-                        my @tolist = sort(@shownew,@retained);
-                        if ($keepnosection) {
-                            push(@tolist,&mt('No section'));
-                        }
-                        $showsecs = join(', ',@tolist);
-                    }
-                }
             }
         }
         my $extent = $scope;
@@ -4736,48 +4585,13 @@ sub update_user_list {
             }
         }
         if ($result eq 'ok' || $result eq 'ok:') {
-            my $dates;
-            if (($choice eq 'chgsec') || ($choice eq 'chgdates')) {
-                $dates = &dates_feedback($start,$end,$now);
-            }
-            if ($choice eq 'chgsec') {
-                if ($nothingtodo) {
-                    $r->print(&mt("Section assignment for role of '[_1]' in [_2] for '[_3]' unchanged.",$plrole,$extent,'<i>'.
-                          &Apache::loncommon::plainname($uname,$udom).
-                          '</i>').' ');
-                    if ($sec eq '') {
-                        $r->print(&mt('[_1]No section[_2] - [_3]','<b>','</b>',$dates));
-                    } else {
-                        $r->print(&mt('Section(s): [_1] - [_2]',
-                                      '<b>'.$showsecs.'</b>',$dates));
-                    }
-                    $r->print('<br />');
-                } else {
-                    $r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for '[_3]' to [_4] - [_5]",$plrole,$extent,
-                        '<i>'.&Apache::loncommon::plainname($uname,$udom).'</i>',
-                        '<b>'.$showsecs.'</b>',$dates).'<br />');
-                   $count ++;
-               }
-               if ($warn_singlesec) {
-                   $r->print('<div class="LC_warning">'.$warn_singlesec.'</div>');
-               }
-            } elsif ($choice eq 'chgdates') {
-                $r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for '[_3]' - [_4]",$plrole,$extent,
-                      '<i>'.&Apache::loncommon::plainname($uname,$udom).'</i>',
-                      $dates).'<br />');
-               $count ++;
-            } else {
-                $r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for '[_3]'.",$plrole,$extent,
-                      '<i>'.&Apache::loncommon::plainname($uname,$udom).'</i>').
-                          '<br />');
-                $count ++;
-            }
+            $r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for [_3]",
+                          $plrole,$extent,$uname.':'.$udom).'<br />');
+            $count++;
         } else {
             $r->print(
-                &mt("Error $result_text{'error'}{$choice} [_1] in [_2] for '[_3]': [_4].",
-                    $plrole,$extent,
-                    '<i>'.&Apache::loncommon::plainname($uname,$udom).'</i>',
-                    $result).'<br />');
+                &mt("Error $result_text{'error'}{$choice} [_1] in [_2] for [_3]: [_4].",
+                    $plrole,$extent,$uname.':'.$udom,$result).'<br />');
         }
     }
     $r->print('<form name="studentform" method="post" action="/adm/createuser">'."\n");
@@ -4793,13 +4607,13 @@ sub update_user_list {
             }
         }
     }
-    $r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} for [quant,_1,user role,user roles,no user roles].",$count).'</b></p>');
+    $r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,no users].",$count).'</b></p>');
     if ($count > 0) {
         if ($choice eq 'revoke' || $choice eq 'drop') {
             $r->print('<p>'.&mt('Re-enabling will re-activate data for the role.').'</p>');
         }
         # Flush the course logs so reverse user roles immediately updated
-        $r->register_cleanup(\&Apache::lonnet::flushcourselogs);
+        &Apache::lonnet::flushcourselogs();
     }
     if ($env{'form.makedatesdefault'}) {
         if ($choice eq 'chgdates' || $choice eq 'reenable' || $choice eq 'activate') {
@@ -4813,27 +4627,6 @@ sub update_user_list {
     $r->print('<a href="javascript:document.studentform.submit()">'.$linktext.'</a></form>'."\n");
 }
 
-sub dates_feedback {
-    my ($start,$end,$now) = @_;
-    my $dates;
-    if ($start < $now) {
-        if ($end == 0) {
-            $dates .= &mt('role(s) active now; no end date');
-        } elsif ($end > $now) {
-            $dates = &mt('role(s) active now; ends [_1].',&Apache::lonlocal::locallocaltime($end));
-        } else {
-            $dates = &mt('role(s) expired: [_1].',&Apache::lonlocal::locallocaltime($end));
-        }
-     } else {
-        if ($end == 0 || $end > $now) {
-            $dates = &mt('future role(s); starts: [_1].',&Apache::lonlocal::locallocaltime($start));
-        } else {
-            $dates = &mt('role(s) expired: [_1].',&Apache::lonlocal::locallocaltime($end));
-        }
-    }
-    return $dates;
-}
-
 sub classlist_drop {
     my ($scope,$uname,$udom,$now) = @_;
     my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)});
@@ -5014,7 +4807,7 @@ sub setsections_javascript {
                     accr => 'A course coordinator role will be added with access to all sections.',
                     acor => 'A coordinator role will be added with access to all sections',
                     inea => 'In each course, each user may only have one student role at a time.',
-                    inco => 'In each community, each user may only have one member role at a time.',
+                    inec => 'In each community, each user may only have on member role at a time.',
                     youh => 'You had selected ',
                     secs => 'sections.',
                     plmo => 'Please modify your selections so they include no more than one section.',
@@ -5022,21 +4815,16 @@ sub setsections_javascript {
                     plch => 'Please choose a different section name.',
                     mnot => 'may not be used as a section name, as it is the name of a course group.',
                     secn => 'Section names and group names must be distinct. Please choose a different section name.',
-                    nonw => 'Section names may only contain letters or numbers.',
                  );                
     $setsection_js .= <<"ENDSECCODE";
 
 function setSections(formname,crstype) {
     var re1 = /^currsec_/;
-    var re2 =/\\W/;
-    var trimleading = /^\\s+/;
-    var trimtrailing = /\\s+\$/;
     var groups = new Array($groupslist);
     for (var i=0;i<formname.elements.length;i++) {
         var str = formname.elements[i].name;
         var checkcurr = str.match(re1);
         if (checkcurr != null) {
-            var num = i;
             if ($checkincluded) {
                 $rolecode
                 if (role == 'cc' || role == 'co') {
@@ -5048,60 +4836,38 @@ function setSections(formname,crstype) {
                 } else {
                     var sections = '';
                     var numsec = 0;
-                    var fromexisting = new Array();
-                    for (var j=0; j<formname.elements[num].length; j++) {
-                        if (formname.elements[num].options[j].selected == true ) {
-                            var addsec = formname.elements[num].options[j].value;
-                            if ((addsec != "") && (addsec != null)) {
-                                fromexisting.push(addsec);
+                    var sections;
+                    for (var j=0; j<formname.elements[i].length; j++) {
+                        if (formname.elements[i].options[j].selected == true ) {
+                            if (formname.elements[i].options[j].value != "") {
                                 if (numsec == 0) {
-                                    sections = addsec;
-                                } else {
-                                    sections = sections + "," +  addsec;
-                                }
-                                numsec ++;
-                            }
-                        }
-                    }
-                    var newsecs = formname.elements[num+1].value;
-                    var validsecs = new Array();
-                    var validsecstr = '';
-                    var badsecs = new Array();
-                    if (newsecs != null && newsecs != "") {
-                        var numsplit;
-                        if (newsecs.indexOf(',') == -1) {
-                            numsplit = new Array(newsecs);
-                        } else {
-                            numsplit = newsecs.split(/,/g);
-                        }
-                        for (var m=0; m<numsplit.length; m++) {
-                            var newsec = numsplit[m];
-                            newsec = newsec.replace(trimleading,'');
-                            newsec = newsec.replace(trimtrailing,'');
-                            if (re2.test(newsec) == true) {
-                                badsecs.push(newsec);
-                            } else {
-                                if (newsec != '') {
-                                    var isnew = 1;
-                                    if (fromexisting != null) {
-                                        for (var n=0; n<fromexisting.length; n++) {
-                                            if (newsec == fromexisting[n]) {
-                                                isnew = 0;
-                                            }
-                                        }
-                                    }
-                                    if (isnew == 1) {
-                                        validsecs.push(newsec);
+                                    if (formname.elements[i].options[j].value != "") {
+                                        sections = formname.elements[i].options[j].value;
+                                        numsec ++;
                                     }
                                 }
+                                else {
+                                    sections = sections + "," +  formname.elements[i].options[j].value
+                                    numsec ++;
+                                }
                             }
                         }
-                        if (badsecs.length > 0) {
-                            alert("$alerts{'nonw'}\\n$alerts{'plch'}");
-                            return;
+                    }
+                    if (numsec > 0) {
+                        if (formname.elements[i+1].value != "" && formname.elements[i+1].value != null) {
+                            sections = sections + "," +  formname.elements[i+1].value;
                         }
-                        numsec = numsec + validsecs.length;
                     }
+                    else {
+                        sections = formname.elements[i+1].value;
+                    }
+                    var newsecs = formname.elements[i+1].value;
+                    var numsplit;
+                    if (newsecs != null && newsecs != "") {
+                        numsplit = newsecs.split(/,/g);
+                        numsec = numsec + numsplit.length;
+                    }
+
                     if ((role == 'st') && (numsec > 1)) {
                         if (crstype == 'Community') {
                             alert("$alerts{'inea'} $alerts{'youh'} "+numsec+" $alerts{'secs'}\\n$alerts{'plmo'}");
@@ -5109,36 +4875,25 @@ function setSections(formname,crstype) {
                             alert("$alerts{'inco'} $alerts{'youh'} "+numsec+" $alerts{'secs'}\\n$alerts{'plmo'}");
                         }
                         return;
-                    } else {
-                        if (validsecs != null) {
-                            for (var j=0; j<validsecs.length; j++) {
-                                if (validsecstr == '' || validsecstr == null) {
-                                    validsecstr = validsecs[j];
-                                } else {
-                                    validsecstr += ','+validsecs[j];
-                                }
-                                if ((validsecs[j] == 'all') ||
-                                    (validsecs[j] == 'none')) {
-                                    alert("'"+validsecs[j]+"' $alerts{'mayn'}\\n$alerts{'plch'}");
+                    }
+                    else {
+                        if (numsplit != null) {
+                            for (var j=0; j<numsplit.length; j++) {
+                                if ((numsplit[j] == 'all') ||
+                                    (numsplit[j] == 'none')) {
+                                    alert("'"+numsplit[j]+"' $alerts{'mayn'}\\n$alerts{'plch'}");
                                     return;
                                 }
                                 for (var k=0; k<groups.length; k++) {
-                                    if (validsecs[j] == groups[k]) {
-                                        alert("'"+validsecs[j]+"' $alerts{'mnot'}\\n$alerts{'secn'}");
+                                    if (numsplit[j] == groups[k]) {
+                                        alert("'"+numsplit[j]+"' $alerts{'mnot'}\\n$alerts{'secn'}");
                                         return;
                                     }
                                 }
                             }
                         }
+                        formname.elements[i+2].value = sections;
                     }
-                    if ((validsecstr != '') && (validsecstr != null)) {
-                        if ((sections == '') || (sections == null)) {
-                            sections = validsecstr;
-                        } else {
-                            sections = sections + "," + validsecstr;
-                        }
-                    }
-                    formname.elements[num+2].value = sections;
                 }
             }
         }
@@ -5594,7 +5349,7 @@ sub sectioncheck_alerts {
     my %alerts = &Apache::lonlocal::texthash(
                     curd => 'You must select a course or community in the current domain',
                     inea => 'In each course, each user may only have one student role at a time',
-                    inco => 'In each community, each user may only have one member role at a time',
+                    inco => 'In each community, each user may only have one member role at a time', 
                     youh => 'You had selected',
                     sect => 'sections',
                     plsm => 'Please modify your selections so they include no more than one section',