loncom/interface/lonmsg.pm - diff

Return to lonmsg.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsg.pm between versions 1.162 and 1.178

version 1.162, 2005/12/09 20:54:26	version 1.178, 2006/03/16 22:12:17
Line 105 users in their domain. The XML packagin	Line 105 users in their domain. The XML packagin
similar. The differences are the use of <recuser>$uname</recuser> and	similar. The differences are the use of <recuser>$uname</recuser> and
<recdomain>$udom</recdomain> in stored internal messages, compared	<recdomain>$udom</recdomain> in stored internal messages, compared
with <recipient username="$uname:$udom">$email</recipient> in stored	with <recipient username="$uname:$udom">$email</recipient> in stored
Domain Coordinator e-mail for teh storage of information about	Domain Coordinator e-mail for the storage of information about
recipients of the message/e-mail.	recipients of the message/e-mail.

=head1 FUNCTIONS	=head1 FUNCTIONS
Line 137 my $interdis;	Line 137 my $interdis;

sub packagemsg {	sub packagemsg {
my ($subject,$message,$citation,$baseurl,$attachmenturl,	my ($subject,$message,$citation,$baseurl,$attachmenturl,
$recuser,$recdomain,$msgid,$type)=@_;	$recuser,$recdomain,$msgid,$type,$crsmsgid)=@_;
$message =&HTML::Entities::encode($message,'<>&"');	$message =&HTML::Entities::encode($message,'<>&"');
$citation=&HTML::Entities::encode($citation,'<>&"');	$citation=&HTML::Entities::encode($citation,'<>&"');
$subject =&HTML::Entities::encode($subject,'<>&"');	$subject =&HTML::Entities::encode($subject,'<>&"');
Line 170 sub packagemsg {	Line 170 sub packagemsg {
$msgid = &buildmsgid($now,$subject,$env{'user.name'},$env{'user.domain'},	$msgid = &buildmsgid($now,$subject,$env{'user.name'},$env{'user.domain'},
$msgcount,$course_context,$$);	$msgcount,$course_context,$$);
}	}
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>'.
'<time>'.&Apache::lonlocal::locallocaltime($now).'</time>'.	'<time>'.&Apache::lonlocal::locallocaltime($now).'</time>';
'<servername>'.$ENV{'SERVER_NAME'}.'</servername>'.	if (defined($crsmsgid)) {
	$result.= '<courseid>'.$course_context.'</courseid>'.
	'<coursesec>'.$env{'request.course.sec'}.'</coursesec>'.
	'<msgid>'.$msgid.'</msgid>'.
	'<coursemsgid>'.$crsmsgid.'</coursemsgid>'.
	'<message>'.$message.'</message>';
	return ($msgid,$result);
	}
	$result .= '<servername>'.$ENV{'SERVER_NAME'}.'</servername>'.
'<host>'.$ENV{'HTTP_HOST'}.'</host>'.	'<host>'.$ENV{'HTTP_HOST'}.'</host>'.
'<client>'.$ENV{'REMOTE_ADDR'}.'</client>'.	'<client>'.$ENV{'REMOTE_ADDR'}.'</client>'.
'<browsertype>'.$env{'browser.type'}.'</browsertype>'.	'<browsertype>'.$env{'browser.type'}.'</browsertype>'.
Line 241 sub unpackagemsg {	Line 249 sub unpackagemsg {
}	}
}	}
}	}
	if (!exists($content{'recuser'})) { $content{'recuser'} = []; }
if ($content{'attachmenturl'}) {	if ($content{'attachmenturl'}) {
my ($fname)=($content{'attachmenturl'}=~m\|/([^/]+)$\|);	my ($fname)=($content{'attachmenturl'}=~m\|/([^/]+)$\|);
if ($notoken) {	if ($notoken) {
Line 266 sub buildmsgid {	Line 275 sub buildmsgid {
}	}

sub unpackmsgid {	sub unpackmsgid {
my ($msgid,$folder)=@_;	my ($msgid,$folder,$skipstatus,$status_cache)=@_;
$msgid=&Apache::lonnet::unescape($msgid);	$msgid=&Apache::lonnet::unescape($msgid);
my $suffix=&foldersuffix($folder);	my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid,
my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid)=split(/\:/,	$processid)=split(/\:/,&Apache::lonnet::unescape($msgid));
&Apache::lonnet::unescape($msgid));	if (!defined($processid)) { $fromcid = ''; }
my %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]);	my %status=();
if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }	unless ($skipstatus) {
unless ($status{$msgid}) { $status{$msgid}='new'; }	if (ref($status_cache)) {
	$status{$msgid} = $status_cache->{$msgid};
	} else {
	my $suffix=&foldersuffix($folder);
	%status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]);
	}
	if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }
	unless ($status{$msgid}) { $status{$msgid}='new'; }
	}
