--- loncom/interface/loncommon.pm	2006/12/28 02:50:20	1.498
+++ loncom/interface/loncommon.pm	2007/01/23 20:00:38	1.503
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.498 2006/12/28 02:50:20 albertel Exp $
+# $Id: loncommon.pm,v 1.503 2007/01/23 20:00:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1335,8 +1335,15 @@ sub multiple_select_form {
         }
     }
     $output.="\n<select name='$name' size='$size' multiple='1'>";
-    my @order = ref($order) ? @$order
-                            : sort(keys(%$hash));
+    my @order;
+    if ($order) {
+        @order = ref($order) ? @$order
+                             : sort(keys(%$hash));
+    }
+    if (exists($$hash{'select_form_order'})) {
+        @order = @{$$hash{'select_form_order'}};
+    }
+        
     foreach my $key (@order) {
         $output.='<option value="'.&HTML::Entities::encode($key,'"<>&').'" ';
         $output.='selected="selected" ' if ($selected{$key});
@@ -2896,16 +2903,16 @@ sub blockcheck {
         $uname = $env{'user.name'};
     }
 
-    my ($startblock,$endblock);
-
     # If uname and udom are for a course, check for blocks in the course.
 
     if (&Apache::lonnet::is_course($udom,$uname)) {
         my %records = &Apache::lonnet::dump('comm_block',$udom,$uname);
-        ($startblock,$endblock)=&get_blocks($setters,$activity,$udom,$uname);
+        my ($startblock,$endblock)=&get_blocks($setters,$activity,$udom,$uname);
         return ($startblock,$endblock);
     }
 
+    my $startblock = 0;
+    my $endblock = 0;
     my %live_courses = &findallcourses(undef,$uname,$udom);
 
     # If uname is for a user, and activity is course-specific, i.e.,
@@ -2966,8 +2973,6 @@ sub blockcheck {
             if ($sec ne 'none') {
                 $checkrole .= '/'.$sec;
             }
-            # Resource belongs to user other than current user.
-            # Assemble privs for that user, and check for 'evb' priv.  
             if ($otheruser) {
                 # Resource belongs to user other than current user.
                 # Assemble privs for that user, and check for 'evb' priv.
@@ -3017,8 +3022,16 @@ sub blockcheck {
 
         # Retrieve blocking times and identity of blocker for course
         # of specified user, unless user has 'evb' privilege.
-
-        ($startblock,$endblock)=&get_blocks($setters,$activity,$cdom,$cnum);
+        
+        my ($start,$end)=&get_blocks($setters,$activity,$cdom,$cnum);
+        if (($start != 0) && 
+            (($startblock == 0) || ($startblock > $start))) {
+            $startblock = $start;
+        }
+        if (($end != 0)  &&
+            (($endblock == 0) || ($endblock < $end))) {
+            $endblock = $end;
+        }
     }
     return ($startblock,$endblock);
 }
@@ -3344,7 +3357,7 @@ sub bodytag {
     my ($role,$realm) = split(/\./,$env{'request.role'},2);
     if ($role  eq 'ca') {
         my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$});
-        $realm = &plainname($rname,$rdom).':'.$rdom;
+        $realm = &plainname($rname,$rdom);
     } 
 # realm
     if ($env{'request.course.id'}) {
@@ -4939,7 +4952,7 @@ sub get_course_users {
                     $usec = 'none';
                 }
                 if ($uname ne '' && $udom ne '') {
-                    if ($end < $now) {
+                    if ($end > 0 && $end < $now) {
                         $status = 'previous';
                     } elsif ($start > $now) {
                         $status = 'future';
@@ -6129,7 +6142,7 @@ sub store_settings {
 }
 
 sub restore_course_settings {
-    return &return_settings($env{'request.course.id'},@_);
+    return &restore_settings($env{'request.course.id'},@_);
 }
 
 sub restore_settings {