--- loncom/interface/lonuserutils.pm	2013/04/11 15:11:09	1.151
+++ loncom/interface/lonuserutils.pm	2013/09/26 17:46:42	1.156
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.151 2013/04/11 15:11:09 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.156 2013/09/26 17:46:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -642,7 +642,7 @@ sub upload_manager_javascript_forward_as
             $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'
+            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
@@ -1631,7 +1631,7 @@ sub print_userlist {
 
     my @cols = &infocolumns($context,$mode,$showcredits);  
     if (!@cols) {
-         $r->print('<hr clear="all" /><span class="LC_warning">'.
+         $r->print('<hr style="clear:both;" /><span class="LC_warning">'.
                    &mt('No user information selected for display.').'</span>'.
                    '<input type="hidden" name="phase" value="display" /></form>'."\n");
          return;
@@ -1674,7 +1674,7 @@ sub print_userlist {
             $r->print('<hr />'.&mt('Searching ...').'<br />&nbsp;<br />');
         }
     } else {
-        $r->print('<hr clear="all" /><div id="searching">'.&mt('Searching ...').'</div>');
+        $r->print('<hr style="clear:both;" /><div id="searching">'.&mt('Searching ...').'</div>');
     }
     $r->rflush();
     if ($context eq 'course') {
@@ -1988,7 +1988,7 @@ sub get_cols_array {
         }
         if (($context eq 'course') && ($mode ne 'autoenroll') &&
             ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'})) {
-            push(@cols,'photos');
+            push(@cols,'photo');
         }
         if ($context eq 'domain') {
             push (@cols,'extent');
@@ -2119,7 +2119,7 @@ sub get_column_names {
     if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
         $lt{'extent'} = &mt('course(s): description, section(s), status');
     } elsif ($context eq 'domain' && $env{'form.roletype'} eq 'community') {
-        $lt{'extent'} = &mt('communities: description, section(s), status');
+        $lt{'extent'} = &mt('community(s): description, section(s), status');
     } elsif (($context eq 'author') || 
              ($context eq 'domain' && $env{'form.roletype'} eq 'author')) {
         $lt{'extent'} = &mt('author');
@@ -2468,7 +2468,9 @@ sub show_users_list {
     if ($mode eq 'pickauthor') {
         @sortable = ('username','fullname','email','status');
     }
-    if (!grep(/^\Q$sortby\E$/,@sortable)) {
+    my %is_sortable;
+    map { $is_sortable{$_} => 1; } @sortable;
+    unless ($is_sortable{$sortby}) {
         $sortby = 'username';
     }
     my $setting = $env{'form.roletype'};
@@ -2712,7 +2714,13 @@ END
             }
         }
         foreach my $item (@cols) {
-            $output .= "<th><a href=\"javascript:document.$formname.sortby.value='$item';document.$formname.submit();\">$lt{$item}</a></th>\n";
+            $output .= "<th>";
+            if ($is_sortable{$item}) {
+                $output .= "<a href=\"javascript:document.$formname.sortby.value='$item';document.$formname.submit();\">$lt{$item}</a>";
+            } else {
+                $output .= $lt{$item};
+            }
+            $output .= "</th>\n";
         }
         my %role_types = &role_type_names();
         $output .= &Apache::loncommon::end_data_table_header_row();
@@ -4618,7 +4626,7 @@ sub upfile_drop_add {
             #  Get current classlist
             my $classlist = &Apache::loncoursedata::get_classlist();
             if (! defined($classlist)) {
-                $r->print('<form name="studentform" method="post" action="/adm/createuser" />'.
+                $r->print('<form name="studentform" method="post" action="/adm/createuser">'.
                           '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
                           '<p class="LC_info">'.&mt('There are no students with current/future access to the course.').'</p>'.
                           '</form>'."\n");
@@ -4741,7 +4749,7 @@ sub print_drop_menu {
         $heading = &mt("Drop Students");
     }
     $r->print('<h3>'.$heading.'</h3>'."\n".
-              '<form name="studentform" method="post">'."\n");
+              '<form name="studentform" method="post" action="">'."\n");
     my $classlist = &Apache::loncoursedata::get_classlist();
     if (! defined($classlist)) {
         my $msg = '';