--- loncom/interface/lonmsgdisplay.pm	2006/05/11 20:05:03	1.24
+++ 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.24 2006/05/11 20:05:03 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.27 2006/05/17 14:58:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -125,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;
@@ -259,133 +260,21 @@ sub movemsg {
 # ======================================================= Display a course list
 
 sub discourse {
-    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('<input type="hidden" name="group" value="'.
-                  $env{'form.group'}.'" />'."\n");
-    }
-    $r->print(<<ENDDISHEADER);
-<input type="hidden" name="sendmode" value="group" />
-<script pe="text/javascript">
-    function checkall() {
-	for (i=0; i<document.forms.compemail.elements.length; i++) {
-            if 
-          (document.forms.compemail.elements[i].name.indexOf('send_to_')==0) {
-	      document.forms.compemail.elements[i].checked=true;
-            }
-        }
-    }
-
-    function checksec() {
-	for (i=0; i<document.forms.compemail.elements.length; i++) {
-            if 
-          (document.forms.compemail.elements[i].name.indexOf
-           ('send_to_&&&'+document.forms.compemail.chksec.value+'&&&')==0) {
-	      document.forms.compemail.elements[i].checked=true;
-            }
-            if
-          (document.forms.compemail.elements[i].name.indexOf
-           ('group_&&&'+document.forms.compemail.chksec.value+'&&&_')==0) {
-              var count = i - document.forms.compemail.elements[i].value;
-              document.forms.compemail.elements[count].checked=true;
-            }
-        }
-    }
+    my $result;
+    my ($course_personnel,
+	$current_members,
+	$expired_members,
+	$future_members) = &Apache::lonselstudent::get_people_in_class();
+    unshift @$current_members, (@$course_personnel);
+    my %defaultUsers;
+
+    $result = &Apache::lonselstudent::render_student_list($current_members,
+							  "compemail",
+							  "current",
+							  \%defaultUsers,
+							  1,"selectedusers",1);
 
-    function uncheckall() {
-	for (i=0; i<document.forms.compemail.elements.length; i++) {
-            if 
-          (document.forms.compemail.elements[i].name.indexOf('send_to_')==0) {
-	      document.forms.compemail.elements[i].checked=false;
-            }
-        }
-    }
-</script>
-<input type="button" onClick="checkall()" value="$lt{'cfa'}" />&nbsp;
-<input type="button" onClick="checksec()" value="$lt{'cfs'}" />
-<input type="text" size="15" name="chksec" value="$env{'form.group'}" />&nbsp;
-<input type="button" onClick="uncheckall()" value="$lt{'cfn'}" />
-<p>
-ENDDISHEADER
-    my %coursepersonnel=&Apache::lonnet::get_course_adv_roles();
-    $r->print(&Apache::loncommon::start_data_table());
-    if (keys(%coursepersonnel) > 0) {
-        $r->print('<h3>Non-students</h3>');
-        $r->print(&Apache::loncommon::start_data_table());
-        $r->print('<tr><th>Name</th><th>Username:Domain</th><th>Role</th></tr>');
-        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('<td><label>'.
-                          '<input type="checkbox" name="send_to_&&&&&&_'.
-                          $puname.':'.$pudom.'" /> '.
-                          &Apache::loncommon::plainname($puname,$pudom).
-                          '</label></td>'.
-                          '<td>('.$user.'),</td><td><i>'.$role.'</i></td>');
-                $r->print(&Apache::loncommon::end_data_table_row());
-            }
-        }
-        $r->print(&Apache::loncommon::end_data_table());
-    }
-    if (keys(%{$classlist}) > 0) {
-        $r->print('<h3>Students</h3>');
-        $r->print(&Apache::loncommon::start_data_table());
-        $r->print('<tr><th>Name</th><th>Username:Domain</th><th>Section</th><th>Groups</th></tr>');
-        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('<td><label>');
-            foreach my $group (@studentsgroups) {
-                $groupcount ++;
-                $groupitems .= ('<input type="hidden" name="group_&&&'.
-                                $group.'&&&_'.$student.'" value="'.
-                                $groupcount.'" />');
-                if (defined($env{'form.group'})) {
-                    if ($env{'form.group'} eq $group) {
-                        $checked = 'checked="checked"';
-                    }
-                }
-            }
-            $r->print(qq{<input type="checkbox" name="$key" $checked />}.
-                      ('&nbsp;'x2).$fullname.'</label>'.$groupitems.
-                      '</td><td>'.$sname.':'.$sdom.'</td><td>'.$section.
-                      '</td><td>'.$grouplist.'</td>');
-            $r->print(&Apache::loncommon::end_data_table_row());
-        }
-        $r->print(&Apache::loncommon::end_data_table());
-    }
+    return $result;
 }
 
 # ==================================================== Display Critical Message
@@ -978,6 +867,8 @@ ENDUPLOAD
     }
     if ($broadcast eq 'group') {
        &discourse($r);
+       my $studentsel = &discourse();
+       $r->print($studentsel);
     }
     $r->print('</form>'.
 	      &Apache::lonfeedback::generate_preview_button('compemail','message').
@@ -1733,13 +1624,26 @@ sub sendoffmail {
 	    &statuschange($msgid,'replied',$folder);
 	}
 
+	my $to = $env{'form.selectedusers.forminput'};
+	my $mode = $env{'form.sendmode'};
+
 	my %toaddr;
-	if ($env{'form.sendmode'} eq 'group') {
-	    foreach my $address (keys(%env)) {
-		if ($address=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
-		    $toaddr{$1}='';
+	if ($to) {
+	    foreach my $dest (@$to) {
+		my ($user,$domain) = split(/:/, $dest);
+		if (($user ne '') && ($domain ne '')) {
+		    my $address = $user.":".$domain; # How the code below expects it.
+		    $toaddr{$address} = '';
 		}
 	    }
+	}
+
+	if ($env{'form.sendmode'} eq 'group') {
+	     foreach my $address (keys(%env)) {
+	 	if ($address=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
+	 	    $toaddr{$1}='';
+	 	}
+	    }
 	} elsif ($env{'form.sendmode'} eq 'upload') {
 	    foreach my $line (split(/[\n\r\f]+/,$env{'form.upfile'})) {
 		my ($rec,$txt)=split(/\s*\:\s*/,$line);
@@ -1749,12 +1653,16 @@ sub sendoffmail {
 		}
 	    }
 	} else {
-	    $toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
+	    if (($env{'form.recuname'} ne '') && ($env{'form.recdomain'} ne '')) {
+		$toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
+	    }
 	}
 	if ($env{'form.additionalrec'}) {
 	    foreach (split(/\,/,$env{'form.additionalrec'})) {
 		my ($auname,$audom)=split(/\@/,$_);
-		$toaddr{$auname.':'.$audom}='';
+		if (($auname ne "") && ($audom ne "")) {
+		    $toaddr{$auname.':'.$audom}='';
+		}
 	    }
 	}
 
@@ -1883,7 +1791,7 @@ sub sendoffmail {
 	}
     } else {
 	$r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.
-		  &mt('Please use the browser "Back" button and correct the recipient addresses').'</p>');
+		  &mt('Please use the browser "Back" button and correct the recipient addresses '."($sendstatus)").'</p>');
     }
 }