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.63 and 1.1135

version 1.1075.2.63, 2014/01/03 20:04:35	version 1.1135, 2013/07/03 05:03:12
Line 72 use Apache::lonuserstate();	Line 72 use Apache::lonuserstate();
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);
use DateTime::TimeZone;	use DateTime::TimeZone;
use DateTime::Locale::Catalog;	use DateTime::Locale::Catalog;
	use Text::Aspell;
use Authen::Captcha;	use Authen::Captcha;
use Captcha::reCAPTCHA;	use Captcha::reCAPTCHA;

Line 158 sub ssi_with_retries {	Line 159 sub ssi_with_retries {
# ----------------------------------------------- Filetypes/Languages/Copyright	# ----------------------------------------------- Filetypes/Languages/Copyright
my %language;	my %language;
my %supported_language;	my %supported_language;
	my %supported_codes;
my %latex_language; # For choosing hyphenation in <transl..>	my %latex_language; # For choosing hyphenation in <transl..>
my %latex_language_bykey; # for choosing hyphenation from metadata	my %latex_language_bykey; # for choosing hyphenation from metadata
my %cprtag;	my %cprtag;
Line 192 BEGIN {	Line 194 BEGIN {
while (my $line = <$fh>) {	while (my $line = <$fh>) {
next if ($line=~/^\#/);	next if ($line=~/^\#/);
chomp($line);	chomp($line);
my ($key,$two,$country,$three,$enc,$val,$sup,$latex)=(split(/\t/,$line));	my ($key,$code,$country,$three,$enc,$val,$sup,$latex)=(split(/\t/,$line));
$language{$key}=$val.' - '.$enc;	$language{$key}=$val.' - '.$enc;
if ($sup) {	if ($sup) {
$supported_language{$key}=$sup;	$supported_language{$key}=$sup;
	$supported_codes{$key} = $code;
}	}
if ($latex) {	if ($latex) {
$latex_language_bykey{$key} = $latex;	$latex_language_bykey{$key} = $latex;
$latex_language{$two} = $latex;	$latex_language{$code} = $latex;
}	}
}	}
close($fh);	close($fh);
Line 663 if (!Array.prototype.indexOf) {	Line 666 if (!Array.prototype.indexOf) {
var n = 0;	var n = 0;
if (arguments.length > 0) {	if (arguments.length > 0) {
n = Number(arguments[1]);	n = Number(arguments[1]);
if (n !== n) { // shortcut for verifying if it's NaN	if (n !== n) { // shortcut for verifying if it is NaN
n = 0;	n = 0;
} else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {	} else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
n = (n > 0 \|\| -1) * Math.floor(Math.abs(n));	n = (n > 0 \|\| -1) * Math.floor(Math.abs(n));
Line 899 sub check_uncheck_jscript {	Line 902 sub check_uncheck_jscript {
function checkAll(field) {	function checkAll(field) {
if (field.length > 0) {	if (field.length > 0) {
for (i = 0; i < field.length; i++) {	for (i = 0; i < field.length; i++) {
if (!field[i].disabled) {	if (!field[i].disabled) {
field[i].checked = true;	field[i].checked = true;
}	}
}	}
} else {	} else {
if (!field.disabled) {	if (!field.disabled) {
field.checked = true;	field.checked = true;
}	}
}	}
Line 1014 sub select_language {	Line 1017 sub select_language {

=pod	=pod


	=item * &list_languages()

	Returns an array reference that is suitable for use in language prompters.
	Each array element is itself a two element array. The first element
	is the language code. The second element a descsriptiuon of the
	language itself. This is suitable for use in e.g.
	&Apache::edit::select_arg (once dereferenced that is).

	=cut

	sub list_languages {
	my @lang_choices;

	foreach my $id (&languageids()) {
	my $code = &supportedlanguagecode($id);
	if ($code) {
	my $selector = $supported_codes{$id};
	my $description = &plainlanguagedescription($id);
	push (@lang_choices, [$selector, $description]);
	}
	}
	return \@lang_choices;
	}

	=pod

=item * &linked_select_forms(...)	=item * &linked_select_forms(...)

linked_select_forms returns a string containing a <script></script> block	linked_select_forms returns a string containing a <script></script> block
Line 1234 sub help_open_topic {	Line 1264 sub help_open_topic {
$topic=~s/\W/\_/g;	$topic=~s/\W/\_/g;

if (!$stayOnPage) {	if (!$stayOnPage) {
if ($env{'browser.mobile'}) {	$link = "javascript:openMyModal('/adm/help/${filename}.hlp',$width,$height,'yes');";
$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 1352 sub help_open_menu {	Line 1378 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;	my $stay_on_page = 1;
unless ($env{'environment.remote'} eq 'on') {
$stay_on_page = 1;	my $link = ($stay_on_page) ? "javascript:helpMenu('display')"
}	: "javascript:helpMenu('open')";
my ($link,$banner_link);	my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);
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 ($httphost) = @_;	my ($text) = @_;
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 = $httphost.'/adm/help/'.$helptopic.'.hlp';	my $details_link = '/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 1417 function helpMenu(target) {	Line 1435 function helpMenu(target) {
return;	return;
}	}
function writeHelp(caller) {	function writeHelp(caller) {
caller.document.writeln('$start_page\\n<frame name="bannerframe" src="'+banner_link+'" marginwidth="0" marginheight="0" frameborder="0">\\n');	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('<frame name="bodyframe" src="$details_link" marginwidth="0" marginheight="0" frameborder="0">\\n$end_page');	caller.document.close()
caller.document.close();	caller.focus()
caller.focus();
}	}
// END LON-CAPA Internal -->	// END LON-CAPA Internal -->
// ]]>	// ]]>
Line 1732 RESIZE	Line 1749 RESIZE

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

	=over 4

=cut	=cut

###############################################################	###############################################################
Line 1739 RESIZE	Line 1758 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 2189 The optional $onchange argument specifie	Line 2206 The optional $onchange argument specifie

The optional $incdoms is a reference to an array of domains which will be the only available options.	The optional $incdoms is a reference to an array of domains which will be the only available options.

The optional $excdoms is a reference to an array of domains which will be excluded from the available options.	The optional $excdoms is a reference to an array of domains which will be excluded from the available options.

=cut	=cut

Line 2207 sub select_dom_form {	Line 2224 sub select_dom_form {
}	}
if ($includeempty) { @domains=('',@domains); }	if ($includeempty) { @domains=('',@domains); }
if (ref($excdoms) eq 'ARRAY') {	if (ref($excdoms) eq 'ARRAY') {
map { $exclude{$_} = 1; } @{$excdoms};	map { $exclude{$_} = 1; } @{$excdoms};
}	}
my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";	my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";
foreach my $dom (@domains) {	foreach my $dom (@domains) {
Line 2332 Outputs:	Line 2349 Outputs:

=item * $clientos	=item * $clientos

=item * $clientmobile

=item * $clientinfo

=back	=back

=back	=back
Line 2354 sub decode_user_agent {	Line 2367 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 2366 sub decode_user_agent {	Line 2378 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 2378 sub decode_user_agent {	Line 2389 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,$clientmobile,$clientinfo);	$clientunicode,$clientos,);
}	}

###############################################################	###############################################################
Line 2554 sub authform_nochange {	Line 2557 sub authform_nochange {
kerb_def_dom => 'MSU.EDU',	kerb_def_dom => 'MSU.EDU',
@_,	@_,
);	);
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});	my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});
my $result;	my $result;
if (!$authnum) {	if (!$authnum) {
$result = &mt('Under your current role you are not permitted to change login settings for this user');	$result = &mt('Under your current role you are not permitted to change login settings for this user');
Line 3050 sub get_related_words {	Line 3053 sub get_related_words {
untie %thesaurus_db;	untie %thesaurus_db;
return @Words;	return @Words;
}	}
	###############################################################
	#
	# Spell checking
	#

	=pod

	=head1 Spell checking

	=over 4

	=item * &check_spelling($wordlist $language)

	Takes a string containing words and feeds it to an external
	spellcheck program via a pipeline. Returns a string containing
	them mis-spelled words.

	Parameters:

	=over 4

	=item - $wordlist

	String that will be fed into the spellcheck program.

	=item - $language

	Language string that specifies the language for which the spell
	check will be performed.

	=back

	=back

	Note: This sub assumes that aspell is installed.


	=cut


=pod	=pod

Line 3057 sub get_related_words {	Line 3099 sub get_related_words {

=cut	=cut

	sub check_spelling {
	my ($wordlist, $language) = @_;
	my @misspellings;

	# Generate the speller and set the langauge.
	# if explicitly selected:

	my $speller = Text::Aspell->new;
	if ($language) {
	$speller->set_option('lang', $language);
	}

	# Turn the word list into an array of words by splittingon whitespace

	my @words = split(/\s+/, $wordlist);

	foreach my $word (@words) {
	if(! $speller->check($word)) {
	push(@misspellings, $word);
	}
	}
	return join(' ', @misspellings);

	}

# -------------------------------------------------------------- Plaintext name	# -------------------------------------------------------------- Plaintext name
=pod	=pod

Line 3247 sub screenname {	Line 3314 sub screenname {
# ------------------------------------------------------------- Confirm Wrapper	# ------------------------------------------------------------- Confirm Wrapper
=pod	=pod

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

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

Line 5018 Inputs:	Line 5085 Inputs:

=item * $bgcolor, used to override the bgcolor on a webpage to a specific value	=item * $bgcolor, used to override the bgcolor on a webpage to a specific value

=item * $no_inline_link, if true and in remote mode, don't show the
'Switch To Inline Menu' link

=item * $args, optional argument valid values are	=item * $args, optional argument valid values are
no_auto_mt_title -> prevents &mt()ing the title arg	no_auto_mt_title -> prevents &mt()ing the title arg
inherit_jsmath -> when creating popup window in a page,	inherit_jsmath -> when creating popup window in a page,
Line 5042 other decorations will be returned.	Line 5106 other decorations will be returned.

sub bodytag {	sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,	my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
$no_nav_bar,$bgcolor,$no_inline_link,$args,$advtoolsref)=@_;	$no_nav_bar,$bgcolor,$args,$advtoolsref)=@_;

my $public;	my $public;
if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))	if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
Line 5050 sub bodytag {	Line 5114 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 5116 sub bodytag {	Line 5179 sub bodytag {

$role = '<span class="LC_nobreak">('.$role.')</span>' if $role;	$role = '<span class="LC_nobreak">('.$role.')</span>' if $role;

if ($env{'request.state'} eq 'construct') { $forcereg=1; }	if ($env{'request.state'} eq 'construct') { $forcereg=1; }



my $funclist;
if (($env{'environment.remote'} eq 'on') && ($env{'request.state'} ne 'construct')) {
$bodytag .= Apache::lonhtmlcommon::scripttag(Apache::lonmenu::utilityfunctions($httphost), 'start')."\n".
Apache::lonmenu::serverform();
my $forbodytag;
&Apache::lonmenu::prepare_functions($env{'request.noversionuri'},
$forcereg,$args->{'group'},
$args->{'bread_crumbs'},
$advtoolsref,'',\$forbodytag);
unless (ref($args->{'bread_crumbs'}) eq 'ARRAY') {
$funclist = $forbodytag;
}
} else {

# if ($env{'request.state'} eq 'construct') {	# if ($env{'request.state'} eq 'construct') {
# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls	# $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
# }	# }

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

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

if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {	if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
if ($dc_info) {	if ($dc_info) {
$dc_info = qq\|<span class="LC_cusr_subheading">$dc_info</span>\|;	$dc_info = qq\|<span class="LC_cusr_subheading">$dc_info</span>\|;
}	}
$bodytag .= qq\|<div id="LC_nav_bar">$left $role<br />	$bodytag .= qq\|<div id="LC_nav_bar">$left $role<br />
<em>$realm</em> $dc_info</div>\|;	<em>$realm</em> $dc_info</div>\|;
return $bodytag;	return $bodytag;
}	}

Line 5163 sub bodytag {	Line 5210 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($httphost);	$bodytag .= Apache::lonmenu::secondary_menu();
$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') {
$bodytag .= &Apache::lonmenu::innerregister($forcereg,	$bodytag .= &Apache::lonmenu::innerregister($forcereg,
$args->{'bread_crumbs'});	$args->{'bread_crumbs'});
} elsif ($forcereg) {	} elsif ($forcereg) {
$bodytag .= &Apache::lonmenu::innerregister($forcereg,undef,	$bodytag .= &Apache::lonmenu::innerregister($forcereg,undef,
$args->{'group'});	$args->{'group'});
} else {	} else {
my $forbodytag;	$bodytag .=
&Apache::lonmenu::prepare_functions($env{'request.noversionuri'},	&Apache::lonmenu::prepare_functions($env{'request.noversionuri'},
$forcereg,$args->{'group'},	$forcereg,$args->{'group'},
$args->{'bread_crumbs'},	$args->{'bread_crumbs'},
$advtoolsref,'',\$forbodytag);	$advtoolsref);
unless (ref($args->{'bread_crumbs'}) eq 'ARRAY') {
$bodytag .= $forbodytag;
}
}	}
}else{	}else{
# this is to seperate menu from content when there's no secondary	# this is to seperate menu from content when there's no secondary
Line 5196 sub bodytag {	Line 5236 sub bodytag {
}	}

return $bodytag;	return $bodytag;
}

#
# Top frame rendering, Remote is up
#

my $imgsrc = $img;
if ($img =~ /^\/adm/) {
$imgsrc = &lonhttpdurl($img);
}
my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';

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

# Explicit link to get inline menu
my $menu= ($no_inline_link?''
:'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');

if ($dc_info) {
$dc_info = qq\|<span class="LC_cusr_subheading">($dc_info)</span>\|;
}

my $name = &plainname($env{'user.name'},$env{'user.domain'});
unless ($public) {
$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'},
undef,'LC_menubuttons_link');
}

unless ($env{'form.inhibitmenu'}) {
$bodytag .= qq\|<div id="LC_nav_bar">$name $role</div>
<ol class="LC_primary_menu LC_floatright LC_right">
<li>$help</li>
<li>$menu</li>
</ol><div id="LC_realm"> $realm $dc_info</div>\|;
}
if ($env{'request.state'} eq 'construct') {
if (!$public){
if ($env{'request.state'} eq 'construct') {
$funclist = &Apache::lonhtmlcommon::scripttag(
&Apache::lonmenu::utilityfunctions($httphost), 'start').
&Apache::lonhtmlcommon::scripttag('','end').
&Apache::lonmenu::innerregister($forcereg,
$args->{'bread_crumbs'});
}
}
}
return $bodytag."\n".$funclist;
}	}

sub dc_courseid_toggle {	sub dc_courseid_toggle {
Line 5275 sub make_attr_string {	Line 5267 sub make_attr_string {
delete($attr_ref->{$key});	delete($attr_ref->{$key});
}	}
}	}
if ($env{'environment.remote'} eq 'on') {	$attr_ref->{'onload'} = $on_load;
$attr_ref->{'onload'} =	$attr_ref->{'onunload'}= $on_unload;
&Apache::lonmenu::loadevents(). $on_load;
$attr_ref->{'onunload'}=
&Apache::lonmenu::unloadevents().$on_unload;
} else {
$attr_ref->{'onload'} = $on_load;
$attr_ref->{'onunload'}= $on_unload;
}
}	}

my $attr_string;	my $attr_string;
foreach my $attr (sort(keys(%$attr_ref))) {	foreach my $attr (keys(%$attr_ref)) {
$attr_string .= " $attr=\"".$attr_ref->{$attr}.'" ';	$attr_string .= " $attr=\"".$attr_ref->{$attr}.'" ';
}	}
return $attr_string;	return $attr_string;
Line 6501 div.LC_edit_problem_saves {	Line 6486 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 6732 ul#LC_secondary_menu li {	Line 6709 ul#LC_secondary_menu li {
font-weight: bold;	font-weight: bold;
line-height: 1.8em;	line-height: 1.8em;
border-right: 1px solid black;	border-right: 1px solid black;
vertical-align: middle;
float: left;	float: left;
}	}

Line 7275 sub headtag {	Line 7251 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 7286 sub headtag {	Line 7261 sub headtag {

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

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

if (!$args->{'frameset'}) {	if (!$args->{'frameset'}) {
$result .= &Apache::lonhtmlcommon::htmlareaheaders();	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
}	}
if ($args->{'force_register'}) {	if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) {
$result .= &Apache::lonmenu::registerurl(1);	$result .= Apache::lonxml::display_title();
}	}
if (!$args->{'no_nav_bar'}	if (!$args->{'no_nav_bar'}
&& !$args->{'only_body'}	&& !$args->{'only_body'}
&& !$args->{'frameset'}) {	&& !$args->{'frameset'}) {
$result .= &help_menu_js($httphost);	$result .= &help_menu_js();
$result.=&modal_window();	$result.=&modal_window();
$result.=&togglebox_script();	$result.=&togglebox_script();
$result.=&wishlist_window();	$result.=&wishlist_window();
Line 7334 ADDMETA	Line 7309 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'}) {
$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 7355 ADDMETA	Line 7321 ADDMETA

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

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

=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 7461 Inputs: none	Line 7421 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 7473 sub xml_begin {	Line 7432 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">'."\n".	$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">'."\n";	.'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">';
}	}
return $output;	return $output;
}	}
Line 7522 $args - additional optional args support	Line 7478 $args - additional optional args support
skip_phases -> hash ref of	skip_phases -> hash ref of
head -> skip the <html><head> generation	head -> skip the <html><head> generation
body -> skip all <body> generation	body -> skip all <body> generation
no_inline_link -> if true and in remote mode, don't show the
'Switch To Inline Menu' link
no_auto_mt_title -> prevent &mt()ing the title arg	no_auto_mt_title -> prevent &mt()ing the title arg
inherit_jsmath -> when creating popup window in a page,	inherit_jsmath -> when creating popup window in a page,
should it have jsmath forced on by the	should it have jsmath forced on by the
current page	current page
bread_crumbs -> Array containing breadcrumbs	bread_crumbs -> Array containing breadcrumbs
bread_crumbs_component -> if exists show it as headline else show only the breadcrumbs	bread_crumbs_component -> if exists show it as headline else show only the breadcrumbs
group -> includes the current group, if page is for a	group -> includes the current group, if page is for a
specific group	specific group

=back	=back

Line 7547 sub start_page {	Line 7501 sub start_page {
my ($result,@advtools);	my ($result,@advtools);

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

if (! exists($args->{'skip_phases'}{'body'}) ) {	if (! exists($args->{'skip_phases'}{'body'}) ) {
Line 7561 sub start_page {	Line 7515 sub start_page {
$args->{'function'}, $args->{'add_entries'},	$args->{'function'}, $args->{'add_entries'},
$args->{'only_body'}, $args->{'domain'},	$args->{'only_body'}, $args->{'domain'},
$args->{'force_register'}, $args->{'no_nav_bar'},	$args->{'force_register'}, $args->{'no_nav_bar'},
$args->{'bgcolor'}, $args->{'no_inline_link'},	$args->{'bgcolor'}, $args,
$args, \@advtools);	\@advtools);
}	}
}	}

Line 7602 sub start_page {	Line 7556 sub start_page {
}else{	}else{
$result .= &Apache::lonhtmlcommon::breadcrumbs();	$result .= &Apache::lonhtmlcommon::breadcrumbs();
}	}
} elsif (($env{'environment.remote'} eq 'on') &&
($env{'form.inhibitmenu'} ne 'yes') &&
($env{'request.noversionuri'} =~ m{^/res/}) &&
($env{'request.noversionuri'} !~ m{^/res/adm/pages/})) {
$result .= '<div style="padding:0;margin:0;clear:both"><hr /></div>';
}	}
return $result;	return $result;
}	}
Line 7696 var modalWindow = {	Line 7645 var modalWindow = {
$(".LCmodal-overlay").click(function(){modalWindow.close();});	$(".LCmodal-overlay").click(function(){modalWindow.close();});
}	}
};	};
var openMyModal = function(source,width,height,scrolling,transparency,style)	var openMyModal = function(source,width,height,scrolling)
{	{
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='"+transparency+"' src='" + source + "' style='"+style+"'>&lt/iframe>";	modalWindow.content = "<iframe width='"+width+"' height='"+height+"' frameborder='0' scrolling='"+scrolling+"' allowtransparency='true' src='" + source + "'>&lt/iframe>";
modalWindow.open();	modalWindow.open();
};	};
// END LON-CAPA Internal -->	// END LON-CAPA Internal -->
Line 7711 ENDMODAL	Line 7660 ENDMODAL
}	}

sub modal_link {	sub modal_link {
my ($link,$linktext,$width,$height,$target,$scrolling,$title,$transparency,$style)=@_;	my ($link,$linktext,$width,$height,$target,$scrolling,$title)=@_;
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','$transparency','$style'); return false;">	<a href="$link" $target_attr title="$title" onclick="javascript:openMyModal('$link',$width,$height,'$scrolling'); return false;">
$linktext</a>	$linktext</a>
ENDLINK	ENDLINK
}	}
Line 7750 sub modal_adhoc_inner {	Line 7697 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','myModal','#FFFFFF',undef,1).	&start_scrollbox($width.'px',$innerwidth.'px',$height.'px').
$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 7970 sub validate_page {	Line 7917 sub validate_page {


sub start_scrollbox {	sub start_scrollbox {
my ($outerwidth,$width,$height,$id,$bgcolor,$cursor,$needjsready) = @_;	my ($outerwidth,$width,$height,$id,$bgcolor)=@_;
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";
$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>

<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 7998 sub end_scrollbox {	Line 7938 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,$args) = @_;	my ($r,$title,$msg) = @_;
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">'.$msg.'</p>'.	'<p class="LC_error">'.&mt($msg).'</p>'.
&Apache::loncommon::end_page();	&Apache::loncommon::end_page();
if (ref($r)) {	if (ref($r)) {
$r->print($page);	$r->print($page);
Line 8394 sub get_sections {	Line 8247 sub get_sections {
}	}
}	}

if ($check_students) {	if ($check_students) {
my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);	my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);
my $sec_index = &Apache::loncoursedata::CL_SECTION();	my $sec_index = &Apache::loncoursedata::CL_SECTION();
my $status_index = &Apache::loncoursedata::CL_STATUS();	my $status_index = &Apache::loncoursedata::CL_STATUS();
Line 8715 Incoming parameters:	Line 8568 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	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, textbook 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 8739 defined for the user's institutional sta	Line 8590 defined for the user's institutional sta


sub get_user_quota {	sub get_user_quota {
my ($uname,$udom,$quotaname,$crstype) = @_;	my ($uname,$udom,$quotaname) = @_;
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 8790 sub get_user_quota {	Line 8641 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') \|\|	$defquota = $domdefs{'uploadquota'};
($crstype eq 'community') \|\| ($crstype eq 'textbook')) {
$defquota = $domdefs{$crstype.'quota'};
}
if ($defquota eq '') {
$defquota = 500;
}
} else {	} else {
($defquota,$settingstatus) = &default_quota($udom,$inststatus,$quotaname);	($defquota,$settingstatus) = &default_quota($udom,$inststatus,$quotaname);
}	}
Line 8825 Retrieves default quota assigned for sto	Line 8670 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.)
Line 8836 Incoming parameters:	Line 8680 Incoming parameters:
(if no quota name provided, defaults to portfolio).	(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

###############################################	###############################################
Line 8898 sub default_quota {	Line 8743 sub default_quota {
$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';
Line 8923 sub default_quota {	Line 8763 sub default_quota {

=pod	=pod

=item * &excess_filesize_warning()	=item * &excess_filesize_authorspace()

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

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

Inputs: 7
1. username or coursenum
2. domain	2. domain
3. context ('author' or 'course')	3. directory path for top level of current authoring space
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.

=back

=cut	=cut

sub excess_filesize_warning {	sub excess_filesize_authorspace {
my ($uname,$udom,$context,$filename,$filesize,$action,$quotatype) = @_;	my ($uname,$udom,$authorspace,$filename,$filesize,$action) = @_;
my $current_disk_usage = 0;	my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,'author'); #expressed in MB
my $disk_quota = &get_user_quota($uname,$udom,$context,$quotatype); #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);	$disk_quota = int($disk_quota * 1000);
	my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$authorspace);
if (($current_disk_usage + $filesize) > $disk_quota) {	if (($current_disk_usage + $filesize) > $disk_quota) {
return '<p><span class="LC_warning">'.	return '<p><span class="LC_warning">'.
&mt("Unable to $action [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.",	&mt("Unable to $action [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.",
Line 9814 sub ask_for_embedded_content {	Line 9639 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,$navmap);	$fileloc,$filename,$delete_output,$modify_output,$title,$symb,$path);
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 9825 sub ask_for_embedded_content {	Line 9651 sub ask_for_embedded_content {
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};	$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
}	}
if (($actionurl eq '/adm/portfolio') \|\|	if (($actionurl eq '/adm/portfolio') \|\|
($actionurl eq '/adm/coursegrp_portfolio')) {	($actionurl eq '/adm/coursegrp_portfolio')) {
my $current_path='/';	my $current_path='/';
if ($env{'form.currentpath'}) {	if ($env{'form.currentpath'}) {
Line 9857 sub ask_for_embedded_content {	Line 9683 sub ask_for_embedded_content {
$toplevel = $url;	$toplevel = $url;
if ($args->{'context'} eq 'paste') {	if ($args->{'context'} eq 'paste') {
($cdom,$cnum) = ($url =~ m{^\Q/uploaded/\E($match_domain)/($match_courseid)/});	($cdom,$cnum) = ($url =~ m{^\Q/uploaded/\E($match_domain)/($match_courseid)/});
($path) =	($path) =
($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs\|supplemental)/(?:default\|\d+)/\d+)/});	($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs\|supplemental)/(?:default\|\d+)/\d+)/});
$fileloc = &Apache::lonnet::filelocation('',$toplevel);	$fileloc = &Apache::lonnet::filelocation('',$toplevel);
$fileloc =~ s{^/}{};	$fileloc =~ s{^/}{};
}	}
}	}
} elsif ($actionurl eq '/adm/dependencies') {	} elsif ($actionurl eq '/adm/dependencies') {
if ($env{'request.course.id'} ne '') {	if ($env{'request.course.id'} ne '') {
if (ref($args) eq 'HASH') {	if (ref($args) eq 'HASH') {
$url = $args->{'docs_url'};	$url = $args->{'docs_url'};
$title = $args->{'docs_title'};	$title = $args->{'docs_title'};
$toplevel = $url;	$toplevel = $url;
unless ($toplevel =~ m{^/}) {	unless ($toplevel =~ m{^/}) {
$toplevel = "/$url";	$toplevel = "/$url";
}	}
Line 9901 sub ask_for_embedded_content {	Line 9727 sub ask_for_embedded_content {
} else {	} else {
$embed_file = $file;	$embed_file = $file;
}	}
my ($absolutepath,$cleaned_file);	my $absolutepath;
if ($embed_file =~ m{^\w+://}) {	if ($embed_file =~ m{^\w+://}) {
$cleaned_file = $embed_file;	$newfiles{$embed_file} = 1;
$newfiles{$cleaned_file} = 1;	$mapping{$embed_file} = $embed_file;
$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 ($cleaned_file =~ m{/}) {	if ($embed_file =~ m{/}) {
my ($path,$fname) = ($cleaned_file =~ m{^(.+)/([^/]*)$});	my ($path,$fname) = ($embed_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 9929 sub ask_for_embedded_content {	Line 9754 sub ask_for_embedded_content {
} else {	} else {
$dependencies{$embed_file} = 1;	$dependencies{$embed_file} = 1;
if ($absolutepath) {	if ($absolutepath) {
$mapping{$cleaned_file} = $absolutepath;	$mapping{$embed_file} = $absolutepath;
} else {	} else {
$mapping{$cleaned_file} = $embed_file;	$mapping{$embed_file} = $embed_file;
}	}
}	}
}	}
Line 9939 sub ask_for_embedded_content {	Line 9764 sub ask_for_embedded_content {
my $dirptr = 16384;	my $dirptr = 16384;
foreach my $path (keys(%subdependencies)) {	foreach my $path (keys(%subdependencies)) {
$currsubfile{$path} = {};	$currsubfile{$path} = {};
if (($actionurl eq '/adm/portfolio') \|\|	if (($actionurl eq '/adm/portfolio') \|\|
($actionurl eq '/adm/coursegrp_portfolio')) {	($actionurl eq '/adm/coursegrp_portfolio')) {
my ($sublistref,$listerror) =	my ($sublistref,$listerror) =
&Apache::lonnet::dirlist($url.$path,$udom,$uname,$getpropath);	&Apache::lonnet::dirlist($url.$path,$udom,$uname,$getpropath);
if (ref($sublistref) eq 'ARRAY') {	if (ref($sublistref) eq 'ARRAY') {
Line 10082 sub ask_for_embedded_content {	Line 9907 sub ask_for_embedded_content {
$counter = scalar(keys(%existing));	$counter = scalar(keys(%existing));
$numpathchg = scalar(keys(%pathchanges));	$numpathchg = scalar(keys(%pathchanges));
return ($output,$counter,$numpathchg,\%existing);	return ($output,$counter,$numpathchg,\%existing);
} elsif (($actionurl eq "/public/$cdom/$cnum/syllabus") &&	} elsif (($actionurl eq "/public/$cdom/$cnum/syllabus") &&
(ref($args) eq 'HASH') && ($args->{'context'} eq 'rewrites')) {	(ref($args) eq 'HASH') && ($args->{'context'} eq 'rewrites')) {
$counter = scalar(keys(%existing));	$counter = scalar(keys(%existing));
$numpathchg = scalar(keys(%pathchanges));	$numpathchg = scalar(keys(%pathchanges));
Line 10305 sub ask_for_embedded_content {	Line 10130 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 10469 sub upload_embedded {	Line 10254 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 internal use.',$1)	$output .= &mt('Invalid file extension ([_1]) - reserved for LONCAPA use - rename the file with a different extension and re-upload. ',$1).'<br />';
.' '.&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 10669 sub modify_html_refs {	Line 10453 sub modify_html_refs {
}	}
my (%allfiles,%codebase,$output,$content);	my (%allfiles,%codebase,$output,$content);
my @changes = &get_env_multiple('form.namechange');	my @changes = &get_env_multiple('form.namechange');
unless ((@changes > 0) \|\| ($context eq 'syllabus')) {	unless ((@changes > 0) \|\| ($context eq 'syllabus')) {
if (wantarray) {	if (wantarray) {
return ('',0,0);	return ('',0,0);
} else {	} else {
Line 10734 sub modify_html_refs {	Line 10518 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 10804 sub modify_html_refs {	Line 10587 sub modify_html_refs {
}	}
}	}
if ($rewrites) {	if ($rewrites) {
my $saveresult;	my $saveresult;
my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult);	my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult);
if ($url eq $container) {	if ($url eq $container) {
my ($fname) = ($container =~ m{/([^/]+)$});	my ($fname) = ($container =~ m{/([^/]+)$});
Line 11028 sub decompress_form {	Line 10811 sub decompress_form {
}	}
}	}
if ($mimetype =~ m{^application/(x\-)?(compressed\|zip)}) {	if ($mimetype =~ m{^application/(x\-)?(compressed\|zip)}) {
my @camtasia6 = ("$topdir/","$topdir/index.html",	my @camtasia = ("$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 @camtasia8 = ("$topdir/","$topdir/$topdir.html",	my @diffs = &compare_arrays(\@paths,\@camtasia);
"$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 = 6;	$is_camtasia = 1;
} else {
@diffs = &compare_arrays(\@paths,\@camtasia8);
if (@diffs == 0) {
$is_camtasia = 8;
}
}	}
}	}
my $output;	my $output;
Line 11076 sub decompress_form {	Line 10832 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 == $is_camtasia) {	if (document.uploaded_decompress.autoextract_camtasia[i].value == 1) {

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 11138 ENDCAM	Line 10895 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="'.$is_camtasia.'" onclick="javascript:camtasiaToggle();" checked="checked" />'.	'<input type="radio" name="autoextract_camtasia" value="1" 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 11371 sub process_decompression {	Line 11128 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 11390 sub process_decompression {	Line 11146 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") && ($version == 6)) \|\|	} elsif ($item eq "$contents[0]/index.html") {
(($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") && ($version == 6)) \|\|	if ($item eq "$contents[0]/media") {
((($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 11843 sub process_extracted_files {	Line 11596 sub process_extracted_files {
$folders{'0'} = $items[-2];	$folders{'0'} = $items[-2];
if ($env{'form.folderpath'} =~ /\:1$/) {	if ($env{'form.folderpath'} =~ /\:1$/) {
$containers{'0'}='page';	$containers{'0'}='page';
} else {	} else {
$containers{'0'}='sequence';	$containers{'0'}='sequence';
}	}
}	}
Line 11963 sub process_extracted_files {	Line 11716 sub process_extracted_files {
}	}
}	}
} else {	} else {
$warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />';	$warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />';
}	}
}	}
for (my $i=1; $i<=$numitems; $i++) {	for (my $i=1; $i<=$numitems; $i++) {
Line 11985 sub process_extracted_files {	Line 11738 sub process_extracted_files {
}	}
if ($itemidx eq '') {	if ($itemidx eq '') {
$itemidx = 0;	$itemidx = 0;
}	}
if (grep(/^\Q$referrer{$i}\E$/,@archdirs)) {	if (grep(/^\Q$referrer{$i}\E$/,@archdirs)) {
if ($mapinner{$referrer{$i}}) {	if ($mapinner{$referrer{$i}}) {
$fullpath = "$prefix$dir/$docstype/$mapinner{$referrer{$i}}";	$fullpath = "$prefix$dir/$docstype/$mapinner{$referrer{$i}}";
Line 12032 sub process_extracted_files {	Line 11785 sub process_extracted_files {
$showpath = "$relpath/$title";	$showpath = "$relpath/$title";
} else {	} else {
$showpath = "/$title";	$showpath = "/$title";
}	}
$result .= '<li>'.&mt('[_1] included as a dependency',$showpath).'</li>'."\n";	$result .= '<li>'.&mt('[_1] included as a dependency',$showpath).'</li>'."\n";
}	}
unless ($ishome) {	unless ($ishome) {
my $fetch = "$fullpath/$title";	my $fetch = "$fullpath/$title";
$fetch =~ s/^\Q$prefix$dir\E//;	$fetch =~ s/^\Q$prefix$dir\E//;
$prompttofetch{$fetch} = 1;	$prompttofetch{$fetch} = 1;
}	}
}	}
Line 12047 sub process_extracted_files {	Line 11800 sub process_extracted_files {
$path,$env{'form.archive_content_'.$referrer{$i}}).'<br />';	$path,$env{'form.archive_content_'.$referrer{$i}}).'<br />';
}	}
} else {	} else {
$warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />';	$warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />';
}	}
}	}
if (keys(%todelete)) {	if (keys(%todelete)) {
Line 12125 sub cleanup_empty_dirs {	Line 11878 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 12235 sub get_turnedin_filepath {	Line 11988 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 12246 sub get_turnedin_filepath {	Line 11996 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 12289 sub get_turnedin_filepath {	Line 12036 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 13229 sub restore_settings {	Line 12973 sub restore_settings {

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

Build recipient lists for following types of e-mail:	Build recipient lists for five 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, (f) loncapa	(d) Help requests, (e) Course requests needing approval, generated by
module change checking, student/employee ID conflict checks, as	lonerrorhandler.pm, CHECKRPMS, loncron, lonsupportreq.pm and
generated by lonerrorhandler.pm, CHECKRPMS, loncron,	loncoursequeueadmin.pm respectively.
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, helpdeskmail,	mailing type (scalar - errormail, packagesmail, or 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,
origmail (scalar - email address of recipient from loncapa.conf,	i.e., predates configuration by DC via domainprefs.pm
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 13438 sub extract_categories {	Line 13178 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 13509 sub recurse_categories {	Line 13249 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 13586 sub assign_categories_table {	Line 13326 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 13620 sub assign_category_rows {	Line 13360 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_data_table">';	$text .= '<td><table class="LC_datatable">';
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 13782 sub commit_studentrole {	Line 13522 sub commit_studentrole {
}	}
}	}
} else {	} else {
if ($secchange) {	if ($secchange) {
$$logmsg .= &mt('Error when attempting section change for [_1] from old section "[_2]" to new section: "[_3]" in course [_4] -error:',$uname,$oldsec,$sec,$cid).' '.$modify_section_result.$linefeed;	$$logmsg .= &mt('Error when attempting section change for [_1] from old section "[_2]" to new section: "[_3]" in course [_4] -error:',$uname,$oldsec,$sec,$cid).' '.$modify_section_result.$linefeed;
} else {	} else {
$$logmsg .= &mt('Error when attempting to modify role for [_1] for section: "[_2]" in course [_3] -error:',$uname,$sec,$cid).' '.$modify_section_result.$linefeed;	$$logmsg .= &mt('Error when attempting to modify role for [_1] for section: "[_2]" in course [_3] -error:',$uname,$sec,$cid).' '.$modify_section_result.$linefeed;
Line 13904 sub check_clone {	Line 13644 sub check_clone {
}	}

sub construct_course {	sub construct_course {
my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,$cnum,$category,$coderef) = @_;	my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,$cnum,$category) = @_;
my $outcome;	my $outcome;
my $linefeed = '<br />'."\n";	my $linefeed = '<br />'."\n";
if ($context eq 'auto') {	if ($context eq 'auto') {
Line 14001 sub construct_course {	Line 13741 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 14190 sub construct_course {	Line 13926 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 14277 sub construct_course {	Line 13994 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 14358 sub group_term {	Line 14021 sub group_term {
}	}

sub course_types {	sub course_types {
my @types = ('official','unofficial','community','textbook');	my @types = ('official','unofficial','community');
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 14496 sub init_user_environment {	Line 14158 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,$clientmobile,$clientinfo) = &decode_user_agent($r);	$clientunicode,$clientos) = &decode_user_agent($r);

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

Line 14527 sub init_user_environment {	Line 14189 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 14548 sub init_user_environment {	Line 14208 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 14566 sub init_user_environment {	Line 14220 sub init_user_environment {
undef,\%userenv,\%domdef,\%is_adv);	undef,\%userenv,\%domdef,\%is_adv);
}	}

foreach my $crstype ('official','unofficial','community','textbook') {	foreach my $crstype ('official','unofficial','community') {
$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 14580 sub init_user_environment {	Line 14234 sub init_user_environment {
my %reqauthor = &Apache::lonnet::get('requestauthor',['author_status','author'],	my %reqauthor = &Apache::lonnet::get('requestauthor',['author_status','author'],
$domain,$username);	$domain,$username);
my $reqstatus = $reqauthor{'author_status'};	my $reqstatus = $reqauthor{'author_status'};
if ($reqstatus eq 'approval' \|\| $reqstatus eq 'approved') {	if ($reqstatus eq 'approval' \|\| $reqstatus eq 'approved') {
if (ref($reqauthor{'author'}) eq 'HASH') {	if (ref($reqauthor{'author'}) eq 'HASH') {
$userenv{'requestauthorqueued'} = $reqstatus.':'.	$userenv{'requestauthorqueued'} = $reqstatus.':'.
$reqauthor{'author'}{'timestamp'};	$reqauthor{'author'}{'timestamp'};
Line 14787 sub parse_supplemental_title {	Line 14441 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 14840 sub symb_to_docspath {	Line 14470 sub symb_to_docspath {
my $thistitle = $res->title();	my $thistitle = $res->title();
$path .= '&'.	$path .= '&'.
&Apache::lonhtmlcommon::entity_encode($thisurl).'&'.	&Apache::lonhtmlcommon::entity_encode($thisurl).'&'.
&escape($thistitle).	&Apache::lonhtmlcommon::entity_encode($thistitle).
':'.$res->randompick().	':'.$res->randompick().
':'.$res->randomout().	':'.$res->randomout().
':'.$res->encrypted().	':'.$res->encrypted().
Line 14856 sub symb_to_docspath {	Line 14486 sub symb_to_docspath {
}	}
$path .= (($path ne '')? '&' : '').	$path .= (($path ne '')? '&' : '').
&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.	&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
&escape($maptitle).	&Apache::lonhtmlcommon::entity_encode($maptitle).
':'.$mapresobj->randompick().	':'.$mapresobj->randompick().
':'.$mapresobj->randomout().	':'.$mapresobj->randomout().
':'.$mapresobj->encrypted().	':'.$mapresobj->encrypted().
Line 14869 sub symb_to_docspath {	Line 14499 sub symb_to_docspath {
$maptitle = 'Main Content';	$maptitle = 'Main Content';
}	}
$path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.	$path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
&escape($maptitle).':::::'.$ispage;	&Apache::lonhtmlcommon::entity_encode($maptitle).':::::'.$ispage;
}	}
unless ($mapurl eq 'default') {	unless ($mapurl eq 'default') {
$path = 'default&'.	$path = 'default&'.
&escape('Main Content').	&Apache::lonhtmlcommon::entity_encode('Main Content').
':::::&'.$path;	':::::&'.$path;
}	}
return $path;	return $path;
Line 14886 sub captcha_display {	Line 14516 sub captcha_display {
if ($captcha eq 'original') {	if ($captcha eq 'original') {
$output = &create_captcha();	$output = &create_captcha();
unless ($output) {	unless ($output) {
$error = 'captcha';	$error = 'captcha';
}	}
} elsif ($captcha eq 'recaptcha') {	} elsif ($captcha eq 'recaptcha') {
$output = &create_recaptcha($pubkey);	$output = &create_recaptcha($pubkey);
unless ($output) {	unless ($output) {
$error = 'recaptcha';	$error = 'recaptcha';
}	}
}	}
return ($output,$error);	return ($output,$error);
Line 15012 sub check_captcha {	Line 14642 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,undef,$use_ssl).	$captcha->get_html($pubkey).
&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 15041 sub check_recaptcha {	Line 14667 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.63
changed lines
	Added in v.1.1135