--- loncom/interface/lonmsg.pm	2003/07/25 01:18:04	1.58
+++ loncom/interface/lonmsg.pm	2003/08/18 17:37:42	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.58 2003/07/25 01:18:04 bowersj2 Exp $
+# $Id: lonmsg.pm,v 1.64 2003/08/18 17:37:42 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -503,6 +503,19 @@ sub discourse {
 <input type=button onClick="uncheckall()" value="Check for None">
 <p>
 ENDDISHEADER
+    my %coursepersonnel=
+       &Apache::lonnet::get_course_adv_roles();
+    foreach my $role (sort keys %coursepersonnel) {
+       foreach (split(/\,/,$coursepersonnel{$role})) {
+	   my ($puname,$pudom)=split(/\:/,$_);
+	   $r->print(
+             '<br /><input type="checkbox" name="send_to_&&&&&&_'.
+             $puname.':'.$pudom.'" /> '.
+		     &Apache::loncommon::plainname($puname,
+                          $pudom).' ('.$_.'), <i>'.$role.'</i>');
+	}
+    }
+
     foreach (sort keys %courselist) {
         my ($end,$start)=split(/\:/,$courselist{$_});
         my $active=1;
@@ -553,7 +566,8 @@ $content{'sendername'}.'@'.
     }
     # Check to see if there were any messages.
     if ($result eq '') {
-        $result = "<h2>You have no critical messages.</h2>";
+        $result = "<h2>You have no critical messages.</h2>".
+	    '<a href="/adm/roles">Select a course</a>';
     } else {
         $r->print($header);
     }
@@ -624,36 +638,101 @@ sub disall {
     }
 </script>
 ENDDISHEADER