return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid},$fromcid);	return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid},$fromcid);
}	}

Line 527 sub user_crit_received {	Line 544 sub user_crit_received {

sub user_normal_msg_raw {	sub user_normal_msg_raw {
my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl,	my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl,
$toperm,$currid,$newid,$sentmessage)=@_;	$toperm,$currid,$newid,$sentmessage,$crsmsgid)=@_;
# Check if allowed missing	# Check if allowed missing
my $status='';	my ($status,$packed_message);
my $msgid='undefined';	my $msgid='undefined';
my $text=$message;	my $text=$message;
unless (($message)&&($user)&&($domain)) { $status='empty'; };	unless (($message)&&($user)&&($domain)) { $status='empty'; };
my $homeserver=&Apache::lonnet::homeserver($user,$domain);	my $homeserver=&Apache::lonnet::homeserver($user,$domain);
if ($homeserver ne 'no_host') {	if ($homeserver ne 'no_host') {
($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl,	($msgid,$packed_message)=
$attachmenturl,$user,$domain,$currid);	&packagemsg($subject,$message,$citation,$baseurl,
	$attachmenturl,$user,$domain,$currid,
	undef,$crsmsgid);

# Store in user folder	# Store in user folder
$status=&Apache::lonnet::critical(	$status=&Apache::lonnet::critical(
'put:'.$domain.':'.$user.':nohist_email:'.	'put:'.$domain.':'.$user.':nohist_email:'.
&Apache::lonnet::escape($msgid).'='.	&Apache::lonnet::escape($msgid).'='.
&Apache::lonnet::escape($message),$homeserver);	&Apache::lonnet::escape($packed_message),$homeserver);
# Save new message received time	# Save new message received time
&Apache::lonnet::put	&Apache::lonnet::put
('email_status',{'recnewemail'=>time},$domain,$user);	('email_status',{'recnewemail'=>time},$domain,$user);
Line 549 sub user_normal_msg_raw {	Line 569 sub user_normal_msg_raw {
unless (($env{'request.course.id'}) &&	unless (($env{'request.course.id'}) &&
(($env{'form.sendmode'} eq 'group') \|\|	(($env{'form.sendmode'} eq 'group') \|\|
(($env{'form.critmsg'}) \|\| ($env{'form.sendbck'})) &&	(($env{'form.critmsg'}) \|\| ($env{'form.sendbck'})) &&
(&Apache::lonnet::allowed('srm',$env{'request.course.id'})))) {	(&Apache::lonnet::allowed('srm',$env{'request.course.id'})
$status .= &store_sent_mail($msgid,$message);	\|\| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
	'/'.$env{'request.course.sec'})))) {
	(undef, my $packed_message_no_citation)=
	&packagemsg($subject,$message,undef ,$baseurl,
	$attachmenturl,$user,$domain,$currid,
	undef,$crsmsgid);

	$status .= &store_sent_mail($msgid,$packed_message_no_citation);
}	}
} else {	} else {
$status='no_host';	$status='no_host';
Line 559 sub user_normal_msg_raw {	Line 586 sub user_normal_msg_raw {
$$newid = $msgid;	$$newid = $msgid;
}	}
if (defined($sentmessage)) {	if (defined($sentmessage)) {
$$sentmessage = $message;	$$sentmessage = $packed_message;
}	}

# Notifications	# Notifications
Line 598 sub user_normal_msg {	Line 625 sub user_normal_msg {
$domain,$user);	$domain,$user);
my $msgforward=$userenv{'msgforward'};	my $msgforward=$userenv{'msgforward'};
if ($msgforward) {	if ($msgforward) {
foreach (split(/\,/,$msgforward)) {	foreach (split(/\,/,$msgforward)) {
my ($forwuser,$forwdomain)=split(/\:/,$_);	my ($forwuser,$forwdomain)=split(/\:/,$_);
$status.=	$status.=
&user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,	&user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
$citation,$baseurl,$attachmenturl,$toperm,undef,undef,$sentmessage).' ';	$citation,$baseurl,$attachmenturl,$toperm,
}	undef,undef,$sentmessage).' ';
	}
} else {	} else {
$status=&user_normal_msg_raw($user,$domain,$subject,$message,	$status=&user_normal_msg_raw($user,$domain,$subject,$message,
$citation,$baseurl,$attachmenturl,$toperm,undef,undef,$sentmessage);	$citation,$baseurl,$attachmenturl,$toperm,
	undef,undef,$sentmessage);
}	}
return $status;	return $status;
}	}

sub store_sent_mail {	sub store_sent_mail {
my ($msgid,$message) = @_;	my ($msgid,$message) = @_;
my $status =' '.&Apache::lonnet::critical(	my $status =' '.&Apache::lonnet::critical(
'put:'.$env{'user.domain'}.':'.$env{'user.name'}.	'put:'.$env{'user.domain'}.':'.$env{'user.name'}.
':nohist_email_sent:'.	':nohist_email_sent:'.
&Apache::lonnet::escape($msgid).'='.	&Apache::lonnet::escape($msgid).'='.
&Apache::lonnet::escape($message),$env{'user.home'});	&Apache::lonnet::escape($message),$env{'user.home'});
return $status;	return $status;
}	}

Line 745 sub discourse {	Line 774 sub discourse {
for (i=0; i<document.forms.compemail.elements.length; i++) {	for (i=0; i<document.forms.compemail.elements.length; i++) {
if	if
(document.forms.compemail.elements[i].name.indexOf	(document.forms.compemail.elements[i].name.indexOf
('send_to_&&&'+document.forms.compemail.chksec.value)==0) {	('send_to_&&&'+document.forms.compemail.chksec.value+'&&&')==0) {
document.forms.compemail.elements[i].checked=true;	document.forms.compemail.elements[i].checked=true;
}	}
}	}
Line 853 sub sortedmessages {	Line 882 sub sortedmessages {
my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);	my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);
#unpack the varibles and repack into temp for sorting	#unpack the varibles and repack into temp for sorting
my @temp;	my @temp;
	my %descriptions;
	my %status_cache =
	&Apache::lonnet::get('email_status'.&foldersuffix($folder),\@messages);
foreach (@messages) {	foreach (@messages) {
my $msgid=&Apache::lonnet::escape($_);	my $msgid=&Apache::lonnet::escape($_);
my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=
&Apache::lonmsg::unpackmsgid($msgid,$folder);	&Apache::lonmsg::unpackmsgid($msgid,$folder,undef,
my $description = &get_course_desc($fromcid);	\%status_cache);
	my $description = &get_course_desc($fromcid,\%descriptions);
my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,	my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,
$msgid,$description);	$msgid,$description);
# Check whether message was sent during blocking period.	# Check whether message was sent during blocking period.
Line 911 sub sortedmessages {	Line 944 sub sortedmessages {
}	}

sub get_course_desc {	sub get_course_desc {
my ($fromcid) = @_;	my ($fromcid,$descriptions) = @_;
my $description;	my $description;
if (defined($env{'course.'.$fromcid.'.description'})) {	if (!$fromcid) {
$description = $env{'course.'.$fromcid.'.description'};	return $description;
} else {	} else {
my %courseinfo=&Apache::lonnet::coursedescription($fromcid);	if (defined($$descriptions{$fromcid})) {
$description = $courseinfo{'description'};	$description = $$descriptions{$fromcid};
	} else {
	if (defined($env{'course.'.$fromcid.'.description'})) {
	$description = $env{'course.'.$fromcid.'.description'};
	} else {
	my %courseinfo=&Apache::lonnet::coursedescription($fromcid); $description = $courseinfo{'description'};
	$description = $courseinfo{'description'};
	}
	$$descriptions{$fromcid} = $description;
	}
	return $description;
}	}
return $description;
}	}

# ======================================================== Display new messages	# ======================================================== Display new messages
Line 936 sub disnew {	Line 978 sub disnew {
'op' => 'Open',	'op' => 'Open',
'do' => 'Domain'	'do' => 'Domain'
);	);
my @msgids = sort split(/\&/,&Apache::lonnet::reply	my @msgids = sort(&Apache::lonnet::getkeys('nohist_email'));
('keys:'.$env{'user.domain'}.':'.
$env{'user.name'}.':nohist_email',
$env{'user.home'}));
my @newmsgs;	my @newmsgs;
my %setters = ();	my %setters = ();
my $startblock = 0;	my $startblock = 0;
Line 948 sub disnew {	Line 987 sub disnew {
my $numblocked = 0;	my $numblocked = 0;
# 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);
	my %status_cache =
	&Apache::lonnet::get('email_status',\@msgids);
	my %descriptions;
foreach (@msgids) {	foreach (@msgids) {
	my $msgid=&Apache::lonnet::escape($_);
my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=	my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
&Apache::lonmsg::unpackmsgid($_);	&Apache::lonmsg::unpackmsgid($msgid,undef,undef,\%status_cache);
if (defined($sendtime) && $sendtime!~/error/) {	if (defined($sendtime) && $sendtime!~/error/) {
my $description = &get_course_desc($fromcid);	my $description = &get_course_desc($fromcid,\%descriptions);
my $numsendtime = $sendtime;	my $numsendtime = $sendtime;
$sendtime = &Apache::lonlocal::locallocaltime($sendtime);	$sendtime = &Apache::lonlocal::locallocaltime($sendtime);
if ($status eq 'new') {	if ($status eq 'new') {
Line 961 sub disnew {	Line 1004 sub disnew {
$numblocked ++;	$numblocked ++;
} else {	} else {
push @newmsgs, {	push @newmsgs, {
msgid => $_,	msgid => $msgid,
sendtime => $sendtime,	sendtime => $sendtime,
shortsub => &Apache::lonnet::unescape($shortsubj),	shortsub => &Apache::lonnet::unescape($shortsubj),
from => $fromname,	from => $fromname,
Line 989 ENDLINK	Line 1032 ENDLINK
}	}
$r->print("</td></tr>");	$r->print("</td></tr>");
}	}
$r->print('</table>'.&Apache::loncommon::endbodytag().'</html>');	$r->print('</table>'.&Apache::loncommon::end_page());
} elsif ($numblocked == 0) {	} elsif ($numblocked == 0) {
$r->print("<h3>".&mt('You have no unread messages')."</h3>");	$r->print("<h3>".&mt('You have no unread messages')."</h3>");
}	}
Line 1205 sub compout {	Line 1248 sub compout {
'ca' => 'Cancel',	'ca' => 'Cancel',
'ma' => 'Mail');	'ma' => 'Mail');

if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) {	if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
	\|\| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
	'/'.$env{'request.course.sec'})) {
my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");	my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
$dispcrit=	$dispcrit=
'<p><label><input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').'</label> ' . $crithelp .	'<p><label><input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').'</label> ' . $crithelp .
Line 1214 sub compout {	Line 1259 sub compout {
&mt('and return receipt') . '</label>' . $crithelp .	&mt('and return receipt') . '</label>' . $crithelp .
'</p><p><label><input type="checkbox" name="permanent" /> '.	'</p><p><label><input type="checkbox" name="permanent" /> '.
&mt('Send copy to permanent email address (if known)').'</label></p>'.	&mt('Send copy to permanent email address (if known)').'</label></p>'.
'<!-- <p><label><input type="checkbox" name="rsspost" /> '.	'<p><label><input type="checkbox" name="rsspost" /> '.
&mt('Include in course RSS newsfeed').'</label></p>-->'; }	&mt('Include in course RSS newsfeed').'</label></p>';
	}
my %message;	my %message;
my %content;	my %content;
my $defdom=$env{'user.domain'};	my $defdom=$env{'user.domain'};
Line 1331 $dispcrit	Line 1377 $dispcrit
ENDUPLOAD	ENDUPLOAD
}	}
if ($broadcast eq 'group') {	if ($broadcast eq 'group') {
&discourse;	&discourse($r);
}	}
$r->print('</form>'.	$r->print('</form>'.
&Apache::lonfeedback::generate_preview_button('compemail','message').	&Apache::lonfeedback::generate_preview_button('compemail','message').
Line 1344 sub retrieve_instructor_comments {	Line 1390 sub retrieve_instructor_comments {
my ($user,$domain)=@_;	my ($user,$domain)=@_;
my $target=$env{'form.grade_target'};	my $target=$env{'form.grade_target'};
if (! $env{'request.course.id'}) { return; }	if (! $env{'request.course.id'}) { return; }
if (! &Apache::lonnet::allowed('srm',$env{'request.course.id'})) {	if (! &Apache::lonnet::allowed('srm',$env{'request.course.id'})
	&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
	'/'.$env{'request.course.sec'})) {
return;	return;
}	}
my %records=&Apache::lonnet::dump('nohist_email',	my %records=&Apache::lonnet::dump('nohist_email',
Line 1369 sub disfacetoface {	Line 1417 sub disfacetoface {
my ($r,$user,$domain)=@_;	my ($r,$user,$domain)=@_;
my $target=$env{'form.grade_target'};	my $target=$env{'form.grade_target'};
unless ($env{'request.course.id'}) { return; }	unless ($env{'request.course.id'}) { return; }
unless (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) {	if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
	&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
	'/'.$env{'request.course.sec'})) {
	$r->print('Not allowed');
return;	return;
}	}
my %records=&Apache::lonnet::dump('nohist_email',	my %records=&Apache::lonnet::dump('nohist_email',
Line 1386 sub disfacetoface {	Line 1437 sub disfacetoface {
} elsif ($content{'subject'}=~/^Broadcast/) {	} elsif ($content{'subject'}=~/^Broadcast/) {
$result .='<h3>'.&mt('Broadcast Message').'</h3>';	$result .='<h3>'.&mt('Broadcast Message').'</h3>';
if ($content{'subject'}=~/^Broadcast\./) {	if ($content{'subject'}=~/^Broadcast\./) {
%content=&unpackagemsg($content{'message'});	if (defined($content{'coursemsgid'})) {
$content{'message'}=	my $crsmsgid = &Apache::lonnet::escape($content{'coursemsgid'});
	my $broadcast_message = &general_message($crsmsgid);
	$content{'message'} = '<b>'.&mt('Subject').': '.$content{'message'}.'</b><br />'.$broadcast_message;
	} else {
	%content=&unpackagemsg($content{'message'});
	$content{'message'} =
'<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.	'<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.
$content{'message'};	$content{'message'};
	}
}	}
} else {	} else {
$result.='<h3>'.&mt('Critical Message').'</h3>';	$result.='<h3>'.&mt('Critical Message').'</h3>';
%content=&unpackagemsg($content{'message'});	if (defined($content{'coursemsgid'})) {
$content{'message'}=	my $crsmsgid=&Apache::lonnet::escape($content{'coursemsgid'});
	my $critical_message = &general_message($crsmsgid);
	$content{'message'} = '<b>'.&mt('Subject').': '.$content{'message'}.'</b><br />'.$critical_message;
	} else {
	%content=&unpackagemsg($content{'message'});
	$content{'message'}=
'<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.	'<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.
$content{'message'};	$content{'message'};
	}
}	}
$result.=&mt('By').': <b>'.	$result.=&mt('By').': <b>'.
&Apache::loncommon::aboutmewrapper(	&Apache::loncommon::aboutmewrapper(
Line 1419 $content{'sendername'}.'@'.	Line 1482 $content{'sendername'}.'@'.
}	}
}	}

	sub general_message {
	my ($crsmsgid) = @_;
	my %general_content;
	if ($crsmsgid) {
	my %course_content = &Apache::lonnet::get('nohist_email',[$crsmsgid],
	$env{'course.'.$env{'request.course.id'}.'.domain'},
	$env{'course.'.$env{'request.course.id'}.'.num'});
	%general_content = &unpackagemsg($course_content{$crsmsgid});
	}
	return $general_content{'message'};
	}

# ---------------------------------------------------------------- Face to face	# ---------------------------------------------------------------- Face to face

sub facetoface {	sub facetoface {
my ($r,$stage)=@_;	my ($r,$stage)=@_;
unless (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) {	if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
	&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
	'/'.$env{'request.course.sec'})) {
	$r->print('Not allowed');
return;	return;
}	}
&printheader($r,	&printheader($r,
Line 1498 ENDBFORM	Line 1576 ENDBFORM
sub examblock {	sub examblock {
my ($r,$action) = @_;	my ($r,$action) = @_;
unless ($env{'request.course.id'}) { return;}	unless ($env{'request.course.id'}) { return;}
unless (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) { $r->print('Not allowed'); }	if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
	&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
	'/'.$env{'request.course.sec'})) {
	$r->print('Not allowed');
	return;
	}
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'comb' => 'Communication Blocking',	'comb' => 'Communication Blocking',
'cbds' => 'Communication blocking during scheduled exams',	'cbds' => 'Communication blocking during scheduled exams',
Line 1538 sub examblock {	Line 1621 sub examblock {
$r->print($lt{'ncbc'}.'<br /><br />');	$r->print($lt{'ncbc'}.'<br /><br />');
}	}
&display_addblocker_table($r,$parmcount,\%ltext);	&display_addblocker_table($r,$parmcount,\%ltext);
my $endbody=&Apache::loncommon::endbodytag();	my $end_page=&Apache::loncommon::end_page();
$r->print(<<"END");	$r->print(<<"END");
<br />	<br />
<input type="hidden" name="blocktotal" value="$blockcount" />	<input type="hidden" name="blocktotal" value="$blockcount" />
<input type ="submit" value="Save Changes" />	<input type ="submit" value="Save Changes" />
</form>	</form>
$endbody	$end_page
</html>
END	END
return;	return;
}	}
Line 1989 sub displayresource {	Line 2071 sub displayresource {
$content{'sendername'},	$content{'sendername'},
$content{'senderdomain'},	$content{'senderdomain'},
$content{'courseid'});	$content{'courseid'});
} else {	} elsif ($env{'user.adv'}) {
return $content{'citation'};	return $content{'citation'};
}	}
	return '';
}	}

# ================================================================== The Header	# ================================================================== The Header

sub header {	sub header {
my ($r,$title,$baseurl)=@_;	my ($r,$title,$baseurl)=@_;
$r->print(&Apache::lonxml::xmlbegin().
'<head>'.&Apache::lonxml::fontsettings().	my $extra = &Apache::loncommon::studentbrowser_javascript();
'<title>Communication and Messages</title>'.
&Apache::lonhtmlcommon::htmlareaheaders());
if ($baseurl) {	if ($baseurl) {
$r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />");	$extra .= "<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />";
}	}
$r->print(&Apache::loncommon::studentbrowser_javascript().'</head>'.	$r->print(&Apache::loncommon::start_page('Communication and Messages',
&Apache::loncommon::bodytag('Communication and Messages'));	$extra));
$r->print(&Apache::lonhtmlcommon::breadcrumbs	$r->print(&Apache::lonhtmlcommon::breadcrumbs
(undef,($title?$title:'Communication and Messages')));	(undef,($title?$title:'Communication and Messages')));

}	}

Line 2041 sub storedcommentlisting {	Line 2122 sub storedcommentlisting {
my ($r)=@_;	my ($r)=@_;
my %msgs=&Apache::lonnet::dump('nohist_stored_comments',undef,undef,	my %msgs=&Apache::lonnet::dump('nohist_stored_comments',undef,undef,
'^'.&Apache::lonnet::escape(&Apache::lonnet::escape($env{'form.showcommentbaseurl'})));	'^'.&Apache::lonnet::escape(&Apache::lonnet::escape($env{'form.showcommentbaseurl'})));
$r->print(&Apache::lonxml::xmlbegin().'<head>'.	$r->print(&Apache::loncommon::start_page('Stored Comment Listing',undef,
&Apache::lonxml::fontsettings().'</head><body>');	{'onlybody' => 1}));
if ((keys %msgs)[0]=~/^error\:/) {	if ((keys %msgs)[0]=~/^error\:/) {
$r->print(&mt('No stored comments yet.'));	$r->print(&mt('No stored comments yet.'));
} else {	} else {
Line 2113 sub sendoffmail {	Line 2194 sub sendoffmail {
my $savemsg;	my $savemsg;
my $msgtype;	my $msgtype;
my %sentmessage;	my %sentmessage;
	my $msgsubj=&Apache::lonfeedback::clear_out_html($env{'form.subject'});
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'}.
	'/'.$env{'request.course.sec'})
	)) {
$savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'},1);	$savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'},1);
$msgtype = 'critical';	$msgtype = 'critical';
} else {	} else {
Line 2127 sub sendoffmail {	Line 2212 sub sendoffmail {
if ($toaddr{$_}) { $msgtxt.='<hr />'.$toaddr{$_}; }	if ($toaddr{$_}) { $msgtxt.='<hr />'.$toaddr{$_}; }
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'}.
	'/'.$env{'request.course.sec'}))) {
$r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': ');	$r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': ');
$thismsg=&user_crit_msg($recuname,$recdomain,	$thismsg=&user_crit_msg($recuname,$recdomain,$msgsubj,$msgtxt,
&Apache::lonfeedback::clear_out_html($env{'form.subject'}),	$env{'form.sendbck'},$env{'form.permanent'},
$msgtxt,	\$sentmessage{$_});
$env{'form.sendbck'},$env{'form.permanent'},\$sentmessage{$_});
} else {	} else {
$r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');	$r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
$thismsg=&user_normal_msg($recuname,$recdomain,	$thismsg=&user_normal_msg($recuname,$recdomain,$msgsubj,$msgtxt,
&Apache::lonfeedback::clear_out_html($env{'form.subject'}),
$msgtxt,
$content{'citation'},undef,undef,$env{'form.permanent'},\$sentmessage{$_});	$content{'citation'},undef,undef,$env{'form.permanent'},\$sentmessage{$_});
}	}
if (($env{'request.course.id'}) && (($msgtype eq 'critical') \|\|	if (($env{'request.course.id'}) && (($msgtype eq 'critical') \|\|
Line 2173 sub sendoffmail {	Line 2257 sub sendoffmail {
my $record_sent;	my $record_sent;
my @recusers = ();	my @recusers = ();
my @recudoms = ();	my @recudoms = ();
my ($stamp,$msgsubj,$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') {
Line 2181 sub sendoffmail {	Line 2265 sub sendoffmail {
my $usermsgid = &buildmsgid($stamp,$usersubj,$msgname,	my $usermsgid = &buildmsgid($stamp,$usersubj,$msgname,
$msgdom,$msgcount,$context,$pid);	$msgdom,$msgcount,$context,$pid);
&user_normal_msg_raw($cnum,$cdom,$subj_prefix.	&user_normal_msg_raw($cnum,$cdom,$subj_prefix.
' ['.$recipient.']',$sentmessage{$recipient},	' ['.$recipient.']',$msgsubj,undef,
undef,undef,undef,undef,$usermsgid);	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);
Line 2191 sub sendoffmail {	Line 2275 sub sendoffmail {
if (@recusers) {	if (@recusers) {
my $specialmessage;	my $specialmessage;
my $sentsubj = $subj_prefix.' ('.$numspecial.' sent) '.	my $sentsubj = $subj_prefix.' ('.$numspecial.' sent) '.
&Apache::lonfeedback::clear_out_html($env{'form.subject'});	$msgsubj;
$sentsubj = &HTML::Entities::encode($sentsubj,'<>&"');	$sentsubj = &HTML::Entities::encode($sentsubj,'<>&"');
my $sentmsgid = &buildmsgid($stamp,$sentsubj,$msgname,	my $sentmsgid = &buildmsgid($stamp,$sentsubj,$msgname,
$msgdom,$msgcount,$context,$pid);	$msgdom,$msgcount,$context,$pid);
($specialmsgid,$specialmessage) =	($specialmsgid,$specialmessage) = &packagemsg($msgsubj,$savemsg,
&packagemsg(&Apache::lonfeedback::clear_out_html(	undef,undef,undef,\@recusers,\@recudoms,$sentmsgid);
$env{'form.subject'}),$savemsg,undef,undef,undef,
\@recusers,\@recudoms,$sentmsgid);
$record_sent = &store_sent_mail($specialmsgid,$specialmessage);	$record_sent = &store_sent_mail($specialmsgid,$specialmessage);
}	}
} else {	} else {
Line 2390 sub handler {	Line 2472 sub handler {
&Apache::loncommunicate::menu($r);	&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode));	&disall($r,($folder?$folder:$dismode));
}	}
$r->print(&Apache::loncommon::endbodytag().'</html>');	$r->print(&Apache::loncommon::end_page());
return OK;	return OK;
}	}
# ================================================= Main program, reset counter	# ================================================= Main program, reset counter

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.162
changed lines
	Added in v.1.178