loncom/interface/lonsupportreq.pm - diff

Return to lonsupportreq.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonsupportreq.pm between versions 1.50 and 1.55

version 1.50, 2008/10/01 17:47:06	version 1.55, 2009/10/22 13:41:41
Line 495 sub print_request_receipt {	Line 495 sub print_request_receipt {
}	}
my %lt = &Apache::lonlocal::texthash (	my %lt = &Apache::lonlocal::texthash (
username => 'Name',	username => 'Name',
email => 'Email',	email => 'E-mail',
cc => 'Cc',	cc => 'Cc',
user => 'Username/domain',	user => 'Username/domain',
phone => 'Phone',	phone => 'Phone',
Line 566 END	Line 566 END
if ($env{'form.'.$item} ne '') {	if ($env{'form.'.$item} ne '') {
if ($item eq 'description') {	if ($item eq 'description') {
my $descrip = $env{'form.description'};	my $descrip = $env{'form.description'};
$descrip =~ s\|\n\|<br />\|g;	$descrip = &cleanup_html($descrip);
	$descrip =~ s\|[\n\r\f]\|<br />\|g;
$displaymsg .=	$displaymsg .=
'<span class="LC_helpform_receipt_cat">'.	'<span class="LC_helpform_receipt_cat">'.
"$lt{$item}</span>: $descrip<br />\n";	"$lt{$item}</span>: $descrip<br />\n";
} elsif ($item eq 'sourceurl') {	} elsif ($item eq 'sourceurl') {
my $showurl = $env{'form.sourceurl'};	my $showurl = $env{'form.sourceurl'};
$showurl =~ s/\?.*$//;	$showurl =~ s/\?.*$//;
	$showurl = &cleanup_html($showurl);
$displaymsg .=	$displaymsg .=
'<span class="LC_helpform_receipt_cat">'.	'<span class="LC_helpform_receipt_cat">'.
"$lt{$item}</span>: $showurl<br />\n";	"$lt{$item}</span>: $showurl<br />\n";
Line 581 END	Line 583 END
'<span class="LC_helpform_receipt_cat">'.	'<span class="LC_helpform_receipt_cat">'.
"$lt{$item}</span>: $okcclist<br />\n";	"$lt{$item}</span>: $okcclist<br />\n";
} else {	} else {
	my $showitem = $env{'form.'.$item};
	$showitem = &cleanup_html($showitem);
$displaymsg .=	$displaymsg .=
'<span class="LC_helpform_receipt_cat">'.	'<span class="LC_helpform_receipt_cat">'.
"$lt{$item}</span>: $env{'form.'.$item}<br />\n";	"$lt{$item}</span>: $showitem<br />\n";
}	}
}	}
}	}
Line 684 END	Line 688 END

