--- loncom/interface/loncommon.pm	2005/09/14 21:25:52	1.273
+++ loncom/interface/loncommon.pm	2005/10/04 18:27:32	1.276
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.273 2005/09/14 21:25:52 raeburn Exp $
+# $Id: loncommon.pm,v 1.276 2005/10/04 18:27:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2946,6 +2946,60 @@ sub get_users_function {
 
 =pod
 
+=item check_user_status
+
+Determines current status of supplied role for a
+specific user. Roles can be active, previous or future.
+
+Inputs: 
+user's domain, user's username, course's domain,
+course's number, optional section/group.
+
+Outputs:
+role status: active, previous or future. 
+
+=cut
+
+sub check_user_status {
+    my ($udom,$uname,$cdom,$crs,$role,$secgrp) = @_;
+    my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname);
+    my @uroles = keys %userinfo;
+    my $srchstr;
+    my $active_chk = 'none';
+    if (@uroles > 0) {
+        if (($role eq 'cc') || ($secgrp eq '') || (!defined($secgrp))) {
+            $srchstr = '/'.$cdom.'/'.$crs.'_'.$role;
+        } else {
+            $srchstr = '/'.$cdom.'/'.$crs.'/'.$secgrp.'_'.$role;         }
+        if (grep/^$srchstr$/,@uroles) {
+            my $role_end = 0;
+            my $role_start = 0;
+            $active_chk = 'active';
+            if ($userinfo{$srchstr} =~ m/^($role)_(\d+)/) {
+                $role_end = $2;
+                if ($userinfo{$srchstr} =~ m/^($role)_($role_end)_(\d+)$/) {
+                    $role_start = $3;
+                }
+            }
+            if ($role_start > 0) {
+                if (time < $role_start) {
+                    $active_chk = 'future';
+                }
+            }
+            if ($role_end > 0) {
+                if (time > $role_end) {
+                    $active_chk = 'previous';
+                }
+            }
+        }
+    }
+    return $active_chk;
+}
+
+###############################################
+
+=pod
+
 =item get_sections
 
 Determines all the sections for a course including
@@ -2964,11 +3018,10 @@ Returns number of sections.
 sub get_sections {
     my ($cdom,$cnum,$sectioncount,$possible_roles) = @_;
     if (!($cdom && $cnum)) { return 0; }
-    my $cid = $cdom.'_'.$cnum;
     my $numsections = 0;
 
     if (!defined($possible_roles) || (grep/^st$/,@$possible_roles)) {
-	my ($classlist) = &Apache::loncoursedata::get_classlist($cid,$cdom,$cnum);
+	my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);
 	my $sec_index = &Apache::loncoursedata::CL_SECTION();
 	my $status_index = &Apache::loncoursedata::CL_STATUS();
 	while (my ($student,$data) = each %$classlist) {
@@ -2998,6 +3051,81 @@ sub get_sections {
     return $numsections;
 }
 
+###############################################
+
+=pod
+                                                                                
+=item get_course_users
+                                                                                
+Retrieves usernames:domains for users in the specified course
+with specific role(s), and access status. 
+
+Incoming parameters:
+1. course_id
+2. course domain
+3. course number
+4. access status: users must have - either active, 
+previous, future, or all.
+5. reference to array of permissible roles
+6. reference to results object (hash of hashes).
+Keys of top level hash are roles.
+Keys of inner hashes are username:domain, with 
+values set to access type.
+                                                                                
+=cut
+                                                                                
+###############################################
+                                                                                
+sub get_course_users {
+    my ($course_id,$cdom,$cnum,$types,$roles,$users) = @_;
+    if (grep/^st$/,@{$roles}) {
+        my $statusidx = &Apache::loncoursedata::CL_STATUS;
+        my $startidx = &Apache::loncoursedata::CL_START;
+        my $endidx = &Apache::loncoursedata::CL_END;
+        my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist($cdom,$cnum);
+        foreach my $student (keys (%{$classlist})) {
+            if (defined($$types{'active'})) {
+                if ($$classlist{$student}[$statusidx] eq 'Active') {
+                    push(@{$$users{st}{$student}},'active');
+                }
+            }
+            if (defined($$types{'previous'})) {
+                if ($$classlist{$student}[$endidx] <= time) {
+                    push(@{$$users{st}{$student}},'previous');
+                }
+            }
+            if (defined($$types{'future'})) {
+                if (($$classlist{$student}[$startidx] > 0) && ($$classlist{$student}[$endidx] > time) || ($$classlist{$student}[$endidx] == 0) || ($$classlist{$student}[$endidx] eq '')) {
+                    push(@{$$users{st}{$student}},'future');
+                }
+            }
+        }
+    }
+    if ((@{$roles} > 0) && (@{$roles} ne "st")) {
+        my ($cdom,$cnum) = split/_/,$course_id;
+        my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$cdom,$cnum);
+        foreach my $person (@coursepersonnel) {
+            my ($role,$user) = ($person =~ /^([^:]*):([^:]+:[^:]+)/);
+            $user =~ s/:$//;
+            if (($role) && (grep/^$role$/,@{$roles})) {
+                my ($uname,$udom) = split/:/,$user;
+                if ($uname ne '' && $udom ne '') {
+                    my $status = &check_user_status($udom,$uname,$cdom,$cnum,$role);
+                    foreach my $type (keys %{$types}) { 
+                        if ($status eq $type) {
+                            $$users{$role}{$user} = $type;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+
+
+###############################################
 
 sub get_posted_cgi {
     my $r=shift;