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.1405 and 1.1421

version 1.1405, 2023/05/22 21:10:55	version 1.1421, 2023/11/19 21:28:17
Line 71 use Apache::lonuserutils();	Line 71 use Apache::lonuserutils();
use Apache::lonuserstate();	use Apache::lonuserstate();
use Apache::courseclassifier();	use Apache::courseclassifier();
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);
	use LONCAPA::ltiutils;
use LONCAPA::LWPReq;	use LONCAPA::LWPReq;
use LONCAPA::map();	use LONCAPA::map();
use HTTP::Request;	use HTTP::Request;
Line 436 sub studentbrowser_javascript {	Line 437 sub studentbrowser_javascript {
<script type="text/javascript" language="Javascript">	<script type="text/javascript" language="Javascript">
// <![CDATA[	// <![CDATA[
var stdeditbrowser;	var stdeditbrowser;
function openstdbrowser(formname,uname,udom,clicker,roleflag,ignorefilter,courseadv) {	function openstdbrowser(formname,uname,udom,clicker,roleflag,ignorefilter,courseadv,uident) {
var url = '/adm/pickstudent?';	var url = '/adm/pickstudent?';
var filter;	var filter;
if (!ignorefilter) {	if (!ignorefilter) {
Line 457 sub studentbrowser_javascript {	Line 458 sub studentbrowser_javascript {
}	}
}	}
if ((courseadv == 'only') \|\| (courseadv == 'none')) { url+="&courseadv="+courseadv; }	if ((courseadv == 'only') \|\| (courseadv == 'none')) { url+="&courseadv="+courseadv; }
	if (uident !== '') { url+="&identelement="+uident; }
var title = 'Student_Browser';	var title = 'Student_Browser';
var options = 'scrollbars=1,resizable=1,menubar=0';	var options = 'scrollbars=1,resizable=1,menubar=0';
options += ',width=700,height=600';	options += ',width=700,height=600';
Line 488 ENDRESBRW	Line 490 ENDRESBRW
}	}

sub selectstudent_link {	sub selectstudent_link {
my ($form,$unameele,$udomele,$courseadv,$clickerid)=@_;	my ($form,$unameele,$udomele,$courseadv,$clickerid,$identelem)=@_;
my $callargs = "'".&Apache::lonhtmlcommon::entity_encode($form)."','".	my $callargs = "'".&Apache::lonhtmlcommon::entity_encode($form)."','".
&Apache::lonhtmlcommon::entity_encode($unameele)."','".	&Apache::lonhtmlcommon::entity_encode($unameele)."','".
&Apache::lonhtmlcommon::entity_encode($udomele)."'";	&Apache::lonhtmlcommon::entity_encode($udomele)."'";
Line 505 sub selectstudent_link {	Line 507 sub selectstudent_link {
$callargs .= ",'','','$courseadv'";	$callargs .= ",'','','$courseadv'";
} elsif ($courseadv eq 'condition') {	} elsif ($courseadv eq 'condition') {
$callargs .= ",'','','$courseadv'";	$callargs .= ",'','','$courseadv'";
	} elsif ($identelem ne '') {
	$callargs .= ",'','',''";
	}
	if ($identelem ne '') {
	$callargs .= ",'".&Apache::lonhtmlcommon::entity_encode($identelem)."'";
}	}
return '<span class="LC_nobreak">'.	return '<span class="LC_nobreak">'.
'<a href="javascript:openstdbrowser('.$callargs.');">'.	'<a href="javascript:openstdbrowser('.$callargs.');">'.
Line 2434 END	Line 2441 END

=pod	=pod

	=item * &iframe_wrapper_headjs()

	#
	# Where iframe is in use, if window.onload() executes before the custom resize function
	# has been defined (jQuery), two global javascript vars (LCnotready and LCresizedef)
	# are used to ensure document.ready() triggers a call to resize, so the iframe contents
	# do not obscure the Functions menu.
	#

	=back

	=cut


	sub iframe_wrapper_headjs {
	return <<"ENDJS";
	<script type="text/javascript">
	// <![CDATA[
	var LCnotready = 0;
	var LCresizedef = 0;
	// ]]>
	</script>

	ENDJS

	}

	=pod

	=item * &iframe_wrapper_resizejs()

	#
	# jQuery to use when iframe is in use and a page resize occurs.
	# This script will ensure that the iframe does not obscure any
	# standard LON-CAPA inline menus (primary, secondary, and/or
	# breadcrumbs and Functions menus. Expects javascript from
	# &iframe_wrapper_headjs() to be in head portion of the web page,
	# e.g., by inclusion in second arg passed to &start_page().
	#

	=back

	=cut

	sub iframe_wrapper_resizejs {
	my $offset = 5;
	&get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
	if (($env{'form.inhibitmenu'} eq 'yes') \|\| ($env{'form.only_body'})) {
	$offset = 0;
	}
	return &Apache::lonhtmlcommon::scripttag(<<SCRIPT);
	\$(document).ready( function() {
	\$(window).unbind('resize').resize(function(){
	var header = null;
	var offset = $offset;
	var height = 0;
	var hdrtop = 0;
	if (\$('div.LC_menus_content:first').length) {
	if (\$('div.LC_menus_content:first').hasClass ("shown")) {
	header = \$('div.LC_menus_content:first');
	offset = 9;
	}
	} else if (\$('div.LC_head_subbox:first').length) {
	header = \$('div.LC_head_subbox:first');
	offset = 9;
	} else {
	if (\$('#LC_breadcrumbs').length) {
	header = \$('#LC_breadcrumbs');
	}
	}
	if (header != null && header.length) {
	height = header.height();
	hdrtop = header.position().top;
	}
	var pos = height + hdrtop + offset;
	\$('.LC_iframecontainer').css('top', pos);
	});
	LCresizedef = 1;
	if (LCnotready == 1) {
	LCnotready = 0;
	\$(window).trigger('resize');
	}
	});
	window.onload = function(){
	if (LCresizedef) {
	LCnotready = 0;
	\$(window).trigger('resize');
	} else {
	LCnotready = 1;
	}
	};
	SCRIPT

	}

	=pod

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

=cut	=cut
Line 6369 Input: (optional) filename from which br	Line 6473 Input: (optional) filename from which br
If page header is being requested for use in a frameset, then	If page header is being requested for use in a frameset, then
the second (option) argument -- frameset will be true, and	the second (option) argument -- frameset will be true, and
the target attribute set for links should be target="_parent".	the target attribute set for links should be target="_parent".
	If $title is supplied as the thitd arg, that will be used to
	the left of the breadcrumbs tail for the current path.

Returns: HTML div with CSTR path and recent box	Returns: HTML div with CSTR path and recent box
To be included on Authoring Space pages	To be included on Authoring Space pages
Line 6376 Returns: HTML div with CSTR path and rec	Line 6482 Returns: HTML div with CSTR path and rec
=cut	=cut

sub CSTR_pageheader {	sub CSTR_pageheader {
my ($trailfile,$frameset) = @_;	my ($trailfile,$frameset,$title) = @_;
if ($trailfile eq '') {	if ($trailfile eq '') {
$trailfile = $env{'request.filename'};	$trailfile = $env{'request.filename'};
}	}
Line 6399 sub CSTR_pageheader {	Line 6505 sub CSTR_pageheader {
$lastitem = $thisdisfn;	$lastitem = $thisdisfn;
}	}

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

Line 6450 sub CSTR_pageheader {	Line 6558 sub CSTR_pageheader {
return $output;	return $output;
}	}

	##############################################
	=pod

	=item * &nocodemirror()

	Input: None

	Returns: 1 if CodeMirror is deactivated based on
	user's preference, or domain default,
	if user indicated use of default.

	=cut

	sub nocodemirror {
	my $nocodem = $env{'environment.nocodemirror'};
	unless ($nocodem) {
	my %domdefs = &Apache::lonnet::get_domain_defaults($env{'user.domain'});
	if ($domdefs{'nocodemirror'}) {
	$nocodem = 'yes';
	}
	}
	if ($nocodem eq 'yes') {
	return 1;
	}
	return;
	}

	##############################################
	=pod

	=item * &permitted_editors()

	Input: None

	Returns: %editors hash in which keys are editors
	permitted in current Authoring Space.
	Value for each key is 1. Possible keys
	are: edit, xml, and daxe. If no specific
	set of editors has been set for the Author
	who owns the Authoring Space, then the
	domain default will be used. If no domain
	default has been set, then the keys will be
	edit and xml.

	=cut

	sub permitted_editors {
	my ($is_author,$is_coauthor,$auname,$audom,%editors);
	if ($env{'request.role'} =~ m{^au\./}) {
	$is_author = 1;
	} elsif ($env{'request.role'} =~ m{^(?:ca\|aa)\./($match_domain)/($match_username)}) {
	($audom,$auname) = ($1,$2);
	if (($audom ne '') && ($auname ne '')) {
	if (($env{'user.domain'} eq $audom) &&
	($env{'user.name'} eq $auname)) {
	$is_author = 1;
	} else {
	$is_coauthor = 1;
	}
	}
	} elsif ($env{'request.course.id'}) {
	if ($env{'request.editurl'} =~ m{^/priv/($match_domain)/($match_username)/}) {
	($audom,$auname) = ($1,$2);
	} elsif ($env{'request.uri'} =~ m{^/priv/($match_domain)/($match_username)/}) {
	($audom,$auname) = ($1,$2);
	}
	if (($audom ne '') && ($auname ne '')) {
	if (($env{'user.domain'} eq $audom) &&
	($env{'user.name'} eq $auname)) {
	$is_author = 1;
	} else {
	$is_coauthor = 1;
	}
	}
	}
	if ($is_author) {
	if (exists($env{'environment.editors'})) {
	map { $editors{$_} = 1; } split(/,/,$env{'environment.editors'});
	} else {
	%editors = ( edit => 1,
	xml => 1,
	);
	}
	} elsif ($is_coauthor) {
	if (exists($env{"environment.internal.editors./$audom/$auname"})) {
	map { $editors{$_} = 1; } split(/,/,$env{"environment.internal.editors./$audom/$auname"});
	} else {
	%editors = ( edit => 1,
	xml => 1,
	);
	}
	} else {
	%editors = ( edit => 1,
	xml => 1,
	);
	}
	return %editors;
	}

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

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

	if ($args->{'collapsible_header'}) {
	my $alttext = &mt('menu state: collapsed');
	my $tooltip = &mt('display standard menus');
	$bodytag .= <<"END";
	<div id="LC_expandingContainer" style="display:inline;">
	<div id="LC_collapsible" class="LC_collapse_trigger" style="position: absolute;top: -5px;left: 0px; z-index:101; display:inline;">
	<a href="#" style="text-decoration:none;"><img class="LC_collapsible_indicator" alt="$alttext" title="$tooltip" src="/res/adm/pages/collapsed.png" style="border:0;margin:0;padding:0;max-width:100%;height:auto" /></a></div>
	<div class="LC_menus_content hidden">
	END
	}
unless ($args->{'no_primary_menu'}) {	unless ($args->{'no_primary_menu'}) {
my ($left,$right) = Apache::lonmenu::primary_menu($crstype,$ltimenu,$menucoll,$menuref,	my ($left,$right) = Apache::lonmenu::primary_menu($crstype,$ltimenu,$menucoll,$menuref,
$args->{'links_disabled'},	$args->{'links_disabled'},
$args->{'links_target'});	$args->{'links_target'},
	$args->{'collapsible_header'});

if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {	if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
if ($dc_info) {	if ($dc_info) {
Line 6738 sub bodytag {	Line 6956 sub bodytag {
$bodytag .= '<hr style="clear:both" />';	$bodytag .= '<hr style="clear:both" />';
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');	$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
}	}
	if ($args->{'collapsible_header'}) {
	$bodytag .= '<div id="LC_collapsible_separator"></div>'.
	'</div></div>';
	}
return $bodytag;	return $bodytag;
}	}

Line 6844 ENDJS	Line 7065 ENDJS
$endbodytag;	$endbodytag;
}	}
}	}
	if ((ref($args) eq 'HASH') && ($args->{'dashjs'})) {
	$endbodytag = &Apache::lonhtmlcommon::dash_to_minus_js().$endbodytag;
	}
return $endbodytag;	return $endbodytag;
}	}

Line 6928 form, .inline {	Line 7152 form, .inline {
display: inline;	display: inline;
}	}

	.LC_menus_content.shown{
	display: inline;
	}

	.LC_menus_content.hidden {
	display: none;
	}

.LC_right {	.LC_right {
text-align:right;	text-align:right;
}	}
Line 6948 form, .inline {	Line 7180 form, .inline {
width:400px;	width:400px;
}	}

	#LC_collapsible_separator {
	border: 1px solid black;
	width: 99.9%;
	height: 0px;
	}

.LC_iframecontainer {	.LC_iframecontainer {
width: 98%;	width: 98%;
margin: 0;	margin: 0;
Line 10496 Scalar: 1 if 'Course' to be used, 0 othe	Line 10734 Scalar: 1 if 'Course' to be used, 0 othe

###############################################	###############################################
sub show_course {	sub show_course {
	my ($udom,$uname) = @_;
	if (($udom ne '') && ($uname ne '')) {
	if (($udom ne $env{'user.domain'}) \|\| ($uname ne $env{'user.name'})) {
	if (&Apache::lonnet::is_advanced_user($udom,$uname)) {
	return 0;
	} else {
	return 1;
	}
	}
	}
my $course = !$env{'user.adv'};	my $course = !$env{'user.adv'};
if (!$env{'user.adv'}) {	if (!$env{'user.adv'}) {
foreach my $env (keys(%env)) {	foreach my $env (keys(%env)) {
Line 16527 sub assign_category_rows {	Line 16775 sub assign_category_rows {


sub commit_customrole {	sub commit_customrole {
my ($udom,$uname,$url,$three,$four,$five,$start,$end,$context) = @_;	my ($udom,$uname,$url,$three,$four,$five,$start,$end,$context,$othdomby,$requester) = @_;
my $result = &Apache::lonnet::assigncustomrole(	my $result = &Apache::lonnet::assigncustomrole(
$udom,$uname,$url,$three,$four,$five,$end,$start,undef,undef,$context);	$udom,$uname,$url,$three,$four,$five,$end,$start,undef,undef,
	$context,$othdomby,$requester);
my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.':'.$three.' in '.$url.	my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.':'.$three.' in '.$url.
($start?', '.&mt('starting').' '.localtime($start):'').	($start?', '.&mt('starting').' '.localtime($start):'').
($end?', ending '.localtime($end):'').': <b>'.$result.'</b><br />';	($end?', ending '.localtime($end):'').': <b>'.$result.'</b><br />';
Line 16541 sub commit_customrole {	Line 16790 sub commit_customrole {
}	}

sub commit_standardrole {	sub commit_standardrole {
my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context,$credits) = @_;	my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context,$credits,
	$othdomby,$requester) = @_;
my ($output,$logmsg,$linefeed,$result);	my ($output,$logmsg,$linefeed,$result);
if ($context eq 'auto') {	if ($context eq 'auto') {
$linefeed = "\n";	$linefeed = "\n";
Line 16550 sub commit_standardrole {	Line 16800 sub commit_standardrole {
}	}
if ($three eq 'st') {	if ($three eq 'st') {
$result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,	$result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,
$one,$two,$sec,$context,$credits);	$one,$two,$sec,$context,$credits,$othdomby,
	$requester);
if (($result =~ /^error/) \|\| ($result eq 'not_in_class') \|\|	if (($result =~ /^error/) \|\| ($result eq 'not_in_class') \|\|
($result eq 'unknown_course') \|\| ($result eq 'refused')) {	($result eq 'unknown_course') \|\| ($result eq 'refused')) {
$output = $logmsg.' '.&mt('Error: ').$result."\n";	$output = $logmsg.' '.&mt('Error: ').$result."\n";
Line 16570 sub commit_standardrole {	Line 16821 sub commit_standardrole {
$output = &mt('Assigning').' '.$three.' in '.$url.	$output = &mt('Assigning').' '.$three.' in '.$url.
($start?', '.&mt('starting').' '.localtime($start):'').	($start?', '.&mt('starting').' '.localtime($start):'').
($end?', '.&mt('ending').' '.localtime($end):'').': ';	($end?', '.&mt('ending').' '.localtime($end):'').': ';
$result = &Apache::lonnet::assignrole($udom,$uname,$url,$three,$end,$start,'','',$context);	$result = &Apache::lonnet::assignrole($udom,$uname,$url,$three,$end,$start,
	'','',$context,$othdomby,$requester);
if ($context eq 'auto') {	if ($context eq 'auto') {
$output .= $result.$linefeed;	$output .= $result.$linefeed;
} else {	} else {
Line 16586 sub commit_standardrole {	Line 16838 sub commit_standardrole {

sub commit_studentrole {	sub commit_studentrole {
my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context,	my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context,
$credits) = @_;	$credits,$othdomby,$requester) = @_;
my ($result,$linefeed,$oldsecurl,$newsecurl);	my ($result,$linefeed,$oldsecurl,$newsecurl);
if ($context eq 'auto') {	if ($context eq 'auto') {
$linefeed = "\n";	$linefeed = "\n";
Line 16610 sub commit_studentrole {	Line 16862 sub commit_studentrole {
}	}
$oldsecurl = $uurl;	$oldsecurl = $uurl;
$expire_role_result =	$expire_role_result =
&Apache::lonnet::assignrole($udom,$uname,$uurl,'st',$now,'','','',$context);	&Apache::lonnet::assignrole($udom,$uname,$uurl,'st',$now,
if ($env{'request.course.sec'} ne '') {	'','','',$context,$othdomby,$requester);
	if ($env{'request.course.sec'} ne '') {
if ($expire_role_result eq 'refused') {	if ($expire_role_result eq 'refused') {
my @roles = ('st');	my @roles = ('st');
my @statuses = ('previous');	my @statuses = ('previous');
Line 16637 sub commit_studentrole {	Line 16890 sub commit_studentrole {
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,	&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,
undef,undef,undef,$sec,	undef,undef,undef,$sec,
$end,$start,'','',$cid,	$end,$start,'','',$cid,
'',$context,$credits);	'',$context,$credits,'',
	$othdomby,$requester);
if ($modify_section_result =~ /^ok/) {	if ($modify_section_result =~ /^ok/) {
if ($secchange == 1) {	if ($secchange == 1) {
if ($sec eq '') {	if ($sec eq '') {
Line 17030 sub construct_course {	Line 17284 sub construct_course {
$cenv{'internal.defaultcredits'} = $args->{'defaultcredits'};	$cenv{'internal.defaultcredits'} = $args->{'defaultcredits'};
}	}
my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner.	my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner.
	my @oklcsecs = (); # Used to accumulate LON-CAPA sections for validated institutional sections.
if ($args->{'crssections'}) {	if ($args->{'crssections'}) {
$cenv{'internal.sectionnums'} = '';	$cenv{'internal.sectionnums'} = '';
if ($args->{'crssections'} =~ m/,/) {	if ($args->{'crssections'} =~ m/,/) {
Line 17043 sub construct_course {	Line 17298 sub construct_course {
my $class = $args->{'crscode'}.$sec;	my $class = $args->{'crscode'}.$sec;
my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$class,$cenv{'internal.courseowner'});	my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$class,$cenv{'internal.courseowner'});
$cenv{'internal.sectionnums'} .= $item.',';	$cenv{'internal.sectionnums'} .= $item.',';
unless ($addcheck eq 'ok') {	if ($addcheck eq 'ok') {
	unless (grep(/^\Q$gp\E$/,@oklcsecs)) {
	push(@oklcsecs,$gp);
	}
	} else {
push(@badclasses,$class);	push(@badclasses,$class);
}	}
}	}
Line 17071 sub construct_course {	Line 17330 sub construct_course {
my ($xl,$gp) = split/:/,$item;	my ($xl,$gp) = split/:/,$item;
my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$xl,$cenv{'internal.courseowner'});	my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$xl,$cenv{'internal.courseowner'});
$cenv{'internal.crosslistings'} .= $item.',';	$cenv{'internal.crosslistings'} .= $item.',';
unless ($addcheck eq 'ok') {	if ($addcheck eq 'ok') {
	unless (grep(/^\Q$gp\E$/,@oklcsecs)) {
	push(@oklcsecs,$gp);
	}
	} else {
push(@badclasses,$xl);	push(@badclasses,$xl);
}	}
}	}
Line 17134 sub construct_course {	Line 17397 sub construct_course {
if ($args->{'no_end_date'}) {	if ($args->{'no_end_date'}) {
$args->{'endaccess'} = 0;	$args->{'endaccess'} = 0;
}	}
	# If an official course with institutional sections is created by cloning
	# an existing course, section-specific hiding of course totals in student's
	# view of grades as copied from cloned course, will be checked for valid
	# sections.
	if (($can_clone && $cloneid) &&
	($cenv{'internal.coursecode'} ne '') &&
	($cenv{'grading'} eq 'standard') &&
	($cenv{'hidetotals'} ne '') &&
	($cenv{'hidetotals'} ne 'all')) {
	my @hidesecs;
	my $deletehidetotals;
	if (@oklcsecs) {
	foreach my $sec (split(/,/,$cenv{'hidetotals'})) {
	if (grep(/^\Q$sec$/,@oklcsecs)) {
	push(@hidesecs,$sec);
	}
	}
	if (@hidesecs) {
	$cenv{'hidetotals'} = join(',',@hidesecs);
	} else {
	$deletehidetotals = 1;
	}
	} else {
	$deletehidetotals = 1;
	}
	if ($deletehidetotals) {
	delete($cenv{'hidetotals'});
	&Apache::lonnet::del('environment',['hidetotals'],$$crsudom,$$crsunum);
	}
	}
$cenv{'internal.autostart'}=$args->{'enrollstart'};	$cenv{'internal.autostart'}=$args->{'enrollstart'};
$cenv{'internal.autoend'}=$args->{'enrollend'};	$cenv{'internal.autoend'}=$args->{'enrollend'};
$cenv{'default_enrollment_start_date'}=$args->{'startaccess'};	$cenv{'default_enrollment_start_date'}=$args->{'startaccess'};
Line 17494 sub init_user_environment {	Line 17787 sub init_user_environment {

my $public=($username eq 'public' && $domain eq 'public');	my $public=($username eq 'public' && $domain eq 'public');

my ($filename,$cookie,$userroles,$firstaccenv,$timerintenv);	my ($filename,$cookie,$userroles,$firstaccenv,$timerintenv,
	$coauthorenv);
my $now=time;	my $now=time;

if ($public) {	if ($public) {
Line 17560 sub init_user_environment {	Line 17854 sub init_user_environment {

# Initialize roles	# Initialize roles

($userroles,$firstaccenv,$timerintenv) =	($userroles,$firstaccenv,$timerintenv,$coauthorenv) =
&Apache::lonnet::rolesinit($domain,$username,$authhost);	&Apache::lonnet::rolesinit($domain,$username,$authhost);
}	}
# ------------------------------------ Check browser type and MathML capability	# ------------------------------------ Check browser type and MathML capability
Line 17638 sub init_user_environment {	Line 17932 sub init_user_environment {
my %is_adv = ( is_adv => $env{'user.adv'} );	my %is_adv = ( is_adv => $env{'user.adv'} );
my %domdef = &Apache::lonnet::get_domain_defaults($domain);	my %domdef = &Apache::lonnet::get_domain_defaults($domain);

foreach my $tool ('aboutme','blog','webdav','portfolio','timezone') {	foreach my $tool ('aboutme','blog','webdav','portfolio','portaccess','timezone') {
$userenv{'availabletools.'.$tool} =	$userenv{'availabletools.'.$tool} =
&Apache::lonnet::usertools_access($username,$domain,$tool,'reload',	&Apache::lonnet::usertools_access($username,$domain,$tool,'reload',
undef,\%userenv,\%domdef,\%is_adv);	undef,\%userenv,\%domdef,\%is_adv);
}	}
Line 17651 sub init_user_environment {	Line 17945 sub init_user_environment {
\%userenv,\%domdef,\%is_adv);	\%userenv,\%domdef,\%is_adv);
}	}

	if ((ref($userroles) eq 'HASH') && ($userroles->{'user.author'}) &&
	(exists($userroles->{"user.role.au./$domain/"}))) {
	if ($userenv{'authoreditors'}) {
	$userenv{'editors'} = $userenv{'authoreditors'};
	} elsif ($domdef{'editors'} ne '') {
	$userenv{'editors'} = $domdef{'editors'};
	} else {
	$userenv{'editors'} = 'edit,xml';
	}
	}

$userenv{'canrequest.author'} =	$userenv{'canrequest.author'} =
&Apache::lonnet::usertools_access($username,$domain,'requestauthor',	&Apache::lonnet::usertools_access($username,$domain,'requestauthor',
'reload','requestauthor',	'reload','requestauthor',
Line 17707 sub init_user_environment {	Line 18012 sub init_user_environment {
if (ref($timerintenv) eq 'HASH') {	if (ref($timerintenv) eq 'HASH') {
&_add_to_env(\%disk_env,$timerintenv);	&_add_to_env(\%disk_env,$timerintenv);
}	}
	if (ref($coauthorenv) eq 'HASH') {
	if (keys(%{$coauthorenv})) {
	&_add_to_env(\%disk_env,$coauthorenv);
	}
	}
if (ref($args->{'extra_env'})) {	if (ref($args->{'extra_env'})) {
&_add_to_env(\%disk_env,$args->{'extra_env'});	&_add_to_env(\%disk_env,$args->{'extra_env'});
}	}

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

Removed from v.1.1405
changed lines
	Added in v.1.1421