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.1222 and 1.1246

version 1.1222, 2015/06/09 21:22:56	version 1.1246, 2016/06/19 04:27:49
Line 72 use Apache::lonuserstate();	Line 72 use Apache::lonuserstate();
use Apache::courseclassifier();	use Apache::courseclassifier();
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);
use DateTime::TimeZone;	use DateTime::TimeZone;
use DateTime::Locale::Catalog;	use DateTime::Locale;
use Encode();	use Encode();
use Text::Aspell;	use Text::Aspell;
use Authen::Captcha;	use Authen::Captcha;
use Captcha::reCAPTCHA;	use Captcha::reCAPTCHA;
	use JSON::DWIW;
	use LWP::UserAgent;
use Crypt::DES;	use Crypt::DES;
use DynaLoader; # for Crypt::DES version	use DynaLoader; # for Crypt::DES version
	use MIME::Lite;
	use MIME::Types;

# ---------------------------------------------- Designs	# ---------------------------------------------- Designs
use vars qw(%defaultdesign);	use vars qw(%defaultdesign);
Line 586 sub coursebrowser_javascript {	Line 590 sub coursebrowser_javascript {
if (formname == 'ccrs') {	if (formname == 'ccrs') {
var ownername = document.forms[formid].ccuname.value;	var ownername = document.forms[formid].ccuname.value;
var ownerdom = document.forms[formid].ccdomain.options[document.forms[formid].ccdomain.selectedIndex].value;	var ownerdom = document.forms[formid].ccdomain.options[document.forms[formid].ccdomain.selectedIndex].value;
url += '&cloner='+ownername+':'+ownerdom+'&crscode='+document.forms[formid].crscode.value;	url += '&cloner='+ownername+':'+ownerdom;
	if (type == 'Course') {
	url += '&crscode='+document.forms[formid].crscode.value;
	}
}	}
if (formname == 'requestcrs') {	if (formname == 'requestcrs') {
url += '&crsdom=$domainfilter&crscode=$instcode';	url += '&crsdom=$domainfilter&crscode=$instcode';
Line 874 sub selectcourse_link {	Line 881 sub selectcourse_link {
my $linktext = &mt('Select Course');	my $linktext = &mt('Select Course');
if ($selecttype eq 'Community') {	if ($selecttype eq 'Community') {
$linktext = &mt('Select Community');	$linktext = &mt('Select Community');
	} elsif ($selecttype eq 'Placement') {
	$linktext = &mt('Select Placement Test');
} elsif ($selecttype eq 'Course/Community') {	} elsif ($selecttype eq 'Course/Community') {
$linktext = &mt('Select Course/Community');	$linktext = &mt('Select Course/Community');
$type = '';	$type = '';
Line 965 sub select_datelocale {	Line 974 sub select_datelocale {
}	}
$output .= '> </option>';	$output .= '> </option>';
}	}
	my @languages = &Apache::lonlocal::preferred_languages();
my (@possibles,%locale_names);	my (@possibles,%locale_names);
my @locales = DateTime::Locale::Catalog::Locales;	my @locales = DateTime::Locale->ids();
foreach my $locale (@locales) {	foreach my $id (@locales) {
if (ref($locale) eq 'HASH') {	if ($id ne '') {
my $id = $locale->{'id'};	my ($en_terr,$native_terr);
if ($id ne '') {	my $loc = DateTime::Locale->load($id);
my $en_terr = $locale->{'en_territory'};	if (ref($loc)) {
my $native_terr = $locale->{'native_territory'};	$en_terr = $loc->name();
my @languages = &Apache::lonlocal::preferred_languages();	$native_terr = $loc->native_name();
if (grep(/^en$/,@languages) \|\| !@languages) {	if (grep(/^en$/,@languages) \|\| !@languages) {
if ($en_terr ne '') {	if ($en_terr ne '') {
$locale_names{$id} = '('.$en_terr.')';	$locale_names{$id} = '('.$en_terr.')';
Line 988 sub select_datelocale {	Line 998 sub select_datelocale {
}	}
}	}
$locale_names{$id} = Encode::encode('UTF-8',$locale_names{$id});	$locale_names{$id} = Encode::encode('UTF-8',$locale_names{$id});
push (@possibles,$id);	push(@possibles,$id);
}	}
}	}
}	}
foreach my $item (sort(@possibles)) {	foreach my $item (sort(@possibles)) {
Line 1084 linked_select_forms takes the following	Line 1094 linked_select_forms takes the following
=item * $onchangesecond, additional javascript call to execute for an onchange	=item * $onchangesecond, additional javascript call to execute for an onchange
event for the second <select> tag	event for the second <select> tag

	=item * $suffix, to differentiate separate uses of select2data javascript
	objects in a page.

=back	=back

Below is an example of such a hash. Only the 'text', 'default', and	Below is an example of such a hash. Only the 'text', 'default', and
Line 1138 sub linked_select_forms {	Line 1151 sub linked_select_forms {
$hashref,	$hashref,
$menuorder,	$menuorder,
$onchangefirst,	$onchangefirst,
$onchangesecond	$onchangesecond,
	$suffix
) = @_;	) = @_;
my $second = "document.$formname.$secondselectname";	my $second = "document.$formname.$secondselectname";
my $first = "document.$formname.$firstselectname";	my $first = "document.$formname.$firstselectname";
Line 1146 sub linked_select_forms {	Line 1160 sub linked_select_forms {
my $result = '';	my $result = '';
$result.='<script type="text/javascript" language="JavaScript">'."\n";	$result.='<script type="text/javascript" language="JavaScript">'."\n";
$result.="// <![CDATA[\n";	$result.="// <![CDATA[\n";
$result.="var select2data = new Object();\n";	$result.="var select2data${suffix} = new Object();\n";
$" = '","';	$" = '","';
my $debug = '';	my $debug = '';
foreach my $s1 (sort(keys(%$hashref))) {	foreach my $s1 (sort(keys(%$hashref))) {
$result.="select2data.d_$s1 = new Object();\n";	$result.="select2data${suffix}['d_$s1'] = new Object();\n";
$result.="select2data.d_$s1.def = new String('".	$result.="select2data${suffix}['d_$s1'].def = new String('".
$hashref->{$s1}->{'default'}."');\n";	$hashref->{$s1}->{'default'}."');\n";
$result.="select2data.d_$s1.values = new Array(";	$result.="select2data${suffix}['d_$s1'].values = new Array(";
my @s2values = sort(keys( %{ $hashref->{$s1}->{'select2'} } ));	my @s2values = sort(keys( %{ $hashref->{$s1}->{'select2'} } ));
if (ref($hashref->{$s1}->{'order'}) eq 'ARRAY') {	if (ref($hashref->{$s1}->{'order'}) eq 'ARRAY') {
@s2values = @{$hashref->{$s1}->{'order'}};	@s2values = @{$hashref->{$s1}->{'order'}};
}	}
$result.="\"@s2values\");\n";	$result.="\"@s2values\");\n";
$result.="select2data.d_$s1.texts = new Array(";	$result.="select2data${suffix}['d_$s1'].texts = new Array(";
my @s2texts;	my @s2texts;
foreach my $value (@s2values) {	foreach my $value (@s2values) {
push @s2texts, $hashref->{$s1}->{'select2'}->{$value};	push @s2texts, $hashref->{$s1}->{'select2'}->{$value};
Line 1169 sub linked_select_forms {	Line 1183 sub linked_select_forms {
$"=' ';	$"=' ';
$result.= <<"END";	$result.= <<"END";

function select1_changed() {	function select1${suffix}_changed() {
// Determine new choice	// Determine new choice
var newvalue = "d_" + $first.value;	var newvalue = "d_" + $first.options[$first.selectedIndex].value;
// update select2	// update select2
var values = select2data[newvalue].values;	var values = select2data${suffix}[newvalue].values;
var texts = select2data[newvalue].texts;	var texts = select2data${suffix}[newvalue].texts;
var select2def = select2data[newvalue].def;	var select2def = select2data${suffix}[newvalue].def;
var i;	var i;
// out with the old	// out with the old
for (i = 0; i < $second.options.length; i++) {	$second.options.length = 0;
$second.options[i] = null;	// in with the new
}
// in with the nuclear
for (i=0;i<values.length; i++) {	for (i=0;i<values.length; i++) {
$second.options[i] = new Option(values[i]);	$second.options[i] = new Option(values[i]);
$second.options[i].value = values[i];	$second.options[i].value = values[i];
Line 1195 function select1_changed() {	Line 1207 function select1_changed() {
</script>	</script>
END	END
# output the initial values for the selection lists	# output the initial values for the selection lists
$result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed();$onchangefirst\">\n";	$result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1${suffix}_changed();$onchangefirst\">\n";
my @order = sort(keys(%{$hashref}));	my @order = sort(keys(%{$hashref}));
if (ref($menuorder) eq 'ARRAY') {	if (ref($menuorder) eq 'ARRAY') {
@order = @{$menuorder};	@order = @{$menuorder};
Line 2269 See lonrights.pm for an example invocati	Line 2281 See lonrights.pm for an example invocati

#-------------------------------------------	#-------------------------------------------
sub select_form {	sub select_form {
my ($def,$name,$hashref,$onchange) = @_;	my ($def,$name,$hashref,$onchange,$readonly) = @_;
return unless (ref($hashref) eq 'HASH');	return unless (ref($hashref) eq 'HASH');
if ($onchange) {	if ($onchange) {
$onchange = ' onchange="'.$onchange.'"';	$onchange = ' onchange="'.$onchange.'"';
}	}
my $selectform = "<select name=\"$name\" size=\"1\"$onchange>\n";	my $disabled;
	if ($readonly) {
	$disabled = ' disabled="disabled"';
	}
	my $selectform = "<select name=\"$name\" size=\"1\"$onchange$disabled>\n";
my @keys;	my @keys;
if (exists($hashref->{'select_form_order'})) {	if (exists($hashref->{'select_form_order'})) {
@keys=@{$hashref->{'select_form_order'}};	@keys=@{$hashref->{'select_form_order'}};
Line 4953 sub blocking_status {	Line 4969 sub blocking_status {
# build a link to a popup window containing the details	# build a link to a popup window containing the details
my $querystring = "?activity=$activity";	my $querystring = "?activity=$activity";
# $uname and $udom decide whose portfolio the user is trying to look at	# $uname and $udom decide whose portfolio the user is trying to look at
if ($activity eq 'port') {	if (($activity eq 'port') \|\| ($activity eq 'passwd')) {
$querystring .= "&udom=$udom" if $udom;	$querystring .= "&udom=$udom" if ($udom =~ /^$match_domain$/);
$querystring .= "&uname=$uname" if $uname;	$querystring .= "&uname=$uname" if ($uname =~ /^$match_username$/);
} elsif ($activity eq 'docs') {	} elsif ($activity eq 'docs') {
$querystring .= '&url='.&HTML::Entities::encode($url,'&"');	$querystring .= '&url='.&HTML::Entities::encode($url,'&"');
}	}
Line 4980 END_MYBLOCK	Line 4996 END_MYBLOCK
$class = '';	$class = '';
} elsif ($activity eq 'printout') {	} elsif ($activity eq 'printout') {
$text = &mt('Printing Blocked');	$text = &mt('Printing Blocked');
	} elsif ($activity eq 'passwd') {
	$text = &mt('Password Changing Blocked');
}	}
$output .= <<"END_BLOCK";	$output .= <<"END_BLOCK";
<div class='$class'>	<div class='$class'>
Line 5408 sub CSTR_pageheader {	Line 5426 sub CSTR_pageheader {
$lastitem = $thisdisfn;	$lastitem = $thisdisfn;
}	}

	my ($crsauthor,$title);
	if (($env{'request.course.id'}) &&
	($env{'course.'.$env{'request.course.id'}.'.num'} eq $uname) &&
	($env{'course.'.$env{'request.course.id'}.'.num'} eq $uname)) {
	$crsauthor = 1;
	$title = &mt('Course Authoring Space');
	} else {
	$title = &mt('Authoring Space');
	}

my $output =	my $output =
'<div>'	'<div>'
.&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?	.&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?
.'<b>'.&mt('Authoring Space:').'</b> '	.'<b>'.$title.'</b> '
.'<form name="dirs" method="post" action="'.$formaction	.'<form name="dirs" method="post" action="'.$formaction
.'" target="_top">' #FIXME lonpubdir: target="_parent"	.'" target="_top">' #FIXME lonpubdir: target="_parent"
.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv/'.$udom,undef,undef);	.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv/'.$udom,undef,undef);
Line 5422 sub CSTR_pageheader {	Line 5450 sub CSTR_pageheader {
.$lastitem	.$lastitem
.'</span>';	.'</span>';
}	}
$output .=
'<br />'	if ($crsauthor) {
#FIXME lonpubdir: &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />"	$output .= '</form>'.&Apache::lonmenu::constspaceform();
.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')	} else {
.'</form>'	$output .=
.&Apache::lonmenu::constspaceform()	'<br />'
.'</div>';	#FIXME lonpubdir: &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />"
	.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
	.'</form>'
	.&Apache::lonmenu::constspaceform();
	}
	$output .= '</div>';

return $output;	return $output;
}	}
Line 5472 Inputs:	Line 5505 Inputs:

=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,
should it have jsmath forced on by the
current page

=item * $advtoolsref, optional argument, ref to an array containing	=item * $advtoolsref, optional argument, ref to an array containing
inlineremote items to be added in "Functions" menu below	inlineremote items to be added in "Functions" menu below
Line 5542 sub bodytag {	Line 5572 sub bodytag {

# construct main body tag	# construct main body tag
my $bodytag = "<body $extra_body_attr>".	my $bodytag = "<body $extra_body_attr>".
&Apache::lontexconvert::init_math_support($args->{'inherit_jsmath'});	&Apache::lontexconvert::init_math_support();

&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);	&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);

Line 5566 sub bodytag {	Line 5596 sub bodytag {
$dc_info =~ s/\s+$//;	$dc_info =~ s/\s+$//;
}	}

$role = '<span class="LC_nobreak">('.$role.')</span>' if $role;	my $crstype;
	if ($env{'request.course.id'}) {
	$crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
	} elsif ($args->{'crstype'}) {
	$crstype = $args->{'crstype'};
	}
	if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) {
	undef($role);
	} else {
	$role = '<span class="LC_nobreak">('.$role.')</span>' if ($role && !$env{'browser.mobile'});
	}

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

Line 5577 sub bodytag {	Line 5617 sub bodytag {
$bodytag .= Apache::lonhtmlcommon::scripttag(	$bodytag .= Apache::lonhtmlcommon::scripttag(
Apache::lonmenu::utilityfunctions($httphost), 'start');	Apache::lonmenu::utilityfunctions($httphost), 'start');

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

if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {	if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
if ($dc_info) {	if ($dc_info) {
Line 5695 sub endbodytag {	Line 5735 sub endbodytag {
unless ((ref($args) eq 'HASH') && ($args->{'notbody'})) {	unless ((ref($args) eq 'HASH') && ($args->{'notbody'})) {
$endbodytag='</body>';	$endbodytag='</body>';
}	}
$endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag;
if ( exists( $env{'internal.head.redirect'} ) ) {	if ( exists( $env{'internal.head.redirect'} ) ) {
if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) {	if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) {
$endbodytag=	$endbodytag=
Line 5870 div.LC_confirm_box .LC_success img {	Line 5909 div.LC_confirm_box .LC_success img {
vertical-align: middle;	vertical-align: middle;
}	}

	.LC_maxwidth {
	max-width: 100%;
	height: auto;
	}

	.LC_textsize_mobile {
	\@media only screen and (max-device-width: 480px) {
	-webkit-text-size-adjust:100%; -moz-text-size-adjust:100%; -ms-text-size-adjust:100%;
	}
	}

.LC_icon {	.LC_icon {
border: none;	border: none;
vertical-align: middle;	vertical-align: middle;
Line 5975 ul.LC_breadcrumb_tools_outerlist li {	Line 6025 ul.LC_breadcrumb_tools_outerlist li {
float: right;	float: right;
}	}

	.LC_placement_prog {
	padding-right: 20px;
	font-weight: bold;
	font-size: 90%;
	}

table#LC_title_bar td {	table#LC_title_bar td {
background: $tabbg;	background: $tabbg;
}	}
Line 5991 table#LC_menubuttons img {	Line 6047 table#LC_menubuttons img {
vertical-align: middle;	vertical-align: middle;
}	}

	.LC_breadcrumbs_hoverable {
	background: $sidebg;
	}

td.LC_table_cell_checkbox {	td.LC_table_cell_checkbox {
text-align: center;	text-align: center;
}	}
Line 7642 ul.LC_funclist li {	Line 7702 ul.LC_funclist li {
}	}

/*	/*
	styles used for response display
	*/
	div.LC_radiofoil, div.LC_rankfoil {
	margin: .5em 0em .5em 0em;
	}
	table.LC_itemgroup {
	margin-top: 1em;
	}

	/*
styles used by TTH when "Default set of options to pass to tth/m	styles used by TTH when "Default set of options to pass to tth/m
when converting TeX" in course settings has been set	when converting TeX" in course settings has been set

Line 7662 span.roman {font-family: serif; font-sty	Line 7732 span.roman {font-family: serif; font-sty
span.overacc2 {position: relative; left: .8em; top: -1.2ex;}	span.overacc2 {position: relative; left: .8em; top: -1.2ex;}
span.overacc1 {position: relative; left: .6em; top: -1.2ex;}	span.overacc1 {position: relative; left: .6em; top: -1.2ex;}

	/*
	sections with roles, for content only
	*/
	section[class^="role-"] {
	padding-left: 10px;
	padding-right: 5px;
	margin-top: 8px;
	margin-bottom: 8px;
	border: 1px solid #2A4;
	border-radius: 5px;
	box-shadow: 0px 1px 1px #BBB;
	}
	section[class^="role-"]>h1 {
	position: relative;
	margin: 0px;
	padding-top: 10px;
	padding-left: 40px;
	}
	section[class^="role-"]>h1:before {
	position: absolute;
	left: -5px;
	top: 5px;
	}
	section.role-activity>h1:before {
	content:url('/adm/daxe/images/section_icons/activity.png');
	}
	section.role-advice>h1:before {
	content:url('/adm/daxe/images/section_icons/advice.png');
	}
	section.role-bibliography>h1:before {
	content:url('/adm/daxe/images/section_icons/bibliography.png');
	}
	section.role-citation>h1:before {
	content:url('/adm/daxe/images/section_icons/citation.png');
	}
	section.role-conclusion>h1:before {
	content:url('/adm/daxe/images/section_icons/conclusion.png');
	}
	section.role-definition>h1:before {
	content:url('/adm/daxe/images/section_icons/definition.png');
	}
	section.role-demonstration>h1:before {
	content:url('/adm/daxe/images/section_icons/demonstration.png');
	}
	section.role-example>h1:before {
	content:url('/adm/daxe/images/section_icons/example.png');
	}
	section.role-explanation>h1:before {
	content:url('/adm/daxe/images/section_icons/explanation.png');
	}
	section.role-introduction>h1:before {
	content:url('/adm/daxe/images/section_icons/introduction.png');
	}
	section.role-method>h1:before {
	content:url('/adm/daxe/images/section_icons/method.png');
	}
	section.role-more_information>h1:before {
	content:url('/adm/daxe/images/section_icons/more_information.png');
	}
	section.role-objectives>h1:before {
	content:url('/adm/daxe/images/section_icons/objectives.png');
	}
	section.role-prerequisites>h1:before {
	content:url('/adm/daxe/images/section_icons/prerequisites.png');
	}
	section.role-remark>h1:before {
	content:url('/adm/daxe/images/section_icons/remark.png');
	}
	section.role-reminder>h1:before {
	content:url('/adm/daxe/images/section_icons/reminder.png');
	}
	section.role-summary>h1:before {
	content:url('/adm/daxe/images/section_icons/summary.png');
	}
	section.role-syntax>h1:before {
	content:url('/adm/daxe/images/section_icons/syntax.png');
	}
	section.role-warning>h1:before {
	content:url('/adm/daxe/images/section_icons/warning.png');
	}

END	END
}	}

Line 7843 OFFLOAD	Line 7994 OFFLOAD
$result .= '>'	$result .= '>'
.$inhibitprint	.$inhibitprint
.$head_extra;	.$head_extra;
if ($env{'browser.mobile'}) {	my $clientmobile;
	if (($env{'user.name'} eq '') && ($env{'user.domain'} eq '')) {
	(undef,undef,undef,undef,undef,undef,$clientmobile) = &decode_user_agent();
	} else {
	$clientmobile = $env{'browser.mobile'};
	}
	if ($clientmobile) {
$result .= '	$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="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" />';	<meta name="apple-mobile-web-app-capable" content="yes" />';
Line 8025 $args - additional optional args support	Line 8182 $args - additional optional args support
head -> skip the <html><head> generation	head -> skip the <html><head> generation
body -> skip all <body> generation	body -> skip all <body> generation
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,
should it have jsmath forced on by the
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
Line 8099 sub start_page {	Line 8253 sub start_page {
#if bread_crumbs_component exists show it as headline else show only the breadcrumbs	#if bread_crumbs_component exists show it as headline else show only the breadcrumbs
if(exists($args->{'bread_crumbs_component'})){	if(exists($args->{'bread_crumbs_component'})){
$result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'});	$result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'});
}else{	} elsif ($args->{'crstype'} eq 'Placement') {
	$result .= &Apache::lonhtmlcommon::breadcrumbs('','','','','','','','','',
	$args->{'crstype'});
	} else {
$result .= &Apache::lonhtmlcommon::breadcrumbs();	$result .= &Apache::lonhtmlcommon::breadcrumbs();
}	}
}	}
Line 9216 Incoming parameters:	Line 9373 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, textbook or community, if quota name is	4. crstype - official, unofficial, textbook, placement or community,
course	if quota name is course

Returns:	Returns:
1. Disk quota (in MB) assigned to student.	1. Disk quota (in MB) assigned to student.
Line 9291 sub get_user_quota {	Line 9448 sub get_user_quota {
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') \|\|	if (($crstype eq 'official') \|\| ($crstype eq 'unofficial') \|\|
($crstype eq 'community') \|\| ($crstype eq 'textbook')) {	($crstype eq 'community') \|\| ($crstype eq 'textbook') \|\|
	($crstype eq 'placement')) {
$defquota = $domdefs{$crstype.'quota'};	$defquota = $domdefs{$crstype.'quota'};
}	}
if ($defquota eq '') {	if ($defquota eq '') {
Line 9439 Inputs: 7	Line 9597 Inputs: 7
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).	7. quotatype (in course context -- official, unofficial, textbook, placement or community).

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 9762 END_BLOCK	Line 9920 END_BLOCK

sub user_rule_check {	sub user_rule_check {
my ($usershash,$checks,$alerts,$rulematch,$inst_results,$curr_rules,$got_rules) = @_;	my ($usershash,$checks,$alerts,$rulematch,$inst_results,$curr_rules,$got_rules) = @_;
my $response;	my ($response,%inst_response);
if (ref($usershash) eq 'HASH') {	if (ref($usershash) eq 'HASH') {
foreach my $user (keys(%{$usershash})) {	if (keys(%{$usershash}) > 1) {
my ($uname,$udom) = split(/:/,$user);	my (%by_username,%by_id,%userdoms);
next if ($udom eq '' \|\| $uname eq '');	my $checkid;
my ($id,$newuser);
if (ref($usershash->{$user}) eq 'HASH') {
$newuser = $usershash->{$user}->{'newuser'};
$id = $usershash->{$user}->{'id'};
}
my $inst_response;
if (ref($checks) eq 'HASH') {	if (ref($checks) eq 'HASH') {
if (defined($checks->{'username'})) {	if ((!defined($checks->{'username'})) && (defined($checks->{'id'}))) {
($inst_response,%{$inst_results->{$user}}) =	$checkid = 1;
&Apache::lonnet::get_instuser($udom,$uname);	}
} elsif (defined($checks->{'id'})) {	}
($inst_response,%{$inst_results->{$user}}) =	foreach my $user (keys(%{$usershash})) {
&Apache::lonnet::get_instuser($udom,undef,$id);	my ($uname,$udom) = split(/:/,$user);
	if ($checkid) {
	if (ref($usershash->{$user}) eq 'HASH') {
	if ($usershash->{$user}->{'id'} ne '') {
	$by_id{$udom}{$usershash->{$user}->{'id'}} = $uname;
	$userdoms{$udom} = 1;
	if (ref($inst_results) eq 'HASH') {
	$inst_results->{$uname.':'.$udom} = {};
	}
	}
	}
	} else {
	$by_username{$udom}{$uname} = 1;
	$userdoms{$udom} = 1;
	if (ref($inst_results) eq 'HASH') {
	$inst_results->{$uname.':'.$udom} = {};
	}
	}
	}
	foreach my $udom (keys(%userdoms)) {
	if (!$got_rules->{$udom}) {
	my %domconfig = &Apache::lonnet::get_dom('configuration',
	['usercreation'],$udom);
	if (ref($domconfig{'usercreation'}) eq 'HASH') {
	foreach my $item ('username','id') {
	if (ref($domconfig{'usercreation'}{$item.'_rule'}) eq 'ARRAY') {
	$$curr_rules{$udom}{$item} =
	$domconfig{'usercreation'}{$item.'_rule'};
	}
	}
	}
	$got_rules->{$udom} = 1;
	}
	}
	if ($checkid) {
	foreach my $udom (keys(%by_id)) {
	my ($outcome,$results) = &Apache::lonnet::get_multiple_instusers($udom,$by_id{$udom},'id');
	if ($outcome eq 'ok') {
	foreach my $id (keys(%{$by_id{$udom}})) {
	my $uname = $by_id{$udom}{$id};
	$inst_response{$uname.':'.$udom} = $outcome;
	}
	if (ref($results) eq 'HASH') {
	foreach my $uname (keys(%{$results})) {
	if (exists($inst_response{$uname.':'.$udom})) {
	$inst_response{$uname.':'.$udom} = $outcome;
	$inst_results->{$uname.':'.$udom} = $results->{$uname};
	}
	}
	}
	}
}	}
} else {	} else {
($inst_response,%{$inst_results->{$user}}) =	foreach my $udom (keys(%by_username)) {
&Apache::lonnet::get_instuser($udom,$uname);	my ($outcome,$results) = &Apache::lonnet::get_multiple_instusers($udom,$by_username{$udom});
return;	if ($outcome eq 'ok') {
	foreach my $uname (keys(%{$by_username{$udom}})) {
	$inst_response{$uname.':'.$udom} = $outcome;
	}
	if (ref($results) eq 'HASH') {
	foreach my $uname (keys(%{$results})) {
	$inst_results->{$uname.':'.$udom} = $results->{$uname};
	}
	}
	}
	}
}	}
if (!$got_rules->{$udom}) {	} elsif (keys(%{$usershash}) == 1) {
my %domconfig = &Apache::lonnet::get_dom('configuration',	my $user = (keys(%{$usershash}))[0];
['usercreation'],$udom);	my ($uname,$udom) = split(/:/,$user);
if (ref($domconfig{'usercreation'}) eq 'HASH') {	if (($udom ne '') && ($uname ne '')) {
foreach my $item ('username','id') {	if (ref($usershash->{$user}) eq 'HASH') {
if (ref($domconfig{'usercreation'}{$item.'_rule'}) eq 'ARRAY') {	if (ref($checks) eq 'HASH') {
$$curr_rules{$udom}{$item} =	if (defined($checks->{'username'})) {
$domconfig{'usercreation'}{$item.'_rule'};	($inst_response{$user},%{$inst_results->{$user}}) =
	&Apache::lonnet::get_instuser($udom,$uname);
	} elsif (defined($checks->{'id'})) {
	if ($usershash->{$user}->{'id'} ne '') {
	($inst_response{$user},%{$inst_results->{$user}}) =
	&Apache::lonnet::get_instuser($udom,undef,
	$usershash->{$user}->{'id'});
	} else {
	($inst_response{$user},%{$inst_results->{$user}}) =
	&Apache::lonnet::get_instuser($udom,$uname);
	}
	}
	} else {
	($inst_response{$user},%{$inst_results->{$user}}) =
	&Apache::lonnet::get_instuser($udom,$uname);
	return;
	}
	if (!$got_rules->{$udom}) {
	my %domconfig = &Apache::lonnet::get_dom('configuration',
	['usercreation'],$udom);
	if (ref($domconfig{'usercreation'}) eq 'HASH') {
	foreach my $item ('username','id') {
	if (ref($domconfig{'usercreation'}{$item.'_rule'}) eq 'ARRAY') {
	$$curr_rules{$udom}{$item} =
	$domconfig{'usercreation'}{$item.'_rule'};
	}
	}
}	}
	$got_rules->{$udom} = 1;
}	}
}	}
$got_rules->{$udom} = 1;	} else {
	return;
	}
	} else {
	return;
	}
	foreach my $user (keys(%{$usershash})) {
	my ($uname,$udom) = split(/:/,$user);
	next if (($udom eq '') \|\| ($uname eq ''));
	my $id;
	if (ref($inst_results) eq 'HASH') {
	if (ref($inst_results->{$user}) eq 'HASH') {
	$id = $inst_results->{$user}->{'id'};
	}
	}
	if ($id eq '') {
	if (ref($usershash->{$user})) {
	$id = $usershash->{$user}->{'id'};
	}
}	}
foreach my $item (keys(%{$checks})) {	foreach my $item (keys(%{$checks})) {
if (ref($$curr_rules{$udom}) eq 'HASH') {	if (ref($$curr_rules{$udom}) eq 'HASH') {
if (ref($$curr_rules{$udom}{$item}) eq 'ARRAY') {	if (ref($$curr_rules{$udom}{$item}) eq 'ARRAY') {
if (@{$$curr_rules{$udom}{$item}} > 0) {	if (@{$$curr_rules{$udom}{$item}} > 0) {
my %rule_check = &Apache::lonnet::inst_rulecheck($udom,$uname,$id,$item,$$curr_rules{$udom}{$item});	my %rule_check = &Apache::lonnet::inst_rulecheck($udom,$uname,$id,$item,
	$$curr_rules{$udom}{$item});
foreach my $rule (@{$$curr_rules{$udom}{$item}}) {	foreach my $rule (@{$$curr_rules{$udom}{$item}}) {
if ($rule_check{$rule}) {	if ($rule_check{$rule}) {
$$rulematch{$user}{$item} = $rule;	$$rulematch{$user}{$item} = $rule;
if ($inst_response eq 'ok') {	if ($inst_response{$user} eq 'ok') {
if (ref($inst_results) eq 'HASH') {	if (ref($inst_results) eq 'HASH') {
if (ref($inst_results->{$user}) eq 'HASH') {	if (ref($inst_results->{$user}) eq 'HASH') {
if (keys(%{$inst_results->{$user}}) == 0) {	if (keys(%{$inst_results->{$user}}) == 0) {
$$alerts{$item}{$udom}{$uname} = 1;	$$alerts{$item}{$udom}{$uname} = 1;
	} elsif ($item eq 'id') {
	if ($inst_results->{$user}->{'id'} eq '') {
	$$alerts{$item}{$udom}{$uname} = 1;
	}
}	}
}	}
}	}
Line 10097 future_reservable - ref to hash of stude	Line 10359 future_reservable - ref to hash of stude

sub get_future_slots {	sub get_future_slots {
my ($cnum,$cdom,$now,$symb) = @_;	my ($cnum,$cdom,$now,$symb) = @_;
	my $map;
	if ($symb) {
	($map) = &Apache::lonnet::decode_symb($symb);
	}
my (%reservable_now,%future_reservable,@sorted_reservable,@sorted_future);	my (%reservable_now,%future_reservable,@sorted_reservable,@sorted_future);
my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);	my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);
foreach my $slot (keys(%slots)) {	foreach my $slot (keys(%slots)) {
next unless($slots{$slot}->{'type'} eq 'schedulable_student');	next unless($slots{$slot}->{'type'} eq 'schedulable_student');
if ($symb) {	if ($symb) {
next if (($slots{$slot}->{'symb'} ne '') &&	if ($slots{$slot}->{'symb'} ne '') {
($slots{$slot}->{'symb'} ne $symb));	my $canuse;
	my %oksymbs;
	my @slotsymbs = split(/\s,\s/,$slots{$slot}->{'symb'});
	map { $oksymbs{$_} = 1; } @slotsymbs;
	if ($oksymbs{$symb}) {
	$canuse = 1;
	} else {
	foreach my $item (@slotsymbs) {
	if ($item =~ /\.(page\|sequence)$/) {
	(undef,undef,my $sloturl) = &Apache::lonnet::decode_symb($item);
	if (($map ne '') && ($map eq $sloturl)) {
	$canuse = 1;
	last;
	}
	}
	}
	}
	next unless ($canuse);
	}
}	}
if (($slots{$slot}->{'starttime'} > $now) &&	if (($slots{$slot}->{'starttime'} > $now) &&
($slots{$slot}->{'endtime'} > $now)) {	($slots{$slot}->{'endtime'} > $now)) {
Line 13851 sub build_recipient_list {	Line 14135 sub build_recipient_list {

=pod	=pod

	=over 4

	=item * &mime_email()

	Sends an email with a possible attachment

	Inputs:

	=over 4

	from - Sender's email address

	to - Email address of recipient

	subject - Subject of email

	body - Body of email

	cc_string - Carbon copy email address

	bcc - Blind carbon copy email address

	type - File type of attachment

	attachment_path - Path of file to be attached

	file_name - Name of file to be attached

	attachment_text - The body of an attachment of type "TEXT"

	=back

	=back

	=cut

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

	sub mime_email {
	my ($from, $to, $subject, $body, $cc_string, $bcc, $attachment_path,
	$file_name, $attachment_text) = @_;
	my $msg = MIME::Lite->new(
	From => $from,
	To => $to,
	Subject => $subject,
	Type =>'TEXT',
	Data => $body,
	);
	if ($cc_string ne '') {
	$msg->add("Cc" => $cc_string);
	}
	if ($bcc ne '') {
	$msg->add("Bcc" => $bcc);
	}
	$msg->attr("content-type" => "text/plain");
	$msg->attr("content-type.charset" => "UTF-8");
	# Attach file if given
	if ($attachment_path) {
	unless ($file_name) {
	if ($attachment_path =~ m-/([^/]+)$-) { $file_name = $1; }
	}
	my ($type, $encoding) = MIME::Types::by_suffix($attachment_path);
	$msg->attach(Type => $type,
	Path => $attachment_path,
	Filename => $file_name
	);
	# Otherwise attach text if given
	} elsif ($attachment_text) {
	$msg->attach(Type => 'TEXT',
	Data => $attachment_text);
	}
	# Send it
	$msg->send('sendmail');
	}

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

	=pod

=head1 Course Catalog Routines	=head1 Course Catalog Routines

=over 4	=over 4
Line 13953 sub extract_categories {	Line 14318 sub extract_categories {
$trailstr = &mt('Official courses (with institutional codes)');	$trailstr = &mt('Official courses (with institutional codes)');
} elsif ($name eq 'communities') {	} elsif ($name eq 'communities') {
$trailstr = &mt('Communities');	$trailstr = &mt('Communities');
	} elsif ($name eq 'placement') {
	$trailstr = &mt('Placement Tests');
} else {	} else {
$trailstr = $name;	$trailstr = $name;
}	}
Line 14091 sub assign_categories_table {	Line 14458 sub assign_categories_table {
next if ($parent eq 'instcode');	next if ($parent eq 'instcode');
if ($type eq 'Community') {	if ($type eq 'Community') {
next unless ($parent eq 'communities');	next unless ($parent eq 'communities');
	} elsif ($type eq 'Placement') {
	next unless ($parent eq 'placement');
} else {	} else {
next if ($parent eq 'communities');	next if (($parent eq 'communities') \|\| ($parent eq 'placement'));
}	}
my $css_class = $itemcount%2?' class="LC_odd_row"':'';	my $css_class = $itemcount%2?' class="LC_odd_row"':'';
my $item = &escape($parent).'::0';	my $item = &escape($parent).'::0';
Line 14105 sub assign_categories_table {	Line 14474 sub assign_categories_table {
my $parent_title = $parent;	my $parent_title = $parent;
if ($parent eq 'communities') {	if ($parent eq 'communities') {
$parent_title = &mt('Communities');	$parent_title = &mt('Communities');
	} elsif ($parent eq 'placement') {
	$parent_title = &mt('Placement Tests');
}	}
$table .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.	$table .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
'<input type="checkbox" name="usecategory" value="'.	'<input type="checkbox" name="usecategory" value="'.
Line 14444 sub check_clone {	Line 14815 sub check_clone {
$can_clone = 1;	$can_clone = 1;
} elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {	} elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {
$can_clone = 1;	$can_clone = 1;
	} elsif (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners)) {
	$can_clone = 1;
}	}
unless ($can_clone) {	unless ($can_clone) {
if (($clonehash{'internal.coursecode'}) && ($args->{'crscode'}) && ($args->{'clonedomain'} eq $args->{'course_domain'})) {	if (($clonehash{'internal.coursecode'}) && ($args->{'crscode'}) &&
	($args->{'clonedomain'} eq $args->{'course_domain'})) {
my (%gotdomdefaults,%gotcodedefaults);	my (%gotdomdefaults,%gotcodedefaults);
foreach my $cloner (@cloners) {	foreach my $cloner (@cloners) {
if (($cloner ne '') && ($cloner !~ /^\\:$match_domain$/) &&	if (($cloner ne '') && ($cloner !~ /^\\:$match_domain$/) &&
Line 14477 sub check_clone {	Line 14851 sub check_clone {
}	}
}	}
}	}
unless ($can_clone) {	}
my $ccrole = 'cc';	}
if ($args->{'crstype'} eq 'Community') {	unless ($can_clone) {
$ccrole = 'co';	my $ccrole = 'cc';
}	if ($args->{'crstype'} eq 'Community') {
my %roleshash =	$ccrole = 'co';
&Apache::lonnet::get_my_roles($args->{'ccuname'},	}
$args->{'ccdomain'},	my %roleshash =
'userroles',['active'],[$ccrole],	&Apache::lonnet::get_my_roles($args->{'ccuname'},
[$args->{'clonedomain'}]);	$args->{'ccdomain'},
if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) \|\|	'userroles',['active'],[$ccrole],
(grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {	[$args->{'clonedomain'}]);
$can_clone = 1;	if ($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) {
} elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},	$can_clone = 1;
$args->{'ccuname'},$args->{'ccdomain'})) {	} elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},
$can_clone = 1;	$args->{'ccuname'},$args->{'ccdomain'})) {
}	$can_clone = 1;
}
}	}
}	}
unless ($can_clone) {	unless ($can_clone) {
Line 14538 sub construct_course {	Line 14911 sub construct_course {
#	#
# Open course	# Open course
#	#
my $crstype = lc($args->{'crstype'});	my $showncrstype;
	if ($args->{'crstype'} eq 'Placement') {
	$showncrstype = 'placement test';
	} else {
	$showncrstype = lc($args->{'crstype'});
	}
my %cenv=();	my %cenv=();
$$courseid=&Apache::lonnet::createcourse($args->{'course_domain'},	$$courseid=&Apache::lonnet::createcourse($args->{'course_domain'},
$args->{'cdescr'},	$args->{'cdescr'},
Line 14555 sub construct_course {	Line 14933 sub construct_course {
# Utils::Course. This needs to at least be output as a comment	# Utils::Course. This needs to at least be output as a comment
# if anyone ever decides to not show this, and Utils::Course::new	# if anyone ever decides to not show this, and Utils::Course::new
# will need to be suitably modified.	# will need to be suitably modified.
$outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed;	$outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$showncrstype,$$courseid).$linefeed;
if ($$courseid =~ /^error:/) {	if ($$courseid =~ /^error:/) {
return (0,$outcome);	return (0,$outcome);
}	}
Line 14575 sub construct_course {	Line 14953 sub construct_course {
# Do the cloning	# Do the cloning
#	#
if ($can_clone && $cloneid) {	if ($can_clone && $cloneid) {
$clonemsg = &mt('Cloning [_1] from [_2]',$crstype,$clonehome);	$clonemsg = &mt('Cloning [_1] from [_2]',$showncrstype,$clonehome);
if ($context ne 'auto') {	if ($context ne 'auto') {
$clonemsg = '<span class="LC_success">'.$clonemsg.'</span>';	$clonemsg = '<span class="LC_success">'.$clonemsg.'</span>';
}	}
Line 14880 sub construct_course {	Line 15258 sub construct_course {
$outcome .= ($fatal?$errtext:'write ok').$linefeed;	$outcome .= ($fatal?$errtext:'write ok').$linefeed;
}	}

	#
	# Set params for Placement Tests
	#
	if ($args->{'crstype'} eq 'Placement') {
	my %storecontent;
	my $prefix=$$crsudom.'_'.$$crsunum.'.0.';
	my %defaults = (
	buttonshide => { value => 'yes',
	type => 'string_yesno',},
	type => { value => 'randomizetry',
	type => 'string_questiontype',},
	maxtries => { value => 1,
	type => 'int_pos',},
	problemstatus => { value => 'no',
	type => 'string_problemstatus',},
	);
	foreach my $key (keys(%defaults)) {
	$storecontent{$prefix.$key} = $defaults{$key}{'value'};
	$storecontent{$prefix.$key.'.type'} = $defaults{$key}{'type'};
	}
	&Apache::lonnet::cput
	('resourcedata',\%storecontent,$$crsudom,$$crsunum);
	}

return (1,$outcome);	return (1,$outcome);
}	}

Line 14940 sub generate_code {	Line 15342 sub generate_code {
############################################################	############################################################
############################################################	############################################################

#SD	# Community, Course and Placement Test
# only Community and Course, or anything else?
sub course_type {	sub course_type {
my ($cid) = @_;	my ($cid) = @_;
if (!defined($cid)) {	if (!defined($cid)) {
Line 14959 sub group_term {	Line 15360 sub group_term {
my %names = (	my %names = (
'Course' => 'group',	'Course' => 'group',
'Community' => 'group',	'Community' => 'group',
	'Placement' => 'group',
);	);
return $names{$crstype};	return $names{$crstype};
}	}

sub course_types {	sub course_types {
my @types = ('official','unofficial','community','textbook');	my @types = ('official','unofficial','community','textbook','placement');
my %typename = (	my %typename = (
official => 'Official course',	official => 'Official course',
unofficial => 'Unofficial course',	unofficial => 'Unofficial course',
community => 'Community',	community => 'Community',
textbook => 'Textbook course',	textbook => 'Textbook course',
	placement => 'Placement test',
);	);
return (\@types,\%typename);	return (\@types,\%typename);
}	}
Line 15184 sub init_user_environment {	Line 15587 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','textbook','placement') {
$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 15432 sub build_filters {	Line 15835 sub build_filters {
$createdfilterform = &timebased_select_form('createdfilter',$filter);	$createdfilterform = &timebased_select_form('createdfilter',$filter);
}	}

	my $prefix = $crstype;
	if ($crstype eq 'Placement') {
	$prefix = 'Placement Test'
	}
my %lt = &Apache::lonlocal::texthash(	my %lt = &Apache::lonlocal::texthash(
'cac' => "$crstype Activity",	'cac' => "$prefix Activity",
'ccr' => "$crstype Created",	'ccr' => "$prefix Created",
'cde' => "$crstype Title",	'cde' => "$prefix Title",
'cdo' => "$crstype Domain",	'cdo' => "$prefix Domain",
'ins' => 'Institutional Code',	'ins' => 'Institutional Code',
'inc' => 'Institutional Categorization',	'inc' => 'Institutional Categorization',
'cow' => "$crstype Owner/Co-owner",	'cow' => "$prefix Owner/Co-owner",
'cop' => "$crstype Personnel Includes",	'cop' => "$prefix Personnel Includes",
'cog' => 'Type',	'cog' => 'Type',
);	);

Line 15448 sub build_filters {	Line 15855 sub build_filters {
my $typeval = 'Course';	my $typeval = 'Course';
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$typeval = 'Community';	$typeval = 'Community';
	} elsif ($crstype eq 'Placement') {
	$typeval = 'Placement';
}	}
$typeselectform = '<input type="hidden" name="type" value="'.$typeval.'" />';	$typeselectform = '<input type="hidden" name="type" value="'.$typeval.'" />';
} else {	} else {
Line 15456 sub build_filters {	Line 15865 sub build_filters {
$typeselectform .= ' onchange="'.$onchange.'"';	$typeselectform .= ' onchange="'.$onchange.'"';
}	}
$typeselectform .= '>'."\n";	$typeselectform .= '>'."\n";
foreach my $posstype ('Course','Community') {	foreach my $posstype ('Course','Community','Placement') {
	my $shown;
	if ($posstype eq 'Placement') {
	$shown = &mt('Placement Test');
	} else {
	$shown = &mt($posstype);
	}
$typeselectform.='<option value="'.$posstype.'"'.	$typeselectform.='<option value="'.$posstype.'"'.
($posstype eq $crstype ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";	($posstype eq $crstype ? ' selected="selected" ' : ''). ">".$shown."</option>\n";
}	}
$typeselectform.="</select>";	$typeselectform.="</select>";
}	}
Line 16034 sub update_content_constraints {	Line 16449 sub update_content_constraints {
my ($reqdmajor,$reqdminor) = split(/\./,$curr_reqd_hash{'internal.releaserequired'});	my ($reqdmajor,$reqdminor) = split(/\./,$curr_reqd_hash{'internal.releaserequired'});
my %checkresponsetypes;	my %checkresponsetypes;
foreach my $key (keys(%Apache::lonnet::needsrelease)) {	foreach my $key (keys(%Apache::lonnet::needsrelease)) {
my ($item,$name,$value,$valmatch) = split(/:/,$key);	my ($item,$name,$value) = split(/:/,$key);
if ($item eq 'resourcetag') {	if ($item eq 'resourcetag') {
if ($name eq 'responsetype') {	if ($name eq 'responsetype') {
$checkresponsetypes{$value} = $Apache::lonnet::needsrelease{$key}	$checkresponsetypes{$value} = $Apache::lonnet::needsrelease{$key}
Line 16209 sub symb_to_docspath {	Line 16624 sub symb_to_docspath {
sub captcha_display {	sub captcha_display {
my ($context,$lonhost) = @_;	my ($context,$lonhost) = @_;
my ($output,$error);	my ($output,$error);
my ($captcha,$pubkey,$privkey) = &get_captcha_config($context,$lonhost);	my ($captcha,$pubkey,$privkey,$version) =
	&get_captcha_config($context,$lonhost);
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,$version);
unless ($output) {	unless ($output) {
$error = 'recaptcha';	$error = 'recaptcha';
}	}
}	}
return ($output,$error,$captcha);	return ($output,$error,$captcha,$version);
}	}

sub captcha_response {	sub captcha_response {
my ($context,$lonhost) = @_;	my ($context,$lonhost) = @_;
my ($captcha_chk,$captcha_error);	my ($captcha_chk,$captcha_error);
my ($captcha,$pubkey,$privkey) = &get_captcha_config($context,$lonhost);	my ($captcha,$pubkey,$privkey,$version) = &get_captcha_config($context,$lonhost);
if ($captcha eq 'original') {	if ($captcha eq 'original') {
($captcha_chk,$captcha_error) = &check_captcha();	($captcha_chk,$captcha_error) = &check_captcha();
} elsif ($captcha eq 'recaptcha') {	} elsif ($captcha eq 'recaptcha') {
$captcha_chk = &check_recaptcha($privkey);	$captcha_chk = &check_recaptcha($privkey,$version);
} else {	} else {
$captcha_chk = 1;	$captcha_chk = 1;
}	}
Line 16240 sub captcha_response {	Line 16656 sub captcha_response {

sub get_captcha_config {	sub get_captcha_config {
my ($context,$lonhost) = @_;	my ($context,$lonhost) = @_;
my ($captcha,$pubkey,$privkey,$hashtocheck);	my ($captcha,$pubkey,$privkey,$version,$hashtocheck);
my $hostname = &Apache::lonnet::hostname($lonhost);	my $hostname = &Apache::lonnet::hostname($lonhost);
my $serverhomeID = &Apache::lonnet::get_server_homeID($hostname);	my $serverhomeID = &Apache::lonnet::get_server_homeID($hostname);
my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);	my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
Line 16256 sub get_captcha_config {	Line 16672 sub get_captcha_config {
}	}
if ($privkey && $pubkey) {	if ($privkey && $pubkey) {
$captcha = 'recaptcha';	$captcha = 'recaptcha';
	$version = $hashtocheck->{'recaptchaversion'};
	if ($version ne '2') {
	$version = 1;
	}
} else {	} else {
$captcha = 'original';	$captcha = 'original';
}	}
Line 16273 sub get_captcha_config {	Line 16693 sub get_captcha_config {
$privkey = $domconfhash{$serverhomedom.'.login.recaptchakeys_private'};	$privkey = $domconfhash{$serverhomedom.'.login.recaptchakeys_private'};
if ($privkey && $pubkey) {	if ($privkey && $pubkey) {
$captcha = 'recaptcha';	$captcha = 'recaptcha';
	$version = $domconfhash{$serverhomedom.'.login.recaptchaversion'};
	if ($version ne '2') {
	$version = 1;
	}
} else {	} else {
$captcha = 'original';	$captcha = 'original';
}	}
Line 16280 sub get_captcha_config {	Line 16704 sub get_captcha_config {
$captcha = 'original';	$captcha = 'original';
}	}
}	}
return ($captcha,$pubkey,$privkey);	return ($captcha,$pubkey,$privkey,$version);
}	}

sub create_captcha {	sub create_captcha {
Line 16339 sub check_captcha {	Line 16763 sub check_captcha {
}	}

sub create_recaptcha {	sub create_recaptcha {
my ($pubkey) = @_;	my ($pubkey,$version) = @_;
my $use_ssl;	if ($version >= 2) {
if ($ENV{'SERVER_PORT'} == 443) {	return '<div class="g-recaptcha" data-sitekey="'.$pubkey.'"></div>';
$use_ssl = 1;	} else {
}	my $use_ssl;
my $captcha = Captcha::reCAPTCHA->new;	if ($ENV{'SERVER_PORT'} == 443) {
return $captcha->get_options_setter({theme => 'white'})."\n".	$use_ssl = 1;
$captcha->get_html($pubkey,undef,$use_ssl).	}
&mt('If the text is hard to read, [_1] will replace them.',	my $captcha = Captcha::reCAPTCHA->new;
'<img src="/res/adm/pages/refresh.gif" alt="reCAPTCHA refresh" />').	return $captcha->get_options_setter({theme => 'white'})."\n".
'<br /><br />';	$captcha->get_html($pubkey,undef,$use_ssl).
	&mt('If the text is hard to read, [_1] will replace them.',
	'<img src="/res/adm/pages/refresh.gif" alt="reCAPTCHA refresh" />').
	'<br /><br />';
	}
}	}

sub check_recaptcha {	sub check_recaptcha {
my ($privkey) = @_;	my ($privkey,$version) = @_;
my $captcha_chk;	my $captcha_chk;
my $captcha = Captcha::reCAPTCHA->new;	if ($version >= 2) {
my $captcha_result =	my $ua = LWP::UserAgent->new;
$captcha->check_answer(	$ua->timeout(10);
$privkey,	my %info = (
$ENV{'REMOTE_ADDR'},	secret => $privkey,
$env{'form.recaptcha_challenge_field'},	response => $env{'form.g-recaptcha-response'},
$env{'form.recaptcha_response_field'},	remoteip => $ENV{'REMOTE_ADDR'},
);	);
if ($captcha_result->{is_valid}) {	my $response = $ua->post('https://www.google.com/recaptcha/api/siteverify',\%info);
$captcha_chk = 1;	if ($response->is_success) {
	my $data = JSON::DWIW->from_json($response->decoded_content);
	if (ref($data) eq 'HASH') {
	if ($data->{'success'}) {
	$captcha_chk = 1;
	}
	}
	}
	} else {
	my $captcha = Captcha::reCAPTCHA->new;
	my $captcha_result =
	$captcha->check_answer(
	$privkey,
	$ENV{'REMOTE_ADDR'},
	$env{'form.recaptcha_challenge_field'},
	$env{'form.recaptcha_response_field'},
	);
	if ($captcha_result->{is_valid}) {
	$captcha_chk = 1;
	}
}	}
return $captcha_chk;	return $captcha_chk;
}	}

sub emailusername_info {	sub emailusername_info {
my @fields = ('firstname','lastname','institution','web','location','officialemail');	my @fields = ('firstname','lastname','institution','web','location','officialemail','id');
my %titles = &Apache::lonlocal::texthash (	my %titles = &Apache::lonlocal::texthash (
lastname => 'Last Name',	lastname => 'Last Name',
firstname => 'First Name',	firstname => 'First Name',
Line 16378 sub emailusername_info {	Line 16825 sub emailusername_info {
location => "School's city, state/province, country",	location => "School's city, state/province, country",
web => "School's web address",	web => "School's web address",
officialemail => 'E-mail address at institution (if different)',	officialemail => 'E-mail address at institution (if different)',
	id => 'Student/Employee ID',
);	);
return (\@fields,\%titles);	return (\@fields,\%titles);
}	}
Line 16458 sub des_decrypt {	Line 16906 sub des_decrypt {
} else {	} else {
$cypher=new DES $keybin;	$cypher=new DES $keybin;
}	}
my $plaintext=	my $plaintext='';
$cypher->decrypt(unpack("a8",pack("H16",substr($cyphertext,0,16))));	my $cypherlength = length($cyphertext);
$plaintext.=	my $numchunks = int($cypherlength/32);
$cypher->decrypt(unpack("a8",pack("H16",substr($cyphertext,16,16))));	for (my $j=0; $j<$numchunks; $j++) {
$plaintext=substr($plaintext,1,ord(substr($plaintext,0,1)) );	my $start = $j*32;
	my $cypherblock = substr($cyphertext,$start,32);
	my $chunk =
	$cypher->decrypt(unpack("a8",pack("H16",substr($cypherblock,0,16))));
	$chunk .=
	$cypher->decrypt(unpack("a8",pack("H16",substr($cypherblock,16,16))));
	$chunk=substr($chunk,1,ord(substr($chunk,0,1)) );
	$plaintext .= $chunk;
	}
return $plaintext;	return $plaintext;
}	}

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

Removed from v.1.1222
changed lines
	Added in v.1.1246