'.&Apache::lontexconvert::msgtexconverted($content{'message'}).''
+ .''.&Apache::lontexconvert::msgtexconverted($content{'message'}).''
.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title('',undef,'LC_oddrow_value')
.''); @@ -1132,7 +1124,7 @@ ENDDISHEADER } $r->print('
'); if ($numblocked > 0) { - $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,$by_ip,$clientip,$blockdom, + $r->print(&blocked_in_folder($numblocked,$startblock,$endblock, \%setters)); } return; @@ -1322,26 +1314,20 @@ ENDDISHEADER $r->print(''); if ($numblocked > 0) { $r->print(&blocked_in_folder($numblocked,$startblock,$endblock, - $by_ip,$clientip,$blockdom,\%setters)); + \%setters)); } } sub blocked_in_folder { - my ($numblocked,$startblock,$endblock,$by_ip,$clientip,$blockdom,$setters) = @_; - my $output; - if ($by_ip) { - $output = ''. - &mt('Sending of LON-CAPA messages is blocked for your current IP address: [_1].',$clientip).'
'. - ''. + ''. &Apache::lontexconvert::msgtexconverted($content{'message'}). ''; } @@ -2136,16 +2102,14 @@ sub displaymessage { my %setters = (); my $numblocked = 0; my $crstype = &Apache::loncommon::course_type(); - my $clientip = &Apache::lonnet::get_requestor_ip($r); # info to generate "next" and "previous" buttons and check if message is blocked - my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) = - &Apache::loncommon::blockcheck(\%setters,'com',$clientip); - my @messages=&sortedmessages(\%blocked,$startblock,$endblock,$by_ip,\$numblocked,$folder,$msgstatus); + my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com'); + my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus); if ( $blocked{$msgid} eq 'ON' ) { &printheader($r,'/adm/email',&mt('Display a Message')); #$r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.')); - my($blocked, $blocktext) = &Apache::loncommon::blocking_status("com",$clientip); + my($blocked, $blocktext) = &Apache::loncommon::blocking_status("com"); $r->print("
".$blocktext); return; } @@ -2179,28 +2143,8 @@ sub displaymessage { my $number_of_messages = scalar(@messages); #subtract 1 for last index - my $head_extra; - -# if student's view of resource will be included -# get tag(s) for css file(s) in use, and pass to &header to include -# in call to loncommon::start_page() - - if (($env{'request.course.id'} eq $content{'courseid'}) && - (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) { - my $symb; - if (defined($content{'symb'})) { - $symb = $content{'symb'}; - } elsif (defined($content{'baseurl'})) { - $symb=&Apache::lonnet::symbread($content{'baseurl'}); - } - if ($symb) { - $head_extra = &Apache::loncommon::css_links($symb); - } - } - # start output - &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','', - $content{'baseurl'},$head_extra); + &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'}); # Prepare available functions my @functionlist; @@ -2504,16 +2448,12 @@ sub displaymessage { $showsymb,$env{'user.domain'},$env{'user.name'}); if ($symb) { if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) { - unless ($showsymb =~ m{^/enc/}) { - $showsymb = &Apache::lonenc::encrypted($showsymb); - } + $showsymb = &Apache::lonenc::check_encrypt($symb); } $symblink = '?symb='.$showsymb; } if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) { - unless ($showurl =~ m{^/enc/}) { - $showurl = &Apache::lonenc::encrypted($showurl); - } + $showurl = $baseurl; } $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to')) .''.$restitle.'' @@ -2553,7 +2493,7 @@ sub displaymessage { # Message $r->print(&Apache::lonhtmlcommon::row_title(&mt('Message')) - .'' + .'' .&Apache::lontexconvert::msgtexconverted($content{'message'},1) .'' ); @@ -2707,10 +2647,9 @@ sub displayresource { && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) { my $symb; if (defined($content{'symb'})) { - $symb = &Apache::lonenc::check_decrypt($content{'symb'}); - } elsif (defined($content{'baseurl'})) { - $symb = - &Apache::lonnet::symbread(&Apache::lonenc::check_decrypt($content{'baseurl'})); + $symb = $content{'symb'}; + } else { + $symb=&Apache::lonnet::symbread($content{'baseurl'}); } # Could not get a symb, give up unless ($symb) { return $content{'citation'}; } @@ -2739,16 +2678,13 @@ sub displayresource { # ================================================================== The Header sub header { - my ($r,$title,$baseurl,$head_extra)=@_; + my ($r,$title,$baseurl)=@_; my $extra = &Apache::loncommon::studentbrowser_javascript(); if ($baseurl) { $extra .= ""; } $extra .= ''; - if ($head_extra) { - $extra .= "\n$head_extra"; - } $r->print(&Apache::loncommon::start_page('Messages', $extra)); $r->print(&Apache::lonhtmlcommon::breadcrumbs @@ -2758,11 +2694,11 @@ sub header { # ---------------------------------------------------------------- Print header sub printheader { - my ($r,$url,$desc,$title,$baseurl,$head_extra)=@_; + my ($r,$url,$desc,$title,$baseurl)=@_; &Apache::lonhtmlcommon::add_breadcrumb ({href=>$url, text=>$desc}); - &header($r,$title,$baseurl,$head_extra); + &header($r,$title,$baseurl); } # ------------------------------------------------------------ Store the comment @@ -2819,15 +2755,8 @@ sub sendoffmail { $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; } - my $clientip = &Apache::lonnet::get_requestor_ip($r); - my %setters; - my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) = - &Apache::loncommon::blockcheck(\%setters,'com',$clientip); - if ($by_ip) { - &printheader($r,'','Sending messages blocked from your location.'); - return 'blocked'; - } elsif ($env{'form.send'}) { - if (!$env{'form.multiforward'}) { + if ($env{'form.send'}) { + if (!$env{'form.multiforward'}) { if ($group eq '') { &printheader($r,'','Messages being sent.'); } else { @@ -2857,6 +2786,8 @@ sub sendoffmail { my $mode = $env{'form.sendmode'}; my (%toaddr,$tos,$cc,$bcc,$broadcast); + my (%willtrust,%trustchecked,%disallowed); + my $serverdefdom = &Apache::lonnet::default_login_domain(); if ($mode eq 'group') { if (defined($env{'form.courserecips'})) { @@ -2866,9 +2797,17 @@ sub sendoffmail { foreach my $dest (@to) { my ($user,$domain) = split(/:/, $dest); if (($user ne '') && ($domain ne '')) { - my $rec = $user.":".$domain; - $toaddr{$rec} = ''; - $broadcast->{$rec} = ''; + unless ($trustchecked{$domain}) { + $willtrust{$domain} = &Apache::lonnet::will_trust('msg',$serverdefdom,$domain); + $trustchecked{$domain} = 1; + } + if ($willtrust{$domain}) { + my $rec = $user.":".$domain; + $toaddr{$rec} = ''; + $broadcast->{$rec} = ''; + } else { + $disallowed{'to'}{$user.":".$domain} = 1; + } } } } @@ -2879,22 +2818,47 @@ sub sendoffmail { if ($txt) { $rec =~ s/^\s+//; $rec =~ s/\s+$//; - $toaddr{$rec}.=$txt."\n"; - $broadcast->{$rec} = ''; + my ($recuname,$recudom) = split(/:/,$rec); + unless ($trustchecked{$recudom}) { + $willtrust{$recudom} = &Apache::lonnet::will_trust('msg',$serverdefdom,$recudom); + $trustchecked{$recudom} = 1; + } + if ($willtrust{$recudom}) { + $toaddr{$rec}.=$txt."\n"; + $broadcast->{$rec} = ''; + } else { + $disallowed{'to'}{$rec} = 1; + } } } } else { if (($env{'form.recuname'} ne '') && ($env{'form.recdomain'} ne '')) { - $toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}=''; - $tos->{$env{'form.recuname'}.':'.$env{'form.recdomain'}}=''; + unless ($trustchecked{$env{'form.recdomain'}}) { + $willtrust{$env{'form.recdomain'}} = &Apache::lonnet::will_trust('msg',$serverdefdom,$env{'form.recdomain'}); + $trustchecked{$env{'form.recdomain'}} = 1; + } + if ($willtrust{$env{'form.recdomain'}}) { + $toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}=''; + $tos->{$env{'form.recuname'}.':'.$env{'form.recdomain'}}=''; + } else { + $disallowed{'to'}{$env{'form.recuname'}.':'.$env{'form.recdomain'}}; + } } } if ($env{'form.additionalrec_to'}) { foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_to'})) { my ($auname,$audom)=split(/:/,$rec); if (($auname ne "") && ($audom ne "")) { - $toaddr{$auname.':'.$audom}=''; - $tos->{$auname.':'.$audom}=''; + unless ($trustchecked{$audom}) { + $willtrust{$audom} = &Apache::lonnet::will_trust('msg',$serverdefdom,$audom); + $trustchecked{$audom} = 1; + } + if ($willtrust{$audom}) { + $toaddr{$auname.':'.$audom}=''; + $tos->{$auname.':'.$audom}=''; + } else { + $disallowed{'to'}{$auname.':'.$audom}; + } } } } @@ -2904,8 +2868,16 @@ sub sendoffmail { foreach my $rec (@toreplies) { my ($auname,$audom)=split(/:/,$rec); if (($auname ne "") && ($audom ne "")) { - $toaddr{$auname.':'.$audom}=''; - $tos->{$auname.':'.$audom}=''; + unless ($trustchecked{$audom}) { + $willtrust{$audom} = &Apache::lonnet::will_trust('msg',$serverdefdom,$audom); + $trustchecked{$audom} = 1; + } + if ($willtrust{$audom}) { + $toaddr{$auname.':'.$audom}=''; + $tos->{$auname.':'.$audom}=''; + } else { + $disallowed{'to'}{$auname.':'.$audom}; + } } } } @@ -2913,9 +2885,17 @@ sub sendoffmail { foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_cc'})) { my ($auname,$audom)=split(/:/,$rec); if (($auname ne "") && ($audom ne "")) { - $toaddr{$auname.':'.$audom}=''; if (!defined($tos->{$auname.':'.$audom})) { - $cc->{$auname.':'.$audom}=''; + unless ($trustchecked{$audom}) { + $willtrust{$audom} = &Apache::lonnet::will_trust('msg',$serverdefdom,$audom); + $trustchecked{$audom} = 1; + } + if ($willtrust{$audom}) { + $toaddr{$auname.':'.$audom}=''; + $cc->{$auname.':'.$audom}=''; + } else { + $disallowed{'cc'}{$auname.':'.$audom}; + } } } } @@ -2926,9 +2906,17 @@ sub sendoffmail { foreach my $rec (@ccreplies) { my ($auname,$audom)=split(/:/,$rec); if (($auname ne "") && ($audom ne "")) { - $toaddr{$auname.':'.$audom}=''; if (!defined($tos->{$auname.':'.$audom})) { - $cc->{$auname.':'.$audom}=''; + unless ($trustchecked{$audom}) { + $willtrust{$audom} = &Apache::lonnet::will_trust('msg',$serverdefdom,$audom); + $trustchecked{$audom} = 1; + } + if ($willtrust{$audom}) { + $toaddr{$auname.':'.$audom}=''; + $cc->{$auname.':'.$audom}=''; + } else { + $disallowed{'cc'}{$auname.':'.$audom} = 1; + } } } } @@ -2939,9 +2927,17 @@ sub sendoffmail { foreach my $rec (@groupreplies) { my ($auname,$audom)=split(/:/,$rec); if (($auname ne "") && ($audom ne "")) { - $toaddr{$auname.':'.$audom}=''; if (!defined($tos->{$auname.':'.$audom})) { - $broadcast->{$auname.':'.$audom}=''; + unless ($trustchecked{$audom}) { + $willtrust{$audom} = &Apache::lonnet::will_trust('msg',$serverdefdom,$audom); + $trustchecked{$audom} = 1; + } + if ($willtrust{$audom}) { + $toaddr{$auname.':'.$audom}=''; + $broadcast->{$auname.':'.$audom}=''; + } else { + $disallowed{'to'}{$auname.':'.$audom} = 1; + } } } } @@ -2950,10 +2946,18 @@ sub sendoffmail { foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_bcc'})) { my ($auname,$audom)=split(/:/,$rec); if (($auname ne "") && ($audom ne "")) { - $toaddr{$auname.':'.$audom}=''; - if ((!defined($tos->{$auname.':'.$audom})) && + if ((!defined($tos->{$auname.':'.$audom})) && (!defined($cc->{$auname.':'.$audom}))) { - $bcc->{$auname.':'.$audom}=''; + unless ($trustchecked{$audom}) { + $willtrust{$audom} = &Apache::lonnet::will_trust('msg',$serverdefdom,$audom); + $trustchecked{$audom} = 1; + } + if ($willtrust{$audom}) { + $toaddr{$auname.':'.$audom}=''; + $bcc->{$auname.':'.$audom}=''; + } else { + $disallowed{'bcc'}{$auname.':'.$audom} = 1; + } } } } @@ -2973,42 +2977,42 @@ sub sendoffmail { } else { $savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'}); } - my %reciphash = ( - to => $tos, - cc => $cc, - bcc => $bcc, - ); - if ($mode eq 'group') { - if ($group eq '') { - $reciphash{'course_broadcast'} = $broadcast; - } else { - if ($env{'form.groupmail'} eq 'cc') { - $reciphash{'group_cc_broadcast'} = $broadcast; + my ($recipid, @recusers, @recudoms, %permresults); + if (keys(%toaddr) > 0) { + my %reciphash = ( + to => $tos, + cc => $cc, + bcc => $bcc, + ); + if ($mode eq 'group') { + if ($group eq '') { + $reciphash{'course_broadcast'} = $broadcast; } else { - $reciphash{'group_bcc_broadcast'} = $broadcast; + if ($env{'form.groupmail'} eq 'cc') { + $reciphash{'group_cc_broadcast'} = $broadcast; + } else { + $reciphash{'group_bcc_broadcast'} = $broadcast; + } } } - } - my ($recipid,$recipstatus) = - &Apache::lonmsg::store_recipients($msgsubj,$env{'user.name'}, - $env{'user.domain'},\%reciphash); - if ($recipstatus ne 'ok') { - &Apache::lonnet::logthis('Failed to store To, Bcc and Cc recipients for '.$env{'user.name'}.':'.$env{'user.domain'}); - } - if ($env{'form.attachment'}) { - if (length($env{'form.attachment'}) <= 1048576) { - $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback/'.$now); - } else { - $r->print(' '.&mt('Attachment not included - exceeded permitted length').'
'); + ($recipid,my $recipstatus) = + &Apache::lonmsg::store_recipients($msgsubj,$env{'user.name'}, + $env{'user.domain'},\%reciphash); + if ($recipstatus ne 'ok') { + &Apache::lonnet::logthis('Failed to store To, Bcc and Cc recipients for '.$env{'user.name'}.':'.$env{'user.domain'}); } - } elsif ($env{'form.multiforward'}) { - if ($env{'form.attachmenturl'} ne '') { - $attachmenturl = $env{'form.attachmenturl'}; + if ($env{'form.attachment'}) { + if (length($env{'form.attachment'})<131072) { + $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback/'.$now); + } else { + $r->print(''.&mt('Attachment not included - exceeded permitted length').'
'); + } + } elsif ($env{'form.multiforward'}) { + if ($env{'form.attachmenturl'} ne '') { + $attachmenturl = $env{'form.attachmenturl'}; + } } } - my @recusers; - my @recudoms; - my %permresults; foreach my $address (sort(keys(%toaddr))) { my ($recuname,$recdomain)=split(/\:/,$address); my $msgtxt = $savemsg; @@ -3146,6 +3150,23 @@ sub sendoffmail { $r->print($message); } } + if (keys(%disallowed)) { + if ((ref($disallowed{'to'}) eq 'HASH') && (keys(%{$disallowed{'to'}}) > 0)) { + $r->print(&mt("The following recipients were excluded because the user's domain does not accept messages from server's domain:").'