-   $r->print(
- '<h1>Display All Messages</h1><form method=post name=disall '.
- 'action="/adm/email">'.
-     '<table border=2><tr><th colspan=2>&nbsp</th><th>Date</th>'.
-     '<th>Username</th><th>Domain</th><th>Subject</th><th>Status</th></tr>');
-    foreach (sort split(/\&/,&Apache::lonnet::reply('keys:'.
-					$ENV{'user.domain'}.':'.
-                                        $ENV{'user.name'}.':nohist_email',
-                                        $ENV{'user.home'}))) {
-        my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
+    $r->print('<h1>Display All Messages</h1><form method=post name=disall '.
+	      'action="/adm/email">'.
+	      '<table border=2><tr><th colspan=2>&nbsp</th><th>');
+    if ($ENV{'form.sortedby'} eq "revdate") {
+	$r->print('<a href = "?sortedby=date">Date</a></th>');
+    } else {
+	$r->print('<a href = "?sortedby=revdate">Date</a></th>');
+    }
+    $r->print('<th>');
+    if ($ENV{'form.sortedby'} eq "revuser") {
+	$r->print('<a href = "?sortedby=user">Username</a>');
+    } else {
+	$r->print('<a href = "?sortedby=revuser">Username</a>');
+    }
+    $r->print('</th><th>');
+    if ($ENV{'form.sortedby'} eq "revdomain") {
+	$r->print('<a href = "?sortedby=domain">Domain</a>');
+    } else {
+	$r->print('<a href = "?sortedby=revdomain">Domain</a>');
+    }
+    $r->print('</th><th>');
+    if ($ENV{'form.sortedby'} eq "revsubject") {
+	$r->print('<a href = "?sortedby=subject">Subject</a>');
+    } else {
+    	$r->print('<a href = "?sortedby=revsubject">Subject</a>');
+    }
+    $r->print('</th><th>');
+    if ($ENV{'form.sortedby'} eq "revstatus") {
+	$r->print('<a href = "?sortedby=status">Status</th>');
+    } else {
+     	$r->print('<a href = "?sortedby=revstatus">Status</th>');
+    }
+    $r->print('</tr>');
+    my @messages = split(/\&/,&Apache::lonnet::reply('keys:'.$ENV{'user.domain'}.':'.$ENV{'user.name'}.':nohist_email',$ENV{'user.home'}));
+    #unpack the varibles and repack into temp for sorting
+    my @temp;
+    foreach (@messages) {
+	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
 	    &Apache::lonmsg::unpackmsgid($_);
+	my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$_);
+	push @temp ,\@temp1;
+    }
+    #default sort
+    @temp = sort  {$a->[0] <=> $b->[0]} @temp;    
+    if ($ENV{'form.sortedby'} eq "date"){
+        @temp = sort  {$a->[0] <=> $b->[0]} @temp;    
+    }
+    if ($ENV{'form.sortedby'} eq "revdate"){
+    	@temp = sort  {$b->[0] <=> $a->[0]} @temp; 
+    }
+    if ($ENV{'form.sortedby'} eq "user"){
+	@temp = sort  {lc($a->[2]) cmp lc($b->[2])} @temp;
+    }
+    if ($ENV{'form.sortedby'} eq "revuser"){
+	@temp = sort  {lc($b->[2]) cmp lc($a->[2])} @temp;
+    }
+    if ($ENV{'form.sortedby'} eq "domain"){
+        @temp = sort  {$a->[3] cmp $b->[3]} @temp;
+    }
+    if ($ENV{'form.sortedby'} eq "revdomain"){
+        @temp = sort  {$b->[3] cmp $a->[3]} @temp;
+    }
+    if ($ENV{'form.sortedby'} eq "subject"){
+        @temp = sort  {lc($a->[1]) cmp lc($b->[1])} @temp;
+    }
+    if ($ENV{'form.sortedby'} eq "revsubject"){
+        @temp = sort  {lc($b->[1]) cmp lc($a->[1])} @temp;
+    }
+    if ($ENV{'form.sortedby'} eq "status"){
+        @temp = sort  {$a->[4] cmp $b->[4]} @temp;
+    }
+    if ($ENV{'form.sortedby'} eq "revstatus"){
+        @temp = sort  {$b->[4] cmp $a->[4]} @temp;
+    }
+    foreach (@temp){
+	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @$_;
 	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
 	    if ($status eq 'new') {
 		$r->print('<tr bgcolor="#FFBB77">');
 	    } elsif ($status eq 'read') {
 		$r->print('<tr bgcolor="#BBBB77">');
 	    } elsif ($status eq 'replied') {
-		$r->print('<tr bgcolor="#AAAA88">');
+		$r->print('<tr bgcolor="#AAAA88">'); 
 	    } else {
 		$r->print('<tr bgcolor="#99BBBB">');
 	    }
-	    $r->print('<td><a href="/adm/email?display='.$_.
-		      '">Open</a></td><td><a href="/adm/email?markdel='.$_.
-		      '">Delete</a><input type=checkbox name="delmark_'.$_.'"></td>'.
+	    $r->print('<td><a href="/adm/email?display='.$origID. 
+		      '">Open</a></td><td><a href="/adm/email?markdel='.$origID.
+		      '">Delete</a><input type=checkbox name="delmark_'.$origID.'"></td>'.
 		      '<td>'.localtime($sendtime).'</td><td>'.
 		      $fromname.'</td><td>'.$fromdomain.'</td><td>'.
 		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
                       $status.'</td></tr>');
 	}
-    }
+    }   
     $r->print('</table><p>'.
               '<a href="javascript:checkall()">Check All</a>&nbsp;'.
               '<a href="javascript:uncheckall()">Uncheck All</a><p>'.
@@ -874,7 +953,7 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['display','replyto','forward','markread','markdel','markunread',
          'sendreply','compose','sendmail','critical','recname','recdom',
-         'recordftf']);
+         'recordftf','sortedby']);
 
 # ------------------------------------------------------ They checked for email
   &Apache::lonnet::put('email_status',{'recnewemail'=>0});
@@ -1059,9 +1138,10 @@ BEGIN {
 
 =back
 
-=end
+=cut
+
+1; 
 
-1;
 __END__