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.1209 and 1.1242

version 1.1209, 2015/03/09 19:09:34	version 1.1242, 2016/05/03 22:33:52
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 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 535 ENDAUTHORBRW	Line 540 ENDAUTHORBRW

sub coursebrowser_javascript {	sub coursebrowser_javascript {
my ($domainfilter,$sec_element,$formname,$role_element,$crstype,	my ($domainfilter,$sec_element,$formname,$role_element,$crstype,
$credits_element) = @_;	$credits_element,$instcode) = @_;
my $wintitle = 'Course_Browser';	my $wintitle = 'Course_Browser';
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$wintitle = 'Community_Browser';	$wintitle = 'Community_Browser';
Line 586 sub coursebrowser_javascript {	Line 591 sub coursebrowser_javascript {
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;	url += '&cloner='+ownername+':'+ownerdom;
	if (type == 'Course') {
	url += '&crscode='+document.forms[formid].crscode.value;
	}
	}
	if (formname == 'requestcrs') {
	url += '&crsdom=$domainfilter&crscode=$instcode';
}	}
if (multflag !=null && multflag != '') {	if (multflag !=null && multflag != '') {
url += '&multiple='+multflag;	url += '&multiple='+multflag;
Line 870 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 961 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 983 sub select_datelocale {	Line 997 sub select_datelocale {
$locale_names{$id} = '('.$en_terr.')';	$locale_names{$id} = '('.$en_terr.')';
}	}
}	}
push (@possibles,$id);	$locale_names{$id} = Encode::encode('UTF-8',$locale_names{$id});
}	push(@possibles,$id);
	}
}	}
}	}
foreach my $item (sort(@possibles)) {	foreach my $item (sort(@possibles)) {
Line 994 sub select_datelocale {	Line 1009 sub select_datelocale {
}	}
$output.=">$item";	$output.=">$item";
if ($locale_names{$item} ne '') {	if ($locale_names{$item} ne '') {
$output.=" $locale_names{$item}</option>\n";	$output.=' '.$locale_names{$item};
}	}
$output.="</option>\n";	$output.="</option>\n";
}	}
Line 2264 See lonrights.pm for an example invocati	Line 2279 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 4040 sub get_previous_attempt {	Line 4059 sub get_previous_attempt {
my %lasthash=();	my %lasthash=();
my $version;	my $version;
for ($version=1;$version<=$returnhash{'version'};$version++) {	for ($version=1;$version<=$returnhash{'version'};$version++) {
foreach my $key (sort(split(/\:/,$returnhash{$version.':keys'}))) {	foreach my $key (reverse(sort(split(/\:/,$returnhash{$version.':keys'})))) {
$lasthash{$key}=$returnhash{$version.':'.$key};	if ($key =~ /\.rawrndseed$/) {
	my ($id) = ($key =~ /^(.+)\.rawrndseed$/);
	$lasthash{$id.'.rndseed'} = $returnhash{$version.':'.$key};
	} else {
	$lasthash{$key}=$returnhash{$version.':'.$key};
	}
}	}
}	}
$prevattempts=&start_data_table().&start_data_table_header_row();	$prevattempts=&start_data_table().&start_data_table_header_row();
Line 4161 sub get_previous_attempt {	Line 4185 sub get_previous_attempt {
}	}
} else {	} else {
if ($key =~ /\./) {	if ($key =~ /\./) {
my $value = &format_previous_attempt_value($key,	my $value = $returnhash{$version.':'.$key};
$returnhash{$version.':'.$key});	if ($key =~ /\.rndseed$/) {
$prevattempts.='<td>'.$value.' </td>';	my ($id) = ($key =~ /^(.+)\.[^.]+$/);
	if (exists($returnhash{$version.':'.$id.'.rawrndseed'})) {
	$value = $returnhash{$version.':'.$id.'.rawrndseed'};
	}
	}
	$prevattempts.='<td>'.&format_previous_attempt_value($key,$value).
	' </td>';
} else {	} else {
$prevattempts.='<td> </td>';	$prevattempts.='<td> </td>';
}	}
Line 4172 sub get_previous_attempt {	Line 4202 sub get_previous_attempt {
} else {	} else {
foreach my $key (sort(keys(%lasthash))) {	foreach my $key (sort(keys(%lasthash))) {
next if ($key =~ /\.foilorder$/);	next if ($key =~ /\.foilorder$/);
my $value = &format_previous_attempt_value($key,	my $value = $returnhash{$version.':'.$key};
$returnhash{$version.':'.$key});	if ($key =~ /\.rndseed$/) {
$prevattempts.='<td>'.$value.' </td>';	my ($id) = ($key =~ /^(.+)\.[^.]+$/);
	if (exists($returnhash{$version.':'.$id.'.rawrndseed'})) {
	$value = $returnhash{$version.':'.$id.'.rawrndseed'};
	}
	}
	$prevattempts.='<td>'.&format_previous_attempt_value($key,$value).
	' </td>';
}	}
}	}
$prevattempts.=&end_data_table_row();	$prevattempts.=&end_data_table_row();
Line 4931 sub blocking_status {	Line 4967 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 4952 END_MYBLOCK	Line 4988 END_MYBLOCK

my $popupUrl = "/adm/blockingstatus/$querystring";	my $popupUrl = "/adm/blockingstatus/$querystring";
my $text = &mt('Communication Blocked');	my $text = &mt('Communication Blocked');
	my $class = 'LC_comblock';
if ($activity eq 'docs') {	if ($activity eq 'docs') {
$text = &mt('Content Access Blocked');	$text = &mt('Content Access Blocked');
	$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='LC_comblock'>	<div class='$class'>
<a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'	<a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'
title='$text'>	title='$text'>
<img class='LC_noBorder LC_middle' title='$text' src='/res/adm/pages/comblock.png' alt='$text'/></a>	<img class='LC_noBorder LC_middle' title='$text' src='/res/adm/pages/comblock.png' alt='$text'/></a>
Line 4979 sub check_ip_acc {	Line 5019 sub check_ip_acc {
if (!defined($acc) \|\| $acc =~ /^\s$/ \|\| $acc =~/^\sno\s*$/i) {	if (!defined($acc) \|\| $acc =~ /^\s$/ \|\| $acc =~/^\sno\s*$/i) {
return 1;	return 1;
}	}
my $allowed=0;	my $allowed;
my $ip=$env{'request.host'} \|\| $ENV{'REMOTE_ADDR'} \|\| $clientip;	my $ip=$env{'request.host'} \|\| $ENV{'REMOTE_ADDR'} \|\| $clientip;

my $name;	my $name;
foreach my $pattern (split(',',$acc)) {	my %access = (
$pattern =~ s/^\s*//;	allowfrom => 1,
$pattern =~ s/\s*$//;	denyfrom => 0,
	);
	my @allows;
	my @denies;
	foreach my $item (split(',',$acc)) {
	$item =~ s/^\s*//;
	$item =~ s/\s*$//;
	my $pattern;
	if ($item =~ /^\!(.+)$/) {
	push(@denies,$1);
	} else {
	push(@allows,$item);
	}
	}
	my $numdenies = scalar(@denies);
	my $numallows = scalar(@allows);
	my $count = 0;
	foreach my $pattern (@denies,@allows) {
	$count ++;
	my $acctype = 'allowfrom';
	if ($count <= $numdenies) {
	$acctype = 'denyfrom';
	}
if ($pattern =~ /\*$/) {	if ($pattern =~ /\*$/) {
#35.8.*	#35.8.*
$pattern=~s/\*//;	$pattern=~s/\*//;
if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }	if ($ip =~ /^\Q$pattern\E/) { $allowed=$access{$acctype}; }
} elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {	} elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {
#35.8.3.[34-56]	#35.8.3.[34-56]
my $low=$2;	my $low=$2;
Line 4997 sub check_ip_acc {	Line 5059 sub check_ip_acc {
$pattern=$1;	$pattern=$1;
if ($ip =~ /^\Q$pattern\E/) {	if ($ip =~ /^\Q$pattern\E/) {
my $last=(split(/\./,$ip))[3];	my $last=(split(/\./,$ip))[3];
if ($last <=$high && $last >=$low) { $allowed=1; }	if ($last <=$high && $last >=$low) { $allowed=$access{$acctype}; }
}	}
} elsif ($pattern =~ /^\*/) {	} elsif ($pattern =~ /^\*/) {
#*.msu.edu	#*.msu.edu
Line 5007 sub check_ip_acc {	Line 5069 sub check_ip_acc {
my $netaddr=inet_aton($ip);	my $netaddr=inet_aton($ip);
($name)=gethostbyaddr($netaddr,AF_INET);	($name)=gethostbyaddr($netaddr,AF_INET);
}	}
if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }	if ($name =~ /\Q$pattern\E$/i) { $allowed=$access{$acctype}; }
} elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {	} elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
#127.0.0.1	#127.0.0.1
if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }	if ($ip =~ /^\Q$pattern\E/) { $allowed=$access{$acctype}; }
} else {	} else {
#some.name.com	#some.name.com
if (!defined($name)) {	if (!defined($name)) {
Line 5018 sub check_ip_acc {	Line 5080 sub check_ip_acc {
my $netaddr=inet_aton($ip);	my $netaddr=inet_aton($ip);
($name)=gethostbyaddr($netaddr,AF_INET);	($name)=gethostbyaddr($netaddr,AF_INET);
}	}
if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }	if ($name =~ /\Q$pattern\E$/i) { $allowed=$access{$acctype}; }
	}
	if ($allowed =~ /^(0\|1)$/) { last; }
	}
	if ($allowed eq '') {
	if ($numdenies && !$numallows) {
	$allowed = 1;
	} else {
	$allowed = 0;
}	}
if ($allowed) { last; }
}	}
return $allowed;	return $allowed;
}	}
Line 5419 Inputs:	Line 5488 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 5489 sub bodytag {	Line 5555 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 5513 sub bodytag {	Line 5579 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 5524 sub bodytag {	Line 5600 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 5642 sub endbodytag {	Line 5718 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 5817 div.LC_confirm_box .LC_success img {	Line 5892 div.LC_confirm_box .LC_success img {
vertical-align: middle;	vertical-align: middle;
}	}

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

.LC_icon {	.LC_icon {
border: none;	border: none;
vertical-align: middle;	vertical-align: middle;
Line 5922 ul.LC_breadcrumb_tools_outerlist li {	Line 6002 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 6795 div.LC_edit_problem_footer,	Line 6881 div.LC_edit_problem_footer,
div.LC_edit_problem_footer div,	div.LC_edit_problem_footer div,
div.LC_edit_problem_editxml_header,	div.LC_edit_problem_editxml_header,
div.LC_edit_problem_editxml_header div {	div.LC_edit_problem_editxml_header div {
margin-top: 5px;
z-index: 100;	z-index: 100;
}	}

Line 6812 table.LC_edit_problem_header_title {	Line 6897 table.LC_edit_problem_header_title {
background: $tabbg;	background: $tabbg;
}	}

div.LC_edit_problem_discards {
float: left;
}

div.LC_edit_actionbar {	div.LC_edit_actionbar {
margin: -5px 0px 0px 0px !important;
background-color: $sidebg;	background-color: $sidebg;
height: 31px;	margin: 0;
	padding: 0;
	line-height: 200%;
}	}

div.LC_edit_problem_saves {	div.LC_edit_actionbar div{
float: right;	padding: 0;
padding-bottom: 5px;	margin: 0;
	display: inline-block;
}	}

.LC_edit_opt {	.LC_edit_opt {
Line 6931 fieldset {	Line 7014 fieldset {
/* overflow: hidden; */	/* overflow: hidden; */
}	}

	article.geogebraweb div {
	margin: 0;
	}

fieldset > legend {	fieldset > legend {
font-weight: bold;	font-weight: bold;
padding: 0 5px 0 5px;	padding: 0 5px 0 5px;
Line 7588 ul.LC_funclist li {	Line 7675 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 7608 span.roman {font-family: serif; font-sty	Line 7705 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 7700 sub headtag {	Line 7878 sub headtag {
<meta http-equiv="pragma" content="no-cache" />	<meta http-equiv="pragma" content="no-cache" />
<meta http-equiv="Refresh" content="$time; url=$url" />	<meta http-equiv="Refresh" content="$time; url=$url" />
ADDMETA	ADDMETA
	} else {
	unless (($args->{'frameset'}) \|\| ($args->{'js_ready'}) \|\| ($args->{'only_body'}) \|\| ($args->{'no_nav_bar'})) {
	my $requrl = $env{'request.uri'};
	if ($requrl eq '') {
	$requrl = $ENV{'REQUEST_URI'};
	$requrl =~ s/\?.+$//;
	}
	unless (($requrl =~ m{^/adm/(?:switchserver\|login\|authenticate\|logout\|groupsort\|cleanup\|helper\|slotrequest\|grades)(\?\|$)}) \|\|
	(($requrl =~ m{^/res/}) && (($env{'form.submitted'} eq 'scantron') \|\|
	($env{'form.grade_symb'}) \|\| ($Apache::lonhomework::scantronmode)))) {
	my $dom_in_use = $Apache::lonnet::perlvar{'lonDefDomain'};
	unless (&Apache::lonnet::allowed('mau',$dom_in_use)) {
	my %domdefs = &Apache::lonnet::get_domain_defaults($dom_in_use);
	if (ref($domdefs{'offloadnow'}) eq 'HASH') {
	my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
	if ($domdefs{'offloadnow'}{$lonhost}) {
	my $newserver = &Apache::lonnet::spareserver(30000,undef,1,$dom_in_use);
	if (($newserver) && ($newserver ne $lonhost)) {
	my $numsec = 5;
	my $timeout = $numsec * 1000;
	my ($newurl,$locknum,%locks,$msg);
	if ($env{'request.role.adv'}) {
	($locknum,%locks) = &Apache::lonnet::get_locks();
	}
	my $disable_submit = 0;
	if ($requrl =~ /$LONCAPA::assess_re/) {
	$disable_submit = 1;
	}
	if ($locknum) {
	my @lockinfo = sort(values(%locks));
	$msg = &mt('Once the following tasks are complete: ')."\\n".
	join(", ",sort(values(%locks)))."\\n".
	&mt('your session will be transferred to a different server, after you click "Roles".');
	} else {
	if (($requrl =~ m{^/res/}) && ($env{'form.submitted'} =~ /^part_/)) {
	$msg = &mt('Your LON-CAPA submission has been recorded')."\\n";
	}
	$msg .= &mt('Your current LON-CAPA session will be transferred to a different server in [quant,_1,second].',$numsec);
	$newurl = '/adm/switchserver?otherserver='.$newserver;
	if (($env{'request.role'}) && ($env{'request.role'} ne 'cm')) {
	$newurl .= '&role='.$env{'request.role'};
	}
	if ($env{'request.symb'}) {
	$newurl .= '&symb='.$env{'request.symb'};
	} else {
	$newurl .= '&origurl='.$requrl;
	}
	}
	&js_escape(\$msg);
	$result.=<<OFFLOAD
	<meta http-equiv="pragma" content="no-cache" />
	<script type="text/javascript">
	// <![CDATA[
	function LC_Offload_Now() {
	var dest = "$newurl";
	if (dest != '') {
	window.location.href="$newurl";
	}
	}
	\$(document).ready(function () {
	window.alert('$msg');
	if ($disable_submit) {
	\$(".LC_hwk_submit").prop("disabled", true);
	\$( ".LC_textline" ).prop( "readonly", "readonly");
	}
	setTimeout('LC_Offload_Now()', $timeout);
	});
	// ]]>
	</script>
	OFFLOAD
	}
	}
	}
	}
	}
	}
}	}
if (!defined($title)) {	if (!defined($title)) {
$title = 'The LearningOnline Network with CAPA';	$title = 'The LearningOnline Network with CAPA';
Line 7713 ADDMETA	Line 7967 ADDMETA
$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 7895 $args - additional optional args support	Line 8155 $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 7969 sub start_page {	Line 8226 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 9086 Incoming parameters:	Line 9346 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 9161 sub get_user_quota {	Line 9421 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 9309 Inputs: 7	Line 9570 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 9407 sub user_picker {	Line 9668 sub user_picker {
}	}
$srchterm = $srch->{'srchterm'};	$srchterm = $srch->{'srchterm'};
}	}
my %lt=&Apache::lonlocal::texthash(	my %html_lt=&Apache::lonlocal::texthash(
'usr' => 'Search criteria',	'usr' => 'Search criteria',
'doma' => 'Domain/institution to search',	'doma' => 'Domain/institution to search',
'uname' => 'username',	'uname' => 'username',
Line 9420 sub user_picker {	Line 9681 sub user_picker {
'exact' => 'is',	'exact' => 'is',
'contains' => 'contains',	'contains' => 'contains',
'begins' => 'begins with',	'begins' => 'begins with',
	);
	my %js_lt=&Apache::lonlocal::texthash(
'youm' => "You must include some text to search for.",	'youm' => "You must include some text to search for.",
'thte' => "The text you are searching for must contain at least two characters when using a 'begins' type search.",	'thte' => "The text you are searching for must contain at least two characters when using a 'begins' type search.",
'thet' => "The text you are searching for must contain at least three characters when using a 'contains' type search.",	'thet' => "The text you are searching for must contain at least three characters when using a 'contains' type search.",
Line 9429 sub user_picker {	Line 9692 sub user_picker {
'whse' => "When searching by last,first you must include at least one character in the first name.",	'whse' => "When searching by last,first you must include at least one character in the first name.",
'thfo' => "The following need to be corrected before the search can be run:",	'thfo' => "The following need to be corrected before the search can be run:",
);	);
	&html_escape(\%html_lt);
	&js_escape(\%js_lt);
my $domform = &select_dom_form($currdom,'srchdomain',1,1);	my $domform = &select_dom_form($currdom,'srchdomain',1,1);
my $srchinsel = ' <select name="srchin">';	my $srchinsel = ' <select name="srchin">';

Line 9443 sub user_picker {	Line 9708 sub user_picker {
next if ($option eq 'crs' && !$env{'request.course.id'});	next if ($option eq 'crs' && !$env{'request.course.id'});
if ($curr_selected{'srchin'} eq $option) {	if ($curr_selected{'srchin'} eq $option) {
$srchinsel .= '	$srchinsel .= '
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';	<option value="'.$option.'" selected="selected">'.$html_lt{$option}.'</option>';
} else {	} else {
$srchinsel .= '	$srchinsel .= '
<option value="'.$option.'">'.$lt{$option}.'</option>';	<option value="'.$option.'">'.$html_lt{$option}.'</option>';
}	}
}	}
$srchinsel .= "\n </select>\n";	$srchinsel .= "\n </select>\n";
Line 9455 sub user_picker {	Line 9720 sub user_picker {
foreach my $option ('lastname','lastfirst','uname') {	foreach my $option ('lastname','lastfirst','uname') {
if ($curr_selected{'srchby'} eq $option) {	if ($curr_selected{'srchby'} eq $option) {
$srchbysel .= '	$srchbysel .= '
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';	<option value="'.$option.'" selected="selected">'.$html_lt{$option}.'</option>';
} else {	} else {
$srchbysel .= '	$srchbysel .= '
<option value="'.$option.'">'.$lt{$option}.'</option>';	<option value="'.$option.'">'.$html_lt{$option}.'</option>';
}	}
}	}
$srchbysel .= "\n </select>\n";	$srchbysel .= "\n </select>\n";
Line 9467 sub user_picker {	Line 9732 sub user_picker {
foreach my $option ('begins','contains','exact') {	foreach my $option ('begins','contains','exact') {
if ($curr_selected{'srchtype'} eq $option) {	if ($curr_selected{'srchtype'} eq $option) {
$srchtypesel .= '	$srchtypesel .= '
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';	<option value="'.$option.'" selected="selected">'.$html_lt{$option}.'</option>';
} else {	} else {
$srchtypesel .= '	$srchtypesel .= '
<option value="'.$option.'">'.$lt{$option}.'</option>';	<option value="'.$option.'">'.$html_lt{$option}.'</option>';
}	}
}	}
$srchtypesel .= "\n </select>\n";	$srchtypesel .= "\n </select>\n";
Line 9555 function validateEntry(callingForm) {	Line 9820 function validateEntry(callingForm) {

if (srchterm == "") {	if (srchterm == "") {
checkok = 0;	checkok = 0;
msg += "$lt{'youm'}\\n";	msg += "$js_lt{'youm'}\\n";
}	}

if (srchtype== 'begins') {	if (srchtype== 'begins') {
if (srchterm.length < 2) {	if (srchterm.length < 2) {
checkok = 0;	checkok = 0;
msg += "$lt{'thte'}\\n";	msg += "$js_lt{'thte'}\\n";
}	}
}	}

if (srchtype== 'contains') {	if (srchtype== 'contains') {
if (srchterm.length < 3) {	if (srchterm.length < 3) {
checkok = 0;	checkok = 0;
msg += "$lt{'thet'}\\n";	msg += "$js_lt{'thet'}\\n";
}	}
}	}
if (srchin == 'instd') {	if (srchin == 'instd') {
if (srchdomain == '') {	if (srchdomain == '') {
checkok = 0;	checkok = 0;
msg += "$lt{'yomc'}\\n";	msg += "$js_lt{'yomc'}\\n";
}	}
}	}
if (srchin == 'dom') {	if (srchin == 'dom') {
if (srchdomain == '') {	if (srchdomain == '') {
checkok = 0;	checkok = 0;
msg += "$lt{'ymcd'}\\n";	msg += "$js_lt{'ymcd'}\\n";
}	}
}	}
if (srchby == 'lastfirst') {	if (srchby == 'lastfirst') {
if (srchterm.indexOf(",") == -1) {	if (srchterm.indexOf(",") == -1) {
checkok = 0;	checkok = 0;
msg += "$lt{'whus'}\\n";	msg += "$js_lt{'whus'}\\n";
}	}
if (srchterm.indexOf(",") == srchterm.length -1) {	if (srchterm.indexOf(",") == srchterm.length -1) {
checkok = 0;	checkok = 0;
msg += "$lt{'whse'}\\n";	msg += "$js_lt{'whse'}\\n";
}	}
}	}
if (checkok == 0) {	if (checkok == 0) {
alert("$lt{'thfo'}\\n"+msg);	alert("$js_lt{'thfo'}\\n"+msg);
return;	return;
}	}
if (checkok == 1) {	if (checkok == 1) {
Line 9612 $new_user_create	Line 9877 $new_user_create
END_BLOCK	END_BLOCK

$output .= &Apache::lonhtmlcommon::start_pick_box().	$output .= &Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title($lt{'doma'}).	&Apache::lonhtmlcommon::row_title($html_lt{'doma'}).
$domform.	$domform.
&Apache::lonhtmlcommon::row_closure().	&Apache::lonhtmlcommon::row_closure().
&Apache::lonhtmlcommon::row_title($lt{'usr'}).	&Apache::lonhtmlcommon::row_title($html_lt{'usr'}).
$srchbysel.	$srchbysel.
$srchtypesel.	$srchtypesel.
'<input type="text" size="15" name="srchterm" value="'.$srchterm.'" />'.	'<input type="text" size="15" name="srchterm" value="'.$srchterm.'" />'.
Line 9628 END_BLOCK	Line 9893 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 9963 future_reservable - ref to hash of stude	Line 10332 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 13717 sub build_recipient_list {	Line 14108 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 13819 sub extract_categories {	Line 14291 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 13957 sub assign_categories_table {	Line 14431 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 13971 sub assign_categories_table {	Line 14447 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 14285 sub check_clone {	Line 14763 sub check_clone {
(&Apache::lonnet::allowed('ccc',$env{'request.role.domain'}))) {	(&Apache::lonnet::allowed('ccc',$env{'request.role.domain'}))) {
$can_clone = 1;	$can_clone = 1;
} else {	} else {
my %clonehash = &Apache::lonnet::get('environment',['cloners'],	my %clonehash = &Apache::lonnet::get('environment',['cloners','internal.coursecode'],
$args->{'clonedomain'},$args->{'clonecourse'});	$args->{'clonedomain'},$args->{'clonecourse'});
my @cloners = split(/,/,$clonehash{'cloners'});	if ($clonehash{'cloners'} eq '') {
if (grep(/^\*$/,@cloners)) {	my %domdefs = &Apache::lonnet::get_domain_defaults($args->{'course_domain'});
$can_clone = 1;	if ($domdefs{'canclone'}) {
} elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {	unless ($domdefs{'canclone'} eq 'none') {
$can_clone = 1;	if ($domdefs{'canclone'} eq 'domain') {
	if ($args->{'ccdomain'} eq $args->{'clonedomain'}) {
	$can_clone = 1;
	}
	} elsif (($clonehash{'internal.coursecode'}) && ($args->{'crscode'}) &&
	($args->{'clonedomain'} eq $args->{'course_domain'})) {
	if (&Apache::lonnet::default_instcode_cloning($args->{'clonedomain'},$domdefs{'canclone'},
	$clonehash{'internal.coursecode'},$args->{'crscode'})) {
	$can_clone = 1;
	}
	}
	}
	}
} else {	} else {
	my @cloners = split(/,/,$clonehash{'cloners'});
	if (grep(/^\*$/,@cloners)) {
	$can_clone = 1;
	} elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {
	$can_clone = 1;
	} elsif (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners)) {
	$can_clone = 1;
	}
	unless ($can_clone) {
	if (($clonehash{'internal.coursecode'}) && ($args->{'crscode'}) &&
	($args->{'clonedomain'} eq $args->{'course_domain'})) {
	my (%gotdomdefaults,%gotcodedefaults);
	foreach my $cloner (@cloners) {
	if (($cloner ne '') && ($cloner !~ /^\\:$match_domain$/) &&
	($cloner !~ /^$match_username\:$match_domain$/) && ($cloner ne '')) {
	my (%codedefaults,@code_order);
	if (ref($gotcodedefaults{$args->{'clonedomain'}}) eq 'HASH') {
	if (ref($gotcodedefaults{$args->{'clonedomain'}}{'defaults'}) eq 'HASH') {
	%codedefaults = %{$gotcodedefaults{$args->{'clonedomain'}}{'defaults'}};
	}
	if (ref($gotcodedefaults{$args->{'clonedomain'}}{'order'}) eq 'ARRAY') {
	@code_order = @{$gotcodedefaults{$args->{'clonedomain'}}{'order'}};
	}
	} else {
	&Apache::lonnet::auto_instcode_defaults($args->{'clonedomain'},
	\%codedefaults,
	\@code_order);
	$gotcodedefaults{$args->{'clonedomain'}}{'defaults'} = \%codedefaults;
	$gotcodedefaults{$args->{'clonedomain'}}{'order'} = \@code_order;
	}
	if (@code_order > 0) {
	if (&Apache::lonnet::check_instcode_cloning(\%codedefaults,\@code_order,
	$cloner,$clonehash{'internal.coursecode'},
	$args->{'crscode'})) {
	$can_clone = 1;
	last;
	}
	}
	}
	}
	}
	}
	}
	unless ($can_clone) {
my $ccrole = 'cc';	my $ccrole = 'cc';
if ($args->{'crstype'} eq 'Community') {	if ($args->{'crstype'} eq 'Community') {
$ccrole = 'co';	$ccrole = 'co';
}	}
my %roleshash =	my %roleshash =
&Apache::lonnet::get_my_roles($args->{'ccuname'},	&Apache::lonnet::get_my_roles($args->{'ccuname'},
$args->{'ccdomain'},	$args->{'ccdomain'},
'userroles',['active'],[$ccrole],	'userroles',['active'],[$ccrole],
[$args->{'clonedomain'}]);	[$args->{'clonedomain'}]);
if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) \|\| (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {	if ($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) {
$can_clone = 1;	$can_clone = 1;
} elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},$args->{'ccuname'},$args->{'ccdomain'})) {	} elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},
	$args->{'ccuname'},$args->{'ccdomain'})) {
$can_clone = 1;	$can_clone = 1;
	}
	}
	unless ($can_clone) {
	if ($args->{'crstype'} eq 'Community') {
	$clonemsg = &mt('No new community created.').$linefeed.&mt('The new community could not be cloned from the existing community because the new community owner ([_1]) does not have cloning rights in the existing community ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
} else {	} else {
if ($args->{'crstype'} eq 'Community') {	$clonemsg = &mt('No new course created.').$linefeed.&mt('The new course could not be cloned from the existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
$clonemsg = &mt('No new community created.').$linefeed.&mt('The new community could not be cloned from the existing community because the new community owner ([_1]) does not have cloning rights in the existing community ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});	}
} else {
$clonemsg = &mt('No new course created.').$linefeed.&mt('The new course could not be cloned from the existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
}
}
}	}
}	}
}	}
Line 14348 sub construct_course {	Line 14884 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 14365 sub construct_course {	Line 14906 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 14385 sub construct_course {	Line 14926 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 14690 sub construct_course {	Line 15231 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 14750 sub generate_code {	Line 15315 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 14769 sub group_term {	Line 15333 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 14994 sub init_user_environment {	Line 15560 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 15242 sub build_filters {	Line 15808 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 15258 sub build_filters {	Line 15828 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 15266 sub build_filters {	Line 15838 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 15525 cloneruname - optional username of new c	Line 16103 cloneruname - optional username of new c

clonerudom - optional domain of new course owner	clonerudom - optional domain of new course owner

domcloner - Optional "domcloner" flag; has value=1 if user has ccc priv in domain being filtered by,	domcloner - optional "domcloner" flag; has value=1 if user has ccc priv in domain being filtered by,
(used when DC is using course creation form)	(used when DC is using course creation form)

codetitles - reference to array of titles of components in institutional codes (official courses).	codetitles - reference to array of titles of components in institutional codes (official courses).

	cc_clone - escaped comma separated list of courses for which course cloner has active CC role
	(and so can clone automatically)

	reqcrsdom - domain of new course, where search_courses is used to identify potential courses to clone

	reqinstcode - institutional code of new course, where search_courses is used to identify potential
	courses to clone

Returns: %courses - hash of courses satisfying search criteria, keys = course IDs, values are corresponding colon-separated escaped description, institutional code, owner and type.	Returns: %courses - hash of courses satisfying search criteria, keys = course IDs, values are corresponding colon-separated escaped description, institutional code, owner and type.

Line 15540 Side Effects: None	Line 16125 Side Effects: None


sub search_courses {	sub search_courses {
my ($dom,$type,$filter,$numtitles,$cloneruname,$clonerudom,$domcloner,$codetitles) = @_;	my ($dom,$type,$filter,$numtitles,$cloneruname,$clonerudom,$domcloner,$codetitles,
	$cc_clone,$reqcrsdom,$reqinstcode) = @_;
my (%courses,%showcourses,$cloner);	my (%courses,%showcourses,$cloner);
if (($filter->{'ownerfilter'} ne '') \|\|	if (($filter->{'ownerfilter'} ne '') \|\|
($filter->{'ownerdomfilter'} ne '')) {	($filter->{'ownerdomfilter'} ne '')) {
Line 15588 sub search_courses {	Line 16174 sub search_courses {
$filter->{'combownerfilter'},	$filter->{'combownerfilter'},
$filter->{'coursefilter'},	$filter->{'coursefilter'},
undef,undef,$type,$regexpok,undef,undef,	undef,undef,$type,$regexpok,undef,undef,
undef,undef,$cloner,$env{'form.cc_clone'},	undef,undef,$cloner,$cc_clone,
$filter->{'cloneableonly'},	$filter->{'cloneableonly'},
$createdbefore,$createdafter,undef,	$createdbefore,$createdafter,undef,
$domcloner);	$domcloner,undef,$reqcrsdom,$reqinstcode);
if (($filter->{'personfilter'} ne '') && ($filter->{'persondomfilter'} ne '')) {	if (($filter->{'personfilter'} ne '') && ($filter->{'persondomfilter'} ne '')) {
my $ccrole;	my $ccrole;
if ($type eq 'Community') {	if ($type eq 'Community') {
Line 16011 sub symb_to_docspath {	Line 16597 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 16042 sub captcha_response {	Line 16629 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 16058 sub get_captcha_config {	Line 16645 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 16075 sub get_captcha_config {	Line 16666 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 16082 sub get_captcha_config {	Line 16677 sub get_captcha_config {
$captcha = 'original';	$captcha = 'original';
}	}
}	}
return ($captcha,$pubkey,$privkey);	return ($captcha,$pubkey,$privkey,$version);
}	}

sub create_captcha {	sub create_captcha {
Line 16141 sub check_captcha {	Line 16736 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 either word 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;
}	}
Line 16260 sub des_decrypt {	Line 16878 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.1209
changed lines
	Added in v.1.1242