--- loncom/interface/lonmsgdisplay.pm	2006/06/12 22:55:23	1.31
+++ loncom/interface/lonmsgdisplay.pm	2006/06/22 14:53:15	1.32
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.31 2006/06/12 22:55:23 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.32 2006/06/22 14:53:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -217,7 +217,7 @@ sub movemsg {
 # Copy message
     my %message=&Apache::lonnet::get('nohist_email'.$srcsuffix,[$msgid]);
     if (!exists($message{$msgid}) || $message{$msgid} eq '') {
-	if (&Apache::slotrequest::network_error(%message)) {
+	if (&Apache::lonnet::error(%message)) {
 	    return (0,&mt('Message not moved, A network error occurred.'));
 	} else {
 	    return (0,&mt('Message not moved as the message is no longer in the source folder.'));
@@ -226,7 +226,7 @@ sub movemsg {
 
     my $result =&Apache::lonnet::put('nohist_email'.$trgsuffix,
 				     {$msgid => $message{$msgid}});
-    if (&Apache::slotrequest::network_error($result)) {
+    if (&Apache::lonnet::error($result)) {
 	return (0,&mt('Message not moved, A network error occurred.'));
     }
 
@@ -234,12 +234,12 @@ sub movemsg {
     unless ($trgfolder eq 'trash') {
        	my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]);
 	# a non-existant status is the mark of an unread msg
-	if (&Apache::slotrequest::network_error(%status)) {
+	if (&Apache::lonnet::error(%status)) {
 	    return (0,&mt('Message copied to new folder but status was not, A network error occurred.'));
 	}
 	my $result=&Apache::lonnet::put('email_status'.$trgsuffix,
 					{$msgid => $status{$msgid}});
-	if (&Apache::slotrequest::network_error($result)) {
+	if (&Apache::lonnet::error($result)) {
 	    return (0,&mt('Message copied to new folder but status was not, A network error occurred.'));
 	}
     }
@@ -249,10 +249,10 @@ sub movemsg {
 	&Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]);
     my $result_del_stat =
 	&Apache::lonnet::del('email_status'.$srcsuffix,[$msgid]);
-    if (&Apache::slotrequest::network_error($result_del_msg)) {
+    if (&Apache::lonnet::error($result_del_msg)) {
 	return (0,&mt('Message copied, but unable to delete the original from the source folder.'));
     }
-    if (&Apache::slotrequest::network_error($result_del_stat)) {
+    if (&Apache::lonnet::error($result_del_stat)) {
 	return (0,&mt('Message copied, but unable to delete the original status from the source folder.'));
     }