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.57 and 1.1172

version 1.1075.2.57, 2013/12/14 00:53:22	version 1.1172, 2014/01/27 02:21:30
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 1354 sub top_nav_help {	Line 1380 sub top_nav_help {
$text = &mt($text);	$text = &mt($text);
my $stay_on_page = 1;	my $stay_on_page = 1;

my $link = ($stay_on_page) ? "javascript:helpMenu('display')"	my ($link,$banner_link);
: "javascript:helpMenu('open')";	unless ($env{'request.noversionuri'} =~ m{^/adm/helpmenu}) {
my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);	$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 {
Line 1378 sub help_menu_js {	Line 1409 sub help_menu_js {
&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,	'use_absolute' => $httphost,
'add_entries' => {	'add_entries' => {
'border' => '0',	'border' => '0',
'rows' => "110,*",},});	'rows' => "110,*",},});
my $end_page =	my $end_page =
&Apache::loncommon::end_page({'frameset' => 1,	&Apache::loncommon::end_page({'frameset' => 1,
Line 1410 function helpMenu(target) {	Line 1441 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 2181 The optional $onchange argument specifie	Line 2213 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 2199 sub select_dom_form {	Line 2231 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 2546 sub authform_nochange {	Line 2578 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 3042 sub get_related_words {	Line 3074 sub get_related_words {
untie %thesaurus_db;	untie %thesaurus_db;
return @Words;	return @Words;
}	}
	###############################################################
	#
	# Spell checking
	#

=pod	=pod

=back	=back

	=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	=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 3754 sub get_previous_attempt {	Line 3846 sub get_previous_attempt {
if (($data eq 'award') \|\| ($data eq 'awarddetail')) {	if (($data eq 'award') \|\| ($data eq 'awarddetail')) {
my $value = &format_previous_attempt_value($key,	my $value = &format_previous_attempt_value($key,
$returnhash{$version.':'.$key});	$returnhash{$version.':'.$key});
$prevattempts.='<td>'.$value.' </td>';	$prevattempts.='<td>'.&HTML::Entities::encode($value, '"<>&').' </td>';
} else {	} else {
$prevattempts.='<td> </td>';	$prevattempts.='<td> </td>';
}	}
Line 3762 sub get_previous_attempt {	Line 3854 sub get_previous_attempt {
if ($key =~ /\./) {	if ($key =~ /\./) {
my $value = &format_previous_attempt_value($key,	my $value = &format_previous_attempt_value($key,
$returnhash{$version.':'.$key});	$returnhash{$version.':'.$key});
$prevattempts.='<td>'.$value.' </td>';	$prevattempts.='<td>'.&HTML::Entities::encode($value, '"<>&').' </td>';
} else {	} else {
$prevattempts.='<td> </td>';	$prevattempts.='<td> </td>';
}	}
Line 3773 sub get_previous_attempt {	Line 3865 sub get_previous_attempt {
next if ($key =~ /\.foilorder$/);	next if ($key =~ /\.foilorder$/);
my $value = &format_previous_attempt_value($key,	my $value = &format_previous_attempt_value($key,
$returnhash{$version.':'.$key});	$returnhash{$version.':'.$key});
$prevattempts.='<td>'.$value.' </td>';	$prevattempts.='<td>'.&HTML::Entities::encode($value, '"<>&').' </td>';
}	}
}	}
$prevattempts.=&end_data_table_row();	$prevattempts.=&end_data_table_row();
Line 3798 sub get_previous_attempt {	Line 3890 sub get_previous_attempt {
if ($key =~/$regexp$/ && (defined &$gradesub)) {	if ($key =~/$regexp$/ && (defined &$gradesub)) {
$value = &$gradesub($value);	$value = &$gradesub($value);
}	}
$prevattempts.='<td>'.$value.' </td>';	$prevattempts.='<td>'. &HTML::Entities::encode($value, '"<>&').' </td>';
} else {	} else {
$prevattempts.='<td> </td>';	$prevattempts.='<td> </td>';
}	}
Line 3807 sub get_previous_attempt {	Line 3899 sub get_previous_attempt {
if ($key =~/$regexp$/ && (defined &$gradesub)) {	if ($key =~/$regexp$/ && (defined &$gradesub)) {
$value = &$gradesub($value);	$value = &$gradesub($value);
}	}
$prevattempts.='<td>'.$value.' </td>';	$prevattempts.='<td>'.&HTML::Entities::encode($value, '"<>&').' </td>';
}	}
} else {	} else {
my $value = &format_previous_attempt_value($key,$lasthash{$key});	my $value = &format_previous_attempt_value($key,$lasthash{$key});
if ($key =~/$regexp$/ && (defined &$gradesub)) {	if ($key =~/$regexp$/ && (defined &$gradesub)) {
$value = &$gradesub($value);	$value = &$gradesub($value);
}	}
$prevattempts.='<td>'.$value.' </td>';	$prevattempts.='<td>'.&HTML::Entities::encode($value, '"<>&').' </td>';
}	}
}	}
$prevattempts.= &end_data_table_row().&end_data_table();	$prevattempts.= &end_data_table_row().&end_data_table();
Line 5010 Inputs:	Line 5102 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 5034 other decorations will be returned.	Line 5123 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 5108 sub bodytag {	Line 5197 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
Line 5136 sub bodytag {	Line 5209 sub bodytag {
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 5155 sub bodytag {	Line 5228 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($httphost);
Line 5163 sub bodytag {	Line 5240 sub bodytag {
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 5184 sub bodytag {	Line 5258 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.'" />';

# 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>$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 5259 sub make_attr_string {	Line 5289 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;
Line 6716 ul#LC_secondary_menu li {	Line 6739 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 7277 sub headtag {	Line 7299 sub headtag {
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'}
Line 7318 ADDMETA	Line 7340 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 7344 sub font_settings {	Line 7370 sub font_settings {
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'}))) {	((ref($args) eq 'HASH') && ($args->{'browser.unicode'}))) {
$headerstring.=	$headerstring.=
'<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'."\n";	'<meta http-equiv="Content-Type" content="text/html; charset=utf-8"';
	if (!$args->{'frameset'}) {
	$headerstring.= ' /';
	}
	$headerstring .= '>'."\n";
}	}
return $headerstring;	return $headerstring;
}	}
Line 7437 Inputs: none	Line 7467 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 7448 sub xml_begin {	Line 7479 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">'."\n".
.'<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">'."\n";
}	}
return $output;	return $output;
}	}
Line 7494 $args - additional optional args support	Line 7528 $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 7519 sub start_page {	Line 7551 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 7533 sub start_page {	Line 7565 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 7574 sub start_page {	Line 7606 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 7721 sub modal_adhoc_inner {	Line 7748 sub modal_adhoc_inner {
my ($funcname,$width,$height,$content)=@_;	my ($funcname,$width,$height,$content)=@_;
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','myModal','#FFFFFF',undef,1).
$content.	$content.
&end_scrollbox().	&end_scrollbox().
Line 8366 sub get_sections {	Line 8393 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 8688 Incoming parameters:	Line 8715 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 8762 sub get_user_quota {	Line 8789 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 8808 Incoming parameters:	Line 8836 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 8903 space to be exceeded.	Line 8931 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 8919 Returns: 1 scalar: HTML to display conta	Line 8948 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 8945 sub excess_filesize_warning {	Line 8974 sub excess_filesize_warning {
###############################################	###############################################




sub get_secgrprole_info {	sub get_secgrprole_info {
my ($cdom,$cnum,$needroles,$type) = @_;	my ($cdom,$cnum,$needroles,$type) = @_;
my %sections_count = &get_sections($cdom,$cnum);	my %sections_count = &get_sections($cdom,$cnum);
Line 9795 sub ask_for_embedded_content {	Line 9826 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 9827 sub ask_for_embedded_content {	Line 9858 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 9909 sub ask_for_embedded_content {	Line 9940 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 10052 sub ask_for_embedded_content {	Line 10083 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 10281 sub ask_for_embedded_content {	Line 10312 sub ask_for_embedded_content {

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

Line 10300 sub clean_path {	Line 10331 sub clean_path {
@contents = ($embed_file);	@contents = ($embed_file);
}	}
my $lastidx = scalar(@contents)-1;	my $lastidx = scalar(@contents)-1;
for (my $i=0; $i<=$lastidx; $i++) {	for (my $i=0; $i<=$lastidx; $i++) {
$contents[$i]=~s{\\}{/}g;	$contents[$i]=~s{\\}{/}g;
$contents[$i]=~s/\s+/\_/g;	$contents[$i]=~s/\s+/\_/g;
$contents[$i]=~s{[^/\w\.\-]}{}g;	$contents[$i]=~s{[^/\w\.\-]}{}g;
Line 10639 sub modify_html_refs {	Line 10670 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 10774 sub modify_html_refs {	Line 10805 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 10998 sub decompress_form {	Line 11029 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 11019 sub decompress_form {	Line 11077 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 {
Line 11082 ENDCAM	Line 11140 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 11315 sub process_decompression {	Line 11373 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 11333 sub process_decompression {	Line 11392 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 11783 sub process_extracted_files {	Line 11845 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 11903 sub process_extracted_files {	Line 11965 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 11925 sub process_extracted_files {	Line 11987 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 11972 sub process_extracted_files {	Line 12034 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 11987 sub process_extracted_files {	Line 12049 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 13177 generated by lonerrorhandler.pm, CHECKRP	Line 13239 generated by lonerrorhandler.pm, CHECKRP
lonsupportreq.pm, loncoursequeueadmin.pm, searchcat.pl 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, helpdeskmail,
requestsmail, updatesmail, or idconflictsmail).	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 13722 sub commit_studentrole {	Line 13784 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 13844 sub check_clone {	Line 13906 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 13941 sub construct_course {	Line 14003 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 14126 sub construct_course {	Line 14192 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 14194 sub construct_course {	Line 14279 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 14221 sub group_term {	Line 14360 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 14428 sub init_user_environment {	Line 14568 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 14442 sub init_user_environment {	Line 14582 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 14833 sub create_captcha {	Line 14973 sub create_captcha {
$output = '<input type="hidden" name="crypt" value="'.$md5sum.'" />'."\n".	$output = '<input type="hidden" name="crypt" value="'.$md5sum.'" />'."\n".
&mt('Type in the letters/numbers shown below').' '.	&mt('Type in the letters/numbers shown below').' '.
'<input type="text" size="5" name="code" value="" /><br />'.	'<input type="text" size="5" name="code" value="" /><br />'.
'<img src="'.$captcha_params{'www_output_dir'}.'/'.$md5sum.'.png" />';	'<img src="'.$captcha_params{'www_output_dir'}.'/'.$md5sum.'.png" alt="captcha" />';
last;	last;
}	}
}	}

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

Removed from v.1.1075.2.57
changed lines
	Added in v.1.1172