loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.1075.2.39 and 1.1075.2.58

version 1.1075.2.39, 2013/06/05 13:25:41	version 1.1075.2.58, 2013/12/19 08:28:05
Line 1234 sub help_open_topic {	Line 1234 sub help_open_topic {
$topic=~s/\W/\_/g;	$topic=~s/\W/\_/g;

if (!$stayOnPage) {	if (!$stayOnPage) {
$link = "javascript:openMyModal('/adm/help/${filename}.hlp',$width,$height,'yes');";	if ($env{'browser.mobile'}) {
	$link = "javascript:openMyModal('/adm/help/${filename}.hlp',$width,$height,'yes');";
	} else {
	$link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
	}
} elsif ($stayOnPage eq 'popup') {	} elsif ($stayOnPage eq 'popup') {
$link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";	$link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
} else {	} else {
Line 1358 sub top_nav_help {	Line 1362 sub top_nav_help {

return <<"END";	return <<"END";
$banner_link	$banner_link
<a href="$link" title="$title">$text</a>	<a href="$link" title="$title">$text</a>
END	END
}	}

sub help_menu_js {	sub help_menu_js {
my ($text) = @_;	my ($httphost) = @_;
my $stayOnPage = 1;	my $stayOnPage = 1;
my $width = 620;	my $width = 620;
my $height = 600;	my $height = 600;
my $helptopic=&general_help();	my $helptopic=&general_help();
my $details_link = '/adm/help/'.$helptopic.'.hlp';	my $details_link = $httphost.'/adm/help/'.$helptopic.'.hlp';
my $nothing=&Apache::lonhtmlcommon::javascript_nothing();	my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
my $start_page =	my $start_page =
&Apache::loncommon::start_page('Help Menu', undef,	&Apache::loncommon::start_page('Help Menu', undef,
{'frameset' => 1,	{'frameset' => 1,
'js_ready' => 1,	'js_ready' => 1,
	'use_absolute' => $httphost,
'add_entries' => {	'add_entries' => {
'border' => '0',	'border' => '0',
'rows' => "110,*",},});	'rows' => "110,*",},});
Line 1719 RESIZE	Line 1724 RESIZE

=head1 Excel and CSV file utility routines	=head1 Excel and CSV file utility routines

=over 4

=cut	=cut

###############################################################	###############################################################
Line 1728 RESIZE	Line 1731 RESIZE

=pod	=pod

	=over 4

=item * &csv_translate($text)	=item * &csv_translate($text)

Translate $text to allow it to be output as a 'comma separated values'	Translate $text to allow it to be output as a 'comma separated values'
Line 2161 sub select_level_form {	Line 2166 sub select_level_form {

=pod	=pod

=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoma,$excdoms)	=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms)

Returns a string containing a <select name='$name' size='1'> form to	Returns a string containing a <select name='$name' size='1'> form to
allow a user to select the domain to preform an operation in.	allow a user to select the domain to preform an operation in.
Line 2319 Outputs:	Line 2324 Outputs:

=item * $clientos	=item * $clientos

	=item * $clientmobile

	=item * $clientinfo

=back	=back

=back	=back
Line 2337 sub decode_user_agent {	Line 2346 sub decode_user_agent {
my $clientversion='0';	my $clientversion='0';
my $clientmathml='';	my $clientmathml='';
my $clientunicode='0';	my $clientunicode='0';
	my $clientmobile=0;
for (my $i=0;$i<=$#browsertype;$i++) {	for (my $i=0;$i<=$#browsertype;$i++) {
my ($bname,$match,$notmatch,$vreg,$minv,$univ)=split(/\:/,$browsertype[$i]);	my ($bname,$match,$notmatch,$vreg,$minv,$univ)=split(/\:/,$browsertype[$i]);
if (($httpbrowser=~/$match/i) && ($httpbrowser!~/$notmatch/i)) {	if (($httpbrowser=~/$match/i) && ($httpbrowser!~/$notmatch/i)) {
Line 2348 sub decode_user_agent {	Line 2358 sub decode_user_agent {
}	}
}	}
my $clientos='unknown';	my $clientos='unknown';
	my $clientinfo;
if (($httpbrowser=~/linux/i) \|\|	if (($httpbrowser=~/linux/i) \|\|
($httpbrowser=~/unix/i) \|\|	($httpbrowser=~/unix/i) \|\|
($httpbrowser=~/ux/i) \|\|	($httpbrowser=~/ux/i) \|\|
Line 2359 sub decode_user_agent {	Line 2370 sub decode_user_agent {
($httpbrowser=~/powerpc/i)) { $clientos='mac'; }	($httpbrowser=~/powerpc/i)) { $clientos='mac'; }
if ($httpbrowser=~/win/i) { $clientos='win'; }	if ($httpbrowser=~/win/i) { $clientos='win'; }
if ($httpbrowser=~/embed/i) { $clientos='pda'; }	if ($httpbrowser=~/embed/i) { $clientos='pda'; }
	if ($httpbrowser=~/(Android\|iPod\|iPad\|iPhone\|webOS\|Blackberry\|Windows Phone\|Opera m(?:ob\|in)\|Fennec)/i) {
	$clientmobile=lc($1);
	}
	if ($httpbrowser=~ m{Firefox/(\d+\.\d+)}) {
	$clientinfo = 'firefox-'.$1;
	} elsif ($httpbrowser=~ m{chromeframe/(\d+\.\d+)\.}) {
	$clientinfo = 'chromeframe-'.$1;
	}
return ($httpbrowser,$clientbrowser,$clientversion,$clientmathml,	return ($httpbrowser,$clientbrowser,$clientversion,$clientmathml,
$clientunicode,$clientos,);	$clientunicode,$clientos,$clientmobile,$clientinfo);
}	}

###############################################################	###############################################################
Line 3220 sub screenname {	Line 3239 sub screenname {
# ------------------------------------------------------------- Confirm Wrapper	# ------------------------------------------------------------- Confirm Wrapper
=pod	=pod

=item confirmwrapper	=item * &confirmwrapper($message)

Wrap messages about completion of operation in box	Wrap messages about completion of operation in box

Line 4838 sub designparm {	Line 4857 sub designparm {

Inputs: $url (usually will be undef).	Inputs: $url (usually will be undef).

Returns: Path to Construction Space containing the resource or	Returns: Path to Authoring Space containing the resource or
directory being viewed (or for which action is being taken).	directory being viewed (or for which action is being taken).
If $url is provided, and begins /priv/<domain>/<uname>	If $url is provided, and begins /priv/<domain>/<uname>
the path will be that portion of the $context argument.	the path will be that portion of the $context argument.
Line 4901 Input: (optional) filename from which br	Line 4920 Input: (optional) filename from which br
is appropriate for use in building the breadcrumb trail.	is appropriate for use in building the breadcrumb trail.

Returns: HTML div with CSTR path and recent box	Returns: HTML div with CSTR path and recent box
To be included on Construction Space pages	To be included on Authoring Space pages

=cut	=cut

Line 4932 sub CSTR_pageheader {	Line 4951 sub CSTR_pageheader {
my $output =	my $output =
'<div>'	'<div>'
.&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?	.&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?
.'<b>'.&mt('Construction Space:').'</b> '	.'<b>'.&mt('Authoring Space:').'</b> '
.'<form name="dirs" method="post" action="'.$formaction	.'<form name="dirs" method="post" action="'.$formaction
.'" target="_top">' #FIXME lonpubdir: target="_parent"	.'" target="_top">' #FIXME lonpubdir: target="_parent"
.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv/'.$udom,undef,undef);	.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv/'.$udom,undef,undef);
Line 5023 sub bodytag {	Line 5042 sub bodytag {
$public = 1;	$public = 1;
}	}
if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }	if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
	my $httphost = $args->{'use_absolute'};

$function = &get_users_function() if (!$function);	$function = &get_users_function() if (!$function);
my $img = &designparm($function.'.img',$domain);	my $img = &designparm($function.'.img',$domain);
Line 5094 sub bodytag {	Line 5114 sub bodytag {

my $funclist;	my $funclist;
if (($env{'environment.remote'} eq 'on') && ($env{'request.state'} ne 'construct')) {	if (($env{'environment.remote'} eq 'on') && ($env{'request.state'} ne 'construct')) {
$bodytag .= Apache::lonhtmlcommon::scripttag(Apache::lonmenu::utilityfunctions(), 'start')."\n".	$bodytag .= Apache::lonhtmlcommon::scripttag(Apache::lonmenu::utilityfunctions($httphost), 'start')."\n".
Apache::lonmenu::serverform();	Apache::lonmenu::serverform();
my $forbodytag;	my $forbodytag;
&Apache::lonmenu::prepare_functions($env{'request.noversionuri'},	&Apache::lonmenu::prepare_functions($env{'request.noversionuri'},
Line 5111 sub bodytag {	Line 5131 sub bodytag {
# }	# }

$bodytag .= Apache::lonhtmlcommon::scripttag(	$bodytag .= Apache::lonhtmlcommon::scripttag(
Apache::lonmenu::utilityfunctions(), 'start');	Apache::lonmenu::utilityfunctions($httphost), 'start');

my ($left,$right) = Apache::lonmenu::primary_menu();	my ($left,$right) = Apache::lonmenu::primary_menu();

Line 5137 sub bodytag {	Line 5157 sub bodytag {

#don't show menus for public users	#don't show menus for public users
if (!$public){	if (!$public){
$bodytag .= Apache::lonmenu::secondary_menu();	$bodytag .= Apache::lonmenu::secondary_menu($httphost);
$bodytag .= Apache::lonmenu::serverform();	$bodytag .= Apache::lonmenu::serverform();
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');	$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
if ($env{'request.state'} eq 'construct') {	if ($env{'request.state'} eq 'construct') {
Line 5200 sub bodytag {	Line 5220 sub bodytag {
if (!$public){	if (!$public){
if ($env{'request.state'} eq 'construct') {	if ($env{'request.state'} eq 'construct') {
$funclist = &Apache::lonhtmlcommon::scripttag(	$funclist = &Apache::lonhtmlcommon::scripttag(
&Apache::lonmenu::utilityfunctions(), 'start').	&Apache::lonmenu::utilityfunctions($httphost), 'start').
&Apache::lonhtmlcommon::scripttag('','end').	&Apache::lonhtmlcommon::scripttag('','end').
&Apache::lonmenu::innerregister($forcereg,	&Apache::lonmenu::innerregister($forcereg,
$args->{'bread_crumbs'});	$args->{'bread_crumbs'});
Line 5251 sub make_attr_string {	Line 5271 sub make_attr_string {
}	}

my $attr_string;	my $attr_string;
foreach my $attr (keys(%$attr_ref)) {	foreach my $attr (sort(keys(%$attr_ref))) {
$attr_string .= " $attr=\"".$attr_ref->{$attr}.'" ';	$attr_string .= " $attr=\"".$attr_ref->{$attr}.'" ';
}	}
return $attr_string;	return $attr_string;
Line 6465 div.LC_edit_problem_saves {	Line 6485 div.LC_edit_problem_saves {
white-space: nowrap;	white-space: nowrap;
}	}

	.LC_edit_problem_latexhelper{
	text-align: right;
	}

	#LC_edit_problem_colorful div{
	margin-left: 40px;
	}

img.stift {	img.stift {
border-width: 0;	border-width: 0;
vertical-align: middle;	vertical-align: middle;
Line 7231 sub headtag {	Line 7259 sub headtag {
my $function = $args->{'function'} \|\| &get_users_function();	my $function = $args->{'function'} \|\| &get_users_function();
my $domain = $args->{'domain'} \|\| &determinedomain();	my $domain = $args->{'domain'} \|\| &determinedomain();
my $bgcolor = $args->{'bgcolor'} \|\| &designparm($function.'.pgbg',$domain);	my $bgcolor = $args->{'bgcolor'} \|\| &designparm($function.'.pgbg',$domain);
	my $httphost = $args->{'use_absolute'};
my $url = join(':',$env{'user.name'},$env{'user.domain'},	my $url = join(':',$env{'user.name'},$env{'user.domain'},
$Apache::lonnet::perlvar{'lonVersion'},	$Apache::lonnet::perlvar{'lonVersion'},
#time(),	#time(),
Line 7241 sub headtag {	Line 7270 sub headtag {

my $result =	my $result =
'<head>'.	'<head>'.
&font_settings();	&font_settings($args);

my $inhibitprint = &print_suppression();	my $inhibitprint = &print_suppression();

Line 7254 sub headtag {	Line 7283 sub headtag {
if (!$args->{'no_nav_bar'}	if (!$args->{'no_nav_bar'}
&& !$args->{'only_body'}	&& !$args->{'only_body'}
&& !$args->{'frameset'}) {	&& !$args->{'frameset'}) {
$result .= &help_menu_js();	$result .= &help_menu_js($httphost);
$result.=&modal_window();	$result.=&modal_window();
$result.=&togglebox_script();	$result.=&togglebox_script();
$result.=&wishlist_window();	$result.=&wishlist_window();
Line 7292 ADDMETA	Line 7321 ADDMETA
.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'	.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'
.$inhibitprint	.$inhibitprint
.$head_extra;	.$head_extra;
	if ($env{'browser.mobile'}) {
	$result .= '
	<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0">
	<meta name="apple-mobile-web-app-capable" content="yes" />';
	}
return $result.'</head>';	return $result.'</head>';
}	}

Line 7301 ADDMETA	Line 7335 ADDMETA

Returns neccessary <meta> to set the proper encoding	Returns neccessary <meta> to set the proper encoding

Inputs: none	Inputs: optional reference to HASH -- $args passed to &headtag()

=cut	=cut

sub font_settings {	sub font_settings {
	my ($args) = @_;
my $headerstring='';	my $headerstring='';
if (!$env{'browser.mathml'} && $env{'browser.unicode'}) {	if ((!$env{'browser.mathml'} && $env{'browser.unicode'}) \|\|
	((ref($args) eq 'HASH') && ($args->{'browser.unicode'}))) {
$headerstring.=	$headerstring.=
'<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';	'<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'."\n";
}	}
return $headerstring;	return $headerstring;
}	}
Line 7413 sub xml_begin {	Line 7449 sub xml_begin {
.'<html xmlns:math="http://www.w3.org/1998/Math/MathML" '	.'<html xmlns:math="http://www.w3.org/1998/Math/MathML" '
.'xmlns="http://www.w3.org/1999/xhtml">';	.'xmlns="http://www.w3.org/1999/xhtml">';
} else {	} else {
$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'	$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n"
.'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">';	.'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">'."\n";
}	}
return $output;	return $output;
}	}
Line 7632 var modalWindow = {	Line 7668 var modalWindow = {
$(".LCmodal-overlay").click(function(){modalWindow.close();});	$(".LCmodal-overlay").click(function(){modalWindow.close();});
}	}
};	};
var openMyModal = function(source,width,height,scrolling)	var openMyModal = function(source,width,height,scrolling,transparency,style)
{	{
modalWindow.windowId = "myModal";	modalWindow.windowId = "myModal";
modalWindow.width = width;	modalWindow.width = width;
modalWindow.height = height;	modalWindow.height = height;
modalWindow.content = "<iframe width='"+width+"' height='"+height+"' frameborder='0' scrolling='"+scrolling+"' allowtransparency='true' src='" + source + "'>&lt/iframe>";	modalWindow.content = "<iframe width='"+width+"' height='"+height+"' frameborder='0' scrolling='"+scrolling+"' allowtransparency='"+transparency+"' src='" + source + "' style='"+style+"'>&lt/iframe>";
modalWindow.open();	modalWindow.open();
};	};
// END LON-CAPA Internal -->	// END LON-CAPA Internal -->
Line 7647 ENDMODAL	Line 7683 ENDMODAL
}	}

sub modal_link {	sub modal_link {
my ($link,$linktext,$width,$height,$target,$scrolling,$title)=@_;	my ($link,$linktext,$width,$height,$target,$scrolling,$title,$transparency,$style)=@_;
unless ($width) { $width=480; }	unless ($width) { $width=480; }
unless ($height) { $height=400; }	unless ($height) { $height=400; }
unless ($scrolling) { $scrolling='yes'; }	unless ($scrolling) { $scrolling='yes'; }
	unless ($transparency) { $transparency='true'; }

my $target_attr;	my $target_attr;
if (defined($target)) {	if (defined($target)) {
$target_attr = 'target="'.$target.'"';	$target_attr = 'target="'.$target.'"';
}	}
return <<"ENDLINK";	return <<"ENDLINK";
<a href="$link" $target_attr title="$title" onclick="javascript:openMyModal('$link',$width,$height,'$scrolling'); return false;">	<a href="$link" $target_attr title="$title" onclick="javascript:openMyModal('$link',$width,$height,'$scrolling','$transparency','$style'); return false;">
$linktext</a>	$linktext</a>
ENDLINK	ENDLINK
}	}
Line 7684 sub modal_adhoc_inner {	Line 7722 sub modal_adhoc_inner {
my $innerwidth=$width-20;	my $innerwidth=$width-20;
$content=&js_ready(	$content=&js_ready(
&start_page('Dialog',undef,{'only_body'=>1,'bgcolor'=>'#FFFFFF'}).	&start_page('Dialog',undef,{'only_body'=>1,'bgcolor'=>'#FFFFFF'}).
&start_scrollbox($width.'px',$innerwidth.'px',$height.'px').	&start_scrollbox($width.'px',$innerwidth.'px',$height.'px','myModal','#FFFFFF',undef,1).
$content.	$content.
&end_scrollbox().	&end_scrollbox().
&end_page()	&end_page()
);	);
return &modal_adhoc_script($funcname,$width,$height,$content);	return &modal_adhoc_script($funcname,$width,$height,$content);
}	}
Line 7904 sub validate_page {	Line 7942 sub validate_page {


sub start_scrollbox {	sub start_scrollbox {
my ($outerwidth,$width,$height,$id,$bgcolor)=@_;	my ($outerwidth,$width,$height,$id,$bgcolor,$cursor,$needjsready) = @_;
unless ($outerwidth) { $outerwidth='520px'; }	unless ($outerwidth) { $outerwidth='520px'; }
unless ($width) { $width='500px'; }	unless ($width) { $width='500px'; }
unless ($height) { $height='200px'; }	unless ($height) { $height='200px'; }
my ($table_id,$div_id,$tdcol);	my ($table_id,$div_id,$tdcol);
if ($id ne '') {	if ($id ne '') {
$table_id = " id='table_$id'";	$table_id = ' id="table_'.$id.'"';
$div_id = " id='div_$id'";	$div_id = ' id="div_'.$id.'"';
}	}
if ($bgcolor ne '') {	if ($bgcolor ne '') {
$tdcol = "background-color: $bgcolor;";	$tdcol = "background-color: $bgcolor;";
}	}
	my $nicescroll_js;
	if ($env{'browser.mobile'}) {
	$nicescroll_js = &nicescroll_javascript('div_'.$id,$cursor,$needjsready);
	}
return <<"END";	return <<"END";
<table style="width: $outerwidth; border: 1px solid none;"$table_id><tr><td style="width: $width;$tdcol"><div style="overflow:auto; width:$width; height: $height;"$div_id>	$nicescroll_js

	<table style="width: $outerwidth; border: 1px solid none;"$table_id><tr><td style="width: $width;$tdcol">
	<div style="overflow:auto; width:$width; height:$height;"$div_id>
END	END
}	}

Line 7925 sub end_scrollbox {	Line 7970 sub end_scrollbox {
return '</div></td></tr></table>';	return '</div></td></tr></table>';
}	}

	sub nicescroll_javascript {
	my ($id,$cursor,$needjsready,$framecheck,$location) = @_;
	my %options;
	if (ref($cursor) eq 'HASH') {
	%options = %{$cursor};
	}
	unless ($options{'railalign'} =~ /^left\|right$/) {
	$options{'railalign'} = 'left';
	}
	unless ($options{'cursorcolor'} =~ /^\#\w+$/) {
	my $function = &get_users_function();
	$options{'cursorcolor'} = &designparm($function.'.sidebg',$env{'request.role.domain'});
	unless ($options{'cursorcolor'} =~ /^\#\w+$/) {
	$options{'cursorcolor'} = '#00F';
	}
	}
	if ($options{'cursoropacity'} =~ /^[\d.]+$/) {
	unless ($options{'cursoropacity'} >= 0.0 && $options{'cursoropacity'} <=1.0) {
	$options{'cursoropacity'}='1.0';
	}
	} else {
	$options{'cursoropacity'}='1.0';
	}
	if ($options{'cursorfixedheight'} eq 'none') {
	delete($options{'cursorfixedheight'});
	} else {
	unless ($options{'cursorfixedheight'} =~ /^\d+$/) { $options{'cursorfixedheight'}='50'; }
	}
	unless ($options{'railoffset'} =~ /^{[\w\:\d\-,]+}$/) {
	delete($options{'railoffset'});
	}
	my @niceoptions;
	while (my($key,$value) = each(%options)) {
	if ($value =~ /^\{.+\}$/) {
	push(@niceoptions,$key.':'.$value);
	} else {
	push(@niceoptions,$key.':"'.$value.'"');
	}
	}
	my $nicescroll_js = '
	$(document).ready(
	function() {
	$("#'.$id.'").niceScroll({'.join(',',@niceoptions).'});
	}
	);
	';
	if ($framecheck) {
	$nicescroll_js .= '
	function expand_div(caller) {
	if (top === self) {
	document.getElementById("'.$id.'").style.width = "auto";
	document.getElementById("'.$id.'").style.height = "auto";
	} else {
	try {
	if (parent.frames) {
	if (parent.frames.length > 1) {
	var framesrc = parent.frames[1].location.href;
	var currsrc = framesrc.replace(/\#.*$/,"");
	if ((caller == "search") \|\| (currsrc == "'.$location.'")) {
	document.getElementById("'.$id.'").style.width = "auto";
	document.getElementById("'.$id.'").style.height = "auto";
	}
	}
	}
	} catch (e) {
	return;
	}
	}
	return;
	}
	';
	}
	if ($needjsready) {
	$nicescroll_js = '
	<script type="text/javascript">'."\n".$nicescroll_js."\n</script>\n";
	} else {
	$nicescroll_js = &Apache::lonhtmlcommon::scripttag($nicescroll_js);
	}
	return $nicescroll_js;
	}

sub simple_error_page {	sub simple_error_page {
my ($r,$title,$msg) = @_;	my ($r,$title,$msg,$args) = @_;
	if (ref($args) eq 'HASH') {
	if (!$args->{'no_auto_mt_msg'}) { $msg = &mt($msg); }
	} else {
	$msg = &mt($msg);
	}

my $page =	my $page =
&Apache::loncommon::start_page($title).	&Apache::loncommon::start_page($title).
'<p class="LC_error">'.&mt($msg).'</p>'.	'<p class="LC_error">'.$msg.'</p>'.
&Apache::loncommon::end_page();	&Apache::loncommon::end_page();
if (ref($r)) {	if (ref($r)) {
$r->print($page);	$r->print($page);
Line 8548 sub get_user_info {	Line 8680 sub get_user_info {

=item * &get_user_quota()	=item * &get_user_quota()

Retrieves quota assigned for storage of portfolio files for a user	Retrieves quota assigned for storage of user files.
	Default is to report quota for portfolio files.

Incoming parameters:	Incoming parameters:
1. user's username	1. user's username
2. user's domain	2. user's domain
	3. quota name - portfolio, author, or course
	(if no quota name provided, defaults to portfolio).
	4. crstype - official, unofficial or community, if quota name is
	course

Returns:	Returns:
1. Disk quota (in Mb) assigned to student.	1. Disk quota (in MB) assigned to student.
2. (Optional) Type of setting: custom or default	2. (Optional) Type of setting: custom or default
(individually assigned or default for user's	(individually assigned or default for user's
institutional status).	institutional status).
Line 8566 Returns:	Line 8703 Returns:

If a value has been stored in the user's environment,	If a value has been stored in the user's environment,
it will return that, otherwise it returns the maximal default	it will return that, otherwise it returns the maximal default
defined for the user's instituional status(es) in the domain.	defined for the user's institutional status(es) in the domain.

=cut	=cut

Line 8574 defined for the user's instituional stat	Line 8711 defined for the user's instituional stat


sub get_user_quota {	sub get_user_quota {
my ($uname,$udom) = @_;	my ($uname,$udom,$quotaname,$crstype) = @_;
my ($quota,$quotatype,$settingstatus,$defquota);	my ($quota,$quotatype,$settingstatus,$defquota);
if (!defined($udom)) {	if (!defined($udom)) {
$udom = $env{'user.domain'};	$udom = $env{'user.domain'};
Line 8589 sub get_user_quota {	Line 8726 sub get_user_quota {
$defquota = 0;	$defquota = 0;
} else {	} else {
my $inststatus;	my $inststatus;
if ($udom eq $env{'user.domain'} && $uname eq $env{'user.name'}) {	if ($quotaname eq 'course') {
$quota = $env{'environment.portfolioquota'};	if (($env{'course.'.$udom.'_'.$uname.'.num'} eq $uname) &&
$inststatus = $env{'environment.inststatus'};	($env{'course.'.$udom.'_'.$uname.'.domain'} eq $udom)) {
} else {	$quota = $env{'course.'.$udom.'_'.$uname.'.internal.uploadquota'};
my %userenv =	} else {
&Apache::lonnet::get('environment',['portfolioquota',	my %cenv = &Apache::lonnet::coursedescription("$udom/$uname");
'inststatus'],$udom,$uname);	$quota = $cenv{'internal.uploadquota'};
my ($tmp) = keys(%userenv);	}
if ($tmp !~ /^(con_lost\|error\|no_such_host)/i) {
$quota = $userenv{'portfolioquota'};
$inststatus = $userenv{'inststatus'};
} else {
undef(%userenv);
}
}
($defquota,$settingstatus) = &default_quota($udom,$inststatus);
if ($quota eq '') {
$quota = $defquota;
$quotatype = 'default';
} else {	} else {
$quotatype = 'custom';	if ($udom eq $env{'user.domain'} && $uname eq $env{'user.name'}) {
	if ($quotaname eq 'author') {
	$quota = $env{'environment.authorquota'};
	} else {
	$quota = $env{'environment.portfolioquota'};
	}
	$inststatus = $env{'environment.inststatus'};
	} else {
	my %userenv =
	&Apache::lonnet::get('environment',['portfolioquota',
	'authorquota','inststatus'],$udom,$uname);
	my ($tmp) = keys(%userenv);
	if ($tmp !~ /^(con_lost\|error\|no_such_host)/i) {
	if ($quotaname eq 'author') {
	$quota = $userenv{'authorquota'};
	} else {
	$quota = $userenv{'portfolioquota'};
	}
	$inststatus = $userenv{'inststatus'};
	} else {
	undef(%userenv);
	}
	}
	}
	if ($quota eq '' \|\| wantarray) {
	if ($quotaname eq 'course') {
	my %domdefs = &Apache::lonnet::get_domain_defaults($udom);
	if (($crstype eq 'official') \|\| ($crstype eq 'unofficial') \|\| ($crstype eq 'community')) {
	$defquota = $domdefs{$crstype.'quota'};
	}
	if ($defquota eq '') {
	$defquota = 500;
	}
	} else {
	($defquota,$settingstatus) = &default_quota($udom,$inststatus,$quotaname);
	}
	if ($quota eq '') {
	$quota = $defquota;
	$quotatype = 'default';
	} else {
	$quotatype = 'custom';
	}
}	}
}	}
if (wantarray) {	if (wantarray) {
Line 8629 Retrieves default quota assigned for sto	Line 8796 Retrieves default quota assigned for sto
given an (optional) user's institutional status.	given an (optional) user's institutional status.

Incoming parameters:	Incoming parameters:

1. domain	1. domain
2. (Optional) institutional status(es). This is a : separated list of	2. (Optional) institutional status(es). This is a : separated list of
status types (e.g., faculty, staff, student etc.)	status types (e.g., faculty, staff, student etc.)
which apply to the user for whom the default is being retrieved.	which apply to the user for whom the default is being retrieved.
If the institutional status string in undefined, the domain	If the institutional status string in undefined, the domain
default quota will be returned.	default quota will be returned.
	3. quota name - portfolio, author, or course
	(if no quota name provided, defaults to portfolio).

Returns:	Returns:
1. Default disk quota (in Mb) for user portfolios in the domain.
	1. Default disk quota (in MB) for user portfolios in the domain.
2. (Optional) institutional type which determined the value of the	2. (Optional) institutional type which determined the value of the
default quota.	default quota.

If a value has been stored in the domain's configuration db,	If a value has been stored in the domain's configuration db,
it will return that, otherwise it returns 20 (for backwards	it will return that, otherwise it returns 20 (for backwards
compatibility with domains which have not set up a configuration	compatibility with domains which have not set up a configuration
db file; the original statically defined portfolio quota was 20 Mb).	db file; the original statically defined portfolio quota was 20 MB).

If the user's status includes multiple types (e.g., staff and student),	If the user's status includes multiple types (e.g., staff and student),
the largest default quota which applies to the user determines the	the largest default quota which applies to the user determines the
default quota returned.	default quota returned.

=back

=cut	=cut

###############################################	###############################################


sub default_quota {	sub default_quota {
my ($udom,$inststatus) = @_;	my ($udom,$inststatus,$quotaname) = @_;
my ($defquota,$settingstatus);	my ($defquota,$settingstatus);
my %quotahash = &Apache::lonnet::get_dom('configuration',	my %quotahash = &Apache::lonnet::get_dom('configuration',
['quotas'],$udom);	['quotas'],$udom);
	my $key = 'defaultquota';
	if ($quotaname eq 'author') {
	$key = 'authorquota';
	}
if (ref($quotahash{'quotas'}) eq 'HASH') {	if (ref($quotahash{'quotas'}) eq 'HASH') {
if ($inststatus ne '') {	if ($inststatus ne '') {
my @statuses = map { &unescape($_); } split(/:/,$inststatus);	my @statuses = map { &unescape($_); } split(/:/,$inststatus);
foreach my $item (@statuses) {	foreach my $item (@statuses) {
if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {	if (ref($quotahash{'quotas'}{$key}) eq 'HASH') {
if ($quotahash{'quotas'}{'defaultquota'}{$item} ne '') {	if ($quotahash{'quotas'}{$key}{$item} ne '') {
if ($defquota eq '') {	if ($defquota eq '') {
$defquota = $quotahash{'quotas'}{'defaultquota'}{$item};	$defquota = $quotahash{'quotas'}{$key}{$item};
$settingstatus = $item;	$settingstatus = $item;
} elsif ($quotahash{'quotas'}{'defaultquota'}{$item} > $defquota) {	} elsif ($quotahash{'quotas'}{$key}{$item} > $defquota) {
$defquota = $quotahash{'quotas'}{'defaultquota'}{$item};	$defquota = $quotahash{'quotas'}{$key}{$item};
$settingstatus = $item;	$settingstatus = $item;
}	}
}	}
} else {	} elsif ($key eq 'defaultquota') {
if ($quotahash{'quotas'}{$item} ne '') {	if ($quotahash{'quotas'}{$item} ne '') {
if ($defquota eq '') {	if ($defquota eq '') {
$defquota = $quotahash{'quotas'}{$item};	$defquota = $quotahash{'quotas'}{$item};
Line 8690 sub default_quota {	Line 8863 sub default_quota {
}	}
}	}
if ($defquota eq '') {	if ($defquota eq '') {
if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {	if (ref($quotahash{'quotas'}{$key}) eq 'HASH') {
$defquota = $quotahash{'quotas'}{'defaultquota'}{'default'};	$defquota = $quotahash{'quotas'}{$key}{'default'};
} else {	} elsif ($key eq 'defaultquota') {
$defquota = $quotahash{'quotas'}{'default'};	$defquota = $quotahash{'quotas'}{'default'};
}	}
$settingstatus = 'default';	$settingstatus = 'default';
	if ($defquota eq '') {
	if ($quotaname eq 'author') {
	$defquota = 500;
	}
	}
}	}
} else {	} else {
$settingstatus = 'default';	$settingstatus = 'default';
$defquota = 20;	if ($quotaname eq 'author') {
	$defquota = 500;
	} else {
	$defquota = 20;
	}
}	}
if (wantarray) {	if (wantarray) {
return ($defquota,$settingstatus);	return ($defquota,$settingstatus);
Line 8708 sub default_quota {	Line 8890 sub default_quota {
}	}
}	}

	###############################################

	=pod

	=item * &excess_filesize_warning()

	Returns warning message if upload of file to authoring space, or copying
	of existing file within authoring space will cause quota for the authoring
	space to be exceeded.

	Same, if upload of a file directly to a course/community via Course Editor
	will cause quota for uploaded content for the course to be exceeded.

	Inputs: 6
	1. username or coursenum
	2. domain
	3. context ('author' or 'course')
	4. filename of file for which action is being requested
	5. filesize (kB) of file
	6. action being taken: copy or upload.

	Returns: 1 scalar: HTML to display containing warning if quota would be exceeded,
	otherwise return null.

	=back

	=cut

	sub excess_filesize_warning {
	my ($uname,$udom,$context,$filename,$filesize,$action) = @_;
	my $current_disk_usage = 0;
	my $disk_quota = &get_user_quota($uname,$udom,$context); #expressed in MB
	if ($context eq 'author') {
	my $authorspace = $Apache::lonnet::perlvar{'lonDocRoot'}."/priv/$udom/$uname";
	$current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$authorspace);
	} else {
	foreach my $subdir ('docs','supplemental') {
	$current_disk_usage += &Apache::lonnet::diskusage($udom,$uname,"userfiles/$subdir",1);
	}
	}
	$disk_quota = int($disk_quota * 1000);
	if (($current_disk_usage + $filesize) > $disk_quota) {
	return '<p><span class="LC_warning">'.
	&mt("Unable to $action [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.",
	'<span class="LC_filename">'.$filename.'</span>',$filesize).'</span>'.
	'<br />'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',
	$disk_quota,$current_disk_usage).
	'</p>';
	}
	return;
	}

	###############################################


sub get_secgrprole_info {	sub get_secgrprole_info {
my ($cdom,$cnum,$needroles,$type) = @_;	my ($cdom,$cnum,$needroles,$type) = @_;
my %sections_count = &get_sections($cdom,$cnum);	my %sections_count = &get_sections($cdom,$cnum);
Line 9547 sub ask_for_embedded_content {	Line 9784 sub ask_for_embedded_content {
my $numexisting = 0;	my $numexisting = 0;
my $numunused = 0;	my $numunused = 0;
my ($output,$upload_output,$toplevel,$url,$udom,$uname,$getpropath,$cdom,$cnum,	my ($output,$upload_output,$toplevel,$url,$udom,$uname,$getpropath,$cdom,$cnum,
$fileloc,$filename,$delete_output,$modify_output,$title,$symb,$path);	$fileloc,$filename,$delete_output,$modify_output,$title,$symb,$path,$navmap);
my $heading = &mt('Upload embedded files');	my $heading = &mt('Upload embedded files');
my $buttontext = &mt('Upload');	my $buttontext = &mt('Upload');

my ($navmap,$cdom,$cnum);
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
if ($actionurl eq '/adm/dependencies') {	if ($actionurl eq '/adm/dependencies') {
$navmap = Apache::lonnavmaps::navmap->new();	$navmap = Apache::lonnavmaps::navmap->new();
Line 9635 sub ask_for_embedded_content {	Line 9871 sub ask_for_embedded_content {
} else {	} else {
$embed_file = $file;	$embed_file = $file;
}	}
my $absolutepath;	my ($absolutepath,$cleaned_file);
if ($embed_file =~ m{^\w+://}) {	if ($embed_file =~ m{^\w+://}) {
$newfiles{$embed_file} = 1;	$cleaned_file = $embed_file;
$mapping{$embed_file} = $embed_file;	$newfiles{$cleaned_file} = 1;
	$mapping{$cleaned_file} = $embed_file;
} else {	} else {
	$cleaned_file = &clean_path($embed_file);
if ($embed_file =~ m{^/}) {	if ($embed_file =~ m{^/}) {
$absolutepath = $embed_file;	$absolutepath = $embed_file;
$embed_file =~ s{^(/+)}{};
}	}
if ($embed_file =~ m{/}) {	if ($cleaned_file =~ m{/}) {
my ($path,$fname) = ($embed_file =~ m{^(.+)/([^/]*)$});	my ($path,$fname) = ($cleaned_file =~ m{^(.+)/([^/]*)$});
$path = &check_for_traversal($path,$url,$toplevel);	$path = &check_for_traversal($path,$url,$toplevel);
my $item = $fname;	my $item = $fname;
if ($path ne '') {	if ($path ne '') {
Line 9662 sub ask_for_embedded_content {	Line 9899 sub ask_for_embedded_content {
} else {	} else {
$dependencies{$embed_file} = 1;	$dependencies{$embed_file} = 1;
if ($absolutepath) {	if ($absolutepath) {
$mapping{$embed_file} = $absolutepath;	$mapping{$cleaned_file} = $absolutepath;
} else {	} else {
$mapping{$embed_file} = $embed_file;	$mapping{$cleaned_file} = $embed_file;
}	}
}	}
}	}
Line 10038 sub ask_for_embedded_content {	Line 10275 sub ask_for_embedded_content {
return ($output,$counter,$numpathchg);	return ($output,$counter,$numpathchg);
}	}

	=pod

	=item * clean_path($name)

	Performs clean-up of directories, subdirectories and filename in an
	embedded object, referenced in an HTML file which is being uploaded
	to a course or portfolio, where
	"Upload embedded images/multimedia files if HTML file" checkbox was
	checked.

	Clean-up is similar to replacements in lonnet::clean_filename()
	except each / between sub-directory and next level is preserved.

	=cut

	sub clean_path {
	my ($embed_file) = @_;
	$embed_file =~s{^/+}{};
	my @contents;
	if ($embed_file =~ m{/}) {
	@contents = split(/\//,$embed_file);
	} else {
	@contents = ($embed_file);
	}
	my $lastidx = scalar(@contents)-1;
	for (my $i=0; $i<=$lastidx; $i++) {
	$contents[$i]=~s{\\}{/}g;
	$contents[$i]=~s/\s+/\_/g;
	$contents[$i]=~s{[^/\w\.\-]}{}g;
	if ($i == $lastidx) {
	$contents[$i]=~s/\.(\d+)(?=\.)/_$1/g;
	}
	}
	if ($lastidx > 0) {
	return join('/',@contents);
	} else {
	return $contents[0];
	}
	}

sub embedded_file_element {	sub embedded_file_element {
my ($context,$num,$embed_file,$mapping,$allfiles,$codebase,$type) = @_;	my ($context,$num,$embed_file,$mapping,$allfiles,$codebase,$type) = @_;
return unless ((ref($mapping) eq 'HASH') && (ref($allfiles) eq 'HASH') &&	return unless ((ref($mapping) eq 'HASH') && (ref($allfiles) eq 'HASH') &&
Line 10162 sub upload_embedded {	Line 10439 sub upload_embedded {
# Check if extension is valid	# Check if extension is valid
if (($fname =~ /\.(\w+)$/) &&	if (($fname =~ /\.(\w+)$/) &&
(&Apache::loncommon::fileembstyle($1) eq 'hdn')) {	(&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
$output .= &mt('Invalid file extension ([_1]) - reserved for LONCAPA use - rename the file with a different extension and re-upload. ',$1).'<br />';	$output .= &mt('Invalid file extension ([_1]) - reserved for internal use.',$1)
	.' '.&mt('Rename the file with a different extension and re-upload.').'<br />';
next;	next;
} elsif (($fname =~ /\.(\w+)$/) &&	} elsif (($fname =~ /\.(\w+)$/) &&
(!defined(&Apache::loncommon::fileembstyle($1)))) {	(!defined(&Apache::loncommon::fileembstyle($1)))) {
Line 10426 sub modify_html_refs {	Line 10704 sub modify_html_refs {
my $numchg = ($content =~ s{($attrib_regexp\s=\s['"]?)\Q$ref\E(['"]?)}{$1$newname$2}gi);	my $numchg = ($content =~ s{($attrib_regexp\s=\s['"]?)\Q$ref\E(['"]?)}{$1$newname$2}gi);
$count += $numchg;	$count += $numchg;
$allfiles{$newname} = $allfiles{$ref};	$allfiles{$newname} = $allfiles{$ref};
	delete($allfiles{$ref});
}	}
if ($env{'form.embedded_codebase_'.$i} ne '') {	if ($env{'form.embedded_codebase_'.$i} ne '') {
$codebase = &unescape($env{'form.embedded_codebase_'.$i});	$codebase = &unescape($env{'form.embedded_codebase_'.$i});
Line 11786 sub cleanup_empty_dirs {	Line 12065 sub cleanup_empty_dirs {

=pod	=pod

=item &get_folder_hierarchy()	=item * &get_folder_hierarchy()

Provides hierarchy of names of folders/sub-folders containing the current	Provides hierarchy of names of folders/sub-folders containing the current
item,	item,
Line 11896 sub get_turnedin_filepath {	Line 12175 sub get_turnedin_filepath {
my $title = $res->compTitle();	my $title = $res->compTitle();
$title =~ s/\W+/_/g;	$title =~ s/\W+/_/g;
if ($title ne '') {	if ($title ne '') {
	if (($pc > 1) && (length($title) > 12)) {
	$title = substr($title,0,12);
	}
push(@pathitems,$title);	push(@pathitems,$title);
}	}
}	}
Line 11904 sub get_turnedin_filepath {	Line 12186 sub get_turnedin_filepath {
my $maptitle = $mapres->compTitle();	my $maptitle = $mapres->compTitle();
$maptitle =~ s/\W+/_/g;	$maptitle =~ s/\W+/_/g;
if ($maptitle ne '') {	if ($maptitle ne '') {
	if (length($maptitle) > 12) {
	$maptitle = substr($maptitle,0,12);
	}
push(@pathitems,$maptitle);	push(@pathitems,$maptitle);
}	}
unless ($env{'request.state'} eq 'construct') {	unless ($env{'request.state'} eq 'construct') {
Line 11944 sub get_turnedin_filepath {	Line 12229 sub get_turnedin_filepath {
$restitle = time;	$restitle = time;
}	}
}	}
	if (length($restitle) > 12) {
	$restitle = substr($restitle,0,12);
	}
push(@pathitems,$restitle);	push(@pathitems,$restitle);
$path .= join('/',@pathitems);	$path .= join('/',@pathitems);
}	}
Line 12881 sub restore_settings {	Line 13169 sub restore_settings {

=item * &build_recipient_list()	=item * &build_recipient_list()

Build recipient lists for five types of e-mail:	Build recipient lists for following types of e-mail:
(a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors	(a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
(d) Help requests, (e) Course requests needing approval, generated by	(d) Help requests, (e) Course requests needing approval, (f) loncapa
lonerrorhandler.pm, CHECKRPMS, loncron, lonsupportreq.pm and	module change checking, student/employee ID conflict checks, as
loncoursequeueadmin.pm respectively.	generated by lonerrorhandler.pm, CHECKRPMS, loncron,
	lonsupportreq.pm, loncoursequeueadmin.pm, searchcat.pl respectively.

Inputs:	Inputs:
defmail (scalar - email address of default recipient),	defmail (scalar - email address of default recipient),
mailing type (scalar - errormail, packagesmail, or helpdeskmail),	mailing type (scalar: errormail, packagesmail, helpdeskmail,
	requestsmail, updatesmail, or idconflictsmail).

defdom (domain for which to retrieve configuration settings),	defdom (domain for which to retrieve configuration settings),
origmail (scalar - email address of recipient from loncapa.conf,
i.e., predates configuration by DC via domainprefs.pm	origmail (scalar - email address of recipient from loncapa.conf,
	i.e., predates configuration by DC via domainprefs.pm

Returns: comma separated list of addresses to which to send e-mail.	Returns: comma separated list of addresses to which to send e-mail.

Line 13086 sub extract_categories {	Line 13378 sub extract_categories {

=pod	=pod

=item *&recurse_categories()	=item * &recurse_categories()

Recursively used to generate breadcrumb trails for course categories.	Recursively used to generate breadcrumb trails for course categories.

Line 13157 sub recurse_categories {	Line 13449 sub recurse_categories {

=pod	=pod

=item *&assign_categories_table()	=item * &assign_categories_table()

Create a datatable for display of hierarchical categories in a domain,	Create a datatable for display of hierarchical categories in a domain,
with checkboxes to allow a course to be categorized.	with checkboxes to allow a course to be categorized.
Line 13234 sub assign_categories_table {	Line 13526 sub assign_categories_table {

=pod	=pod

=item *&assign_category_rows()	=item * &assign_category_rows()

Create a datatable row for display of nested categories in a domain,	Create a datatable row for display of nested categories in a domain,
with checkboxes to allow a course to be categorized,called recursively.	with checkboxes to allow a course to be categorized,called recursively.
Line 13268 sub assign_category_rows {	Line 13560 sub assign_category_rows {
if (ref($cats->[$depth]{$parent}) eq 'ARRAY') {	if (ref($cats->[$depth]{$parent}) eq 'ARRAY') {
my $numchildren = @{$cats->[$depth]{$parent}};	my $numchildren = @{$cats->[$depth]{$parent}};
my $css_class = $itemcount%2?' class="LC_odd_row"':'';	my $css_class = $itemcount%2?' class="LC_odd_row"':'';
$text .= '<td><table class="LC_datatable">';	$text .= '<td><table class="LC_data_table">';
for (my $j=0; $j<$numchildren; $j++) {	for (my $j=0; $j<$numchildren; $j++) {
$name = $cats->[$depth]{$parent}[$j];	$name = $cats->[$depth]{$parent}[$j];
$item = &escape($name).':'.&escape($parent).':'.$depth;	$item = &escape($name).':'.&escape($parent).':'.$depth;
Line 14066 sub init_user_environment {	Line 14358 sub init_user_environment {
# ------------------------------------ Check browser type and MathML capability	# ------------------------------------ Check browser type and MathML capability

my ($httpbrowser,$clientbrowser,$clientversion,$clientmathml,	my ($httpbrowser,$clientbrowser,$clientversion,$clientmathml,
$clientunicode,$clientos) = &decode_user_agent($r);	$clientunicode,$clientos,$clientmobile,$clientinfo) = &decode_user_agent($r);

# ------------------------------------------------------------- Get environment	# ------------------------------------------------------------- Get environment

Line 14097 sub init_user_environment {	Line 14389 sub init_user_environment {
"browser.mathml" => $clientmathml,	"browser.mathml" => $clientmathml,
"browser.unicode" => $clientunicode,	"browser.unicode" => $clientunicode,
"browser.os" => $clientos,	"browser.os" => $clientos,
	"browser.mobile" => $clientmobile,
	"browser.info" => $clientinfo,
"server.domain" => $Apache::lonnet::perlvar{'lonDefDomain'},	"server.domain" => $Apache::lonnet::perlvar{'lonDefDomain'},
"request.course.fn" => '',	"request.course.fn" => '',
"request.course.uri" => '',	"request.course.uri" => '',
Line 14116 sub init_user_environment {	Line 14410 sub init_user_environment {
$env{'browser.interface'}=$form->{'interface'};	$env{'browser.interface'}=$form->{'interface'};
}	}

	if ($form->{'iptoken'}) {
	my $lonhost = $r->dir_config('lonHostID');
	$initial_env{"user.noloadbalance"} = $lonhost;
	$env{'user.noloadbalance'} = $lonhost;
	}

my %is_adv = ( is_adv => $env{'user.adv'} );	my %is_adv = ( is_adv => $env{'user.adv'} );
my %domdef;	my %domdef;
unless ($domain eq 'public') {	unless ($domain eq 'public') {
Line 14349 sub parse_supplemental_title {	Line 14649 sub parse_supplemental_title {
return $title;	return $title;
}	}

	sub recurse_supplemental {
	my ($cnum,$cdom,$suppmap,$numfiles,$errors) = @_;
	if ($suppmap) {
	my ($errtext,$fatal) = &LONCAPA::map::mapread('/uploaded/'.$cdom.'/'.$cnum.'/'.$suppmap);
	if ($fatal) {
	$errors ++;
	} else {
	if ($#LONCAPA::map::resources > 0) {
	foreach my $res (@LONCAPA::map::resources) {
	my ($title,$src,$ext,$type,$status)=split(/\:/,$res);
	if (($src ne '') && ($status eq 'res')) {
	if ($src =~ m{^\Q/uploaded/$cdom/$cnum/\E(supplemental_\d+\.sequence)$}) {
	($numfiles,$errors) = &recurse_supplemental($cnum,$cdom,$1,$numfiles,$errors);
	} else {
	$numfiles ++;
	}
	}
	}
	}
	}
	}
	return ($numfiles,$errors);
	}

sub symb_to_docspath {	sub symb_to_docspath {
my ($symb) = @_;	my ($symb) = @_;
return unless ($symb);	return unless ($symb);
Line 14378 sub symb_to_docspath {	Line 14702 sub symb_to_docspath {
my $thistitle = $res->title();	my $thistitle = $res->title();
$path .= '&'.	$path .= '&'.
&Apache::lonhtmlcommon::entity_encode($thisurl).'&'.	&Apache::lonhtmlcommon::entity_encode($thisurl).'&'.
&Apache::lonhtmlcommon::entity_encode($thistitle).	&escape($thistitle).
':'.$res->randompick().	':'.$res->randompick().
':'.$res->randomout().	':'.$res->randomout().
':'.$res->encrypted().	':'.$res->encrypted().
Line 14394 sub symb_to_docspath {	Line 14718 sub symb_to_docspath {
}	}
$path .= (($path ne '')? '&' : '').	$path .= (($path ne '')? '&' : '').
&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.	&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
&Apache::lonhtmlcommon::entity_encode($maptitle).	&escape($maptitle).
':'.$mapresobj->randompick().	':'.$mapresobj->randompick().
':'.$mapresobj->randomout().	':'.$mapresobj->randomout().
':'.$mapresobj->encrypted().	':'.$mapresobj->encrypted().
Line 14407 sub symb_to_docspath {	Line 14731 sub symb_to_docspath {
$maptitle = 'Main Content';	$maptitle = 'Main Content';
}	}
$path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.	$path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
&Apache::lonhtmlcommon::entity_encode($maptitle).':::::'.$ispage;	&escape($maptitle).':::::'.$ispage;
}	}
unless ($mapurl eq 'default') {	unless ($mapurl eq 'default') {
$path = 'default&'.	$path = 'default&'.
&Apache::lonhtmlcommon::entity_encode('Main Content').	&escape('Main Content').
':::::&'.$path;	':::::&'.$path;
}	}
return $path;	return $path;
Line 14550 sub check_captcha {	Line 14874 sub check_captcha {

sub create_recaptcha {	sub create_recaptcha {
my ($pubkey) = @_;	my ($pubkey) = @_;
	my $use_ssl;
	if ($ENV{'SERVER_PORT'} == 443) {
	$use_ssl = 1;
	}
my $captcha = Captcha::reCAPTCHA->new;	my $captcha = Captcha::reCAPTCHA->new;
return $captcha->get_options_setter({theme => 'white'})."\n".	return $captcha->get_options_setter({theme => 'white'})."\n".
$captcha->get_html($pubkey).	$captcha->get_html($pubkey,undef,$use_ssl).
&mt('If either word is hard to read, [_1] will replace them.',	&mt('If either word is hard to read, [_1] will replace them.',
'<img src="/res/adm/pages/refresh.gif" alt="reCAPTCHA refresh" />').	'<img src="/res/adm/pages/refresh.gif" alt="reCAPTCHA refresh" />').
'<br /><br />';	'<br /><br />';
Line 14575 sub check_recaptcha {	Line 14903 sub check_recaptcha {
return $captcha_chk;	return $captcha_chk;
}	}

	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/>/>/g;
	$outgoing =~ s/\(/&#040/g;
	$outgoing =~ s/\)/)/g;
	$outgoing =~ s/"/"/g;
	$outgoing =~ s/'/'/g;
	$outgoing =~ s/\$/$/g;
	$outgoing =~ s{/}{/}g;
	$outgoing =~ s/=/=/g;
	$outgoing =~ s/\\/\/g
	}
	return $outgoing;
	}

=pod	=pod

=back	=back

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

Removed from v.1.1075.2.39
changed lines
	Added in v.1.1075.2.58