--- loncom/interface/loncommon.pm	2006/12/11 21:16:32	1.491
+++ 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.491 2006/12/11 21:16:32 albertel Exp $
+# $Id: loncommon.pm,v 1.503 2007/01/23 20:00:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,6 +59,7 @@ use Apache::lonnet;
 use GDBM_File;
 use POSIX qw(strftime mktime);
 use Apache::lonmenu();
+use Apache::lonenc();
 use Apache::lonlocal;
 use HTML::Entities;
 use Apache::lonhtmlcommon();
@@ -515,8 +516,8 @@ function setSect(sectionlist) {
 
 sub selectcourse_link {
    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
-    return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
-        '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select [_1]',$selecttype)."</a>";
+   return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
+        '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select Course')."</a>";
 }
 
 sub check_uncheck_jscript {
@@ -1334,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});
@@ -2690,7 +2698,9 @@ sub get_student_answers {
   }
   $moreenv{'grade_target'}='answer';
   %moreenv=(%form,%moreenv);
-  my $userview=&Apache::lonnet::ssi('/res/'.$feedurl,%moreenv);
+  $feedurl = &Apache::lonnet::clutter($feedurl);
+  &Apache::lonenc::check_encrypt(\$feedurl);
+  my $userview=&Apache::lonnet::ssi($feedurl,%moreenv);
   return $userview;
 }
 
@@ -2893,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.,
@@ -2963,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.
@@ -3014,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);
 }
@@ -3341,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'}) {
@@ -3925,6 +3941,11 @@ table.LC_mail_list tr.LC_mail_other {
 table.LC_mail_list tr.LC_mail_other:hover {
   background-color: $mail_other_hover;
 }
+table.LC_mail_list tr.LC_mail_even {
+}
+table.LC_mail_list tr.LC_mail_odd {
+}
+
 
 table#LC_portfolio_actions {
   width: auto;
@@ -4468,6 +4489,11 @@ Inputs:         $args - additional optio
                                  a html attribute
                  frameset     -> if true will start with a <frameset>
                                  rather than <body>
+                 dicsussion   -> if true will get discussion from
+                                  lonxml::xmlend
+                                 (you can pass the target and parser arguments
+                                  through optional 'target' and 'parser' args
+                                  to this routine)
 
 =cut
 
@@ -4926,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';
@@ -6064,16 +6090,19 @@ Returns: both routines return nothing
 #######################################################
 #######################################################
 sub store_course_settings {
+    return &store_settings($env{'request.course.id'},@_);
+}
+
+sub store_settings {
     # save to the environment
     # appenv the same items, just to be safe
-    my $courseid = $env{'request.course.id'};
     my $udom  = $env{'user.domain'};
     my $uname = $env{'user.name'};
-    my ($prefix,$Settings) = @_;
+    my ($context,$prefix,$Settings) = @_;
     my %SaveHash;
     my %AppHash;
     while (my ($setting,$type) = each(%$Settings)) {
-        my $basename = join('.','internal',$courseid,$prefix,$setting);
+        my $basename = join('.','internal',$context,$prefix,$setting);
         my $envname = 'environment.'.$basename;
         if (exists($env{'form.'.$setting})) {
             # Save this value away
@@ -6113,11 +6142,14 @@ sub store_course_settings {
 }
 
 sub restore_course_settings {
-    my $courseid = $env{'request.course.id'};
-    my ($prefix,$Settings) = @_;
+    return &restore_settings($env{'request.course.id'},@_);
+}
+
+sub restore_settings {
+    my ($context,$prefix,$Settings) = @_;
     while (my ($setting,$type) = each(%$Settings)) {
         next if (exists($env{'form.'.$setting}));
-        my $envname = 'environment.internal.'.$courseid.'.'.$prefix.
+        my $envname = 'environment.internal.'.$context.'.'.$prefix.
             '.'.$setting;
         if (exists($env{$envname})) {
             if ($type eq 'scalar') {