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.1106 and 1.1129

version 1.1106, 2012/12/22 15:37:02	version 1.1129, 2013/05/21 18:54:15
Line 67 use Apache::lonhtmlcommon();	Line 67 use Apache::lonhtmlcommon();
use Apache::loncoursedata();	use Apache::loncoursedata();
use Apache::lontexconvert();	use Apache::lontexconvert();
use Apache::lonclonecourse();	use Apache::lonclonecourse();
	use Apache::lonuserutils();
	use Apache::lonuserstate();
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);
use DateTime::TimeZone;	use DateTime::TimeZone;
use DateTime::Locale::Catalog;	use DateTime::Locale::Catalog;
Line 529 ENDAUTHORBRW	Line 531 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) = @_;
my $wintitle = 'Course_Browser';	my $wintitle = 'Course_Browser';
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$wintitle = 'Community_Browser';	$wintitle = 'Community_Browser';
Line 592 sub coursebrowser_javascript {	Line 595 sub coursebrowser_javascript {
}	}
$id_functions	$id_functions
ENDSTDBRW	ENDSTDBRW
if (($sec_element ne '') \|\| ($role_element ne '')) {	if (($sec_element ne '') \|\| ($role_element ne '') \|\| ($credits_element ne '')) {
$output .= &setsec_javascript($sec_element,$formname,$role_element);	$output .= &setsec_javascript($sec_element,$formname,$role_element,
	$credits_element);
}	}
$output .= '	$output .= '
// ]]>	// ]]>
Line 750 ENDUSERBRW	Line 754 ENDUSERBRW
}	}

sub setsec_javascript {	sub setsec_javascript {
my ($sec_element,$formname,$role_element) = @_;	my ($sec_element,$formname,$role_element,$credits_element) = @_;
my (@courserolenames,@communityrolenames,$rolestr,$courserolestr,	my (@courserolenames,@communityrolenames,$rolestr,$courserolestr,
$communityrolestr);	$communityrolestr);
if ($role_element ne '') {	if ($role_element ne '') {
Line 845 function setRole(crstype) {	Line 849 function setRole(crstype) {
}	}
\|;	\|;
}	}
	if ($credits_element) {
	$setsections .= qq\|
	function setCredits(defaultcredits) {
	document.$formname.$credits_element.value = defaultcredits;
	return;
	}
	\|;
	}
return $setsections;	return $setsections;
}	}

Line 999 sub select_language {	Line 1011 sub select_language {
$langchoices{$code} = &plainlanguagedescription($id);	$langchoices{$code} = &plainlanguagedescription($id);
}	}
}	}
	%langchoices = &Apache::lonlocal::texthash(%langchoices);
return &select_form($selected,$name,\%langchoices);	return &select_form($selected,$name,\%langchoices);
}	}

Line 1057 linked_select_forms takes the following	Line 1070 linked_select_forms takes the following

=item * $menuorder, the order of values in the first menu	=item * $menuorder, the order of values in the first menu

	=item * $onchangefirst, additional javascript call to execute for an onchange
	event for the first <select> tag

	=item * $onchangesecond, additional javascript call to execute for an onchange
	event for the second <select> tag

=back	=back

