loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.1075.2.105 and 1.1075.2.118

version 1.1075.2.105, 2016/08/07 20:56:23	version 1.1075.2.118, 2016/11/13 17:42:13
Line 76 use DateTime::Locale;	Line 76 use DateTime::Locale;
use Encode();	use Encode();
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

Line 934 ENDSCRT	Line 936 ENDSCRT
}	}

sub select_timezone {	sub select_timezone {
my ($name,$selected,$onchange,$includeempty)=@_;	my ($name,$selected,$onchange,$includeempty,$disabled)=@_;
my $output='<select name="'.$name.'" '.$onchange.'>'."\n";	my $output='<select name="'.$name.'" '.$onchange.$disabled.'>'."\n";
if ($includeempty) {	if ($includeempty) {
$output .= '<option value=""';	$output .= '<option value=""';
if (($selected eq '') \|\| ($selected eq 'local')) {	if (($selected eq '') \|\| ($selected eq 'local')) {
Line 956 sub select_timezone {	Line 958 sub select_timezone {
}	}

sub select_datelocale {	sub select_datelocale {
my ($name,$selected,$onchange,$includeempty)=@_;	my ($name,$selected,$onchange,$includeempty,$disabled)=@_;
my $output='<select name="'.$name.'" '.$onchange.'>'."\n";	my $output='<select name="'.$name.'" '.$onchange.$disabled.'>'."\n";
if ($includeempty) {	if ($includeempty) {
$output .= '<option value=""';	$output .= '<option value=""';
if ($selected eq '') {	if ($selected eq '') {
Line 1009 sub select_datelocale {	Line 1011 sub select_datelocale {
}	}

sub select_language {	sub select_language {
my ($name,$selected,$includeempty) = @_;	my ($name,$selected,$includeempty,$noedit) = @_;
my %langchoices;	my %langchoices;
if ($includeempty) {	if ($includeempty) {
%langchoices = ('' => 'No language preference');	%langchoices = ('' => 'No language preference');
Line 1021 sub select_language {	Line 1023 sub select_language {
}	}
}	}
%langchoices = &Apache::lonlocal::texthash(%langchoices);	%langchoices = &Apache::lonlocal::texthash(%langchoices);
return &select_form($selected,$name,\%langchoices);	return &select_form($selected,$name,\%langchoices,undef,$noedit);
}	}

=pod	=pod
Line 1742 RESIZE	Line 1744 RESIZE

}	}

	sub colorfuleditor_js {
	return <<"COLORFULEDIT"
	<script type="text/javascript">
	// <![CDATA[>
	function fold_box(curDepth, lastresource){

	// we need a list because there can be several blocks you need to fold in one tag
	var block = document.getElementsByName('foldblock_'+curDepth);
	// but there is only one folding button per tag
	var foldbutton = document.getElementById('folding_btn_'+curDepth);

	if(block.item(0).style.display == 'none'){

	foldbutton.value = '@{[&mt("Hide")]}';
	for (i = 0; i < block.length; i++){
	block.item(i).style.display = '';
	}
	}else{

	foldbutton.value = '@{[&mt("Show")]}';
	for (i = 0; i < block.length; i++){
	// block.item(i).style.visibility = 'collapse';
	block.item(i).style.display = 'none';
	}
	};
	saveState(lastresource);
	}

	function saveState (lastresource) {

	var tag_list = getTagList();
	if(tag_list != null){
	var timestamp = new Date().getTime();
	var key = lastresource;

	// the value pattern is: 'time;key1,value1;key2,value2; ... '
	// starting with timestamp
	var value = timestamp+';';

	// building the list of key-value pairs
	for(var i = 0; i < tag_list.length; i++){
	value += tag_list[i]+',';
	value += document.getElementsByName(tag_list[i])[0].style.display+';';
	}

	// only iterate whole storage if nothing to override
	if(localStorage.getItem(key) == null){

	// prevent storage from growing large
	if(localStorage.length > 50){
	var regex_getTimestamp = /^(?:\d)+;/;
	var oldest_timestamp = regex_getTimestamp.exec(localStorage.key(0));
	var oldest_key;

	for(var i = 1; i < localStorage.length; i++){
	if (regex_getTimestamp.exec(localStorage.key(i)) < oldest_timestamp) {
	oldest_key = localStorage.key(i);
	oldest_timestamp = regex_getTimestamp.exec(oldest_key);
	}
	}
	localStorage.removeItem(oldest_key);
	}
	}
	localStorage.setItem(key,value);
	}
	}

	// restore folding status of blocks (on page load)
	function restoreState (lastresource) {
	if(localStorage.getItem(lastresource) != null){
	var key = lastresource;
	var value = localStorage.getItem(key);
	var regex_delTimestamp = /^\d+;/;

	value.replace(regex_delTimestamp, '');

	var valueArr = value.split(';');
	var pairs;
	var elements;
	for (var i = 0; i < valueArr.length; i++){
	pairs = valueArr[i].split(',');
	elements = document.getElementsByName(pairs[0]);

	for (var j = 0; j < elements.length; j++){
	elements[j].style.display = pairs[1];
	if (pairs[1] == "none"){
	var regex_id = /([_\\d]+)\$/;
	regex_id.exec(pairs[0]);
	document.getElementById("folding_btn"+RegExp.\$1).value = "Show";
	}
	}
	}
	}
	}

	function getTagList () {

	var stringToSearch = document.lonhomework.innerHTML;

	var ret = new Array();
	var regex_findBlock = /(foldblock_.*?)"/g;
	var tag_list = stringToSearch.match(regex_findBlock);

	if(tag_list != null){
	for(var i = 0; i < tag_list.length; i++){
	ret.push(tag_list[i].replace(/"/, ''));
	}
	}
	return ret;
	}

	function saveScrollPosition (resource) {
	var tag_list = getTagList();

	// we dont always want to jump to the first block
	// 170 is roughly above the "Problem Editing" header. we just want to save if the user scrolled down further than this
	if(\$(window).scrollTop() > 170){
	if(tag_list != null){
	var result;
	for(var i = 0; i < tag_list.length; i++){
	if(isElementInViewport(tag_list[i])){
	result += tag_list[i]+';';
	}
	}
	sessionStorage.setItem('anchor_'+resource, result);
	}
	} else {
	// we dont need to save zero, just delete the item to leave everything tidy
	sessionStorage.removeItem('anchor_'+resource);
	}
	}

	function restoreScrollPosition(resource){

	var elem = sessionStorage.getItem('anchor_'+resource);
	if(elem != null){
	var tag_list = elem.split(';');
	var elem_list;

	for(var i = 0; i < tag_list.length; i++){
	elem_list = document.getElementsByName(tag_list[i]);

	if(elem_list.length > 0){
	elem = elem_list[0];
	break;
	}
	}
	elem.scrollIntoView();
	}
	}

	function isElementInViewport(el) {

	// change to last element instead of first
	var elem = document.getElementsByName(el);
	var rect = elem[0].getBoundingClientRect();

	return (
	rect.top >= 0 &&
	rect.left >= 0 &&
	rect.bottom <= (window.innerHeight \|\| document.documentElement.clientHeight) && /or $(window).height() /
	rect.right <= (window.innerWidth \|\| document.documentElement.clientWidth) /or $(window).width() /
	);
	}

	function autosize(depth){
	var cmInst = window['cm'+depth];
	var fitsizeButton = document.getElementById('fitsize'+depth);

	// is fixed size, switching to dynamic
	if (sessionStorage.getItem("autosized_"+depth) == null) {
	cmInst.setSize("","auto");
	fitsizeButton.value = "@{[&mt('Fixed size')]}";
	sessionStorage.setItem("autosized_"+depth, "yes");

	// is dynamic size, switching to fixed
	} else {
	cmInst.setSize("","300px");
	fitsizeButton.value = "@{[&mt('Dynamic size')]}";
	sessionStorage.removeItem("autosized_"+depth);
	}
	}



	// ]]>
	</script>
	COLORFULEDIT
	}

	sub xmleditor_js {
	return <<XMLEDIT
	<script type="text/javascript" src="/adm/jQuery/addons/jquery-scrolltofixed.js"></script>
	<script type="text/javascript">
	// <![CDATA[>

	function saveScrollPosition (resource) {

	var scrollPos = \$(window).scrollTop();
	sessionStorage.setItem(resource,scrollPos);
	}

	function restoreScrollPosition(resource){

	var scrollPos = sessionStorage.getItem(resource);
	\$(window).scrollTop(scrollPos);
	}

	// unless internet explorer
	if (!(window.navigator.appName == "Microsoft Internet Explorer" && (document.documentMode \|\| document.compatMode))){

	\$(document).ready(function() {
	\$(".LC_edit_actionbar").scrollToFixed(\{zIndex: 100\});
	});
	}

	// inserts text at cursor position into codemirror (xml editor only)
	function insertText(text){
	cm.focus();
	var curPos = cm.getCursor();
	cm.replaceRange(text.replace(/ESCAPEDSCRIPT/g,'script'), {line: curPos.line,ch: curPos.ch});
	}
	// ]]>
	</script>
	XMLEDIT
	}

	sub insert_folding_button {
	my $curDepth = $Apache::lonxml::curdepth;
	my $lastresource = $env{'request.ambiguous'};

	return "<input type=\"button\" id=\"folding_btn_$curDepth\"
	value=\"".&mt('Hide')."\" onclick=\"fold_box('$curDepth','$lastresource')\">";
	}


=pod	=pod

=head1 Excel and CSV file utility routines	=head1 Excel and CSV file utility routines
Line 2001 sub multiple_select_form {	Line 2239 sub multiple_select_form {

=pod	=pod

=item * &select_form($defdom,$name,$hashref,$onchange)	=item * &select_form($defdom,$name,$hashref,$onchange,$readonly)

Returns a string containing a <select name='$name' size='1'> form to	Returns a string containing a <select name='$name' size='1'> form to
allow a user to select options from a ref to a hash containing:	allow a user to select options from a ref to a hash containing:
option_name => displayed text. An optional $onchange can include	option_name => displayed text. An optional $onchange can include
a javascript onchange item, e.g., onchange="this.form.submit();"	a javascript onchange item, e.g., onchange="this.form.submit();".
	An optional arg -- $readonly -- if true will cause the select form
	to be disabled, e.g., for the case where an instructor has a section-
	specific role, and is viewing/modifying parameters.

See lonrights.pm for an example invocation and use.	See lonrights.pm for an example invocation and use.

Line 2014 See lonrights.pm for an example invocati	Line 2255 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.'"';
Line 2188 sub select_level_form {	Line 2429 sub select_level_form {

=pod	=pod

=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms)	=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms,$disabled)

Returns a string containing a <select name='$name' size='1'> form to	Returns a string containing a <select name='$name' size='1'> form to
allow a user to select the domain to preform an operation in.	allow a user to select the domain to preform an operation in.
Line 2203 The optional $onchange argument specifie	Line 2444 The optional $onchange argument specifie

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

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

	The optional $disabled argument, if true, adds the disabled attribute to the select tag.

=cut	=cut

#-------------------------------------------	#-------------------------------------------
sub select_dom_form {	sub select_dom_form {
my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms) = @_;	my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms,$disabled) = @_;
if ($onchange) {	if ($onchange) {
$onchange = ' onchange="'.$onchange.'"';	$onchange = ' onchange="'.$onchange.'"';
}	}
	if ($disabled) {
	$disabled = ' disabled="disabled"';
	}
my (@domains,%exclude);	my (@domains,%exclude);
if (ref($incdoms) eq 'ARRAY') {	if (ref($incdoms) eq 'ARRAY') {
@domains = sort {lc($a) cmp lc($b)} (@{$incdoms});	@domains = sort {lc($a) cmp lc($b)} (@{$incdoms});
Line 2223 sub select_dom_form {	Line 2469 sub select_dom_form {
if (ref($excdoms) eq 'ARRAY') {	if (ref($excdoms) eq 'ARRAY') {
map { $exclude{$_} = 1; } @{$excdoms};	map { $exclude{$_} = 1; } @{$excdoms};
}	}
my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";	my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange$disabled>\n";
foreach my $dom (@domains) {	foreach my $dom (@domains) {
next if ($exclude{$dom});	next if ($exclude{$dom});
$selectdomain.="<option value=\"$dom\" ".	$selectdomain.="<option value=\"$dom\" ".
Line 2599 sub authform_kerberos {	Line 2845 sub authform_kerberos {
@_,	@_,
);	);
my ($check4,$check5,$krbcheck,$krbarg,$krbver,$result,$authtype,	my ($check4,$check5,$krbcheck,$krbarg,$krbver,$result,$authtype,
$autharg,$jscall);	$autharg,$jscall,$disabled);
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});	my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});
if ($in{'kerb_def_auth'} eq 'krb5') {	if ($in{'kerb_def_auth'} eq 'krb5') {
$check5 = ' checked="checked"';	$check5 = ' checked="checked"';
} else {	} else {
$check4 = ' checked="checked"';	$check4 = ' checked="checked"';
}	}
	if ($in{'readonly'}) {
	$disabled = ' disabled="disabled"';
	}
$krbarg = $in{'kerb_def_dom'};	$krbarg = $in{'kerb_def_dom'};
if (defined($in{'curr_authtype'})) {	if (defined($in{'curr_authtype'})) {
if ($in{'curr_authtype'} eq 'krb') {	if ($in{'curr_authtype'} eq 'krb') {
Line 2650 sub authform_kerberos {	Line 2899 sub authform_kerberos {
if (defined($in{'mode'})) {	if (defined($in{'mode'})) {
if ($in{'mode'} eq 'modifycourse') {	if ($in{'mode'} eq 'modifycourse') {
if ($authnum == 1) {	if ($authnum == 1) {
$authtype = '<input type="radio" name="login" value="krb" />';	$authtype = '<input type="radio" name="login" value="krb"'.$disabled.' />';
}	}
}	}
}	}
Line 2659 sub authform_kerberos {	Line 2908 sub authform_kerberos {
if ($authtype eq '') {	if ($authtype eq '') {
$authtype = '<input type="radio" name="login" value="krb" '.	$authtype = '<input type="radio" name="login" value="krb" '.
'onclick="'.$jscall.'" onchange="'.$jscall.'"'.	'onclick="'.$jscall.'" onchange="'.$jscall.'"'.
$krbcheck.' />';	$krbcheck.$disabled.' />';
}	}
if (($can_assign{'krb4'} && $can_assign{'krb5'}) \|\|	if (($can_assign{'krb4'} && $can_assign{'krb5'}) \|\|
($can_assign{'krb4'} && !$can_assign{'krb5'} &&	($can_assign{'krb4'} && !$can_assign{'krb5'} &&
Line 2672 sub authform_kerberos {	Line 2921 sub authform_kerberos {
'<label>'.$authtype,	'<label>'.$authtype,
'</label><input type="text" size="10" name="krbarg" '.	'</label><input type="text" size="10" name="krbarg" '.
'value="'.$krbarg.'" '.	'value="'.$krbarg.'" '.
'onchange="'.$jscall.'" />',	'onchange="'.$jscall.'"'.$disabled.' />',
'<label><input type="radio" name="krbver" value="4" '.$check4.' />',	'<label><input type="radio" name="krbver" value="4" '.$check4.$disabled.' />',
'</label><label><input type="radio" name="krbver" value="5" '.$check5.' />',	'</label><label><input type="radio" name="krbver" value="5" '.$check5.$disabled.' />',
'</label>');	'</label>');
} elsif ($can_assign{'krb4'}) {	} elsif ($can_assign{'krb4'}) {
$result .= &mt	$result .= &mt
Line 2683 sub authform_kerberos {	Line 2932 sub authform_kerberos {
'<label>'.$authtype,	'<label>'.$authtype,
'</label><input type="text" size="10" name="krbarg" '.	'</label><input type="text" size="10" name="krbarg" '.
'value="'.$krbarg.'" '.	'value="'.$krbarg.'" '.
'onchange="'.$jscall.'" />',	'onchange="'.$jscall.'"'.$disabled.' />',
'<label><input type="hidden" name="krbver" value="4" />',	'<label><input type="hidden" name="krbver" value="4" />',
'</label>');	'</label>');
} elsif ($can_assign{'krb5'}) {	} elsif ($can_assign{'krb5'}) {
Line 2693 sub authform_kerberos {	Line 2942 sub authform_kerberos {
'<label>'.$authtype,	'<label>'.$authtype,
'</label><input type="text" size="10" name="krbarg" '.	'</label><input type="text" size="10" name="krbarg" '.
'value="'.$krbarg.'" '.	'value="'.$krbarg.'" '.
'onchange="'.$jscall.'" />',	'onchange="'.$jscall.'"'.$disabled.' />',
'<label><input type="hidden" name="krbver" value="5" />',	'<label><input type="hidden" name="krbver" value="5" />',
'</label>');	'</label>');
}	}
Line 2706 sub authform_internal {	Line 2955 sub authform_internal {
kerb_def_dom => 'MSU.EDU',	kerb_def_dom => 'MSU.EDU',
@_,	@_,
);	);
my ($intcheck,$intarg,$result,$authtype,$autharg,$jscall);	my ($intcheck,$intarg,$result,$authtype,$autharg,$jscall,$disabled);
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});	my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});
	if ($in{'readonly'}) {
	$disabled = ' disabled="disabled"';
	}
if (defined($in{'curr_authtype'})) {	if (defined($in{'curr_authtype'})) {
if ($in{'curr_authtype'} eq 'int') {	if ($in{'curr_authtype'} eq 'int') {
if ($can_assign{'int'}) {	if ($can_assign{'int'}) {
Line 2736 sub authform_internal {	Line 2988 sub authform_internal {
if (defined($in{'mode'})) {	if (defined($in{'mode'})) {
if ($in{'mode'} eq 'modifycourse') {	if ($in{'mode'} eq 'modifycourse') {
if ($authnum == 1) {	if ($authnum == 1) {
$authtype = '<input type="radio" name="login" value="int" />';	$authtype = '<input type="radio" name="login" value="int"'.$disabled.' />';
}	}
}	}
}	}
Line 2744 sub authform_internal {	Line 2996 sub authform_internal {
$jscall = "javascript:changed_radio('int',$in{'formname'});";	$jscall = "javascript:changed_radio('int',$in{'formname'});";
if ($authtype eq '') {	if ($authtype eq '') {
$authtype = '<input type="radio" name="login" value="int" '.$intcheck.	$authtype = '<input type="radio" name="login" value="int" '.$intcheck.
' onchange="'.$jscall.'" onclick="'.$jscall.'" />';	' onchange="'.$jscall.'" onclick="'.$jscall.'"'.$disabled.' />';
}	}
$autharg = '<input type="password" size="10" name="intarg" value="'.	$autharg = '<input type="password" size="10" name="intarg" value="'.
$intarg.'" onchange="'.$jscall.'" />';	$intarg.'" onchange="'.$jscall.'"'.$disabled.' />';
$result = &mt	$result = &mt
('[_1] Internally authenticated (with initial password [_2])',	('[_1] Internally authenticated (with initial password [_2])',
'<label>'.$authtype,'</label>'.$autharg);	'<label>'.$authtype,'</label>'.$autharg);
$result.="<label><input type=\"checkbox\" name=\"visible\" onclick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';	$result.='<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.intarg.type='."'text'".' } else { this.form.intarg.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>';
return $result;	return $result;
}	}

Line 2761 sub authform_local {	Line 3013 sub authform_local {
kerb_def_dom => 'MSU.EDU',	kerb_def_dom => 'MSU.EDU',
@_,	@_,
);	);
my ($loccheck,$locarg,$result,$authtype,$autharg,$jscall);	my ($loccheck,$locarg,$result,$authtype,$autharg,$jscall,$disabled);
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});	my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});
	if ($in{'readonly'}) {
	$disabled = ' disabled="disabled"';
	}
if (defined($in{'curr_authtype'})) {	if (defined($in{'curr_authtype'})) {
if ($in{'curr_authtype'} eq 'loc') {	if ($in{'curr_authtype'} eq 'loc') {
if ($can_assign{'loc'}) {	if ($can_assign{'loc'}) {
Line 2791 sub authform_local {	Line 3046 sub authform_local {
if (defined($in{'mode'})) {	if (defined($in{'mode'})) {
if ($in{'mode'} eq 'modifycourse') {	if ($in{'mode'} eq 'modifycourse') {
if ($authnum == 1) {	if ($authnum == 1) {
$authtype = '<input type="radio" name="login" value="loc" />';	$authtype = '<input type="radio" name="login" value="loc"'.$disabled.' />';
}	}
}	}
}	}
Line 2800 sub authform_local {	Line 3055 sub authform_local {
if ($authtype eq '') {	if ($authtype eq '') {
$authtype = '<input type="radio" name="login" value="loc" '.	$authtype = '<input type="radio" name="login" value="loc" '.
$loccheck.' onchange="'.$jscall.'" onclick="'.	$loccheck.' onchange="'.$jscall.'" onclick="'.
$jscall.'" />';	$jscall.'"'.$disabled.' />';
}	}
$autharg = '<input type="text" size="10" name="locarg" value="'.	$autharg = '<input type="text" size="10" name="locarg" value="'.
$locarg.'" onchange="'.$jscall.'" />';	$locarg.'" onchange="'.$jscall.'"'.$disabled.' />';
$result = &mt('[_1] Local Authentication with argument [_2]',	$result = &mt('[_1] Local Authentication with argument [_2]',
'<label>'.$authtype,'</label>'.$autharg);	'<label>'.$authtype,'</label>'.$autharg);
return $result;	return $result;
Line 2815 sub authform_filesystem {	Line 3070 sub authform_filesystem {
kerb_def_dom => 'MSU.EDU',	kerb_def_dom => 'MSU.EDU',
@_,	@_,
);	);
my ($fsyscheck,$result,$authtype,$autharg,$jscall);	my ($fsyscheck,$result,$authtype,$autharg,$jscall,$disabled);
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});	my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});
	if ($in{'readonly'}) {
	$disabled = ' disabled="disabled"';
	}
if (defined($in{'curr_authtype'})) {	if (defined($in{'curr_authtype'})) {
if ($in{'curr_authtype'} eq 'fsys') {	if ($in{'curr_authtype'} eq 'fsys') {
if ($can_assign{'fsys'}) {	if ($can_assign{'fsys'}) {
Line 2842 sub authform_filesystem {	Line 3100 sub authform_filesystem {
if (defined($in{'mode'})) {	if (defined($in{'mode'})) {
if ($in{'mode'} eq 'modifycourse') {	if ($in{'mode'} eq 'modifycourse') {
if ($authnum == 1) {	if ($authnum == 1) {
$authtype = '<input type="radio" name="login" value="fsys" />';	$authtype = '<input type="radio" name="login" value="fsys"'.$disabled.' />';
}	}
}	}
}	}
Line 2851 sub authform_filesystem {	Line 3109 sub authform_filesystem {
if ($authtype eq '') {	if ($authtype eq '') {
$authtype = '<input type="radio" name="login" value="fsys" '.	$authtype = '<input type="radio" name="login" value="fsys" '.
$fsyscheck.' onchange="'.$jscall.'" onclick="'.	$fsyscheck.' onchange="'.$jscall.'" onclick="'.
$jscall.'" />';	$jscall.'"'.$disabled.' />';
}	}
$autharg = '<input type="text" size="10" name="fsysarg" value=""'.	$autharg = '<input type="text" size="10" name="fsysarg" value=""'.
' onchange="'.$jscall.'" />';	' onchange="'.$jscall.'"'.$disabled.' />';
$result = &mt	$result = &mt
('[_1] Filesystem Authenticated (with initial password [_2])',	('[_1] Filesystem Authenticated (with initial password [_2])',
'<label><input type="radio" name="login" value="fsys" '.	'<label><input type="radio" name="login" value="fsys" '.
$fsyscheck.'onchange="'.$jscall.'" onclick="'.$jscall.'" />',	$fsyscheck.'onchange="'.$jscall.'" onclick="'.$jscall.'"'.$disabled.' />',
'</label><input type="password" size="10" name="fsysarg" value="" '.	'</label><input type="password" size="10" name="fsysarg" value="" '.
'onchange="'.$jscall.'" />');	'onchange="'.$jscall.'"'.$disabled.' />');
return $result;	return $result;
}	}

Line 2882 sub get_assignable_auth {	Line 3140 sub get_assignable_auth {
my $context;	my $context;
if ($env{'request.role'} =~ /^au/) {	if ($env{'request.role'} =~ /^au/) {
$context = 'author';	$context = 'author';
} elsif ($env{'request.role'} =~ /^dc/) {	} elsif ($env{'request.role'} =~ /^(dc\|dh)/) {
$context = 'domain';	$context = 'domain';
} elsif ($env{'request.course.id'}) {	} elsif ($env{'request.course.id'}) {
$context = 'course';	$context = 'course';
Line 4689 sub check_ip_acc {	Line 4947 sub check_ip_acc {
return 1;	return 1;
}	}
my $allowed=0;	my $allowed=0;
my $ip=$env{'request.host'} \|\| $ENV{'REMOTE_ADDR'} \|\| $clientip;	my $ip=$ENV{'REMOTE_ADDR'} \|\| $clientip \|\| $env{'request.host'};

my $name;	my $name;
foreach my $pattern (split(',',$acc)) {	foreach my $pattern (split(',',$acc)) {
Line 5182 sub bodytag {	Line 5440 sub bodytag {
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
if ($env{'request.role'} !~ /^cr/) {	if ($env{'request.role'} !~ /^cr/) {
$role = &Apache::lonnet::plaintext($role,&course_type());	$role = &Apache::lonnet::plaintext($role,&course_type());
	} elsif ($role =~ m{^cr/($match_domain)/\1-domainconfig/(\w+)$}) {
	$role = &mt('Helpdesk[_1]',' '.$2);
	} else {
	$role = (split(/\//,$role,4))[-1];
}	}
if ($env{'request.course.sec'}) {	if ($env{'request.course.sec'}) {
$role .= (' 'x2).'- '.&mt('section:').' '.$env{'request.course.sec'};	$role .= (' 'x2).'- '.&mt('section:').' '.$env{'request.course.sec'};
Line 5221 sub bodytag {	Line 5483 sub bodytag {
$dc_info =~ s/\s+$//;	$dc_info =~ s/\s+$//;
}	}

$role = '<span class="LC_nobreak">('.$role.')</span>' if $role;	$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 5282 sub bodytag {	Line 5544 sub bodytag {
if ($env{'request.state'} eq 'construct') {	if ($env{'request.state'} eq 'construct') {
$bodytag .= &Apache::lonmenu::innerregister($forcereg,	$bodytag .= &Apache::lonmenu::innerregister($forcereg,
$args->{'bread_crumbs'});	$args->{'bread_crumbs'});
} elsif ($forcereg) {	} elsif ($forcereg) {
$bodytag .= &Apache::lonmenu::innerregister($forcereg,undef,	$bodytag .= &Apache::lonmenu::innerregister($forcereg,undef,
$args->{'group'});	$args->{'group'},
	$args->{'hide_buttons'});
} else {	} else {
my $forbodytag;	my $forbodytag;
&Apache::lonmenu::prepare_functions($env{'request.noversionuri'},	&Apache::lonmenu::prepare_functions($env{'request.noversionuri'},
Line 5598 div.LC_confirm_box .LC_success img {	Line 5861 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 5719 table#LC_menubuttons img {	Line 5993 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 6576 div.LC_edit_problem_footer,	Line 6854 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;
}	}

div.LC_edit_problem_header_title {	div.LC_edit_problem_header_title {
Line 6592 table.LC_edit_problem_header_title {	Line 6870 table.LC_edit_problem_header_title {
background: $tabbg;	background: $tabbg;
}	}

div.LC_edit_problem_discards {	div.LC_edit_actionbar {
float: left;	background-color: $sidebg;
padding-bottom: 5px;	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 6615 div.LC_edit_problem_saves {	Line 6896 div.LC_edit_problem_saves {
margin-left: 40px;	margin-left: 40px;
}	}

	#LC_edit_problem_codemirror div{
	margin-left: 0px;
	}

img.stift {	img.stift {
border-width: 0;	border-width: 0;
vertical-align: middle;	vertical-align: middle;
Line 6733 fieldset > legend {	Line 7018 fieldset > legend {
ol.LC_primary_menu {	ol.LC_primary_menu {
margin: 0;	margin: 0;
padding: 0;	padding: 0;
background-color: $pgbg_or_bgcolor;
}	}

ol#LC_PathBreadcrumbs {	ol#LC_PathBreadcrumbs {
Line 6745 ol.LC_primary_menu li {	Line 7029 ol.LC_primary_menu li {
vertical-align: middle;	vertical-align: middle;
text-align: left;	text-align: left;
list-style: none;	list-style: none;
	position: relative;
float: left;	float: left;
	z-index: 100; /* will be displayed above codemirror and underneath the help-layer */
	line-height: 1.5em;
}	}

ol.LC_primary_menu li a {	ol.LC_primary_menu li a,
	ol.LC_primary_menu li p {
display: block;	display: block;
margin: 0;	margin: 0;
padding: 0 5px 0 10px;	padding: 0 5px 0 10px;
text-decoration: none;	text-decoration: none;
}	}

ol.LC_primary_menu li ul {	ol.LC_primary_menu li p span.LC_primary_menu_innertitle {
	display: inline-block;
	width: 95%;
	text-align: left;
	}

	ol.LC_primary_menu li p span.LC_primary_menu_innerarrow {
	display: inline-block;
	width: 5%;
	float: right;
	text-align: right;
	font-size: 70%;
	}

	ol.LC_primary_menu ul {
display: none;	display: none;
width: 10em;	width: 15em;
background-color: $data_table_light;	background-color: $data_table_light;
	position: absolute;
	top: 100%;
	}

	ol.LC_primary_menu ul ul {
	left: 100%;
	top: 0;
}	}

ol.LC_primary_menu li:hover ul, ol.LC_primary_menu li.hover ul {	ol.LC_primary_menu li:hover > ul, ol.LC_primary_menu li.hover > ul {
display: block;	display: block;
position: absolute;	position: absolute;
margin: 0;	margin: 0;
Line 6770 ol.LC_primary_menu li:hover ul, ol.LC_pr	Line 7079 ol.LC_primary_menu li:hover ul, ol.LC_pr
}	}

ol.LC_primary_menu li:hover li, ol.LC_primary_menu li.hover li {	ol.LC_primary_menu li:hover li, ol.LC_primary_menu li.hover li {
	/* First Submenu -> size should be smaller than the menu title of the whole menu */
font-size: 90%;	font-size: 90%;
vertical-align: top;	vertical-align: top;
float: none;	float: none;
border-left: 1px solid black;	border-left: 1px solid black;
border-right: 1px solid black;	border-right: 1px solid black;
	/* A dark bottom border to visualize different menu options;
	overwritten in the create_submenu routine for the last border-bottom of the menu */
	border-bottom: 1px solid $data_table_dark;
}	}

ol.LC_primary_menu li:hover li a, ol.LC_primary_menu li.hover li a {	ol.LC_primary_menu li li p:hover {
background-color:$data_table_light;	color:$button_hover;
	text-decoration:none;
	background-color:$data_table_dark;
}	}

ol.LC_primary_menu li li a:hover {	ol.LC_primary_menu li li a:hover {
Line 6786 ol.LC_primary_menu li li a:hover {	Line 7101 ol.LC_primary_menu li li a:hover {
background-color:$data_table_dark;	background-color:$data_table_dark;
}	}

	/* Font-size equal to the size of the predecessors*/
	ol.LC_primary_menu li:hover li li {
	font-size: 100%;
	}

ol.LC_primary_menu li img {	ol.LC_primary_menu li img {
vertical-align: bottom;	vertical-align: bottom;
height: 1.1em;	height: 1.1em;
Line 6842 ul#LC_secondary_menu li {	Line 7162 ul#LC_secondary_menu li {
font-weight: bold;	font-weight: bold;
line-height: 1.8em;	line-height: 1.8em;
border-right: 1px solid black;	border-right: 1px solid black;
vertical-align: middle;
float: left;	float: left;
}	}

Line 7530 OFFLOAD	Line 7849 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 9204 sub get_secgrprole_info {	Line 9529 sub get_secgrprole_info {
}	}

sub user_picker {	sub user_picker {
my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype,$context) = @_;	my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype,$context,$fixeddom) = @_;
my $currdom = $dom;	my $currdom = $dom;
	my @alldoms = &Apache::lonnet::all_domains();
	if (@alldoms == 1) {
	my %domsrch = &Apache::lonnet::get_dom('configuration',
	['directorysrch'],$alldoms[0]);
	my $domdesc = &Apache::lonnet::domain($alldoms[0],'description');
	my $showdom = $domdesc;
	if ($showdom eq '') {
	$showdom = $dom;
	}
	if (ref($domsrch{'directorysrch'}) eq 'HASH') {
	if ((!$domsrch{'directorysrch'}{'available'}) &&
	($domsrch{'directorysrch'}{'lcavailable'} eq '0')) {
	return (&mt('LON-CAPA directory search is not available in domain: [_1]',$showdom),0);
	}
	}
	}
my %curr_selected = (	my %curr_selected = (
srchin => 'dom',	srchin => 'dom',
srchby => 'lastname',	srchby => 'lastname',
Line 9252 sub user_picker {	Line 9593 sub user_picker {
);	);
&html_escape(\%html_lt);	&html_escape(\%html_lt);
&js_escape(\%js_lt);	&js_escape(\%js_lt);
my $domform = &select_dom_form($currdom,'srchdomain',1,1);	my $domform;
	if ($fixeddom) {
	$domform = &select_dom_form($currdom,'srchdomain',1,1,undef,[$currdom]);
	} else {
	$domform = &select_dom_form($currdom,'srchdomain',1,1);
	}
my $srchinsel = ' <select name="srchin">';	my $srchinsel = ' <select name="srchin">';

my @srchins = ('crs','dom','alc','instd');	my @srchins = ('crs','dom','alc','instd');
Line 9446 END_BLOCK	Line 9792 END_BLOCK
&Apache::lonhtmlcommon::row_closure(1).	&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::end_pick_box().	&Apache::lonhtmlcommon::end_pick_box().
'<br />';	'<br />';
return $output;	return ($output,1);
}	}

sub user_rule_check {	sub user_rule_check {
Line 13870 currcat - scalar with an & separated lis	Line 14216 currcat - scalar with an & separated lis

type - scalar contains course type (Course or Community).	type - scalar contains course type (Course or Community).

	disabled - scalar (optional) contains disabled="disabled" if input elements are
	to be readonly (e.g., Domain Helpdesk role viewing course settings).

Returns: $output (markup to be displayed)	Returns: $output (markup to be displayed)

=cut	=cut

sub assign_categories_table {	sub assign_categories_table {
my ($cathash,$currcat,$type) = @_;	my ($cathash,$currcat,$type,$disabled) = @_;
my $output;	my $output;
if (ref($cathash) eq 'HASH') {	if (ref($cathash) eq 'HASH') {
my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);	my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);
Line 13911 sub assign_categories_table {	Line 14260 sub assign_categories_table {
}	}
$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="'.
$item.'"'.$checked.' />'.$parent_title.'</span>'.	$item.'"'.$checked.$disabled.' />'.$parent_title.'</span>'.
'<input type="hidden" name="catname" value="'.$parent.'" /></td>';	'<input type="hidden" name="catname" value="'.$parent.'" /></td>';
my $depth = 1;	my $depth = 1;
push(@path,$parent);	push(@path,$parent);
$table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);	$table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories,$disabled);
pop(@path);	pop(@path);
$table .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';	$table .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
$itemcount ++;	$itemcount ++;
Line 13954 path - Array containing all categories b	Line 14303 path - Array containing all categories b

currcategories - reference to array of current categories assigned to the course	currcategories - reference to array of current categories assigned to the course

	disabled - scalar (optional) contains disabled="disabled" if input elements are
	to be readonly (e.g., Domain Helpdesk role viewing course settings).

Returns: $output (markup to be displayed).	Returns: $output (markup to be displayed).

=cut	=cut

sub assign_category_rows {	sub assign_category_rows {
my ($itemcount,$cats,$depth,$parent,$path,$currcategories) = @_;	my ($itemcount,$cats,$depth,$parent,$path,$currcategories,$disabled) = @_;
my ($text,$name,$item,$chgstr);	my ($text,$name,$item,$chgstr);
if (ref($cats) eq 'ARRAY') {	if (ref($cats) eq 'ARRAY') {
my $maxdepth = scalar(@{$cats});	my $maxdepth = scalar(@{$cats});
Line 13982 sub assign_category_rows {	Line 14334 sub assign_category_rows {
}	}
$text .= '<tr><td><span class="LC_nobreak"><label>'.	$text .= '<tr><td><span class="LC_nobreak"><label>'.
'<input type="checkbox" name="usecategory" value="'.	'<input type="checkbox" name="usecategory" value="'.
$item.'"'.$checked.' />'.$name.'</label></span>'.	$item.'"'.$checked.$disabled.' />'.$name.'</label></span>'.
'<input type="hidden" name="catname" value="'.$name.'" />'.	'<input type="hidden" name="catname" value="'.$name.'" />'.
'</td><td>';	'</td><td>';
if (ref($path) eq 'ARRAY') {	if (ref($path) eq 'ARRAY') {
push(@{$path},$name);	push(@{$path},$name);
$text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories);	$text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories,$disabled);
pop(@{$path});	pop(@{$path});
}	}
$text .= '</td></tr>';	$text .= '</td></tr>';
Line 14579 sub construct_course {	Line 14931 sub construct_course {
if ($args->{'setcontent'}) {	if ($args->{'setcontent'}) {
$cenv{'question.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};	$cenv{'question.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
}	}
	if ($args->{'setcomment'}) {
	$cenv{'comment.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
	}
}	}
if ($args->{'reshome'}) {	if ($args->{'reshome'}) {
$cenv{'reshome'}=$args->{'reshome'}.'/';	$cenv{'reshome'}=$args->{'reshome'}.'/';
Line 16014 sub symb_to_docspath {	Line 16369 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 16045 sub captcha_response {	Line 16401 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 16061 sub get_captcha_config {	Line 16417 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 16078 sub get_captcha_config {	Line 16438 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 16085 sub get_captcha_config {	Line 16449 sub get_captcha_config {
$captcha = 'original';	$captcha = 'original';
}	}
}	}
return ($captcha,$pubkey,$privkey);	return ($captcha,$pubkey,$privkey,$version);
}	}

sub create_captcha {	sub create_captcha {
Line 16144 sub check_captcha {	Line 16508 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;
}	}
Line 16264 sub des_decrypt {	Line 16651 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.1075.2.105
changed lines
	Added in v.1.1075.2.118