--- loncom/interface/lonmsgdisplay.pm 2006/05/17 09:46:01 1.25
+++ loncom/interface/lonmsgdisplay.pm 2006/05/17 14:58:28 1.27
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.25 2006/05/17 09:46:01 foxr Exp $
+# $Id: lonmsgdisplay.pm,v 1.27 2006/05/17 14:58:28 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -28,7 +28,6 @@
package Apache::lonmsgdisplay;
-use Apache::lonselstudent;
=pod
@@ -126,6 +125,7 @@ use Apache::lonlocal;
use Apache::loncommunicate;
use Apache::lonfeedback;
use Apache::lonrss();
+use Apache::lonselstudent();
# Querystring component with sorting type
my $sqs;
@@ -277,137 +277,6 @@ sub discourse {
return $result;
}
-# --------------------------------- No longer needed ..old display course list.
-sub discourse_obsolete {
- my $r=shift;
- my ($classlist,$keylist) = &Apache::loncoursedata::get_classlist();
- my ($classgroups,$studentgroups) =
- &Apache::loncoursedata::get_group_memberships($classlist,$keylist);
- my %lt=&Apache::lonlocal::texthash('cfa' => 'Check All',
- 'cfs' => 'Check Section/Group',
- 'cfn' => 'Uncheck All');
- if (defined($env{'form.group'})) {
- $r->print(''."\n");
- }
- $r->print(<
-
-
-
-
-
-
-ENDDISHEADER
- my %coursepersonnel=&Apache::lonnet::get_course_adv_roles();
- $r->print(&Apache::loncommon::start_data_table());
- if (keys(%coursepersonnel) > 0) {
- $r->print('
Non-students
');
- $r->print(&Apache::loncommon::start_data_table());
- $r->print('Name | Username:Domain | Role |
');
- foreach my $role (sort(keys(%coursepersonnel))) {
- foreach my $user (split(/\,/,$coursepersonnel{$role})) {
- my ($puname,$pudom)=split(/\:/,$user);
- $r->print(&Apache::loncommon::start_data_table_row());
- $r->print(' | '.
- '('.$user.'), | '.$role.' | ');
- $r->print(&Apache::loncommon::end_data_table_row());
- }
- }
- $r->print(&Apache::loncommon::end_data_table());
- }
- if (keys(%{$classlist}) > 0) {
- $r->print('Students
');
- $r->print(&Apache::loncommon::start_data_table());
- $r->print('Name | Username:Domain | Section | Groups |
');
- my $sort = sub {
- my $aname=lc($classlist->{$a}[&Apache::loncoursedata::CL_FULLNAME()]);
- if (!$aname) { $aname=$a; }
- my $bname=lc($classlist->{$b}[&Apache::loncoursedata::CL_FULLNAME()]);
- if (!$bname) { $bname=$b; }
- return $aname cmp $bname;
- };
- foreach my $student (sort $sort (keys(%{$classlist}))) {
- my $info=$classlist->{$student};
- my ($sname,$sdom,$status,$fullname,$section) =
- (@{$info}[&Apache::loncoursedata::CL_SNAME(),
- &Apache::loncoursedata::CL_SDOM(),
- &Apache::loncoursedata::CL_STATUS(),
- &Apache::loncoursedata::CL_FULLNAME(),
- &Apache::loncoursedata::CL_SECTION()]);
- next if ($status ne 'Active');
- next if ($env{'request.course.sec'} &&
- $section ne $env{'request.course.sec'});
- my @studentsgroups =
- &Apache::loncoursedata::get_students_groups($student,$status,
- $classgroups);
- my $grouplist = join(', ',@studentsgroups);
- my $key = 'send_to_&&&'.$section.'&&&_'.$student;
- if (! defined($fullname) || $fullname eq '') {$fullname = $sname;}
- my $checked = '';
- my $groupcount = 0;
- my $groupitems;
- $r->print(&Apache::loncommon::start_data_table_row());
- $r->print(''.$groupitems.
- ' | '.$sname.':'.$sdom.' | '.$section.
- ' | '.$grouplist.' | ');
- $r->print(&Apache::loncommon::end_data_table_row());
- }
- $r->print(&Apache::loncommon::end_data_table());
- }
-}
-
# ==================================================== Display Critical Message
sub discrit {
@@ -1761,7 +1630,7 @@ sub sendoffmail {
my %toaddr;
if ($to) {
foreach my $dest (@$to) {
- my ($user,$domain) = split /:/, $dest;
+ my ($user,$domain) = split(/:/, $dest);
if (($user ne '') && ($domain ne '')) {
my $address = $user.":".$domain; # How the code below expects it.
$toaddr{$address} = '';