loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.1111, 2013/01/15 17:37:45	version 1.1113, 2013/01/21 02:12:51
Line 993 sub select_language {	Line 993 sub select_language {
my ($name,$selected,$includeempty) = @_;	my ($name,$selected,$includeempty) = @_;
my %langchoices;	my %langchoices;
if ($includeempty) {	if ($includeempty) {
%langchoices = ('' => 'No language preference');	%langchoices = ('' => &mt('No language preference'));
}	}
foreach my $id (&languageids()) {	foreach my $id (&languageids()) {
my $code = &supportedlanguagecode($id);	my $code = &supportedlanguagecode($id);
Line 4981 sub CSTR_pageheader {	Line 4981 sub CSTR_pageheader {

my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
my ($udom,$uname,$thisdisfn)=	my ($udom,$uname,$thisdisfn)=
($trailfile =~ m{^\Q$londocroot\E/priv/([^/]+)/([^/]+)/(.*)$});	($trailfile =~ m{^\Q$londocroot\E/priv/([^/]+)/([^/]+)(?:\|/(.*))$});
my $formaction = "/priv/$udom/$uname/$thisdisfn";	my $formaction = "/priv/$udom/$uname/$thisdisfn";
$formaction =~ s{/+}{/}g;	$formaction =~ s{/+}{/}g;