version 1.126, 2005/01/01 17:58:48
|
version 1.130, 2005/01/25 15:28:02
|
Line 590 sub makefolder {
|
Line 590 sub makefolder {
|
|
|
sub movemsg { |
sub movemsg { |
my ($msgid,$srcfolder,$trgfolder)=@_; |
my ($msgid,$srcfolder,$trgfolder)=@_; |
my $unmsgid=&Apache::lonnet::unescape($msgid); |
|
my $srcsuffix=&foldersuffix($srcfolder); |
my $srcsuffix=&foldersuffix($srcfolder); |
my $trgsuffix=&foldersuffix($trgfolder); |
my $trgsuffix=&foldersuffix($trgfolder); |
|
|
Line 599 sub movemsg {
|
Line 598 sub movemsg {
|
&Apache::lonnet::put('nohist_email'.$trgsuffix,{$msgid => $message{$msgid}}); |
&Apache::lonnet::put('nohist_email'.$trgsuffix,{$msgid => $message{$msgid}}); |
|
|
# Copy status |
# Copy status |
my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$unmsgid]); |
unless ($trgfolder eq 'trash') { |
&Apache::lonnet::put('email_status'.$trgsuffix,{$unmsgid => $status{$unmsgid}}); |
my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]); |
# See if was deleted -> becomes "read" in trash |
&Apache::lonnet::put('email_status'.$trgsuffix,{$msgid => $status{$msgid}}); |
my $currentstatus=(&unpackmsgid($status{$unmsgid}),$srcfolder); |
|
if ($currentstatus eq 'deleted') { |
|
&statuschange($msgid,'read',$trgfolder); |
|
} |
} |
# Delete orginals |
# Delete orginals |
&Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]); |
&Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]); |
&Apache::lonnet::del('email_status'.$srcsuffix,[$unmsgid]); |
&Apache::lonnet::del('email_status'.$srcsuffix,[$msgid]); |
} |
} |
|
|
# ======================================================= Display a course list |
# ======================================================= Display a course list |
Line 679 ENDDISHEADER
|
Line 675 ENDDISHEADER
|
&Apache::loncoursedata::CL_FULLNAME(), |
&Apache::loncoursedata::CL_FULLNAME(), |
&Apache::loncoursedata::CL_SECTION()]); |
&Apache::loncoursedata::CL_SECTION()]); |
next if ($status ne 'Active'); |
next if ($status ne 'Active'); |
my $key = 'send_to_&&&'.$section.'&&&'.$student; |
my $key = 'send_to_&&&'.$section.'&&&_'.$student; |
if (! defined($fullname) || $fullname eq '') { $fullname = $sname; } |
if (! defined($fullname) || $fullname eq '') { $fullname = $sname; } |
$r->print('<tr><td><label>'. |
$r->print('<tr><td><label>'. |
qq{<input type="checkbox" name="$key">}.(' 'x2). |
qq{<input type="checkbox" name="$key">}.(' 'x2). |
Line 707 sub discrit {
|
Line 703 sub discrit {
|
$content{'sendername'}.'@'. |
$content{'sendername'}.'@'. |
$content{'senderdomain'}.') '.$content{'time'}. |
$content{'senderdomain'}.') '.$content{'time'}. |
'<br />'.&mt('Subject').': '.$content{'subject'}. |
'<br />'.&mt('Subject').': '.$content{'subject'}. |
'<br /><blockquote>'. |
'<br /><pre>'. |
&Apache::lontexconvert::msgtexconverted($content{'message'}). |
&Apache::lontexconvert::msgtexconverted($content{'message'}). |
'</blockquote><small>'. |
'</pre><small>'. |
&mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox'). |
&mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox'). |
'</small><br />'. |
'</small><br />'. |
'<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'. |
'<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'. |
Line 1242 sub disfacetoface {
|
Line 1238 sub disfacetoface {
|
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('. |
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('. |
$content{'sendername'}.'@'. |
$content{'sendername'}.'@'. |
$content{'senderdomain'}.') '.$content{'time'}. |
$content{'senderdomain'}.') '.$content{'time'}. |
'<br /><blockquote>'. |
'<br /><pre>'. |
&Apache::lontexconvert::msgtexconverted($content{'message'}). |
&Apache::lontexconvert::msgtexconverted($content{'message'}). |
'</blockquote>'; |
'</pre>'; |
} |
} |
# Check to see if there were any messages. |
# Check to see if there were any messages. |
if ($result eq '') { |
if ($result eq '') { |