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.42 and 1.1075.2.65

version 1.1075.2.42, 2013/08/03 22:32:01	version 1.1075.2.65, 2014/02/17 17:14:30
Line 74 use DateTime::TimeZone;	Line 74 use DateTime::TimeZone;
use DateTime::Locale::Catalog;	use DateTime::Locale::Catalog;
use Authen::Captcha;	use Authen::Captcha;
use Captcha::reCAPTCHA;	use Captcha::reCAPTCHA;
	use Crypt::DES;
	use DynaLoader; # for Crypt::DES version

# ---------------------------------------------- Designs	# ---------------------------------------------- Designs
use vars qw(%defaultdesign);	use vars qw(%defaultdesign);
Line 1234 sub help_open_topic {	Line 1236 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 1348 sub help_open_menu {	Line 1354 sub help_open_menu {
sub top_nav_help {	sub top_nav_help {
my ($text) = @_;	my ($text) = @_;
$text = &mt($text);	$text = &mt($text);
my $stay_on_page = 1;	my $stay_on_page;
	unless ($env{'environment.remote'} eq 'on') {
my $link = ($stay_on_page) ? "javascript:helpMenu('display')"	$stay_on_page = 1;
: "javascript:helpMenu('open')";	}
my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);	my ($link,$banner_link);
	unless ($env{'request.noversionuri'} =~ m{^/adm/helpmenu}) {
	$link = ($stay_on_page) ? "javascript:helpMenu('display')"
	: "javascript:helpMenu('open')";
	$banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);
	}
my $title = &mt('Get help');	my $title = &mt('Get help');
	if ($link) {
return <<"END";	return <<"END";
$banner_link	$banner_link
<a href="$link" title="$title">$text</a>	<a href="$link" title="$title">$text</a>
END	END
	} else {
	return ' '.$text.' ';
	}
}	}

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 1405 function helpMenu(target) {	Line 1419 function helpMenu(target) {
return;	return;
}	}
function writeHelp(caller) {	function writeHelp(caller) {
caller.document.writeln('$start_page\\n<frame name="bannerframe" src="'+banner_link+'" />\\n<frame name="bodyframe" src="$details_link" />\\n$end_page')	caller.document.writeln('$start_page\\n<frame name="bannerframe" src="'+banner_link+'" marginwidth="0" marginheight="0" frameborder="0">\\n');
caller.document.close()	caller.document.writeln('<frame name="bodyframe" src="$details_link" marginwidth="0" marginheight="0" frameborder="0">\\n$end_page');
caller.focus()	caller.document.close();
	caller.focus();
}	}
// END LON-CAPA Internal -->	// END LON-CAPA Internal -->
// ]]>	// ]]>
Line 1719 RESIZE	Line 1734 RESIZE

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

=over 4

=cut	=cut

###############################################################	###############################################################
Line 1728 RESIZE	Line 1741 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 5037 sub bodytag {	Line 5052 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 5108 sub bodytag {	Line 5124 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 5125 sub bodytag {	Line 5141 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 5149 sub bodytag {	Line 5165 sub bodytag {
}	}
$bodytag .= qq\|<div id="LC_realm">$realm $dc_info</div>\|;	$bodytag .= qq\|<div id="LC_realm">$realm $dc_info</div>\|;

	#if directed to not display the secondary menu, don't.
	if ($args->{'no_secondary_menu'}) {
	return $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 5190 sub bodytag {	Line 5210 sub bodytag {
}	}
my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';	my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';

	my $help=($no_inline_link?''
	:&Apache::loncommon::top_nav_help('Help'));

# Explicit link to get inline menu	# Explicit link to get inline menu
my $menu= ($no_inline_link?''	my $menu= ($no_inline_link?''
:'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');	:'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');
Line 5207 sub bodytag {	Line 5230 sub bodytag {
unless ($env{'form.inhibitmenu'}) {	unless ($env{'form.inhibitmenu'}) {
$bodytag .= qq\|<div id="LC_nav_bar">$name $role</div>	$bodytag .= qq\|<div id="LC_nav_bar">$name $role</div>
<ol class="LC_primary_menu LC_floatright LC_right">	<ol class="LC_primary_menu LC_floatright LC_right">
	<li>$help</li>
<li>$menu</li>	<li>$menu</li>
</ol><div id="LC_realm"> $realm $dc_info</div>\|;	</ol><div id="LC_realm"> $realm $dc_info</div>\|;
}	}
Line 5214 sub bodytag {	Line 5238 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 5265 sub make_attr_string {	Line 5289 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 6479 div.LC_edit_problem_saves {	Line 6503 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 7245 sub headtag {	Line 7277 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 7255 sub headtag {	Line 7288 sub headtag {

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

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

Line 7268 sub headtag {	Line 7301 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 7303 ADDMETA	Line 7336 ADDMETA
}	}
if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }	if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
$result .= '<title> LON-CAPA '.$title.'</title>'	$result .= '<title> LON-CAPA '.$title.'</title>'
.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'	.'<link rel="stylesheet" type="text/css" href="'.$url.'"';
	if (!$args->{'frameset'}) {
	$result .= ' /';
	}
	$result .= '>'
.$inhibitprint	.$inhibitprint
.$head_extra;	.$head_extra;
if ($env{'browser.mobile'}) {	if ($env{'browser.mobile'}) {
Line 7320 ADDMETA	Line 7357 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"';
	if (!$args->{'frameset'}) {
	$headerstring.= ' /';
	}
	$headerstring .= '>'."\n";
}	}
return $headerstring;	return $headerstring;
}	}
Line 7420 Inputs: none	Line 7463 Inputs: none
=cut	=cut

sub xml_begin {	sub xml_begin {
	my ($is_frameset) = @_;
my $output='';	my $output='';

if ($env{'browser.mathml'}) {	if ($env{'browser.mathml'}) {
Line 7431 sub xml_begin {	Line 7475 sub xml_begin {
.'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">'	.'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">'
.'<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">';
	} elsif ($is_frameset) {
	$output='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'."\n".
	'<html>'."\n";
} 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 7502 sub start_page {	Line 7549 sub start_page {
my ($result,@advtools);	my ($result,@advtools);

if (! exists($args->{'skip_phases'}{'head'}) ) {	if (! exists($args->{'skip_phases'}{'head'}) ) {
$result .= &xml_begin() . &headtag($title, $head_extra, $args);	$result .= &xml_begin($args->{'frameset'}) . &headtag($title, $head_extra, $args);
}	}

if (! exists($args->{'skip_phases'}{'body'}) ) {	if (! exists($args->{'skip_phases'}{'body'}) ) {
Line 7608 function set_wishlistlink(title, path) {	Line 7655 function set_wishlistlink(title, path) {
title = document.title;	title = document.title;
title = title.replace(/^LON-CAPA /,'');	title = title.replace(/^LON-CAPA /,'');
}	}
	title = encodeURIComponent(title);
if (!path) {	if (!path) {
path = location.pathname;	path = location.pathname;
}	}
	path = encodeURIComponent(path);
Win = window.open('/adm/wishlist?mode=newLink&setTitle='+title+'&setPath='+path,	Win = window.open('/adm/wishlist?mode=newLink&setTitle='+title+'&setPath='+path,
'wishlistNewLink','width=560,height=350,scrollbars=0');	'wishlistNewLink','width=560,height=350,scrollbars=0');
}	}
Line 7925 sub validate_page {	Line 7974 sub validate_page {


sub start_scrollbox {	sub start_scrollbox {
my ($outerwidth,$width,$height,$id,$bgcolor,$cursor,$needjsready)=@_;	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'; }
Line 7945 sub start_scrollbox {	Line 7994 sub start_scrollbox {
$nicescroll_js	$nicescroll_js

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

Line 8035 function expand_div(caller) {	Line 8084 function expand_div(caller) {
}	}

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 8665 Incoming parameters:	Line 8720 Incoming parameters:
2. user's domain	2. user's domain
3. quota name - portfolio, author, or course	3. quota name - portfolio, author, or course
(if no quota name provided, defaults to portfolio).	(if no quota name provided, defaults to portfolio).
4. crstype - official, unofficial or community, if quota name is	4. crstype - official, unofficial, textbook or community, if quota name is
course	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 8739 sub get_user_quota {	Line 8794 sub get_user_quota {
if ($quota eq '' \|\| wantarray) {	if ($quota eq '' \|\| wantarray) {
if ($quotaname eq 'course') {	if ($quotaname eq 'course') {
my %domdefs = &Apache::lonnet::get_domain_defaults($udom);	my %domdefs = &Apache::lonnet::get_domain_defaults($udom);
if (($crstype eq 'official') \|\| ($crstype eq 'unofficial') \|\| ($crstype eq 'community')) {	if (($crstype eq 'official') \|\| ($crstype eq 'unofficial') \|\|
	($crstype eq 'community') \|\| ($crstype eq 'textbook')) {
$defquota = $domdefs{$crstype.'quota'};	$defquota = $domdefs{$crstype.'quota'};
}	}
if ($defquota eq '') {	if ($defquota eq '') {
Line 8785 Incoming parameters:	Line 8841 Incoming parameters:

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
Line 8880 space to be exceeded.	Line 8936 space to be exceeded.
Same, if upload of a file directly to a course/community via Course Editor	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.	will cause quota for uploaded content for the course to be exceeded.

Inputs: 6	Inputs: 7
1. username or coursenum	1. username or coursenum
2. domain	2. domain
3. context ('author' or 'course')	3. context ('author' or 'course')
4. filename of file for which action is being requested	4. filename of file for which action is being requested
5. filesize (kB) of file	5. filesize (kB) of file
6. action being taken: copy or upload.	6. action being taken: copy or upload.
	7. quotatype (in course context -- official, unofficial, community or textbook).

Returns: 1 scalar: HTML to display containing warning if quota would be exceeded,	Returns: 1 scalar: HTML to display containing warning if quota would be exceeded,
otherwise return null.	otherwise return null.
Line 8896 Returns: 1 scalar: HTML to display conta	Line 8953 Returns: 1 scalar: HTML to display conta
=cut	=cut

sub excess_filesize_warning {	sub excess_filesize_warning {
my ($uname,$udom,$context,$filename,$filesize,$action) = @_;	my ($uname,$udom,$context,$filename,$filesize,$action,$quotatype) = @_;
my $current_disk_usage = 0;	my $current_disk_usage = 0;
my $disk_quota = &get_user_quota($uname,$udom,$context); #expressed in MB	my $disk_quota = &get_user_quota($uname,$udom,$context,$quotatype); #expressed in MB
if ($context eq 'author') {	if ($context eq 'author') {
my $authorspace = $Apache::lonnet::perlvar{'lonDocRoot'}."/priv/$udom/$uname";	my $authorspace = $Apache::lonnet::perlvar{'lonDocRoot'}."/priv/$udom/$uname";
$current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$authorspace);	$current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$authorspace);
Line 9761 sub ask_for_embedded_content {	Line 9818 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 9849 sub ask_for_embedded_content {	Line 9905 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 9876 sub ask_for_embedded_content {	Line 9933 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 10252 sub ask_for_embedded_content {	Line 10309 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 10376 sub upload_embedded {	Line 10473 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 10640 sub modify_html_refs {	Line 10738 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 10933 sub decompress_form {	Line 11032 sub decompress_form {
}	}
}	}
if ($mimetype =~ m{^application/(x\-)?(compressed\|zip)}) {	if ($mimetype =~ m{^application/(x\-)?(compressed\|zip)}) {
my @camtasia = ("$topdir/","$topdir/index.html",	my @camtasia6 = ("$topdir/","$topdir/index.html",
"$topdir/media/",	"$topdir/media/",
"$topdir/media/$topdir.mp4",	"$topdir/media/$topdir.mp4",
"$topdir/media/FirstFrame.png",	"$topdir/media/FirstFrame.png",
"$topdir/media/player.swf",	"$topdir/media/player.swf",
"$topdir/media/swfobject.js",	"$topdir/media/swfobject.js",
"$topdir/media/expressInstall.swf");	"$topdir/media/expressInstall.swf");
my @diffs = &compare_arrays(\@paths,\@camtasia);	my @camtasia8 = ("$topdir/","$topdir/$topdir.html",
	"$topdir/$topdir.mp4",
	"$topdir/$topdir\_config.xml",
	"$topdir/$topdir\_controller.swf",
	"$topdir/$topdir\_embed.css",
	"$topdir/$topdir\_First_Frame.png",
	"$topdir/$topdir\_player.html",
	"$topdir/$topdir\_Thumbnails.png",
	"$topdir/playerProductInstall.swf",
	"$topdir/scripts/",
	"$topdir/scripts/config_xml.js",
	"$topdir/scripts/handlebars.js",
	"$topdir/scripts/jquery-1.7.1.min.js",
	"$topdir/scripts/jquery-ui-1.8.15.custom.min.js",
	"$topdir/scripts/modernizr.js",
	"$topdir/scripts/player-min.js",
	"$topdir/scripts/swfobject.js",
	"$topdir/skins/",
	"$topdir/skins/configuration_express.xml",
	"$topdir/skins/express_show/",
	"$topdir/skins/express_show/player-min.css",
	"$topdir/skins/express_show/spritesheet.png");
	my @diffs = &compare_arrays(\@paths,\@camtasia6);
if (@diffs == 0) {	if (@diffs == 0) {
$is_camtasia = 1;	$is_camtasia = 6;
	} else {
	@diffs = &compare_arrays(\@paths,\@camtasia8);
	if (@diffs == 0) {
	$is_camtasia = 8;
	}
}	}
}	}
my $output;	my $output;
Line 10954 sub decompress_form {	Line 11080 sub decompress_form {
function camtasiaToggle() {	function camtasiaToggle() {
for (var i=0; i<document.uploaded_decompress.autoextract_camtasia.length; i++) {	for (var i=0; i<document.uploaded_decompress.autoextract_camtasia.length; i++) {
if (document.uploaded_decompress.autoextract_camtasia[i].checked) {	if (document.uploaded_decompress.autoextract_camtasia[i].checked) {
if (document.uploaded_decompress.autoextract_camtasia[i].value == 1) {	if (document.uploaded_decompress.autoextract_camtasia[i].value == $is_camtasia) {

document.getElementById('camtasia_titles').style.display='block';	document.getElementById('camtasia_titles').style.display='block';
} else {	} else {
document.getElementById('camtasia_titles').style.display='none';	document.getElementById('camtasia_titles').style.display='none';
Line 11017 ENDCAM	Line 11142 ENDCAM
if ($is_camtasia) {	if ($is_camtasia) {
$output .= $lt{'auto'}.'<br />'.	$output .= $lt{'auto'}.'<br />'.
'<span class="LC_nobreak">'.$lt{'proa'}.'<label>'.	'<span class="LC_nobreak">'.$lt{'proa'}.'<label>'.
'<input type="radio" name="autoextract_camtasia" value="1" onclick="javascript:camtasiaToggle();" checked="checked" />'.	'<input type="radio" name="autoextract_camtasia" value="'.$is_camtasia.'" onclick="javascript:camtasiaToggle();" checked="checked" />'.
$lt{'yes'}.'</label> <label>'.	$lt{'yes'}.'</label> <label>'.
'<input type="radio" name="autoextract_camtasia" value="0" onclick="javascript:camtasiaToggle();" />'.	'<input type="radio" name="autoextract_camtasia" value="0" onclick="javascript:camtasiaToggle();" />'.
$lt{'no'}.'</label></span><br />'.	$lt{'no'}.'</label></span><br />'.
Line 11250 sub process_decompression {	Line 11375 sub process_decompression {
\%titles,\%children);	\%titles,\%children);
}	}
if ($env{'form.autoextract_camtasia'}) {	if ($env{'form.autoextract_camtasia'}) {
	my $version = $env{'form.autoextract_camtasia'};
my %displayed;	my %displayed;
my $total = 1;	my $total = 1;
$env{'form.archive_directory'} = [];	$env{'form.archive_directory'} = [];
Line 11268 sub process_decompression {	Line 11394 sub process_decompression {
$env{'form.archive_'.$i} = 'display';	$env{'form.archive_'.$i} = 'display';
$env{'form.archive_title_'.$i} = $env{'form.camtasia_foldername'};	$env{'form.archive_title_'.$i} = $env{'form.camtasia_foldername'};
$displayed{'folder'} = $i;	$displayed{'folder'} = $i;
} elsif ($item eq "$contents[0]/index.html") {	} elsif ((($item eq "$contents[0]/index.html") && ($version == 6)) \|\|
	(($item eq "$contents[0]/$contents[0]".'.html') && ($version == 8))) {
$env{'form.archive_'.$i} = 'display';	$env{'form.archive_'.$i} = 'display';
$env{'form.archive_title_'.$i} = $env{'form.camtasia_moviename'};	$env{'form.archive_title_'.$i} = $env{'form.camtasia_moviename'};
$displayed{'web'} = $i;	$displayed{'web'} = $i;
} else {	} else {
if ($item eq "$contents[0]/media") {	if ((($item eq "$contents[0]/media") && ($version == 6)) \|\|
	((($item eq "$contents[0]/scripts") \|\| ($item eq "$contents[0]/skins") \|\|
	($item eq "$contents[0]/skins/express_show")) && ($version == 8))) {
push(@{$env{'form.archive_directory'}},$i);	push(@{$env{'form.archive_directory'}},$i);
}	}
$env{'form.archive_'.$i} = 'dependency';	$env{'form.archive_'.$i} = 'dependency';
Line 12000 sub cleanup_empty_dirs {	Line 12129 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 12110 sub get_turnedin_filepath {	Line 12239 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 12118 sub get_turnedin_filepath {	Line 12250 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 12158 sub get_turnedin_filepath {	Line 12293 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 13095 sub restore_settings {	Line 13233 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 13300 sub extract_categories {	Line 13442 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 13371 sub recurse_categories {	Line 13513 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 13448 sub assign_categories_table {	Line 13590 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 13482 sub assign_category_rows {	Line 13624 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 13766 sub check_clone {	Line 13908 sub check_clone {
}	}

sub construct_course {	sub construct_course {
my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,$cnum,$category) = @_;	my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,$cnum,$category,$coderef) = @_;
my $outcome;	my $outcome;
my $linefeed = '<br />'."\n";	my $linefeed = '<br />'."\n";
if ($context eq 'auto') {	if ($context eq 'auto') {
Line 13863 sub construct_course {	Line 14005 sub construct_course {
'plc.users.denied',	'plc.users.denied',
'hidefromcat',	'hidefromcat',
'checkforpriv',	'checkforpriv',
'categories'],	'categories',
	'internal.uniquecode'],
$$crsudom,$$crsunum);	$$crsudom,$$crsunum);
	if ($args->{'textbook'}) {
	$cenv{'internal.textbook'} = $args->{'textbook'};
	}
}	}

#	#
Line 14048 sub construct_course {	Line 14194 sub construct_course {
}	}
}	}

	#
	# generate and store uniquecode (available to course requester), if course should have one.
	#
	if ($args->{'uniquecode'}) {
	my ($code,$error) = &make_unique_code($$crsudom,$$crsunum);
	if ($code) {
	$cenv{'internal.uniquecode'} = $code;
	my %crsinfo =
	&Apache::lonnet::courseiddump($$crsudom,'.',1,'.','.',$$crsunum,undef,undef,'.');
	if (ref($crsinfo{$$crsudom.'_'.$$crsunum}) eq 'HASH') {
	$crsinfo{$$crsudom.'_'.$$crsunum}{'uniquecode'} = $code;
	my $putres = &Apache::lonnet::courseidput($$crsudom,\%crsinfo,$crsuhome,'notime');
	}
	if (ref($coderef)) {
	$$coderef = $code;
	}
	}
	}

if ($args->{'disresdis'}) {	if ($args->{'disresdis'}) {
$cenv{'pch.roles.denied'}='st';	$cenv{'pch.roles.denied'}='st';
}	}
Line 14116 sub construct_course {	Line 14281 sub construct_course {
return (1,$outcome);	return (1,$outcome);
}	}

	sub make_unique_code {
	my ($cdom,$cnum) = @_;
	# get lock on uniquecodes db
	my $lockhash = {
	$cnum."\0".'uniquecodes' => $env{'user.name'}.
	':'.$env{'user.domain'},
	};
	my $tries = 0;
	my $gotlock = &Apache::lonnet::newput_dom('uniquecodes',$lockhash,$cdom);
	my ($code,$error);

	while (($gotlock ne 'ok') && ($tries<3)) {
	$tries ++;
	sleep 1;
	$gotlock = &Apache::lonnet::newput_dom('uniquecodes',$lockhash,$cdom);
	}
	if ($gotlock eq 'ok') {
	my %currcodes = &Apache::lonnet::dump_dom('uniquecodes',$cdom);
	my $gotcode;
	my $attempts = 0;
	while ((!$gotcode) && ($attempts < 100)) {
	$code = &generate_code();
	if (!exists($currcodes{$code})) {
	$gotcode = 1;
	unless (&Apache::lonnet::newput_dom('uniquecodes',{ $code => $cnum },$cdom) eq 'ok') {
	$error = 'nostore';
	}
	}
	$attempts ++;
	}
	my @del_lock = ($cnum."\0".'uniquecodes');
	my $dellockoutcome = &Apache::lonnet::del_dom('uniquecodes',\@del_lock,$cdom);
	} else {
	$error = 'nolock';
	}
	return ($code,$error);
	}

	sub generate_code {
	my $code;
	my @letts = qw(B C D G H J K M N P Q R S T V W X Z);
	for (my $i=0; $i<6; $i++) {
	my $lettnum = int (rand 2);
	my $item = '';
	if ($lettnum) {
	$item = $letts[int( rand(18) )];
	} else {
	$item = 1+int( rand(8) );
	}
	$code .= $item;
	}
	return $code;
	}

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

Line 14143 sub group_term {	Line 14362 sub group_term {
}	}

sub course_types {	sub course_types {
my @types = ('official','unofficial','community');	my @types = ('official','unofficial','community','textbook');
my %typename = (	my %typename = (
official => 'Official course',	official => 'Official course',
unofficial => 'Unofficial course',	unofficial => 'Unofficial course',
community => 'Community',	community => 'Community',
	textbook => 'Textbook course',
);	);
return (\@types,\%typename);	return (\@types,\%typename);
}	}
Line 14332 sub init_user_environment {	Line 14552 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 14344 sub init_user_environment {	Line 14570 sub init_user_environment {
undef,\%userenv,\%domdef,\%is_adv);	undef,\%userenv,\%domdef,\%is_adv);
}	}

foreach my $crstype ('official','unofficial','community') {	foreach my $crstype ('official','unofficial','community','textbook') {
$userenv{'canrequest.'.$crstype} =	$userenv{'canrequest.'.$crstype} =
&Apache::lonnet::usertools_access($username,$domain,$crstype,	&Apache::lonnet::usertools_access($username,$domain,$crstype,
'reload','requestcourses',	'reload','requestcourses',
Line 14565 sub parse_supplemental_title {	Line 14791 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 14594 sub symb_to_docspath {	Line 14844 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 14610 sub symb_to_docspath {	Line 14860 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 14623 sub symb_to_docspath {	Line 14873 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 14766 sub check_captcha {	Line 15016 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 14791 sub check_recaptcha {	Line 15045 sub check_recaptcha {
return $captcha_chk;	return $captcha_chk;
}	}

	sub emailusername_info {
	my @fields = ('lastname','firstname','institution','web','location','officialemail');
	my %titles = &Apache::lonlocal::texthash (
	lastname => 'Last Name',
	firstname => 'First Name',
	institution => 'School/college/university',
	location => "School's city, state/province, country",
	web => "School's web address",
	officialemail => 'E-mail address at institution (if different)',
	);
	return (\@fields,\%titles);
	}

	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;
	}

	# Use:
	# my $answer=reply("encrypt:passwd:$udom:$uname:$upass",$tryserver);
	#
	##################################################
	# password associated functions #
	##################################################
	sub des_keys {
	# Make a new key for DES encryption.
	# Each key has two parts which are returned separately.
	# Please note: Each key must be passed through the &hex function
	# before it is output to the web browser. The hex versions cannot
	# be used to decrypt.
	my @hexstr=('0','1','2','3','4','5','6','7',
	'8','9','a','b','c','d','e','f');
	my $lkey='';
	for (0..7) {
	$lkey.=$hexstr[rand(15)];
	}
	my $ukey='';
	for (0..7) {
	$ukey.=$hexstr[rand(15)];
	}
	return ($lkey,$ukey);
	}

	sub des_decrypt {
	my ($key,$cyphertext) = @_;
	my $keybin=pack("H16",$key);
	my $cypher;
	if ($Crypt::DES::VERSION>=2.03) {
	$cypher=new Crypt::DES $keybin;
	} else {
	$cypher=new DES $keybin;
	}
	my $plaintext=
	$cypher->decrypt(unpack("a8",pack("H16",substr($cyphertext,0,16))));
	$plaintext.=
	$cypher->decrypt(unpack("a8",pack("H16",substr($cyphertext,16,16))));
	$plaintext=substr($plaintext,1,ord(substr($plaintext,0,1)) );
	return $plaintext;
	}

=pod	=pod

=back	=back

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

Removed from v.1.1075.2.42
changed lines
	Added in v.1.1075.2.65