version 1.140, 2005/04/07 06:56:23
|
version 1.142, 2005/05/15 01:11:32
|
Line 141 sub packagemsg {
|
Line 141 sub packagemsg {
|
$partsubj=&Apache::lonnet::escape($partsubj); |
$partsubj=&Apache::lonnet::escape($partsubj); |
my $msgid=&Apache::lonnet::escape( |
my $msgid=&Apache::lonnet::escape( |
$now.':'.$partsubj.':'.$env{'user.name'}.':'. |
$now.':'.$partsubj.':'.$env{'user.name'}.':'. |
$env{'user.domain'}.':'.$msgcount.':'.$$); |
$env{'user.domain'}.':'.$msgcount.':'. |
|
$env{'request.course.id'}.':'.$$); |
my $result='<sendername>'.$env{'user.name'}.'</sendername>'. |
my $result='<sendername>'.$env{'user.name'}.'</sendername>'. |
'<senderdomain>'.$env{'user.domain'}.'</senderdomain>'. |
'<senderdomain>'.$env{'user.domain'}.'</senderdomain>'. |
'<subject>'.$subject.'</subject>'. |
'<subject>'.$subject.'</subject>'. |
Line 209 sub unpackmsgid {
|
Line 210 sub unpackmsgid {
|
my ($msgid,$folder)=@_; |
my ($msgid,$folder)=@_; |
$msgid=&Apache::lonnet::unescape($msgid); |
$msgid=&Apache::lonnet::unescape($msgid); |
my $suffix=&foldersuffix($folder); |
my $suffix=&foldersuffix($folder); |
my ($sendtime,$shortsubj,$fromname,$fromdomain)=split(/\:/, |
my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid)=split(/\:/, |
&Apache::lonnet::unescape($msgid)); |
&Apache::lonnet::unescape($msgid)); |
my %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]); |
my %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]); |
if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; } |
if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; } |
unless ($status{$msgid}) { $status{$msgid}='new'; } |
unless ($status{$msgid}) { $status{$msgid}='new'; } |
return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid}); |
return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid},$fromcid); |
} |
} |
|
|
|
|
sub sendemail { |
sub sendemail { |
Line 612 sub makefolder {
|
Line 613 sub makefolder {
|
|
|
sub movemsg { |
sub movemsg { |
my ($msgid,$srcfolder,$trgfolder)=@_; |
my ($msgid,$srcfolder,$trgfolder)=@_; |
|
if ($srcfolder eq 'new') { $srcfolder=''; } |
my $srcsuffix=&foldersuffix($srcfolder); |
my $srcsuffix=&foldersuffix($srcfolder); |
my $trgsuffix=&foldersuffix($trgfolder); |
my $trgsuffix=&foldersuffix($trgfolder); |
|
|
Line 762 sub sortedmessages {
|
Line 764 sub sortedmessages {
|
my @temp; |
my @temp; |
foreach (@messages) { |
foreach (@messages) { |
my $msgid=&Apache::lonnet::escape($_); |
my $msgid=&Apache::lonnet::escape($_); |
my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)= |
my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)= |
&Apache::lonmsg::unpackmsgid($msgid,$folder); |
&Apache::lonmsg::unpackmsgid($msgid,$folder); |
my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status, |
my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status, |
$msgid); |
$msgid); |
Line 836 sub disnew {
|
Line 838 sub disnew {
|
# Check for blocking of display because of scheduled online exams. |
# Check for blocking of display because of scheduled online exams. |
&blockcheck(\%setters,\$startblock,\$endblock); |
&blockcheck(\%setters,\$startblock,\$endblock); |
foreach (@msgids) { |
foreach (@msgids) { |
my ($sendtime,$shortsubj,$fromname,$fromdom,$status)= |
my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= |
&Apache::lonmsg::unpackmsgid($_); |
&Apache::lonmsg::unpackmsgid($_); |
if (defined($sendtime) && $sendtime!~/error/) { |
if (defined($sendtime) && $sendtime!~/error/) { |
my $numsendtime = $sendtime; |
my $numsendtime = $sendtime; |
Line 1042 ENDDISHEADER
|
Line 1044 ENDDISHEADER
|
# ============================================================== Compose output |
# ============================================================== Compose output |
|
|
sub compout { |
sub compout { |
my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder)=@_; |
my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder,$dismode)=@_; |
my $suffix=&foldersuffix($folder); |
my $suffix=&foldersuffix($folder); |
|
|
if ($broadcast eq 'individual') { |
if ($broadcast eq 'individual') { |
Line 1173 $latexHelp
|
Line 1175 $latexHelp
|
</textarea></p><br /> |
</textarea></p><br /> |
$dispcrit |
$dispcrit |
$disbase |
$disbase |
|
<input type="hidden" name="folder" value="$folder" /> |
|
<input type="hidden" name="dismode" value="$dismode" /> |
<input type="submit" name="send" value="$func $lt{'ma'}" /> |
<input type="submit" name="send" value="$func $lt{'ma'}" /> |
<input type="submit" name="cancel" value="$lt{'ca'}" /><hr /> |
<input type="submit" name="cancel" value="$lt{'ca'}" /><hr /> |
$citation |
$citation |
Line 2047 sub handler {
|
Line 2051 sub handler {
|
} else { |
} else { |
$sqs.='&folder='.&Apache::lonnet::escape($folder); |
$sqs.='&folder='.&Apache::lonnet::escape($folder); |
} |
} |
|
# ------------------------------------------------------------ Get Display Mode |
|
|
|
my $dismode=$env{'form.dismode'}; |
|
unless ($dismode) { |
|
$dismode=''; |
|
} else { |
|
$sqs.='&dismode='.&Apache::lonnet::escape($dismode); |
|
} |
|
|
# --------------------------------------------------------------------- Display |
# --------------------------------------------------------------------- Display |
|
|
Line 2078 sub handler {
|
Line 2090 sub handler {
|
if ($env{'form.display'}) { |
if ($env{'form.display'}) { |
&displaymessage($r,$env{'form.display'},$folder); |
&displaymessage($r,$env{'form.display'},$folder); |
} elsif ($env{'form.replyto'}) { |
} elsif ($env{'form.replyto'}) { |
&compout($r,'',$env{'form.replyto'},undef,undef,$folder); |
&compout($r,'',$env{'form.replyto'},undef,undef,$folder,$dismode); |
} elsif ($env{'form.confirm'}) { |
} elsif ($env{'form.confirm'}) { |
&printheader($r,'','Confirmed Receipt'); |
&printheader($r,'','Confirmed Receipt'); |
foreach (keys %env) { |
foreach (keys %env) { |
Line 2103 sub handler {
|
Line 2115 sub handler {
|
&printheader($r,'','Deleted Message'); |
&printheader($r,'','Deleted Message'); |
&statuschange($env{'form.markdel'},'deleted',$folder); |
&statuschange($env{'form.markdel'},'deleted',$folder); |
&Apache::loncommunicate::menu($r); |
&Apache::loncommunicate::menu($r); |
&disall($r,$folder); |
&disall($r,($folder?$folder:$dismode)); |
} elsif ($env{'form.markedmove'}) { |
} elsif ($env{'form.markedmove'}) { |
my $total=0; |
my $total=0; |
foreach (keys %env) { |
foreach (keys %env) { |
Line 2116 sub handler {
|
Line 2128 sub handler {
|
&printheader($r,'','Moved Messages'); |
&printheader($r,'','Moved Messages'); |
$r->print('Moved '.$total.' message(s)<p>'); |
$r->print('Moved '.$total.' message(s)<p>'); |
&Apache::loncommunicate::menu($r); |
&Apache::loncommunicate::menu($r); |
&disall($r,$folder); |
&disall($r,($folder?$folder:$dismode)); |
} elsif ($env{'form.markeddel'}) { |
} elsif ($env{'form.markeddel'}) { |
my $total=0; |
my $total=0; |
foreach (keys %env) { |
foreach (keys %env) { |
Line 2128 sub handler {
|
Line 2140 sub handler {
|
&printheader($r,'','Deleted Messages'); |
&printheader($r,'','Deleted Messages'); |
$r->print('Deleted '.$total.' message(s)<p>'); |
$r->print('Deleted '.$total.' message(s)<p>'); |
&Apache::loncommunicate::menu($r); |
&Apache::loncommunicate::menu($r); |
&disall($r,$folder); |
&disall($r,($folder?$folder:$dismode)); |
} elsif ($env{'form.markunread'}) { |
} elsif ($env{'form.markunread'}) { |
&printheader($r,'','Marked Message as Unread'); |
&printheader($r,'','Marked Message as Unread'); |
&statuschange($env{'form.markunread'},'new'); |
&statuschange($env{'form.markunread'},'new'); |
&Apache::loncommunicate::menu($r); |
&Apache::loncommunicate::menu($r); |
&disall($r,$folder); |
&disall($r,($folder?$folder:$dismode)); |
} elsif ($env{'form.compose'}) { |
} elsif ($env{'form.compose'}) { |
&compout($r,'','',$env{'form.compose'}); |
&compout($r,'','',$env{'form.compose'}); |
} elsif ($env{'form.recordftf'}) { |
} elsif ($env{'form.recordftf'}) { |
Line 2145 sub handler {
|
Line 2157 sub handler {
|
if ($env{'form.storebasecomment'}) { |
if ($env{'form.storebasecomment'}) { |
&storecomment($r); |
&storecomment($r); |
} |
} |
&disall($r,$folder); |
&disall($r,($folder?$folder:$dismode)); |
} elsif ($env{'form.newfolder'}) { |
} elsif ($env{'form.newfolder'}) { |
&printheader($r,'','New Folder'); |
&printheader($r,'','New Folder'); |
&makefolder($env{'form.newfolder'}); |
&makefolder($env{'form.newfolder'}); |
Line 2155 sub handler {
|
Line 2167 sub handler {
|
&storedcommentlisting($r); |
&storedcommentlisting($r); |
} else { |
} else { |
&printheader($r,'','Display All Messages'); |
&printheader($r,'','Display All Messages'); |
&Apache::loncommunicate::menu($r); |
&Apache::loncommunicate::menu($r); |
&disall($r,$folder); |
&disall($r,($folder?$folder:$dismode)); |
} |
} |
$r->print(&Apache::loncommon::endbodytag().'</html>'); |
$r->print(&Apache::loncommon::endbodytag().'</html>'); |
return OK; |
return OK; |