[LON-CAPA-cvs] cvs: loncom /interface lonmsg.pm

[www]

www		Mon Jun  6 17:06:18 2005 EDT

  Modified files:              
    /loncom/interface	lonmsg.pm 
  Log:
  Bug #2986: purge deleted messages immediately
  
  
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.147 loncom/interface/lonmsg.pm:1.148
--- loncom/interface/lonmsg.pm:1.147	Mon Jun  6 16:31:24 2005
+++ loncom/interface/lonmsg.pm	Mon Jun  6 17:06:14 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.147 2005/06/06 20:31:24 www Exp $
+# $Id: lonmsg.pm,v 1.148 2005/06/06 21:06:14 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -596,6 +596,9 @@
     if (($newstatus eq 'deleted') || ($newstatus eq 'new')) {
 	&Apache::lonnet::put('email_status'.$suffix,{$msgid => $newstatus});
     }
+    if ($newstatus eq 'deleted') {
+       &movemsg(&Apache::lonnet::unescape($msgid),$folder,'trash');
+   }
 }
 
 # ============================================================= Make new folder
@@ -1777,7 +1780,7 @@
 	      '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).$sqs.
 	      '"><b>'.&mt('Mark Unread').'</b></a></td>'.
 	      '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.
-	      '"><b>Delete</b></a></td>'.
+	      '"><b>'.&mt('Delete').'</b></a></td>'.
 	      '<td><a href="/adm/email?'.$sqs.
 	      ($env{'form.dismode'} eq 'new'?'&folder=new':'').
 	      '"><b>'.&mt('Back to Folder Display').'</b></a></td>');