[LON-CAPA-cvs] cvs: loncom / lond

[raeburn]

raeburn		Fri Mar  7 22:17:38 2008 EDT

  Modified files:              
    /loncom	lond 
  Log:
  If filtering for self-enrollment, include in course matches if self-enrollment is active, or will become active in the future.
  
  
Index: loncom/lond
diff -u loncom/lond:1.397 loncom/lond:1.398
--- loncom/lond:1.397	Fri Feb 29 16:01:03 2008
+++ loncom/lond	Fri Mar  7 22:17:38 2008
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.397 2008/02/29 21:01:03 raeburn Exp $
+# $Id: lond,v 1.398 2008/03/08 03:17:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,7 +59,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.397 $'; #' stupid emacs
+my $VERSION='$Revision: 1.398 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -3498,8 +3498,7 @@
     if ($hashref) {
 	while (my ($key,$value) = each(%$hashref)) {
             my ($unesc_key,$lasttime_key,$lasttime,$is_hash,%val,
-                %unesc_val,$selfenroll_start,$selfenroll_end,
-                $selfenroll_types);
+                %unesc_val,$selfenroll_end,$selfenroll_types);
             $unesc_key = &unescape($key);
             if ($unesc_key =~ /^lasttime:/) {
                 next;
@@ -3519,13 +3518,9 @@
                     $unesc_val{'owner'} = $items->{'owner'};
                     $unesc_val{'type'} = $items->{'type'};
                     $selfenroll_types = $items->{'selfenroll_types'};
-                    $selfenroll_start = $items->{'selfenroll_start_date'};
                     $selfenroll_end = $items->{'selfenroll_end_date'};
                     if ($selfenrollonly) {
                         next if (!$selfenroll_types);
-                        if (($selfenroll_start > 0) && ($selfenroll_start > $now)) {
-                            next;
-                        }
                         if (($selfenroll_end > 0) && ($selfenroll_end <= $now)) {
                             next;
                         }