loncom/interface/londocs.pm - diff

Return to londocs.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/londocs.pm between versions 1.484.2.91 and 1.484.2.93

version 1.484.2.91, 2021/02/10 12:46:11	version 1.484.2.93, 2021/12/22 01:22:06
Line 177 sub default_folderpath {	Line 177 sub default_folderpath {
}	}
}	}

	sub validate_folderpath {
	my ($supplementalflag) = @_;
	if ($env{'form.folderpath'} ne '') {
	my @items = split(/\&/,$env{'form.folderpath'});
	my $badpath;
	for (my $i=0; $i<@items; $i++) {
	my $odd = $i%2;
	if (($odd) && (!$supplementalflag) && ($items[$i] !~ /^[^:]*:(\|\d+):(\|1):(\|1):(\|1):(\|1)$/)) {
	$badpath = 1;
	} elsif ((!$odd) && ($items[$i] !~ /^(default\|supplemental)(\|_\d+)$/)) {
	$badpath = 1;
	}
	last if ($badpath);
	}
	if ($badpath) {
	delete($env{'form.folderpath'});
	}
	}
	return;
	}

	sub validate_suppath {
	if ($env{'form.supppath'} ne '') {
	my @items = split(/\&/,$env{'form.supppath'});
	my $badpath;
	for (my $i=0; $i<@items; $i++) {
	my $odd = $i%2;
	if ((!$odd) && ($items[$i] !~ /^supplemental(\|_\d+)$/)) {
	$badpath = 1;
	}
	last if ($badpath);
	}
	if ($badpath) {
	delete($env{'form.supppath'});
	}
	}
	return;
	}

sub dumpcourse {	sub dumpcourse {
my ($r) = @_;	my ($r) = @_;
my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
Line 3923 END	Line 3962 END
} elsif ($url eq "/public/$coursedom/$coursenum/syllabus") {	} elsif ($url eq "/public/$coursedom/$coursenum/syllabus") {
if (($ENV{'SERVER_PORT'} == 443) &&	if (($ENV{'SERVER_PORT'} == 443) &&
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {	($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
unless (&Apache::lonnet::uses_sts()) {	unless ((&Apache::lonnet::uses_sts()) \|\| (&Apache::lonnet::waf_allssl($hostname))) {
$url .= '?usehttp=1';	$url .= '?usehttp=1';
}	}
$nomodal = 1;	$nomodal = 1;
Line 3988 END	Line 4027 END
$url = $1;	$url = $1;
$anchor = $2;	$anchor = $2;
if (($url =~ m{^(\|/adm/wrapper)/ext/(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) {	if (($url =~ m{^(\|/adm/wrapper)/ext/(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) {
unless (&Apache::lonnet::uses_sts()) {	unless ((&Apache::lonnet::uses_sts()) \|\| (&Apache::lonnet::waf_allssl($hostname))) {
if ($hostname ne '') {	if ($hostname ne '') {
$url = 'http://'.$hostname.$url;	$url = 'http://'.$hostname.$url;
}	}
Line 4000 END	Line 4039 END
} elsif ($url =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) {	} elsif ($url =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) {
if (($ENV{'SERVER_PORT'} == 443) &&	if (($ENV{'SERVER_PORT'} == 443) &&
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {	($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
unless (&Apache::lonnet::uses_sts()) {	unless ((&Apache::lonnet::uses_sts()) \|\| (&Apache::lonnet::waf_allssl($hostname))) {
if ($hostname ne '') {	if ($hostname ne '') {
$url = 'http://'.$hostname.$url;	$url = 'http://'.$hostname.$url;
}	}
Line 5139 sub handler {	Line 5178 sub handler {
if ($env{'form.tools'}) { $toolsflag=1; }	if ($env{'form.tools'}) { $toolsflag=1; }

if ($env{'form.folderpath'} ne '') {	if ($env{'form.folderpath'} ne '') {
my @items = split(/\&/,$env{'form.folderpath'});	&validate_folderpath($supplementalflag);
my $badpath;
for (my $i=0; $i<@items; $i++) {
my $odd = $i%2;
if (($odd) && (!$supplementalflag) && ($items[$i] !~ /^[^:]*:(\|\d+):(\|1):(\|1):(\|1):(\|1)$/)) {
$badpath = 1;
} elsif ((!$odd) && ($items[$i] !~ /^(default\|supplemental)(\|_\d+)$/)) {
$badpath = 1;
}
last if ($badpath);
}
if ($badpath) {
delete($env{'form.folderpath'});
}
}	}

if ($env{'form.supppath'} ne '') {	if ($env{'form.supppath'} ne '') {
my @items = split(/\&/,$env{'form.supppath'});	&validate_suppath();
my $badpath;
for (my $i=0; $i<@items; $i++) {
my $odd = $i%2;
if ((!$odd) && ($items[$i] !~ /^supplemental(\|_\d+)$/)) {
$badpath = 1;
}
last if ($badpath);
}
if ($badpath) {
delete($env{'form.supppath'});
}
}	}

my $script='';	my $script='';
Line 5225 sub handler {	Line 5240 sub handler {
} else {	} else {
undef($env{'form.folderpath'});	undef($env{'form.folderpath'});
}	}
	if ($env{'form.folderpath'} ne '') {
	&validate_folderpath($supplementalflag);
	}
}	}

# If we are not allowed to make changes, all we can see are supplemental docs	# If we are not allowed to make changes, all we can see are supplemental docs
Line 6584 sub editing_js {	Line 6602 sub editing_js {
if ($backtourl =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) {	if ($backtourl =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) {
if (($ENV{'SERVER_PORT'} == 443) &&	if (($ENV{'SERVER_PORT'} == 443) &&
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {	($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
unless (&Apache::lonnet::uses_sts()) {	unless ((&Apache::lonnet::uses_sts()) \|\| (&Apache::lonnet::waf_allssl($hostname))) {
if ($hostname ne '') {	if ($hostname ne '') {
$backtourl = 'http://'.$hostname.$backtourl;	$backtourl = 'http://'.$hostname.$backtourl;
}	}
Line 6593 sub editing_js {	Line 6611 sub editing_js {
}	}
} elsif ($backtourl =~ m{^/adm/wrapper/ext/(?!https:)}) {	} elsif ($backtourl =~ m{^/adm/wrapper/ext/(?!https:)}) {
if (($ENV{'SERVER_PORT'} == 443) && ($hostname ne '')) {	if (($ENV{'SERVER_PORT'} == 443) && ($hostname ne '')) {
unless (&Apache::lonnet::uses_sts()) {	unless ((&Apache::lonnet::uses_sts()) \|\| (&Apache::lonnet::waf_allssl($hostname))) {
if ($hostname ne '') {	if ($hostname ne '') {
$backtourl = 'http://'.$hostname.$backtourl;	$backtourl = 'http://'.$hostname.$backtourl;
}	}

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

Removed from v.1.484.2.91
changed lines
	Added in v.1.484.2.93