if ($attachmentpath =~ m-/([^/]+)$-) {	if ($attachmentpath =~ m-/([^/]+)$-) {
$fname = $1;	$fname = $1;
$displaymsg .= '<br />'.&mt('An uploaded screenshot file \'[_1]\' ([_2] bytes) was included in the request sent by [_3].',$fname,$attachmentsize,$env{'user.name'}.': '.$env{'user.domain'});	$displaymsg .= '<br />'
	.&mt('An uploaded screenshot file [_1] ([_2] bytes) was included in the request sent by [_3].'
	,'<span class="LC_filename">'.$fname.'<span>'
	,$attachmentsize
	,$env{'user.name'}.':'.$env{'user.domain'}
	);
$supportmsg .= "\n";	$supportmsg .= "\n";
foreach my $var (@cookievars) {	foreach my $var (@cookievars) {
$supportmsg .= "$var: $cookies{$var}\n";	$supportmsg .= "$var: $cookies{$var}\n";
Line 741 END	Line 750 END
unlink($attachmentpath);	unlink($attachmentpath);
}	}
$r->print('<b>'.$lt{'your'}.'</b>:<br /><br />'."\n");	$r->print('<b>'.$lt{'your'}.'</b>:<br /><br />'."\n");
$r->print(&Apache::lonhtmlcommon::start_pick_box('LC_helpform_receipt').	$r->print('<div style="width:620px;">'.
	&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title($lt{'info'},undef,'LC_oddrow_value')."\n".$displaymsg."\n".	&Apache::lonhtmlcommon::row_title($lt{'info'},undef,'LC_oddrow_value')."\n".$displaymsg."\n".
&Apache::lonhtmlcommon::row_closure().	&Apache::lonhtmlcommon::row_closure().
&Apache::lonhtmlcommon::row_title($lt{'adin'},undef,'LC_evenrow_value'));	&Apache::lonhtmlcommon::row_title($lt{'adin'},undef,'LC_evenrow_value'));
Line 767 END	Line 777 END
$envmsg =~ s/, $//;	$envmsg =~ s/, $//;
$r->print($envmsg."\n".	$r->print($envmsg."\n".
&Apache::lonhtmlcommon::row_closure(1)."\n".	&Apache::lonhtmlcommon::row_closure(1)."\n".
&Apache::lonhtmlcommon::end_pick_box()."\n".	&Apache::lonhtmlcommon::end_pick_box().
	"</div>\n".
&Apache::loncommon::end_page());	&Apache::loncommon::end_page());
}	}

Line 796 sub print_header {	Line 807 sub print_header {
$r->print(<<END);	$r->print(<<END);
<table width="620" border="0" cellspacing="0" cellpadding="0" height="55"> <tr height="50"> <td width='5'> </td>	<table width="620" border="0" cellspacing="0" cellpadding="0" height="55"> <tr height="50"> <td width='5'> </td>
<td>	<td>
<fieldset><legend><img src="$location/lonIcons/minilogo.gif" height='20' width='29' valign='bottom' />  <b><font size="+1">LON-CAPA $lt{'headline'}</font></b></legend>	<fieldset>
	<legend>
	<img src="$location/lonIcons/minilogo.gif" height="20" width="29" valign="bottom" />
	LON-CAPA $lt{'headline'}
	</legend>
<table id="LC_helpmenu_links">	<table id="LC_helpmenu_links">
<tr>	<tr>
<td align="center"><span class="LC_nobreak"><img src="$location/help/help.png" border="0" alt="($lt{'login'})" valign="middle" /> <b><a href="/adm/loginproblems.html">$lt{'login'}</a></b> </span></td>	<td align="center"><span class="LC_nobreak"><img src="$location/help/help.png" border="0" alt="($lt{'login'})" valign="middle" /> <b><a href="/adm/loginproblems.html">$lt{'login'}</a></b> </span></td>
Line 837 sub get_domain {	Line 852 sub get_domain {
} elsif ($env{'request.role.domain'}) {	} elsif ($env{'request.role.domain'}) {
$codedom = $env{'request.role.domain'};	$codedom = $env{'request.role.domain'};
} else {	} else {
$codedom = $Apache::lonnet::perlvar{'lonDefDomain'};	$codedom = &Apache::lonnet::default_login_domain();
}	}
return $codedom;	return $codedom;
}	}

	sub cleanup_html {
	my ($incoming) = @_;
	my $outgoing;
	if ($incoming ne '') {
	$outgoing = $incoming;
	$outgoing =~ s/\#/#/g;
	$outgoing =~ s/\&/&/g;
	$outgoing =~ s/</</g;
	$outgoing =~ s/>/>/g;
	$outgoing =~ s/\(/&#040/g;
	$outgoing =~ s/\)/)/g;
	$outgoing =~ s/"/"/g;
	$outgoing =~ s/'/'/g;
	$outgoing =~ s/\$/$/g;
	}
	return $outgoing;
	}

1;	1;

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

Removed from v.1.50
changed lines
	Added in v.1.55