Below is an example of such a hash. Only the 'text', 'default', and	Below is an example of such a hash. Only the 'text', 'default', and
Line 1110 sub linked_select_forms {	Line 1129 sub linked_select_forms {
$secondselectname,	$secondselectname,
$hashref,	$hashref,
$menuorder,	$menuorder,
	$onchangefirst,
	$onchangesecond
) = @_;	) = @_;
my $second = "document.$formname.$secondselectname";	my $second = "document.$formname.$secondselectname";
my $first = "document.$formname.$firstselectname";	my $first = "document.$formname.$firstselectname";
Line 1166 function select1_changed() {	Line 1187 function select1_changed() {
</script>	</script>
END	END
# output the initial values for the selection lists	# output the initial values for the selection lists
$result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed()\">\n";	$result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed();$onchangefirst\">\n";
my @order = sort(keys(%{$hashref}));	my @order = sort(keys(%{$hashref}));
if (ref($menuorder) eq 'ARRAY') {	if (ref($menuorder) eq 'ARRAY') {
@order = @{$menuorder};	@order = @{$menuorder};
Line 1179 END	Line 1200 END
$result .= "</select>\n";	$result .= "</select>\n";
my %select2 = %{$hashref->{$firstdefault}->{'select2'}};	my %select2 = %{$hashref->{$firstdefault}->{'select2'}};
$result .= $middletext;	$result .= $middletext;
$result .= "<select size=\"1\" name=\"$secondselectname\">\n";	$result .= "<select size=\"1\" name=\"$secondselectname\"";
	if ($onchangesecond) {
	$result .= ' onchange="'.$onchangesecond.'"';
	}
	$result .= ">\n";
my $seconddefault = $hashref->{$firstdefault}->{'default'};	my $seconddefault = $hashref->{$firstdefault}->{'default'};

my @secondorder = sort(keys(%select2));	my @secondorder = sort(keys(%select2));
Line 2166 sub select_level_form {	Line 2191 sub select_level_form {

=pod	=pod

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

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 2179 If the $showdomdesc flag is set, the dom	Line 2204 If the $showdomdesc flag is set, the dom

The optional $onchange argument specifies what should occur if the domain selector is changed, e.g., 'this.form.submit()' if the form is to be automatically submitted.	The optional $onchange argument specifies what should occur if the domain selector is changed, e.g., 'this.form.submit()' if the form is to be automatically submitted.

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.

=cut	=cut

#-------------------------------------------	#-------------------------------------------
sub select_dom_form {	sub select_dom_form {
my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms) = @_;	my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms) = @_;
if ($onchange) {	if ($onchange) {
$onchange = ' onchange="'.$onchange.'"';	$onchange = ' onchange="'.$onchange.'"';
}	}
my @domains;	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});
} else {	} else {
@domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());	@domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
}	}
if ($includeempty) { @domains=('',@domains); }	if ($includeempty) { @domains=('',@domains); }
	if (ref($excdoms) eq 'ARRAY') {
	map { $exclude{$_} = 1; } @{$excdoms};
	}
my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";	my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";
foreach my $dom (@domains) {	foreach my $dom (@domains) {
	next if ($exclude{$dom});
$selectdomain.="<option value=\"$dom\" ".	$selectdomain.="<option value=\"$dom\" ".
($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;	($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
if ($showdomdesc) {	if ($showdomdesc) {
Line 4979 sub CSTR_pageheader {	Line 5010 sub CSTR_pageheader {

my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
my ($udom,$uname,$thisdisfn)=	my ($udom,$uname,$thisdisfn)=
($trailfile =~ m{^\Q$londocroot\E/priv/([^/]+)/([^/]+)/(.*)$});	($trailfile =~ m{^\Q$londocroot\E/priv/([^/]+)/([^/]+)(?:\|/(.*))$});
my $formaction = "/priv/$udom/$uname/$thisdisfn";	my $formaction = "/priv/$udom/$uname/$thisdisfn";
$formaction =~ s{/+}{/}g;	$formaction =~ s{/+}{/}g;

Line 5722 table.LC_nested tr.LC_empty_row td {	Line 5753 table.LC_nested tr.LC_empty_row td {
padding: 8px;	padding: 8px;
}	}

table.LC_data_table tr.LC_empty_row td {	table.LC_data_table tr.LC_empty_row td,
	table.LC_data_table tr.LC_footer_row td {
background-color: $sidebg;	background-color: $sidebg;
}	}

Line 6448 div.LC_edit_problem_saves {	Line 6480 div.LC_edit_problem_saves {
padding-bottom: 5px;	padding-bottom: 5px;
}	}

	.LC_edit_opt {
	padding-left: 1em;
	white-space: nowrap;
	}

img.stift {	img.stift {
border-width: 0;	border-width: 0;
vertical-align: middle;	vertical-align: middle;
Line 6656 ol.LC_docs_parameters li.LC_docs_paramet	Line 6693 ol.LC_docs_parameters li.LC_docs_paramet
}	}

ul#LC_secondary_menu {	ul#LC_secondary_menu {
clear: both;	clear: right;
color: $fontmenu;	color: $fontmenu;
background: $tabbg;	background: $tabbg;
list-style: none;	list-style: none;
Line 6664 ul#LC_secondary_menu {	Line 6701 ul#LC_secondary_menu {
margin: 0;	margin: 0;
width: 100%;	width: 100%;
text-align: left;	text-align: left;
	float: left;
}	}

ul#LC_secondary_menu li {	ul#LC_secondary_menu li {
font-weight: bold;	font-weight: bold;
line-height: 1.8em;	line-height: 1.8em;
	border-right: 1px solid black;
	float: left;
	}

	ul#LC_secondary_menu li.LC_hoverable:hover, ul#LC_secondary_menu li.hover {
	background-color: $data_table_light;
	}

	ul#LC_secondary_menu li a {
padding: 0 0.8em;	padding: 0 0.8em;
	}

	ul#LC_secondary_menu li ul {
	display: none;
	}

	ul#LC_secondary_menu li:hover ul, ul#LC_secondary_menu li.hover ul {
	display: block;
	position: absolute;
	margin: 0;
	padding: 0;
	list-style:none;
	float: none;
	background-color: $data_table_light;
	z-index: 2;
	margin-left: -1px;
	}

	ul#LC_secondary_menu li ul li {
	font-size: 90%;
	vertical-align: top;
	border-left: 1px solid black;
border-right: 1px solid black;	border-right: 1px solid black;
display: inline;	background-color: $data_table_light;
vertical-align: middle;	list-style:none;
	float: none;
	}

	ul#LC_secondary_menu li ul li:hover, ul#LC_secondary_menu li ul li.hover {
	background-color: $data_table_dark;
}	}

ul.LC_TabContent {	ul.LC_TabContent {
Line 7744 sub LCprogressbar {	Line 7818 sub LCprogressbar {
$LCcurrentid=$$.'_'.$LCidcnt;	$LCcurrentid=$$.'_'.$LCidcnt;
my $starting=&mt('Starting');	my $starting=&mt('Starting');
my $content=(<<ENDPROGBAR);	my $content=(<<ENDPROGBAR);
<p>
<div id="progressbar$LCcurrentid">	<div id="progressbar$LCcurrentid">
<span class="pblabel">$starting</span>	<span class="pblabel">$starting</span>
</div>	</div>
</p>
ENDPROGBAR	ENDPROGBAR
&r_print($r,$content.&LCprogressbar_script($LCcurrentid));	&r_print($r,$content.&LCprogressbar_script($LCcurrentid));
}	}
Line 8162 sub get_sections {	Line 8234 sub get_sections {
my %sectioncount;	my %sectioncount;
my $now = time;	my $now = time;

if (!defined($possible_roles) \|\| (grep(/^st$/,@$possible_roles))) {	my $check_students = 1;
	my $only_students = 0;
	if (ref($possible_roles) eq 'ARRAY') {
	if (grep(/^st$/,@{$possible_roles})) {
	if (@{$possible_roles} == 1) {
	$only_students = 1;
	}
	} else {
	$check_students = 0;
	}
	}

	if ($check_students) {
my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);	my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);
my $sec_index = &Apache::loncoursedata::CL_SECTION();	my $sec_index = &Apache::loncoursedata::CL_SECTION();
my $status_index = &Apache::loncoursedata::CL_STATUS();	my $status_index = &Apache::loncoursedata::CL_STATUS();
Line 8189 sub get_sections {	Line 8273 sub get_sections {
}	}
}	}
}	}
	if ($only_students) {
	return %sectioncount;
	}
