version 1.30, 2006/05/30 20:09:25
|
version 1.32, 2006/06/22 14:53:15
|
Line 217 sub movemsg {
|
Line 217 sub movemsg {
|
# Copy message |
# Copy message |
my %message=&Apache::lonnet::get('nohist_email'.$srcsuffix,[$msgid]); |
my %message=&Apache::lonnet::get('nohist_email'.$srcsuffix,[$msgid]); |
if (!exists($message{$msgid}) || $message{$msgid} eq '') { |
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.')); |
return (0,&mt('Message not moved, A network error occurred.')); |
} else { |
} else { |
return (0,&mt('Message not moved as the message is no longer in the source folder.')); |
return (0,&mt('Message not moved as the message is no longer in the source folder.')); |
Line 226 sub movemsg {
|
Line 226 sub movemsg {
|
|
|
my $result =&Apache::lonnet::put('nohist_email'.$trgsuffix, |
my $result =&Apache::lonnet::put('nohist_email'.$trgsuffix, |
{$msgid => $message{$msgid}}); |
{$msgid => $message{$msgid}}); |
if (&Apache::slotrequest::network_error($result)) { |
if (&Apache::lonnet::error($result)) { |
return (0,&mt('Message not moved, A network error occurred.')); |
return (0,&mt('Message not moved, A network error occurred.')); |
} |
} |
|
|
Line 234 sub movemsg {
|
Line 234 sub movemsg {
|
unless ($trgfolder eq 'trash') { |
unless ($trgfolder eq 'trash') { |
my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]); |
my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]); |
# a non-existant status is the mark of an unread msg |
# 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.')); |
return (0,&mt('Message copied to new folder but status was not, A network error occurred.')); |
} |
} |
my $result=&Apache::lonnet::put('email_status'.$trgsuffix, |
my $result=&Apache::lonnet::put('email_status'.$trgsuffix, |
{$msgid => $status{$msgid}}); |
{$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.')); |
return (0,&mt('Message copied to new folder but status was not, A network error occurred.')); |
} |
} |
} |
} |
Line 249 sub movemsg {
|
Line 249 sub movemsg {
|
&Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]); |
&Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]); |
my $result_del_stat = |
my $result_del_stat = |
&Apache::lonnet::del('email_status'.$srcsuffix,[$msgid]); |
&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.')); |
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.')); |
return (0,&mt('Message copied, but unable to delete the original status from the source folder.')); |
} |
} |
|
|
Line 1058 ENDTREC
|
Line 1058 ENDTREC
|
($env{'form.recdomain'}) && ($env{'form.recuname'})) { |
($env{'form.recdomain'}) && ($env{'form.recuname'})) { |
chomp($env{'form.newrecord'}); |
chomp($env{'form.newrecord'}); |
if ($env{'form.newrecord'}) { |
if ($env{'form.newrecord'}) { |
my $recordtxt = $env{'form.newrecord'}; |
&Apache::lonmsg::store_instructor_comment($env{'form.newrecord'}, |
&Apache::lonmsg::user_normal_msg_raw( |
$env{'form.recuname'}, |
$env{'course.'.$env{'request.course.id'}.'.num'}, |
$env{'form.recdomain'}); |
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
|
&mt('Record'). |
|
' ['.$env{'form.recuname'}.':'.$env{'form.recdomain'}.']', |
|
$recordtxt); |
|
} |
} |
$r->print('<h3>'.&Apache::loncommon::plainname($env{'form.recuname'}, |
$r->print('<h3>'.&Apache::loncommon::plainname($env{'form.recuname'}, |
$env{'form.recdomain'}).'</h3>'); |
$env{'form.recdomain'}).'</h3>'); |