version 1.11, 2006/04/23 07:13:21
|
version 1.14, 2006/04/25 20:02:30
|
Line 338 ENDDISHEADER
|
Line 338 ENDDISHEADER
|
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). |
$fullname.'</label></td><td>'.$sname.'@'.$sdom.'</td><td>'.$section. |
$fullname.'</label></td><td>'.$sname.':'.$sdom.'</td><td>'.$section. |
'</td></tr>'); |
'</td></tr>'); |
} |
} |
$r->print('</table>'); |
$r->print('</table>'); |
Line 359 sub discrit {
|
Line 359 sub discrit {
|
$result.='<hr />'.&mt('From').': <b>'. |
$result.='<hr />'.&mt('From').': <b>'. |
&Apache::loncommon::aboutmewrapper( |
&Apache::loncommon::aboutmewrapper( |
&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 />'.&mt('Subject').': '.$content{'subject'}. |
'<br />'.&mt('Subject').': '.$content{'subject'}. |
'<br /><pre>'. |
'<br /><pre>'. |
Line 867 sub compout {
|
Line 867 sub compout {
|
$r->print('<tr><td colspan="2">'.&mt('Replying to').' '. |
$r->print('<tr><td colspan="2">'.&mt('Replying to').' '. |
&Apache::loncommon::aboutmewrapper( |
&Apache::loncommon::aboutmewrapper( |
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. |
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. |
$content{'sendername'}.'@'. |
$content{'sendername'}.':'. |
$content{'senderdomain'}.')'. |
$content{'senderdomain'}.')'. |
'<input type="hidden" name="recuname" value="'.$content{'sendername'}.'" />'. |
'<input type="hidden" name="recuname" value="'.$content{'sendername'}.'" />'. |
'<input type="hidden" name="recdomain" value="'.$content{'senderdomain'}.'" />'. |
'<input type="hidden" name="recdomain" value="'.$content{'senderdomain'}.'" />'. |
Line 960 sub retrieve_instructor_comments {
|
Line 960 sub retrieve_instructor_comments {
|
next if ($content{'subject'} !~ /^Record/); |
next if ($content{'subject'} !~ /^Record/); |
# &Apache::lonfeedback::newline_to_br(\$content{'message'}); |
# &Apache::lonfeedback::newline_to_br(\$content{'message'}); |
$result.='Recorded by '. |
$result.='Recorded by '. |
$content{'sendername'}.'@'.$content{'senderdomain'}."\n"; |
$content{'sendername'}.':'.$content{'senderdomain'}."\n"; |
$result.= |
$result.= |
&Apache::lontexconvert::msgtexconverted($content{'message'})."\n"; |
&Apache::lontexconvert::msgtexconverted($content{'message'})."\n"; |
} |
} |
Line 1018 sub disfacetoface {
|
Line 1018 sub disfacetoface {
|
$result.=&mt('By').': <b>'. |
$result.=&mt('By').': <b>'. |
&Apache::loncommon::aboutmewrapper( |
&Apache::loncommon::aboutmewrapper( |
&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 /><pre>'. |
'<br /><pre>'. |
&Apache::lontexconvert::msgtexconverted($content{'message'}). |
&Apache::lontexconvert::msgtexconverted($content{'message'}). |
Line 1232 sub blockstore {
|
Line 1232 sub blockstore {
|
unless ( defined($cancels{$_}) ) { |
unless ( defined($cancels{$_}) ) { |
my ($newstart,$newend) = &get_dates_from_form($_); |
my ($newstart,$newend) = &get_dates_from_form($_); |
my $newkey = $newstart.'____'.$newend; |
my $newkey = $newstart.'____'.$newend; |
$blocking{$newkey} = $env{'user.name'}.'@'.$env{'user.domain'}.':'.$env{'form.title_'.$_}; |
$blocking{$newkey} = $env{'user.name'}.':'.$env{'user.domain'}.':'.$env{'form.title_'.$_}; |
} |
} |
} |
} |
if ($addtotal + $modtotal > 0) { |
if ($addtotal + $modtotal > 0) { |
Line 1319 END
|
Line 1319 END
|
my ($start,$end) = split/____/,$_; |
my ($start,$end) = split/____/,$_; |
my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange); |
my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange); |
my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange); |
my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange); |
my ($setter,$title) = split/:/,$$records{$_}; |
my (@data,$setuname,$setudom,$title); |
my ($setuname,$setudom) = split/@/,$setter; |
@data = split(/:/,$$records{$_},3); |
|
if (scalar(@data) eq 2) { |
|
$title = $data[1]; |
|
($setuname,$setudom) = split(/@/,$data[0]); |
|
} else { |
|
($setuname,$setudom,$title) = @data; |
|
} |
my $settername = &Apache::loncommon::plainname($setuname,$setudom); |
my $settername = &Apache::loncommon::plainname($setuname,$setudom); |
$r->print(<<"END"); |
$r->print(<<"END"); |
<tr bgcolor="$bgcols[$iter]"> |
<tr bgcolor="$bgcols[$iter]"> |
Line 1487 END
|
Line 1493 END
|
$closeblock= &Apache::lonlocal::locallocaltime($closeblock); |
$closeblock= &Apache::lonlocal::locallocaltime($closeblock); |
$r->print('<tr><td>'.$courseinfo{'description'}.'</td>'. |
$r->print('<tr><td>'.$courseinfo{'description'}.'</td>'. |
'<td>'.$openblock.' to '.$closeblock.'</td>'. |
'<td>'.$openblock.' to '.$closeblock.'</td>'. |
'<td>'.$fullname.' ('.$uname.'@'.$udom. |
'<td>'.$fullname.' ('.$uname.':'.$udom. |
')</td></tr>'); |
')</td></tr>'); |
} |
} |
} |
} |
Line 1719 sub sendoffmail {
|
Line 1725 sub sendoffmail {
|
%content=&Apache::lonmsg::unpackagemsg($message{$msgid},1); |
%content=&Apache::lonmsg::unpackagemsg($message{$msgid},1); |
&statuschange($msgid,'replied',$folder); |
&statuschange($msgid,'replied',$folder); |
} |
} |
my %toaddr=(); |
|
undef %toaddr; |
my %toaddr; |
if ($env{'form.sendmode'} eq 'group') { |
if ($env{'form.sendmode'} eq 'group') { |
foreach (keys %env) { |
foreach my $address (keys(%env)) { |
if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) { |
if ($address=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) { |
$toaddr{$1}=''; |
$toaddr{$1}=''; |
} |
} |
} |
} |
} elsif ($env{'form.sendmode'} eq 'upload') { |
} elsif ($env{'form.sendmode'} eq 'upload') { |
foreach (split(/[\n\r\f]+/,$env{'form.upfile'})) { |
foreach my $line (split(/[\n\r\f]+/,$env{'form.upfile'})) { |
my ($rec,$txt)=split(/\s*\:\s*/,$_); |
my ($rec,$txt)=split(/\s*\:\s*/,$line); |
if ($txt) { |
if ($txt) { |
$rec=~s/\@/\:/; |
$rec=~s/\@/\:/; |
$toaddr{$rec}.=$txt."\n"; |
$toaddr{$rec}.=$txt."\n"; |
Line 1761 sub sendoffmail {
|
Line 1767 sub sendoffmail {
|
$savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'}); |
$savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'}); |
} |
} |
|
|
foreach (keys %toaddr) { |
foreach my $address (sort(keys(%toaddr))) { |
my ($recuname,$recdomain)=split(/\:/,$_); |
my ($recuname,$recdomain)=split(/\:/,$address); |
my $msgtxt = $savemsg; |
my $msgtxt = $savemsg; |
if ($toaddr{$_}) { $msgtxt.='<hr />'.$toaddr{$_}; } |
if ($toaddr{$address}) { $msgtxt.='<hr />'.$toaddr{$address}; } |
my $thismsg; |
my @thismsg; |
if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) && |
if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) && |
(&Apache::lonnet::allowed('srm',$env{'request.course.id'}) |
(&Apache::lonnet::allowed('srm',$env{'request.course.id'}) |
|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}. |
|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}. |
'/'.$env{'request.course.sec'}))) { |
'/'.$env{'request.course.sec'}))) { |
$r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': '); |
$r->print(&mt('Sending critical message').' '.$recuname.':'.$recdomain.': '); |
$thismsg=&Apache::lonmsg::user_crit_msg($recuname,$recdomain,$msgsubj,$msgtxt, |
@thismsg= |
$env{'form.sendbck'},$env{'form.permanent'}, |
&Apache::lonmsg::user_crit_msg($recuname,$recdomain, |
\$sentmessage{$_}); |
$msgsubj,$msgtxt, |
|
$env{'form.sendbck'}, |
|
$env{'form.permanent'}, |
|
\$sentmessage{$address}); |
} else { |
} else { |
$r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': '); |
$r->print(&mt('Sending').' '.$recuname.':'.$recdomain.': '); |
$thismsg=&Apache::lonmsg::user_normal_msg($recuname,$recdomain,$msgsubj,$msgtxt, |
@thismsg= |
$content{'citation'},undef,undef,$env{'form.permanent'},\$sentmessage{$_}); |
&Apache::lonmsg::user_normal_msg($recuname,$recdomain, |
|
$msgsubj,$msgtxt, |
|
$content{'citation'}, |
|
undef,undef, |
|
$env{'form.permanent'}, |
|
\$sentmessage{$address}); |
} |
} |
if (($env{'request.course.id'}) && (($msgtype eq 'critical') || |
if (($env{'request.course.id'}) && (($msgtype eq 'critical') || |
($env{'form.sendmode'} eq 'group'))) { |
($env{'form.sendmode'} eq 'group'))) { |
$specialmsg_status{$recuname.':'.$recdomain} = $thismsg; |
$specialmsg_status{$recuname.':'.$recdomain} = |
if ($thismsg eq 'ok') { |
join(' ',@thismsg); |
$numspecial ++; |
foreach my $result (@thismsg) { |
} |
if ($result eq 'ok') { |
|
$numspecial++; |
|
} |
|
} |
} |
} |
$r->print($thismsg.'<br />'); |
$sendstatus.=' '.join(' ',@thismsg); |
$sendstatus.=' '.$thismsg; |
|
} |
} |
if (($env{'request.course.id'}) && (($env{'form.sendmode'} eq 'group') |
if (($env{'request.course.id'}) && (($env{'form.sendmode'} eq 'group') |
|| ($msgtype eq 'critical'))) { |
|| ($msgtype eq 'critical'))) { |
Line 1810 sub sendoffmail {
|
Line 1826 sub sendoffmail {
|
} |
} |
if ($specialresult eq 'ok') { |
if ($specialresult eq 'ok') { |
my $record_sent; |
my $record_sent; |
my @recusers = (); |
my @recusers; |
my @recudoms = (); |
my @recudoms; |
my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) = |
my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) = |
split(/\:/,&Apache::lonnet::unescape($specialmsgid)); |
split(/\:/,&Apache::lonnet::unescape($specialmsgid)); |
|
|
foreach my $recipient (sort(keys(%toaddr))) { |
foreach my $recipient (sort(keys(%toaddr))) { |
if ($specialmsg_status{$recipient} eq 'ok') { |
if ($specialmsg_status{$recipient} eq 'ok') { |
my $usersubj = $subj_prefix.'['.$recipient.']'; |
my $usersubj = $subj_prefix.'['.$recipient.']'; |
Line 1825 sub sendoffmail {
|
Line 1842 sub sendoffmail {
|
&Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,$subj_prefix. |
&Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,$subj_prefix. |
' ['.$recipient.']',$msgsubj,undef, |
' ['.$recipient.']',$msgsubj,undef, |
undef,undef,undef,$usermsgid,undef,undef,$specialmsgid); |
undef,undef,undef,$usermsgid,undef,undef,$specialmsgid); |
my ($uname,$udom) = split/:/,$recipient; |
my ($uname,$udom) = split(/:/,$recipient); |
push(@recusers,$uname); |
push(@recusers,$uname); |
push(@recudoms,$udom); |
push(@recudoms,$udom); |
} |
} |
} |
} |
if (@recusers) { |
if (@recusers) { |
my $specialmessage; |
my $specialmessage; |
my $sentsubj = $subj_prefix.' ('.$numspecial.' sent) '. |
my $sentsubj = |
$msgsubj; |
$subj_prefix.' ('.$numspecial.' sent) '.$msgsubj; |
$sentsubj = &HTML::Entities::encode($sentsubj,'<>&"'); |
$sentsubj = &HTML::Entities::encode($sentsubj,'<>&"'); |
my $sentmsgid = |
my $sentmsgid = |
&Apache::lonmsg::buildmsgid($stamp,$sentsubj,$msgname, |
&Apache::lonmsg::buildmsgid($stamp,$sentsubj,$msgname, |