my %courseroles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);	my %courseroles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
foreach my $user (sort(keys(%courseroles))) {	foreach my $user (sort(keys(%courseroles))) {
if ($user !~ /^(\w{2})/) { next; }	if ($user !~ /^(\w{2})/) { next; }
Line 8336 sub get_course_users {	Line 8423 sub get_course_users {
active => 'Active',	active => 'Active',
future => 'Future',	future => 'Future',
);	);
my %nothide;	my (%nothide,@possdoms);
if ($hidepriv) {	if ($hidepriv) {
my %coursehash=&Apache::lonnet::coursedescription($cdom.'_'.$cnum);	my %coursehash=&Apache::lonnet::coursedescription($cdom.'_'.$cnum);
foreach my $user (split(/\s\,\s/,$coursehash{'nothideprivileged'})) {	foreach my $user (split(/\s\,\s/,$coursehash{'nothideprivileged'})) {
Line 8346 sub get_course_users {	Line 8433 sub get_course_users {
$nothide{$user} = 1;	$nothide{$user} = 1;
}	}
}	}
	my @possdoms = ($cdom);
	if ($coursehash{'checkforpriv'}) {
	push(@possdoms,split(/,/,$coursehash{'checkforpriv'}));
	}
}	}
foreach my $person (sort(keys(%coursepersonnel))) {	foreach my $person (sort(keys(%coursepersonnel))) {
my $match = 0;	my $match = 0;
Line 8381 sub get_course_users {	Line 8472 sub get_course_users {
}	}
if ($uname ne '' && $udom ne '') {	if ($uname ne '' && $udom ne '') {
if ($hidepriv) {	if ($hidepriv) {
if ((&Apache::lonnet::privileged($uname,$udom)) &&	if ((&Apache::lonnet::privileged($uname,$udom,\@possdoms)) &&
(!$nothide{$uname.':'.$udom})) {	(!$nothide{$uname.':'.$udom})) {
next;	next;
}	}
Line 9472 sub ask_for_embedded_content {	Line 9563 sub ask_for_embedded_content {
my $heading = &mt('Upload embedded files');	my $heading = &mt('Upload embedded files');
my $buttontext = &mt('Upload');	my $buttontext = &mt('Upload');

my $navmap;	my ($navmap,$cdom,$cnum);
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
$navmap = Apache::lonnavmaps::navmap->new();	if ($actionurl eq '/adm/dependencies') {
	$navmap = Apache::lonnavmaps::navmap->new();
	}
	$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
}	}
if (($actionurl eq '/adm/portfolio') \|\| ($actionurl eq '/adm/coursegrp_portfolio')) {	if (($actionurl eq '/adm/portfolio') \|\|
	($actionurl eq '/adm/coursegrp_portfolio')) {
my $current_path='/';	my $current_path='/';
if ($env{'form.currentpath'}) {	if ($env{'form.currentpath'}) {
$current_path = $env{'form.currentpath'};	$current_path = $env{'form.currentpath'};
}	}
if ($actionurl eq '/adm/coursegrp_portfolio') {	if ($actionurl eq '/adm/coursegrp_portfolio') {
$udom = $env{'course.'.$env{'request.course.id'}.'.domain'};	$udom = $cdom;
$uname = $env{'course.'.$env{'request.course.id'}.'.num'};	$uname = $cnum;
$url = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';	$url = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';
} else {	} else {
$udom = $env{'user.domain'};	$udom = $env{'user.domain'};
Line 9515 sub ask_for_embedded_content {	Line 9611 sub ask_for_embedded_content {
}	}
} elsif ($actionurl eq '/adm/dependencies') {	} elsif ($actionurl eq '/adm/dependencies') {
if ($env{'request.course.id'} ne '') {	if ($env{'request.course.id'} ne '') {
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
if (ref($args) eq 'HASH') {	if (ref($args) eq 'HASH') {
$url = $args->{'docs_url'};	$url = $args->{'docs_url'};
$title = $args->{'docs_title'};	$title = $args->{'docs_title'};
$toplevel = "/$url";	$toplevel = $url;
	unless ($toplevel =~ m{^/}) {
	$toplevel = "/$url";
	}
($rem) = ($toplevel =~ m{^(.+/)[^/]+$});	($rem) = ($toplevel =~ m{^(.+/)[^/]+$});
($path) =	if ($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/portfolio/syllabus\E)}) {
($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs\|supplemental)/(?:default\|\d+)/\d+)/});	$path = $1;
	} else {
	($path) =
	($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs\|supplemental)/(?:default\|\d+)/\d+)/});
	}
$fileloc = &Apache::lonnet::filelocation('',$toplevel);	$fileloc = &Apache::lonnet::filelocation('',$toplevel);
$fileloc =~ s{^/}{};	$fileloc =~ s{^/}{};
($filename) = ($fileloc =~ m{.+/([^/]+)$});	($filename) = ($fileloc =~ m{.+/([^/]+)$});
$heading = &mt('Status of dependencies in [_1]',"$title ($filename)");	$heading = &mt('Status of dependencies in [_1]',"$title ($filename)");
}	}
}	}
}	} elsif ($actionurl eq "/public/$cdom/$cnum/syllabus") {
my $now = time();	$udom = $cdom;
foreach my $embed_file (keys(%{$allfiles})) {	$uname = $cnum;
	$url = "/uploaded/$cdom/$cnum/portfolio/syllabus";
	$toplevel = $url;
	$path = $url;
	$fileloc = &Apache::lonnet::filelocation('',$toplevel).'/';
	$fileloc =~ s{^/}{};
	}
	foreach my $file (keys(%{$allfiles})) {
	my $embed_file;
	if (($path eq "/uploaded/$cdom/$cnum/portfolio/syllabus") && ($file =~ m{^\Q$path/\E(.+)$})) {
	$embed_file = $1;
	} else {
	$embed_file = $file;
	}
my $absolutepath;	my $absolutepath;
if ($embed_file =~ m{^\w+://}) {	if ($embed_file =~ m{^\w+://}) {
$newfiles{$embed_file} = 1;	$newfiles{$embed_file} = 1;
Line 9570 sub ask_for_embedded_content {	Line 9684 sub ask_for_embedded_content {
my $dirptr = 16384;	my $dirptr = 16384;
foreach my $path (keys(%subdependencies)) {	foreach my $path (keys(%subdependencies)) {
$currsubfile{$path} = {};	$currsubfile{$path} = {};
if (($actionurl eq '/adm/portfolio') \|\| ($actionurl eq '/adm/coursegrp_portfolio')) {	if (($actionurl eq '/adm/portfolio') \|\|
	($actionurl eq '/adm/coursegrp_portfolio')) {
my ($sublistref,$listerror) =	my ($sublistref,$listerror) =
&Apache::lonnet::dirlist($url.$path,$udom,$uname,$getpropath);	&Apache::lonnet::dirlist($url.$path,$udom,$uname,$getpropath);
if (ref($sublistref) eq 'ARRAY') {	if (ref($sublistref) eq 'ARRAY') {
Line 9586 sub ask_for_embedded_content {	Line 9701 sub ask_for_embedded_content {
}	}
} elsif (($actionurl eq '/adm/dependencies') \|\|	} elsif (($actionurl eq '/adm/dependencies') \|\|
(($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&	(($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&
($args->{'context'} eq 'paste'))) {	($args->{'context'} eq 'paste')) \|\|
	($actionurl eq "/public/$cdom/$cnum/syllabus")) {
if ($env{'request.course.id'} ne '') {	if ($env{'request.course.id'} ne '') {
my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$});	my $dir;
	if ($actionurl eq "/public/$cdom/$cnum/syllabus") {
	$dir = $fileloc;
	} else {
	($dir) = ($fileloc =~ m{^(.+/)[^/]+$});
	}
if ($dir ne '') {	if ($dir ne '') {
my ($sublistref,$listerror) =	my ($sublistref,$listerror) =
&Apache::lonnet::dirlist($dir.$path,$cdom,$cnum,$getpropath,undef,'/');	&Apache::lonnet::dirlist($dir.$path,$cdom,$cnum,$getpropath,undef,'/');
Line 9636 sub ask_for_embedded_content {	Line 9757 sub ask_for_embedded_content {
}	}
}	}
my %currfile;	my %currfile;
if (($actionurl eq '/adm/portfolio') \|\| ($actionurl eq '/adm/coursegrp_portfolio')) {	if (($actionurl eq '/adm/portfolio') \|\|
	($actionurl eq '/adm/coursegrp_portfolio')) {
my ($dirlistref,$listerror) =	my ($dirlistref,$listerror) =
&Apache::lonnet::dirlist($url,$udom,$uname,$getpropath);	&Apache::lonnet::dirlist($url,$udom,$uname,$getpropath);
if (ref($dirlistref) eq 'ARRAY') {	if (ref($dirlistref) eq 'ARRAY') {
Line 9652 sub ask_for_embedded_content {	Line 9774 sub ask_for_embedded_content {
}	}
} elsif (($actionurl eq '/adm/dependencies') \|\|	} elsif (($actionurl eq '/adm/dependencies') \|\|
(($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&	(($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&
($args->{'context'} eq 'paste'))) {	($args->{'context'} eq 'paste')) \|\|
	($actionurl eq "/public/$cdom/$cnum/syllabus")) {
if ($env{'request.course.id'} ne '') {	if ($env{'request.course.id'} ne '') {
my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$});	my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$});
if ($dir ne '') {	if ($dir ne '') {
Line 9687 sub ask_for_embedded_content {	Line 9810 sub ask_for_embedded_content {
($file eq $filename.'.bak') \|\|	($file eq $filename.'.bak') \|\|
($dependencies{$file})) {	($dependencies{$file})) {
if ($actionurl eq '/adm/dependencies') {	if ($actionurl eq '/adm/dependencies') {
next if (($rem ne '') &&	unless ($toplevel =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus\E}) {
(($env{"httpref.$rem".$file} ne '') \|\|	next if (($rem ne '') &&
(ref($navmap) &&	(($env{"httpref.$rem".$file} ne '') \|\|
(($navmap->getResourceByUrl($rem.$file) ne '') \|\|	(ref($navmap) &&
(($file =~ /^(.*\.s?html?)\.bak$/i) &&	(($navmap->getResourceByUrl($rem.$file) ne '') \|\|
($navmap->getResourceByUrl($rem.$1)))))));	(($file =~ /^(.*\.s?html?)\.bak$/i) &&
	($navmap->getResourceByUrl($rem.$1)))))));
	}
}	}
$unused{$file} = 1;	$unused{$file} = 1;
}	}
Line 9701 sub ask_for_embedded_content {	Line 9826 sub ask_for_embedded_content {
($args->{'context'} eq 'paste')) {	($args->{'context'} eq 'paste')) {
$counter = scalar(keys(%existing));	$counter = scalar(keys(%existing));
$numpathchg = scalar(keys(%pathchanges));	$numpathchg = scalar(keys(%pathchanges));
return ($output,$counter,$numpathchg,\%existing);	return ($output,$counter,$numpathchg,\%existing);
	} elsif (($actionurl eq "/public/$cdom/$cnum/syllabus") &&
	(ref($args) eq 'HASH') && ($args->{'context'} eq 'rewrites')) {
	$counter = scalar(keys(%existing));
	$numpathchg = scalar(keys(%pathchanges));
	return ($output,$counter,$numpathchg,\%existing,\%mapping);
}	}
foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%newfiles)) {	foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%newfiles)) {
if ($actionurl eq '/adm/dependencies') {	if ($actionurl eq '/adm/dependencies') {
next if ($embed_file =~ m{^\w+://});	next if ($embed_file =~ m{^\w+://});
}	}
$upload_output .= &start_data_table_row().	$upload_output .= &start_data_table_row().
'<td><img src="'.&icon($embed_file).'" /> '.	'<td valign="top"><img src="'.&icon($embed_file).'" /> '.
'<span class="LC_filename">'.$embed_file.'</span>';	'<span class="LC_filename">'.$embed_file.'</span>';
unless ($mapping{$embed_file} eq $embed_file) {	unless ($mapping{$embed_file} eq $embed_file) {
$upload_output .= '<br /><span class="LC_info" style="font-size:smaller;">'.&mt('changed from: [_1]',$mapping{$embed_file}).'</span>';	$upload_output .= '<br /><span class="LC_info" style="font-size:smaller;">'.
	&mt('changed from: [_1]',$mapping{$embed_file}).'</span>';
}	}
$upload_output .= '</td><td>';	$upload_output .= '</td>';
if ($args->{'ignore_remote_references'} && $embed_file =~ m{^\w+://}) {	if ($args->{'ignore_remote_references'} && $embed_file =~ m{^\w+://}) {
$upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';	$upload_output.='<td align="right">'.
	'<span class="LC_info LC_fontsize_medium">'.
	&mt("URL points to web address").'</span>';
$numremref++;	$numremref++;
} elsif ($args->{'error_on_invalid_names'}	} elsif ($args->{'error_on_invalid_names'}
&& $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {	&& $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
$upload_output.='<span class="LC_warning">'.&mt('Invalid characters').'</span>';	$upload_output.='<td align="right"><span class="LC_warning">'.
	&mt('Invalid characters').'</span>';
$numinvalid++;	$numinvalid++;
} else {	} else {
$upload_output .= &embedded_file_element('upload_embedded',$counter,	$upload_output .= '<td>'.
	&embedded_file_element('upload_embedded',$counter,
$embed_file,\%mapping,	$embed_file,\%mapping,
$allfiles,$codebase,'upload');	$allfiles,$codebase,'upload');
$counter ++;	$counter ++;
Line 9751 sub ask_for_embedded_content {	Line 9886 sub ask_for_embedded_content {
$counter ++;	$counter ++;
} else {	} else {
$upload_output .= &start_data_table_row().	$upload_output .= &start_data_table_row().
'<td><span class="LC_filename">'.$embed_file.'</span></td>';	'<td valign="top"><img src="'.&icon($embed_file).'" /> '.
'<td><span class="LC_warning">'.&mt('Already exists').'</span></td>'.	'<span class="LC_filename">'.$embed_file.'</span></td>'.
	'<td align="right"><span class="LC_info LC_fontsize_medium">'.&mt('Already exists').'</span></td>'.
&Apache::loncommon::end_data_table_row()."\n";	&Apache::loncommon::end_data_table_row()."\n";
}	}
}	}
Line 9847 sub ask_for_embedded_content {	Line 9983 sub ask_for_embedded_content {
$output = '<b>'.&mt('Referenced files').'</b>:<br />';	$output = '<b>'.&mt('Referenced files').'</b>:<br />';
if ($applies > 1) {	if ($applies > 1) {
$output .=	$output .=
&mt('No files need to be uploaded, as one of the following applies to each reference:').'<ul>';	&mt('No dependencies need to be uploaded, as one of the following applies to each reference:').'<ul>';
if ($numremref) {	if ($numremref) {
$output .= '<li>'.&mt('reference is to a URL which points to another server').'</li>'."\n";	$output .= '<li>'.&mt('reference is to a URL which points to another server').'</li>'."\n";
}	}
Line 9890 sub ask_for_embedded_content {	Line 10026 sub ask_for_embedded_content {
$chgcount ++;	$chgcount ++;
}	}
}	}
if ($counter) {	if (($counter) \|\| ($numunused)) {
if ($numpathchg) {	if ($numpathchg) {
$output .= '<input type ="hidden" name="number_pathchange_items" value="'.	$output .= '<input type ="hidden" name="number_pathchange_items" value="'.
$numpathchg.'" />'."\n";	$numpathchg.'" />'."\n";
Line 9903 sub ask_for_embedded_content {	Line 10039 sub ask_for_embedded_content {
} elsif ($actionurl eq '/adm/dependencies') {	} elsif ($actionurl eq '/adm/dependencies') {
$output .= '<input type="hidden" name="action" value="process_changes" />';	$output .= '<input type="hidden" name="action" value="process_changes" />';
}	}
$output .= '<input type ="submit" value="'.$buttontext.'" />'."\n".'</form>'."\n";	$output .= '<input type ="submit" value="'.$buttontext.'" />'."\n".'</form>'."\n";
} elsif ($numpathchg) {	} elsif ($numpathchg) {
my %pathchange = ();	my %pathchange = ();
$output .= &modify_html_form('pathchange',$actionurl,$state,\%pathchange,$pathchange_output);	$output .= &modify_html_form('pathchange',$actionurl,$state,\%pathchange,$pathchange_output);
if (($actionurl eq '/adm/portfolio') \|\| ($actionurl eq '/adm/coursegrp_portfolio')) {	if (($actionurl eq '/adm/portfolio') \|\| ($actionurl eq '/adm/coursegrp_portfolio')) {
$output .= '<p>'.&mt('or').'</p>';	$output .= '<p>'.&mt('or').'</p>';
}	}
}	}
return ($output,$counter,$numpathchg);	return ($output,$counter,$numpathchg);
}	}
Line 10045 sub upload_embedded {	Line 10181 sub upload_embedded {
$output .= &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1).'<br />';	$output .= &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1).'<br />';
next;	next;
} elsif ($fname=~/\.(\d+)\.(\w+)$/) {	} elsif ($fname=~/\.(\d+)\.(\w+)$/) {
$output .= &mt('File name not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2).'<br />';	$output .= &mt('Filename not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2).'<br />';
next;	next;
}	}
$env{'form.embedded_item_'.$i.'.filename'}=$fname;	$env{'form.embedded_item_'.$i.'.filename'}=$fname;
	my $subdir = $path;
	$subdir =~ s{/+$}{};
if ($context eq 'portfolio') {	if ($context eq 'portfolio') {
my $result;	my $result;
if ($state eq 'existingfile') {	if ($state eq 'existingfile') {
$result=	$result=
&Apache::lonnet::userfileupload('embedded_item_'.$i,'existingfile',	&Apache::lonnet::userfileupload('embedded_item_'.$i,'existingfile',
$dirpath.$env{'form.currentpath'}.$path);	$dirpath.$env{'form.currentpath'}.$subdir);
} else {	} else {
$result=	$result=
&Apache::lonnet::userfileupload('embedded_item_'.$i,'',	&Apache::lonnet::userfileupload('embedded_item_'.$i,'',
$dirpath.	$dirpath.
$env{'form.currentpath'}.$path);	$env{'form.currentpath'}.$subdir);
if ($result !~ m\|^/uploaded/\|) {	if ($result !~ m\|^/uploaded/\|) {
$output .= '<span class="LC_error">'	$output .= '<span class="LC_error">'
.&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'	.&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'
Line 10071 sub upload_embedded {	Line 10209 sub upload_embedded {
$path.$fname.'</span>').'<br />';	$path.$fname.'</span>').'<br />';
}	}
}	}
} elsif ($context eq 'coursedoc') {	} elsif (($context eq 'coursedoc') \|\| ($context eq 'syllabus')) {
	my $extendedsubdir = $dirpath.'/'.$subdir;
	$extendedsubdir =~ s{/+$}{};
my $result =	my $result =
&Apache::lonnet::userfileupload('embedded_item_'.$i,'coursedoc',	&Apache::lonnet::userfileupload('embedded_item_'.$i,$context,$extendedsubdir);
$dirpath.'/'.$path);
if ($result !~ m\|^/uploaded/\|) {	if ($result !~ m\|^/uploaded/\|) {
$output .= '<span class="LC_error">'	$output .= '<span class="LC_error">'
.&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'	.&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'
Line 10084 sub upload_embedded {	Line 10223 sub upload_embedded {
} else {	} else {
$output .= &mt('Uploaded [_1]','<span class="LC_filename">'.	$output .= &mt('Uploaded [_1]','<span class="LC_filename">'.
$path.$fname.'</span>').'<br />';	$path.$fname.'</span>').'<br />';
	if ($context eq 'syllabus') {
	&Apache::lonnet::make_public_indefinitely($result);
	}
}	}
} else {	} else {
# Save the file	# Save the file
Line 10215 sub modify_html_form {	Line 10357 sub modify_html_form {
}	}

sub modify_html_refs {	sub modify_html_refs {
my ($context,$dirpath,$uname,$udom,$dir_root) = @_;	my ($context,$dirpath,$uname,$udom,$dir_root,$url) = @_;
my $container;	my $container;
if ($context eq 'portfolio') {	if ($context eq 'portfolio') {
$container = $env{'form.container'};	$container = $env{'form.container'};
Line 10224 sub modify_html_refs {	Line 10366 sub modify_html_refs {
} elsif ($context eq 'manage_dependencies') {	} elsif ($context eq 'manage_dependencies') {
(undef,undef,$container) = &Apache::lonnet::decode_symb($env{'form.symb'});	(undef,undef,$container) = &Apache::lonnet::decode_symb($env{'form.symb'});
$container = "/$container";	$container = "/$container";
	} elsif ($context eq 'syllabus') {
	$container = $url;
} else {	} else {
$container = $Apache::lonnet::perlvar{'lonDocRoot'}.$env{'form.filename'};	$container = $Apache::lonnet::perlvar{'lonDocRoot'}.$env{'form.filename'};
}	}
my (%allfiles,%codebase,$output,$content);	my (%allfiles,%codebase,$output,$content);
my @changes = &get_env_multiple('form.namechange');	my @changes = &get_env_multiple('form.namechange');
unless (@changes > 0) {	unless ((@changes > 0) \|\| ($context eq 'syllabus')) {
if (wantarray) {	if (wantarray) {
return ('',0,0);	return ('',0,0);
} else {	} else {
Line 10237 sub modify_html_refs {	Line 10381 sub modify_html_refs {
}	}
}	}
if (($context eq 'portfolio') \|\| ($context eq 'coursedoc') \|\|	if (($context eq 'portfolio') \|\| ($context eq 'coursedoc') \|\|
($context eq 'manage_dependencies')) {	($context eq 'manage_dependencies') \|\| ($context eq 'syllabus')) {
unless ($container =~ m{^/uploaded/\Q$udom\E/\Q$uname\E/}) {	unless ($container =~ m{^/uploaded/\Q$udom\E/\Q$uname\E/}) {
if (wantarray) {	if (wantarray) {
return ('',0,0);	return ('',0,0);
Line 10293 sub modify_html_refs {	Line 10437 sub modify_html_refs {
if ($content =~ m{($attrib_regexp\s=\s['"]?)\Q$ref\E(['"]?)}) {	if ($content =~ m{($attrib_regexp\s=\s['"]?)\Q$ref\E(['"]?)}) {
my $numchg = ($content =~ s{($attrib_regexp\s=\s['"]?)\Q$ref\E(['"]?)}{$1$newname$2}gi);	my $numchg = ($content =~ s{($attrib_regexp\s=\s['"]?)\Q$ref\E(['"]?)}{$1$newname$2}gi);
$count += $numchg;	$count += $numchg;
	$allfiles{$newname} = $allfiles{$ref};
}	}
if ($env{'form.embedded_codebase_'.$i} ne '') {	if ($env{'form.embedded_codebase_'.$i} ne '') {
$codebase = &unescape($env{'form.embedded_codebase_'.$i});	$codebase = &unescape($env{'form.embedded_codebase_'.$i});
Line 10301 sub modify_html_refs {	Line 10446 sub modify_html_refs {
}	}
}	}
}	}
	my $skiprewrites;
if ($count \|\| $codebasecount) {	if ($count \|\| $codebasecount) {
my $saveresult;	my $saveresult;
if (($context eq 'portfolio') \|\| ($context eq 'coursedoc') \|\|	if (($context eq 'portfolio') \|\| ($context eq 'coursedoc') \|\|
($context eq 'manage_dependencies')) {	($context eq 'manage_dependencies') \|\| ($context eq 'syllabus')) {
my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult);	my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult);
if ($url eq $container) {	if ($url eq $container) {
my ($fname) = ($container =~ m{/([^/]+)$});	my ($fname) = ($container =~ m{/([^/]+)$});
Line 10317 sub modify_html_refs {	Line 10463 sub modify_html_refs {
'<span class="LC_filename">'.	'<span class="LC_filename">'.
$container.'</span>').'</p>';	$container.'</span>').'</p>';
}	}
	if ($context eq 'syllabus') {
	unless ($saveresult eq 'ok') {
	$skiprewrites = 1;
	}
	}
} else {	} else {
if (open(my $fh,">$container")) {	if (open(my $fh,">$container")) {
print $fh $content;	print $fh $content;
Line 10332 sub modify_html_refs {	Line 10483 sub modify_html_refs {
}	}
}	}
}	}
	if (($context eq 'syllabus') && (!$skiprewrites)) {
	my ($actionurl,$state);
	$actionurl = "/public/$udom/$uname/syllabus";
	my ($ignore,$num,$numpathchanges,$existing,$mapping) =
	&ask_for_embedded_content($actionurl,$state,\%allfiles,
	\%codebase,
	{'context' => 'rewrites',
	'ignore_remote_references' => 1,});
	if (ref($mapping) eq 'HASH') {
	my $rewrites = 0;
	foreach my $key (keys(%{$mapping})) {
	next if ($key =~ m{^https?://});
	my $ref = $mapping->{$key};
	my $newname = "/uploaded/$udom/$uname/portfolio/syllabus/$key";
	my $attrib;
	if (ref($allfiles{$mapping->{$key}}) eq 'ARRAY') {
	$attrib = join('\|',@{$allfiles{$mapping->{$key}}});
	}
	if ($content =~ m{($attrib\s=\s['"]?)\Q$ref\E(['"]?)}) {
	my $numchg = ($content =~ s{($attrib\s=\s['"]?)\Q$ref\E(['"]?)}{$1$newname$2}gi);
	$rewrites += $numchg;
	}
	}
	if ($rewrites) {
	my $saveresult;
	my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult);
	if ($url eq $container) {
	my ($fname) = ($container =~ m{/([^/]+)$});
	$output .= '<p>'.&mt('Rewrote [quant,_1,link] as [quant,_1,absolute link] in [_2].',
	$count,'<span class="LC_filename">'.
	$fname.'</span>').'</p>';
	} else {
	$output .= '<p class="LC_error">'.
	&mt('Error: could not update links in [_1].',
	'<span class="LC_filename">'.
	$container.'</span>').'</p>';

	}
	}
	}
	}
} else {	} else {
&logthis('Failed to parse '.$container.	&logthis('Failed to parse '.$container.
' to modify references: '.$parse_result);	' to modify references: '.$parse_result);
Line 10747 sub process_decompression {	Line 10939 sub process_decompression {
my ($docudom,$docuname,$file,$destination,$dir_root,$hiddenelem) = @_;	my ($docudom,$docuname,$file,$destination,$dir_root,$hiddenelem) = @_;
my ($dir,$error,$warning,$output);	my ($dir,$error,$warning,$output);
if ($file !~ /\.(zip\|tar\|bz2\|gz\|tar.gz\|tar.bz2\|tgz)$/) {	if ($file !~ /\.(zip\|tar\|bz2\|gz\|tar.gz\|tar.bz2\|tgz)$/) {
$error = &mt('File name not a supported archive file type.').	$error = &mt('Filename not a supported archive file type.').
'<br />'.&mt('File name should end with one of: [_1].',	'<br />'.&mt('Filename should end with one of: [_1].',
'.zip, .tar, .bz2, .gz, .tar.gz, .tar.bz2, .tgz');	'.zip, .tar, .bz2, .gz, .tar.gz, .tar.bz2, .tgz');
} else {	} else {
my $docuhome = &Apache::lonnet::homeserver($docuname,$docudom);	my $docuhome = &Apache::lonnet::homeserver($docuname,$docudom);
Line 11587 sub cleanup_empty_dirs {	Line 11779 sub cleanup_empty_dirs {
my $numitems = 0;	my $numitems = 0;
foreach my $item (@dircontents) {	foreach my $item (@dircontents) {
if (-d "$path/$item") {	if (-d "$path/$item") {
&recurse_dirs("$path/$item");	&cleanup_empty_dirs("$path/$item");
if (-e "$path/$item") {	if (-e "$path/$item") {
$numitems ++;	$numitems ++;
}	}
Line 11634 sub get_folder_hierarchy {	Line 11826 sub get_folder_hierarchy {
my @pcs = split(/,/,$pcslist);	my @pcs = split(/,/,$pcslist);
foreach my $pc (@pcs) {	foreach my $pc (@pcs) {
if ($pc == 1) {	if ($pc == 1) {
push(@pathitems,&mt('Main Course Documents'));	push(@pathitems,&mt('Main Content'));
} else {	} else {
my $res = $navmap->getByMapPc($pc);	my $res = $navmap->getByMapPc($pc);
if (ref($res)) {	if (ref($res)) {
Line 11649 sub get_folder_hierarchy {	Line 11841 sub get_folder_hierarchy {
}	}
if ($showitem) {	if ($showitem) {
if ($mapres->{ID} eq '0.0') {	if ($mapres->{ID} eq '0.0') {
push(@pathitems,&mt('Main Course Documents'));	push(@pathitems,&mt('Main Content'));
} else {	} else {
my $maptitle = $mapres->compTitle();	my $maptitle = $mapres->compTitle();
$maptitle =~ s/\W+/_/g;	$maptitle =~ s/\W+/_/g;
Line 13136 sub commit_customrole {	Line 13328 sub commit_customrole {
}	}

sub commit_standardrole {	sub commit_standardrole {
my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_;	my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context,$credits) = @_;
my ($output,$logmsg,$linefeed);	my ($output,$logmsg,$linefeed);
if ($context eq 'auto') {	if ($context eq 'auto') {
$linefeed = "\n";	$linefeed = "\n";
Line 13145 sub commit_standardrole {	Line 13337 sub commit_standardrole {
}	}
if ($three eq 'st') {	if ($three eq 'st') {
my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,	my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,
$one,$two,$sec,$context);	$one,$two,$sec,$context,$credits);
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 13176 sub commit_standardrole {	Line 13368 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) = @_;
my ($result,$linefeed,$oldsecurl,$newsecurl);	my ($result,$linefeed,$oldsecurl,$newsecurl);
if ($context eq 'auto') {	if ($context eq 'auto') {
$linefeed = "\n";	$linefeed = "\n";
Line 13223 sub commit_studentrole {	Line 13416 sub commit_studentrole {
}	}
}	}
if (($expire_role_result eq 'ok') \|\| ($secchange == 0)) {	if (($expire_role_result eq 'ok') \|\| ($secchange == 0)) {
$modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid,'',$context);	$modify_section_result =
	&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,
	undef,undef,undef,$sec,
	$end,$start,'','',$cid,
	'',$context,$credits);
if ($modify_section_result =~ /^ok/) {	if ($modify_section_result =~ /^ok/) {
if ($secchange == 1) {	if ($secchange == 1) {
if ($sec eq '') {	if ($sec eq '') {
Line 13245 sub commit_studentrole {	Line 13442 sub commit_studentrole {
}	}
}	}
} else {	} else {
if ($secchange) {	if ($secchange) {
$$logmsg .= &mt('Error when attempting section change for [_1] from old section "[_2]" to new section: "[_3]" in course [_4] -error:',$uname,$oldsec,$sec,$cid).' '.$modify_section_result.$linefeed;	$$logmsg .= &mt('Error when attempting section change for [_1] from old section "[_2]" to new section: "[_3]" in course [_4] -error:',$uname,$oldsec,$sec,$cid).' '.$modify_section_result.$linefeed;
} else {	} else {
$$logmsg .= &mt('Error when attempting to modify role for [_1] for section: "[_2]" in course [_3] -error:',$uname,$sec,$cid).' '.$modify_section_result.$linefeed;	$$logmsg .= &mt('Error when attempting to modify role for [_1] for section: "[_2]" in course [_3] -error:',$uname,$sec,$cid).' '.$modify_section_result.$linefeed;
Line 13280 sub commit_studentrole {	Line 13477 sub commit_studentrole {
return $result;	return $result;
}	}

	sub show_role_extent {
	my ($scope,$context,$role) = @_;
	$scope =~ s{^/}{};
	my @courseroles = &Apache::lonuserutils::roles_by_context('course',1);
	push(@courseroles,'co');
	my @authorroles = &Apache::lonuserutils::roles_by_context('author');
	if (($context eq 'course') \|\| (grep(/^\Q$role\E/,@courseroles))) {
	$scope =~ s{/}{_};
	return '<span class="LC_cusr_emph">'.$env{'course.'.$scope.'.description'}.'</span>';
	} elsif (($context eq 'author') \|\| (grep(/^\Q$role\E/,@authorroles))) {
	my ($audom,$auname) = split(/\//,$scope);
	return &mt('[_1] Author Space','<span class="LC_cusr_emph">'.
	&Apache::loncommon::plainname($auname,$audom).'</span>');
	} else {
	$scope =~ s{/$}{};
	return &mt('Domain: [_1]','<span class="LC_cusr_emph">'.
	&Apache::lonnet::domain($scope,'description').'</span>');
	}
	}

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

Line 13443 sub construct_course {	Line 13660 sub construct_course {
'pch.users.denied',	'pch.users.denied',
'plc.users.denied',	'plc.users.denied',
'hidefromcat',	'hidefromcat',
	'checkforpriv',
'categories'],	'categories'],
$$crsudom,$$crsunum);	$$crsudom,$$crsunum);
}	}
Line 13472 sub construct_course {	Line 13690 sub construct_course {
} else {	} else {
$cenv{'internal.courseowner'} = $args->{'curruser'};	$cenv{'internal.courseowner'} = $args->{'curruser'};
}	}
	if ($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.
if ($args->{'crssections'}) {	if ($args->{'crssections'}) {
$cenv{'internal.sectionnums'} = '';	$cenv{'internal.sectionnums'} = '';
Line 13496 sub construct_course {	Line 13717 sub construct_course {
# do not hide course coordinator from staff listing,	# do not hide course coordinator from staff listing,
# even if privileged	# even if privileged
$cenv{'nothideprivileged'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};	$cenv{'nothideprivileged'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
	# add course coordinator's domain to domains to check for privileged users
	# if different to course domain
	if ($$crsudom ne $args->{'ccdomain'}) {
	$cenv{'checkforpriv'} = $args->{'ccdomain'};
	}
# add crosslistings	# add crosslistings
if ($args->{'crsxlist'}) {	if ($args->{'crsxlist'}) {
$cenv{'internal.crosslistings'}='';	$cenv{'internal.crosslistings'}='';
Line 14086 sub update_content_constraints {	Line 14312 sub update_content_constraints {
return;	return;
}	}

	sub allmaps_incourse {
	my ($cdom,$cnum,$chome,$cid) = @_;
	if ($cdom eq '' \|\| $cnum eq '' \|\| $chome eq '' \|\| $cid eq '') {
	$cid = $env{'request.course.id'};
	$cdom = $env{'course.'.$cid.'.domain'};
	$cnum = $env{'course.'.$cid.'.num'};
	$chome = $env{'course.'.$cid.'.home'};
	}
	my %allmaps = ();
	my $lastchange =
	&Apache::lonnet::get_coursechange($cdom,$cnum);
	if ($lastchange > $env{'request.course.tied'}) {
	my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
	unless ($ferr) {
	&update_content_constraints($cdom,$cnum,$chome,$cid);
	}
	}
	my $navmap = Apache::lonnavmaps::navmap->new();
	if (defined($navmap)) {
	foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) {
	$allmaps{$res->src()} = 1;
	}
	}
	return \%allmaps;
	}

sub parse_supplemental_title {	sub parse_supplemental_title {
my ($title) = @_;	my ($title) = @_;

Line 14150 sub symb_to_docspath {	Line 14402 sub symb_to_docspath {
$path =~ s/^\&//;	$path =~ s/^\&//;
my $maptitle = $mapresobj->title();	my $maptitle = $mapresobj->title();
if ($mapurl eq 'default') {	if ($mapurl eq 'default') {
$maptitle = 'Main Course Documents';	$maptitle = 'Main Content';
}	}
$path .= (($path ne '')? '&' : '').	$path .= (($path ne '')? '&' : '').
&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.	&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
Line 14164 sub symb_to_docspath {	Line 14416 sub symb_to_docspath {
my $maptitle = &Apache::lonnet::gettitle($mapurl);	my $maptitle = &Apache::lonnet::gettitle($mapurl);
my $ispage = (($type eq 'page')? 1 : '');	my $ispage = (($type eq 'page')? 1 : '');
if ($mapurl eq 'default') {	if ($mapurl eq 'default') {
$maptitle = 'Main Course Documents';	$maptitle = 'Main Content';
}	}
$path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.	$path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
&Apache::lonhtmlcommon::entity_encode($maptitle).':::::'.$ispage;	&Apache::lonhtmlcommon::entity_encode($maptitle).':::::'.$ispage;
}	}
unless ($mapurl eq 'default') {	unless ($mapurl eq 'default') {
$path = 'default&'.	$path = 'default&'.
&Apache::lonhtmlcommon::entity_encode('Main Course Documents').	&Apache::lonhtmlcommon::entity_encode('Main Content').
':::::&'.$path;	':::::&'.$path;
}	}
return $path;	return $path;
Line 14295 sub check_captcha {	Line 14547 sub check_captcha {
output_folder => $captcha_params{'output_dir'},	output_folder => $captcha_params{'output_dir'},
data_folder => $captcha_params{'db_dir'},	data_folder => $captcha_params{'db_dir'},
);	);
my $captcha_chk = $captcha->check_code($code,$md5sum);	$captcha_chk = $captcha->check_code($code,$md5sum);
my %captcha_hash = (	my %captcha_hash = (
0 => 'Code not checked (file error)',	0 => 'Code not checked (file error)',
-1 => 'Failed: code expired',	-1 => 'Failed: code expired',

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

Removed from v.1.1106
changed lines
	Added in v.1.1129