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.618 and 1.635

version 1.618, 2016/11/30 00:27:20	version 1.635, 2017/08/14 14:54:29
Line 603 sub recurse_html {	Line 603 sub recurse_html {
} else {	} else {
$relfile = $dependency;	$relfile = $dependency;
$depurl = $currurlpath;	$depurl = $currurlpath;
$depurl =~ s{[^/]+$}{};	$depurl =~ s{[^/]+$}{};
$depurl .= $dependency;	$depurl .= $dependency;
($newcontainer) = ($depurl =~ m{^\Q$prefix\E(.+)$});	($newcontainer) = ($depurl =~ m{^\Q$prefix\E(.+)$});
}	}
next if ($relfile eq '');	next if ($relfile eq '');
my $newname = $replacehash->{$container};	my $newname = $replacehash->{$container};
Line 654 sub group_import {	Line 654 sub group_import {
}	}
}	}
if ($url) {	if ($url) {
if ($url =~ m{^(/adm/$coursedom/$coursenum/(\d+)/exttool)s?\:?(.*)$}) {	if ($url =~ m{^(/adm/$coursedom/$coursenum/(\d+)/ext\.tool)\:?(.*)$}) {
$url = $1;	$url = $1;
my $marker = $2;	my $marker = $2;
my $info = $3;	my $info = $3;
my ($toolid,%toolhash,%toolsettings);	my ($toolid,%toolhash,%toolsettings);
	my @extras = ('linktext','explanation','crslabel','crstitle');
my @toolinfo = split(/:/,$info);	my @toolinfo = split(/:/,$info);
if ($residx) {	if ($residx) {
%toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum);	%toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum);
Line 668 sub group_import {	Line 669 sub group_import {
}	}
$toolid =~ s/\D//g;	$toolid =~ s/\D//g;
($toolhash{'target'},$toolhash{'width'},$toolhash{'height'},	($toolhash{'target'},$toolhash{'width'},$toolhash{'height'},
	$toolhash{'linktext'},$toolhash{'explanation'},
$toolhash{'crslabel'},$toolhash{'crstitle'}) = @toolinfo;	$toolhash{'crslabel'},$toolhash{'crstitle'}) = @toolinfo;
$toolhash{'crslabel'} = &unescape($toolhash{'crslabel'});	foreach my $item (@extras) {
$toolhash{'crstitle'} = &unescape($toolhash{'crstitle'});	$toolhash{$item} = &unescape($toolhash{$item});
	}
if (ref($ltitoolsref) eq 'HASH') {	if (ref($ltitoolsref) eq 'HASH') {
my @deleted;	my @deleted;
if (ref($ltitoolsref->{$toolid}) eq 'HASH') {	if (ref($ltitoolsref->{$toolid}) eq 'HASH') {
if ($ltitoolsref->{$toolid}->{'url'} =~ m{^https://}) {
$url =~ s/exttool$/exttools/;
}
$toolhash{'id'} = $toolid;	$toolhash{'id'} = $toolid;
if (($toolhash{'target'} eq 'iframe') \|\| ($toolhash{'target'} eq 'window')) {	if (($toolhash{'target'} eq 'iframe') \|\| ($toolhash{'target'} eq 'tab') \|\|
	($toolhash{'target'} eq 'window')) {
if ($toolhash{'target'} eq 'window') {	if ($toolhash{'target'} eq 'window') {
foreach my $item ('width','height') {	foreach my $item ('width','height') {
$toolhash{$item} =~ s/^\s+//;	$toolhash{$item} =~ s/^\s+//;
$toolhash{$item} =~ s/\s+$//;	$toolhash{$item} =~ s/\s+$//;
	if ($toolhash{$item} =~ /\D/) {
	delete($toolhash{$item});
	if ($residx) {
	if ($toolsettings{$item}) {
	push(@deleted,$item);
	}
	}
	}
}	}
}	}
} elsif ($residx) {	} elsif ($residx) {
$toolhash{'target'} = $toolsettings{'target'};	$toolhash{'target'} = $toolsettings{'target'};
if ($toolhash{'target'} eq 'window') {	if ($toolhash{'target'} eq 'window') {
$toolhash{'width'} = $toolsettings{'width'};	foreach my $item ('width','height') {
$toolhash{'height'} = $toolsettings{'height'};	$toolhash{$item} = $toolsettings{$item};
	}
}	}
} elsif (ref($ltitoolsref->{$toolid}->{'display'}) eq 'HASH') {	} elsif (ref($ltitoolsref->{$toolid}->{'display'}) eq 'HASH') {
$toolhash{'target'} = $ltitoolsref->{$toolid}->{'display'}->{'target'};	$toolhash{'target'} = $ltitoolsref->{$toolid}->{'display'}->{'target'};
Line 699 sub group_import {	Line 709 sub group_import {
}	}
}	}
if ($toolhash{'target'} eq 'iframe') {	if ($toolhash{'target'} eq 'iframe') {
delete($toolhash{'width'});	foreach my $item ('width','height','linktext','explanation') {
delete($toolhash{'height'});	delete($toolhash{$item});
if ($residx) {	if ($residx) {
if ($toolsettings{'width'}) {	if ($toolsettings{$item}) {
push(@deleted,'width');	push(@deleted,$item);
	}
}	}
if ($toolsettings{'height'}) {	}
push(@deleted,'height');	} elsif ($toolhash{'target'} eq 'tab') {
	foreach my $item ('width','height') {
	delete($toolhash{$item});
	if ($residx) {
	if ($toolsettings{$item}) {
	push(@deleted,$item);
	}
}	}
}	}
}	}
if (ref($ltitoolsref->{$toolid}->{'crsconf'}) eq 'HASH') {	if (ref($ltitoolsref->{$toolid}->{'crsconf'}) eq 'HASH') {
foreach my $item ('label','title') {	foreach my $item ('label','title','linktext','explanation') {
	my $crsitem;
	if (($item eq 'label') \|\| ($item eq 'title')) {
	$crsitem = 'crs'.$item;
	} else {
	$crsitem = $item;
	}
if ($ltitoolsref->{$toolid}->{'crsconf'}->{$item}) {	if ($ltitoolsref->{$toolid}->{'crsconf'}->{$item}) {
$toolhash{'crs'.$item} =~ s/^\s+//;	$toolhash{$crsitem} =~ s/^\s+//;
$toolhash{'crs'.$item} =~ s/\s+$//;	$toolhash{$crsitem} =~ s/\s+$//;
if ($toolhash{'crs'.$item} eq '') {	if ($toolhash{$crsitem} eq '') {
delete($toolhash{'crs'.$item});	delete($toolhash{$crsitem});
}	}
} else {	} else {
delete($toolhash{'crs'.$item});	delete($toolhash{$crsitem});
}	}
if (($residx) && (exists($toolsettings{'crs'.$item}))) {	if (($residx) && (exists($toolsettings{$crsitem}))) {
unless (exists($toolhash{'crs'.$item})) {	unless (exists($toolhash{$crsitem})) {
push(@deleted,'crs'.$item);	push(@deleted,$crsitem);
}	}
}	}
}	}
Line 748 sub group_import {	Line 771 sub group_import {
$donechk = 1;	$donechk = 1;
}	}
if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page\|sequence)$}) {	if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page\|sequence)$}) {
&contained_map_check($url,$folder,\%removefrommap,\%removeparam,	&contained_map_check($url,$folder,$coursenum,$coursedom,\%removefrommap,
\%addedmaps,\%hierarchy,\%titles,$allmaps);	\%removeparam,\%addedmaps,\%hierarchy,\%titles,$allmaps);
$importuploaded = 1;	$importuploaded = 1;
} elsif ($url =~ m{^/res/.+\.(page\|sequence)$}) {	} elsif ($url =~ m{^/res/.+\.(page\|sequence)$}) {
next if ($allmaps->{$url});	next if ($allmaps->{$url});
Line 789 $initialtext	Line 812 $initialtext
</html>	</html>
END	END
$env{'form.output'}=$newhtml;	$env{'form.output'}=$newhtml;
my $result =	my $result =
&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,	&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
'output',	'output',
"$filepath/$residx/$fname.html");	"$filepath/$residx/$fname.html");
Line 920 sub docs_change_log {	Line 943 sub docs_change_log {
'// <![CDATA['."\n".	'// <![CDATA['."\n".
&Apache::loncommon::display_filter_js('docslog')."\n".	&Apache::loncommon::display_filter_js('docslog')."\n".
&editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag,	&editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag,
$coursedom,$coursenum,'','',$canedit,\$navmap)."\n".	$coursedom,$coursenum,'','',$canedit,'',\$navmap)."\n".
&history_tab_js()."\n".	&history_tab_js()."\n".
&Apache::lonratedt::editscript('simple')."\n".	&Apache::lonratedt::editscript('simple')."\n".
'// ]]>'."\n".	'// ]]>'."\n".
Line 948 sub docs_change_log {	Line 971 sub docs_change_log {
if ($supplementalflag) {	if ($supplementalflag) {
$tid = 2;	$tid = 2;
}	}
my ($breadcrumbtrail) =	my ($breadcrumbtrail) =
&Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);	&Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);
$r->print($breadcrumbtrail.	$r->print($breadcrumbtrail.
&generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto,	&generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto,
Line 1147 sub update_paste_buffer {	Line 1170 sub update_paste_buffer {
foreach my $suffix (@currpaste) {	foreach my $suffix (@currpaste) {
my $cid = $env{'docs.markedcopy_crs_'.$suffix};	my $cid = $env{'docs.markedcopy_crs_'.$suffix};
my $url = $env{'docs.markedcopy_url_'.$suffix};	my $url = $env{'docs.markedcopy_url_'.$suffix};
my $mapidx = $env{'docs.markedcopy_map_'.$suffix};	my $mapidx = $env{'docs.markedcopy_map_'.$suffix};
if (($cid =~ /^$match_domain(?:_)$match_courseid$/) &&	if (($cid =~ /^$match_domain(?:_)$match_courseid$/) &&
($url ne '')) {	($url ne '')) {
$pasteurls{$cid.'_'.$url.'_'.$mapidx} = 1;	$pasteurls{$cid.'_'.$url.'_'.$mapidx} = 1;
Line 1200 sub update_paste_buffer {	Line 1223 sub update_paste_buffer {
$subdir = $prefix;	$subdir = $prefix;
}	}
my (%addedmaps,%removefrommap,%removeparam,%hierarchy,%titles,%allmaps);	my (%addedmaps,%removefrommap,%removeparam,%hierarchy,%titles,%allmaps);
&contained_map_check($url,$folder,\%removefrommap,\%removeparam,\%addedmaps,	&contained_map_check($url,$folder,$coursenum,$coursedom,\%removefrommap,
\%hierarchy,\%titles,\%allmaps);	\%removeparam,\%addedmaps,\%hierarchy,\%titles,\%allmaps);
if (ref($hierarchy{$url}) eq 'HASH') {	if (ref($hierarchy{$url}) eq 'HASH') {
my ($nested,$nestednames);	my ($nested,$nestednames);
&recurse_uploaded_maps($url,$subdir,\%hierarchy,\%titles,\$nested,\$nestednames);	&recurse_uploaded_maps($url,$subdir,\%hierarchy,\%titles,\$nested,\$nestednames);
Line 1279 sub print_paste_buffer {	Line 1302 sub print_paste_buffer {
my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1];	my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1];
if ($url =~ m{^(?:/adm/wrapper/ext\|(?:http\|https)(?:&colon;\|:))//} ) {	if ($url =~ m{^(?:/adm/wrapper/ext\|(?:http\|https)(?:&colon;\|:))//} ) {
$is_external = 1;	$is_external = 1;
} elsif ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/exttools?$}) {	} elsif ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) {
$is_exttool = 1;	$is_exttool = 1;
}	}
if ($folder =~ /^supplemental/) {	if ($folder =~ /^supplemental/) {
Line 1313 sub print_paste_buffer {	Line 1336 sub print_paste_buffer {
$is_uploaded_map = 1;	$is_uploaded_map = 1;
}	}
} elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) \|\|	} elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) \|\|
($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard\|smppg)$})) {	($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard\|smppg\|ext\.tool)$})) {
if ($cid ne $env{'request.course.id'}) {	if ($cid ne $env{'request.course.id'}) {
my ($srcdom,$srcnum) = split(/_/,$cid);	my ($srcdom,$srcnum) = split(/_/,$cid);
if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {	if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
$othercrs = '<br />'.&mt('(from another course)');	if (($is_exttool) && ($srcdom ne $coursedom)) {
	$canpaste = 0;
	$nopaste = &mt('Paste from another domain unavailable.');
	} else {
	$othercrs = '<br />'.&mt('(from another course)');
	}
} else {	} else {
$canpaste = 0;	$canpaste = 0;
$nopaste = &mt('Paste from another course unavailable.');	$nopaste = &mt('Paste from another course unavailable.');
}	}
}	}
}	}
if ($canpaste) {	if ($canpaste) {
push(@pasteable,$suffix);	push(@pasteable,$suffix);
}	}
}	}
my $buffer;	my $buffer;
if (($is_external) \|\| ($is_exttool)) {	if ($is_external) {
$buffer = &mt('External Resource').': '.	$buffer = &mt('External Resource').': '.
&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}).' ('.	&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}).' ('.
&LONCAPA::map::qtescape($url).')';	&LONCAPA::map::qtescape($url).')';
	} elsif ($is_exttool) {
	$buffer = &mt('External Tool').': '.
	&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix});
} else {	} else {
my $icon = &Apache::loncommon::icon($extension);	my $icon = &Apache::loncommon::icon($extension);
if ($extension eq 'sequence' &&	if ($extension eq 'sequence' &&
Line 1490 sub supp_pasteable {	Line 1521 sub supp_pasteable {
($url =~ m{^/uploaded/$match_domain/$match_courseid/(docs\|supplemental)/(default\|\d+)/\d+/}) \|\|	($url =~ m{^/uploaded/$match_domain/$match_courseid/(docs\|supplemental)/(default\|\d+)/\d+/}) \|\|
($url =~ m{^/adm/$match_domain/$match_username/aboutme}) \|\|	($url =~ m{^/adm/$match_domain/$match_username/aboutme}) \|\|
($url =~ m{^/public/$match_domain/$match_courseid/syllabus}) \|\|	($url =~ m{^/public/$match_domain/$match_courseid/syllabus}) \|\|
($url =~ m{^/adm/$match_domain/$match_courseid/\d+/exttools?$})) {	($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$})) {
return 1;	return 1;
}	}
return;	return;
Line 1612 sub do_paste_from_buffer {	Line 1643 sub do_paste_from_buffer {
return();	return();
}	}

my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%duplicate,	my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom,%duplicate,
%prefixchg,%srcdom,%srcnum,%srcmapidx,%marktomove,$save_err,$lockerrors,$allresult);	%prefixchg,%srcdom,%srcnum,%srcmapidx,%marktomove,$save_err,$lockerrors,$allresult);

foreach my $suffix (@topaste) {	foreach my $suffix (@topaste) {
Line 1641 sub do_paste_from_buffer {	Line 1672 sub do_paste_from_buffer {
$srcdom{$suffix} = $srcd;	$srcdom{$suffix} = $srcd;
$srcnum{$suffix} = $srcn;	$srcnum{$suffix} = $srcn;
} elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) \|\|	} elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) \|\|
($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard\|smppg)$})) {	($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard\|smppg)$}) \|\|
	($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$})) {
my ($srcd,$srcn) = split(/_/,$cid);	my ($srcd,$srcn) = split(/_/,$cid);
# When paste buffer was populated using an active role in a different course	# When paste buffer was populated using an active role in a different course
# check for mdc privilege in the course from which the resource was pasted	# check for mdc privilege in the course from which the resource was pasted
Line 1651 sub do_paste_from_buffer {	Line 1683 sub do_paste_from_buffer {
next;	next;
}	}
}	}
	# When buffer was populated using an active role in a different course
	# disallow pasting of External Tool if course is in a different domain.
	if (($url =~ m{/ext\.tool$}) && ($srcd ne $coursedom)) {
	$notindom{$suffix} = 1;
	next;
	}
$srcdom{$suffix} = $srcd;	$srcdom{$suffix} = $srcd;
$srcnum{$suffix} = $srcn;	$srcnum{$suffix} = $srcn;
}	}
Line 1659 sub do_paste_from_buffer {	Line 1697 sub do_paste_from_buffer {
if ($url=~/\.(page\|sequence)$/) {	if ($url=~/\.(page\|sequence)$/) {
$is_map{$suffix} = 1;	$is_map{$suffix} = 1;
}	}

if ($url =~ m{^/uploaded/$match_domain/$match_courseid/([^/]+)}) {	if ($url =~ m{^/uploaded/$match_domain/$match_courseid/([^/]+)}) {
my $oldprefix = $1;	my $oldprefix = $1;
# When pasting content from Main Content to Supplemental Content and vice versa	# When pasting content from Main Content to Supplemental Content and vice versa
Line 1704 sub do_paste_from_buffer {	Line 1741 sub do_paste_from_buffer {
%msgs = &Apache::lonlocal::texthash (	%msgs = &Apache::lonlocal::texthash (
notinsupp => 'Paste failed: content type is not supported within Supplemental Content',	notinsupp => 'Paste failed: content type is not supported within Supplemental Content',
notincrs => 'Paste failed: Item is from a different course which you do not have rights to edit.',	notincrs => 'Paste failed: Item is from a different course which you do not have rights to edit.',
	notindom => 'Paste failed: Item is an external tool from a course in a different donain.',
duplicate => 'Paste failed: only one instance of a particular published sequence or page is allowed within each course.',	duplicate => 'Paste failed: only one instance of a particular published sequence or page is allowed within each course.',
);	);

Line 1757 sub do_paste_from_buffer {	Line 1795 sub do_paste_from_buffer {
if ($is_map{$suffix}) {	if ($is_map{$suffix}) {
# If pasting a map, check if map contains other maps	# If pasting a map, check if map contains other maps
my (%hierarchy,%titles);	my (%hierarchy,%titles);
&contained_map_check($url,$folder,\%removefrommap,\%removeparam,	&contained_map_check($url,$folder,$coursenum,$coursedom,
\%addedmaps,\%hierarchy,\%titles,$allmaps);	\%removefrommap,\%removeparam,\%addedmaps,
	\%hierarchy,\%titles,$allmaps);
if ($url=~ m{^/uploaded/}) {	if ($url=~ m{^/uploaded/}) {
my $newurl;	my $newurl;
unless ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') {	unless ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') {
Line 1811 sub do_paste_from_buffer {	Line 1850 sub do_paste_from_buffer {
}	}
}	}
}	}
if ($url=~ m{/(bulletinboard\|smppg)$}) {	if ($url=~ m{/(bulletinboard\|smppg\|ext\.tool)$}) {
my $prefix = $1;	my $prefix = $1;
my $fromothercrs;	my $fromothercrs;
#need to copy the db contents to a new one, unless this is a move.	#need to copy the db contents to a new one, unless this is a move.
Line 1828 sub do_paste_from_buffer {	Line 1867 sub do_paste_from_buffer {
}	}
}	}
unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) {	unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) {
my (%lockerr,$msg);	my (%lockerr,$msg);
my ($newurl,$result,$errtext) =	my ($newurl,$result,$errtext) =
&dbcopy(\%info,$coursedom,$coursenum,\%lockerr);	&dbcopy(\%info,$coursedom,$coursenum,\%lockerr);
if ($result eq 'ok') {	if ($result eq 'ok') {
Line 1839 sub do_paste_from_buffer {	Line 1878 sub do_paste_from_buffer {
$msg = &mt('Paste failed: An error occurred when copying the simple page.').' '.$errtext;	$msg = &mt('Paste failed: An error occurred when copying the simple page.').' '.$errtext;
} elsif ($prefix eq 'bulletinboard') {	} elsif ($prefix eq 'bulletinboard') {
$msg = &mt('Paste failed: An error occurred when copying the discussion board.').' '.$errtext;	$msg = &mt('Paste failed: An error occurred when copying the discussion board.').' '.$errtext;
	} elsif ($prefix eq 'ext.tool') {
	$msg = &mt('Paste failed: An error occurred when copying the external tool.').' '.$errtext;
}	}
$results{$suffix} = $result;	$results{$suffix} = $result;
$msgerrs{$suffix} = $msg;	$msgerrs{$suffix} = $msg;
Line 1885 sub do_paste_from_buffer {	Line 1926 sub do_paste_from_buffer {
if ($newdocsdir eq '') {	if ($newdocsdir eq '') {
$newdocsdir = 'default';	$newdocsdir = 'default';
}	}
if (($prefixchg{$suffix}) \|\|	if (($prefixchg{$suffix}) \|\|
($srcdom{$suffix} ne $coursedom) \|\|	($srcdom{$suffix} ne $coursedom) \|\|
($srcnum{$suffix} ne $coursenum) \|\|	($srcnum{$suffix} ne $coursenum) \|\|
($env{'form.docs.markedcopy_options_'.$suffix} ne 'move')) {	($env{'form.docs.markedcopy_options_'.$suffix} ne 'move')) {
my $newpath = "$newprefix/$newdocsdir/$newidx/$rem";	my $newpath = "$newprefix/$newdocsdir/$newidx/$rem";
Line 2098 sub dbcopy {	Line 2139 sub dbcopy {
my ($url,$result,$errtext);	my ($url,$result,$errtext);
if (ref($dbref) eq 'HASH') {	if (ref($dbref) eq 'HASH') {
$url = $dbref->{'src'};	$url = $dbref->{'src'};
if ($url =~ m{/(smppg\|bulletinboard)$}) {	if ($url =~ m{/(smppg\|bulletinboard\|ext\.tool)$}) {
my $prefix = $1;	my $prefix = $1;
	if ($prefix eq 'ext.tool') {
	$prefix = 'exttool';
	}
if (($dbref->{'cdom'} =~ /^$match_domain$/) &&	if (($dbref->{'cdom'} =~ /^$match_domain$/) &&
($dbref->{'cnum'} =~ /^$match_courseid$/)) {	($dbref->{'cnum'} =~ /^$match_courseid$/)) {
my $db_name;	my $db_name;
Line 2110 sub dbcopy {	Line 2154 sub dbcopy {
&Apache::lonsimplepage::get_db_name($url,$marker,	&Apache::lonsimplepage::get_db_name($url,$marker,
$dbref->{'cdom'},	$dbref->{'cdom'},
$dbref->{'cnum'});	$dbref->{'cnum'});
	} elsif ($dbref->{'src'} =~ m{/ext\.tool$}) {
	$db_name = 'exttool_'.$marker;
} else {	} else {
$db_name = 'bulletinpage_'.$marker;	$db_name = 'bulletinpage_'.$marker;
}	}
Line 2120 sub dbcopy {	Line 2166 sub dbcopy {
if (!$suffix) {	if (!$suffix) {
if ($prefix eq 'smppg') {	if ($prefix eq 'smppg') {
$errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url);	$errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url);
	} elsif ($prefix eq 'exttool') {
	$errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying an external tool [_1].',$url);
} else {	} else {
$errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a discussion board [_1].',$url);	$errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a discussion board [_1].',$url);
}	}
Line 2153 sub dbcopy {	Line 2201 sub dbcopy {
$result=&Apache::lonnet::put($db_name,\%contents,	$result=&Apache::lonnet::put($db_name,\%contents,
$coursedom,$coursenum);	$coursedom,$coursenum);
if ($result eq 'ok') {	if ($result eq 'ok') {
$url =~ s{/(\d*)/(smppg\|bulletinboard)$}{/$suffix/$2}x;	$url =~ s{/(\d*)/(smppg\|bulletinboard\|ext\.tool)$}{/$suffix/$2}x;
}	}
}	}
if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) {	if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) {
Line 2163 sub dbcopy {	Line 2211 sub dbcopy {
if ($prefix eq 'smppg') {	if ($prefix eq 'smppg') {
$lockerrorsref->{$prefix} .=	$lockerrorsref->{$prefix} .=
' '.&mt('This will prevent creation of additional simple pages in this course.');	' '.&mt('This will prevent creation of additional simple pages in this course.');
	} elsif ($prefix eq 'exttool') {
	$lockerrorsref->{$prefix} .=
	' '.&mt('This will prevent addition of more external tools to this course.');
} else {	} else {
$lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional discussion boards in this course.');	$lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional discussion boards in this course.');
}	}
Line 2292 sub uniqueness_check {	Line 2343 sub uniqueness_check {
}	}

sub contained_map_check {	sub contained_map_check {
my ($url,$folder,$removefrommap,$removeparam,$addedmaps,$hierarchy,$titles,	my ($url,$folder,$coursenum,$coursedom,$removefrommap,$removeparam,$addedmaps,
$allmaps) = @_;	$hierarchy,$titles,$allmaps) = @_;
my $content = &Apache::lonnet::getfile($url);	my $content = &Apache::lonnet::getfile($url);
unless ($content eq '-1') {	unless ($content eq '-1') {
my $parser = HTML::TokeParser->new(\$content);	my $parser = HTML::TokeParser->new(\$content);
Line 2303 sub contained_map_check {	Line 2354 sub contained_map_check {
if ($token->[1] eq 'resource') {	if ($token->[1] eq 'resource') {
next if ($token->[2]->{'type'} eq 'zombie');	next if ($token->[2]->{'type'} eq 'zombie');
my $ressrc = $token->[2]->{'src'};	my $ressrc = $token->[2]->{'src'};
if ($folder =~ /^supplemental/) {	if ($ressrc =~ m{^/adm/($match_domain)/$match_courseid/\d+/ext\.tool$}) {
	my $srcdom = $1;
	unless ($srcdom eq $coursedom) {
	$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
	next;
	}
	} elsif ($folder =~ /^supplemental/) {
unless (&supp_pasteable($ressrc)) {	unless (&supp_pasteable($ressrc)) {
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;	$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
next;	next;
Line 2322 sub contained_map_check {	Line 2379 sub contained_map_check {
$addedmaps->{$ressrc} = [$url];	$addedmaps->{$ressrc} = [$url];
}	}
}	}
&contained_map_check($ressrc,$folder,$removefrommap,$removeparam,	&contained_map_check($ressrc,$folder,$coursenum,$coursedom,$removefrommap,
$addedmaps,$hierarchy,$titles,$allmaps);	$removeparam,$addedmaps,$hierarchy,$titles,$allmaps);
}	}
} elsif ($token->[1] eq 'param') {	} elsif ($token->[1] eq 'param') {
if ($folder =~ /^supplemental/) {	if ($folder =~ /^supplemental/) {
Line 2858 sub update_parameter {	Line 2915 sub update_parameter {
'randomorder' => {},	'randomorder' => {},
);	);
foreach my $which (keys(%allchecked)) {	foreach my $which (keys(%allchecked)) {
$env{'form.all'.$which} =~ s/,$//;	$env{'form.all'.$which} =~ s/,$//;
if ($which eq 'randompick') {	if ($which eq 'randompick') {
foreach my $item (split(/,/,$env{'form.all'.$which})) {	foreach my $item (split(/,/,$env{'form.all'.$which})) {
my ($res,$value) = split(/:/,$item);	my ($res,$value) = split(/:/,$item);
Line 2961 sub update_parameter {	Line 3018 sub update_parameter {

sub handle_edit_cmd {	sub handle_edit_cmd {
my ($coursenum,$coursedom) =@_;	my ($coursenum,$coursedom) =@_;
	my $haschanges = 0;
if ($env{'form.cmd'} eq '') {	if ($env{'form.cmd'} eq '') {
return 0;	return $haschanges;
}	}
my ($cmd,$idx)=split('_',$env{'form.cmd'});	my ($cmd,$idx)=split('_',$env{'form.cmd'});

Line 2977 sub handle_edit_cmd {	Line 3035 sub handle_edit_cmd {
&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);	&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
}	}
splice(@LONCAPA::map::order, $idx, 1);	splice(@LONCAPA::map::order, $idx, 1);
	$haschanges = 1;
} elsif ($cmd eq 'cut') {	} elsif ($cmd eq 'cut') {
&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);	&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
splice(@LONCAPA::map::order, $idx, 1);	splice(@LONCAPA::map::order, $idx, 1);
	$haschanges = 1;
} elsif ($cmd eq 'up'	} elsif ($cmd eq 'up'
&& ($idx) && (defined($LONCAPA::map::order[$idx-1]))) {	&& ($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
@LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1];	@LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1];
	$haschanges = 1;
} elsif ($cmd eq 'down'	} elsif ($cmd eq 'down'
&& defined($LONCAPA::map::order[$idx+1])) {	&& defined($LONCAPA::map::order[$idx+1])) {
@LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1];	@LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1];
	$haschanges = 1;
} elsif ($cmd eq 'rename') {	} elsif ($cmd eq 'rename') {
my $comment = &LONCAPA::map::qtunescape($env{'form.title'});	my $comment = &LONCAPA::map::qtunescape($env{'form.title'});
if ($comment=~/\S/) {	if ($comment=~/\S/) {
Line 2999 sub handle_edit_cmd {	Line 3057 sub handle_edit_cmd {
# Devalidate title cache	# Devalidate title cache
my $renamed_url=&LONCAPA::map::qtescape($url);	my $renamed_url=&LONCAPA::map::qtescape($url);
&Apache::lonnet::devalidate_title_cache($renamed_url);	&Apache::lonnet::devalidate_title_cache($renamed_url);
	$haschanges = 1;
} else {	} elsif ($cmd eq 'setalias') {
return 0;	my $newvalue = $env{'form.alias'};
	if ($newvalue ne '') {
	unless (Apache::lonnet::get_symb_from_alias($newvalue)) {
	&LONCAPA::map::storeparameter($idx,'parameter_0_mapalias',$newvalue,
	'string');
	&remember_parms($idx,'mapalias','set',$newvalue);
	$haschanges = 1;
	}
	}
	} elsif ($cmd eq 'delalias') {
	my $current = (&LONCAPA::map::getparameter($idx,'parameter_0_mapalias'))[0];
	if ($current ne '') {
	&LONCAPA::map::delparameter($idx,'parameter_0_mapalias');
	&remember_parms($idx,'mapalias','del');
	$haschanges = 1;
	}
}	}
return 1;	return $haschanges;
}	}

sub editor {	sub editor {
my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,	my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
$supplementalflag,$orderhash,$iconpath,$pathitem,$ltitoolsref,	$supplementalflag,$orderhash,$iconpath,$pathitem,$ltitoolsref,
$canedit,$navmapref,$hiddentop)=@_;	$canedit,$hostname,$navmapref,$hiddentop)=@_;
my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container);	my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container);
if ($allowed) {	if ($allowed) {
(my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,	(my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,
Line 3127 sub editor {	Line 3200 sub editor {
# Rename, cut, copy or remove a single resource	# Rename, cut, copy or remove a single resource
if (&handle_edit_cmd($coursenum,$coursedom)) {	if (&handle_edit_cmd($coursenum,$coursedom)) {
my $contentchg;	my $contentchg;
if ($env{'form.cmd'} =~ m{^(remove\|cut)_}) {	if ($env{'form.cmd'} =~ m{^(remove\|cut\|setalias\|delalias)_}) {
$contentchg = 1;	$contentchg = 1;
}	}
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg);	($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg);
Line 3220 sub editor {	Line 3293 sub editor {
} else {	} else {
return $errortxt;	return $errortxt;
}	}
} elsif ($url =~ m{^/adm/$coursedom/$coursenum/new/exttool}) {	} elsif ($url =~ m{^/adm/$coursedom/$coursenum/new/ext\.tool}) {
my ($suffix,$errortxt,$locknotfreed) =	my ($suffix,$errortxt,$locknotfreed) =
&new_timebased_suffix($coursedom,$coursenum,'exttool');	&new_timebased_suffix($coursedom,$coursenum,'exttool');
if ($locknotfreed) {	if ($locknotfreed) {
Line 3339 sub editor {	Line 3412 sub editor {
$output .= &entryline($idx,$name,$url,$folder,$allowed,$res,	$output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
$coursenum,$coursedom,$crstype,	$coursenum,$coursedom,$crstype,
$pathitem,$supplementalflag,$container,	$pathitem,$supplementalflag,$container,
\%filters,\%curr_groups,$ltitoolsref,$canedit,$isencrypted,$navmapref);	\%filters,\%curr_groups,$ltitoolsref,$canedit,
	$isencrypted,$navmapref,$hostname);
$idx++;	$idx++;
$shown++;	$shown++;
}	}
Line 3366 sub editor {	Line 3440 sub editor {
.&Apache::loncommon::start_data_table(undef,'contentlist')	.&Apache::loncommon::start_data_table(undef,'contentlist')
.&Apache::loncommon::start_data_table_header_row()	.&Apache::loncommon::start_data_table_header_row()
.'<th colspan="2">'.&mt('Move').'</th>'	.'<th colspan="2">'.&mt('Move').'</th>'
.'<th colspan="2">'.&mt('Actions').'</th>'	.'<th colspan="3">'.&mt('Actions').'</th>'
.'<th>'.&mt('Document').'</th>';	.'<th>'.&mt('Document').'</th>';
if ($folder !~ /^supplemental/) {	if ($folder !~ /^supplemental/) {
$to_show .= '<th colspan="4">'.&mt('Settings').'</th>';	$to_show .= '<th colspan="2">'.&mt('Settings').'</th>';
}	}
$to_show .= &Apache::loncommon::end_data_table_header_row();	$to_show .= &Apache::loncommon::end_data_table_header_row();
if ($folder !~ /^supplemental/) {	if ($folder !~ /^supplemental/) {
Line 3387 sub editor {	Line 3461 sub editor {
if (@allidx > 0) {	if (@allidx > 0) {
my $path;	my $path;
if ($env{'form.folderpath'}) {	if ($env{'form.folderpath'}) {
$path =	$path =
&HTML::Entities::encode($env{'form.folderpath'},'<>&"');	&HTML::Entities::encode($env{'form.folderpath'},'<>&"');
}	}
if (@allidx > 1) {	if (@allidx > 1) {
$to_show .=	$to_show .=
&Apache::loncommon::continue_data_table_row().	&Apache::loncommon::continue_data_table_row().
'<td colspan="2"> </td>'.	'<td colspan="2"> </td>'.
'<td>'.	'<td>'.
&multiple_check_form('actions',\%lists,$canedit).	&multiple_check_form('actions',\%lists,$canedit).
'</td>'.	'</td>'.
'<td> </td>'.	'<td colspan="3"> </td>'.
'<td> </td>'.	'<td colspan="2">'.
'<td colspan="4">'.
&multiple_check_form('settings',\%lists,$canedit).	&multiple_check_form('settings',\%lists,$canedit).
'</td>'.	'</td>'.
&Apache::loncommon::end_data_table_row();	&Apache::loncommon::end_data_table_row();
Line 3639 sub process_file_upload {	Line 3712 sub process_file_upload {
my $uploadphase = 'upload_embedded';	my $uploadphase = 'upload_embedded';
my $primaryurl = &HTML::Entities::encode($url,'<>&"');	my $primaryurl = &HTML::Entities::encode($url,'<>&"');
my $state = &embedded_form_elems($uploadphase,$primaryurl,$newidx);	my $state = &embedded_form_elems($uploadphase,$primaryurl,$newidx);
my ($embedded,$num) =	my ($embedded,$num) =
&Apache::loncommon::ask_for_embedded_content(	&Apache::loncommon::ask_for_embedded_content(
'/adm/coursedocs',$state,$allfiles,$codebase,{'docs_url' => $url});	'/adm/coursedocs',$state,$allfiles,$codebase,{'docs_url' => $url});
if ($embedded) {	if ($embedded) {
Line 3720 sub is_supplemental_title {	Line 3793 sub is_supplemental_title {
sub entryline {	sub entryline {
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,	my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
$crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups,	$crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups,
$ltitoolsref,$canedit,$isencrypted,$navmapref)=@_;	$ltitoolsref,$canedit,$isencrypted,$navmapref,$hostname)=@_;
my ($foldertitle,$renametitle,$oldtitle);	my ($foldertitle,$renametitle,$oldtitle);
if (&is_supplemental_title($title)) {	if (&is_supplemental_title($title)) {
($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
Line 3747 sub entryline {	Line 3820 sub entryline {
my $line=&Apache::loncommon::start_data_table_row();	my $line=&Apache::loncommon::start_data_table_row();
my ($form_start,$form_end,$form_common,$form_param);	my ($form_start,$form_end,$form_common,$form_param);
# Edit commands	# Edit commands
my ($esc_path, $path, $symb);	my ($esc_path, $path, $symb, $curralias);
if ($env{'form.folderpath'}) {	if ($env{'form.folderpath'}) {
$esc_path=&escape($env{'form.folderpath'});	$esc_path=&escape($env{'form.folderpath'});
$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');	$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
Line 3816 END	Line 3889 END
'ct' => 'Cut',	'ct' => 'Cut',
'rn' => 'Rename',	'rn' => 'Rename',
'cp' => 'Copy',	'cp' => 'Copy',
	'da' => 'Unset alias',
	'sa' => 'Set alias',
'ex' => 'External Resource',	'ex' => 'External Resource',
'et' => 'External Tool',	'et' => 'External Tool',
'ed' => 'Edit',	'ed' => 'Edit',
Line 3837 END	Line 3912 END
\|/aboutme$	\|/aboutme$
\|/navmaps$	\|/navmaps$
\|/bulletinboard$	\|/bulletinboard$
\|/exttools?$	\|/ext\.tool$
\|\.html$)}x)	\|\.html$)}x)
\|\| $isexternal) {	\|\| $isexternal) {
$skip_confirm = 1;	$skip_confirm = 1;
Line 3846 END	Line 3921 END
($url!~/$LONCAPA::assess_page_seq_re/)) {	($url!~/$LONCAPA::assess_page_seq_re/)) {
$confirm_removal = 1;	$confirm_removal = 1;
}	}
	if ($url =~ /$LONCAPA::assess_re/) {
	$curralias = (&LONCAPA::map::getparameter($orderidx,'parameter_0_mapalias'))[0];
	}

if ($denied{'copy'}) {	if ($denied{'copy'}) {
$copylink=(<<ENDCOPY)	$copylink=(<<ENDCOPY)
Line 3969 END	Line 4047 END
}	}
}	}

my ($editlink,$extresform,$anchor,$hiddenres);	my ($editlink,$extresform,$anchor,$hiddenres,$nomodal);
my $orig_url = $url;	my $orig_url = $url;
$orig_url=~s{http(&colon;\|:)//https(&colon;\|:)//}{https$2//};	$orig_url=~s{http(&colon;\|:)//https(&colon;\|:)//}{https$2//};
$url=~s{^http(\|s)(&colon;\|:)//}{/adm/wrapper/ext/};	$url=~s{^http(\|s)(&colon;\|:)//}{/adm/wrapper/ext/};
Line 3987 END	Line 4065 END
} elsif ($url!~/\.(sequence\|page)$/) {	} elsif ($url!~/\.(sequence\|page)$/) {
$url='/adm/coursedocs/showdoc'.$url;	$url='/adm/coursedocs/showdoc'.$url;
}	}
} elsif ($url=~m\|^/ext/\|) {	} elsif ($url=~m{^(\|/adm/wrapper)/ext/([^#]+)}) {
$url='/adm/wrapper'.$url;	my $wrapped = $1;
} elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/exttools?$}) {	my $exturl = $2;
	if ($wrapped eq '') {
	$url='/adm/wrapper'.$url;
	}
	if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) {
	$nomodal = 1;
	}
	} elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) {
$url='/adm/wrapper'.$url;	$url='/adm/wrapper'.$url;
	} elsif ($url eq "/public/$coursedom/$coursenum/syllabus") {
	if (($ENV{'SERVER_PORT'} == 443) &&
	($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
	$url .= '?usehttp=1';
	$nomodal = 1;
	}
}	}
if (&Apache::lonnet::symbverify($symb,$url)) {	if (&Apache::lonnet::symbverify($symb,$url)) {
my $shownsymb = $symb;	my $shownsymb = $symb;
Line 4020 END	Line 4111 END
if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) \|\|	if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) \|\|
$isencrypted \|\| (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) {	$isencrypted \|\| (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) {
$checkencrypt = 1;	$checkencrypt = 1;
} else {	} elsif (ref($navmapref)) {
unless (ref($$navmapref)) {	unless (ref($$navmapref)) {
$$navmapref = Apache::lonnavmaps::navmap->new();	$$navmapref = Apache::lonnavmaps::navmap->new();
}	}
Line 4048 END	Line 4139 END
$url='';	$url='';
}	}
}	}
} elsif ($supplementalflag) {	} elsif ($supplementalflag) {
if ($isexternal) {	if ($isexternal) {
if ($url =~ /^([^#]+)#([^#]+)$/) {	if ($url =~ /^([^#]+)#([^#]+)$/) {
$url = $1;	$url = $1;
$anchor = $2;	$anchor = $2;
	if (($url =~ m{^(\|/adm/wrapper)/ext/(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) {
	if ($hostname ne '') {
	$url = 'http://'.$hostname.$url;
	}
	$nomodal = 1;
	}
	}
	} elsif ($url =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) {
	if (($ENV{'SERVER_PORT'} == 443) &&
	($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
	if ($hostname ne '') {
	$url = 'http://'.$hostname.$url;
	}
	$url .= (($url =~ /\?/) ? '&':'?').'usehttp=1';
	$nomodal = 1;
}	}
}	}
}	}
Line 4075 END	Line 4181 END
my $encryptmap = ((&LONCAPA::map::getparameter($orderidx,	my $encryptmap = ((&LONCAPA::map::getparameter($orderidx,
'parameter_encrypturl'))[0]=~/^yes$/i);	'parameter_encrypturl'))[0]=~/^yes$/i);
unless ($hiddenmap) {	unless ($hiddenmap) {
unless (ref($$navmapref)) {	if (ref($navmapref)) {
$$navmapref = Apache::lonnavmaps::navmap->new();	unless (ref($$navmapref)) {
}	$$navmapref = Apache::lonnavmaps::navmap->new();
if (ref($$navmapref)) {	}
if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') {	if (ref($$navmapref)) {
my @resources = $$navmapref->retrieveResources($folderurl,$filterFunc,1,1);	if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') {
unless (@resources) {	my @resources = $$navmapref->retrieveResources($folderurl,$filterFunc,1,1);
$hiddenmap = 1;	unless (@resources) {
unless ($env{'request.role.adv'}) {	$hiddenmap = 1;
$url = '';	unless ($env{'request.role.adv'}) {
$hiddenfolder = 1;	$url = '';
	$hiddenfolder = 1;
	}
}	}
}	}
}	}
}	}
}	}
unless ($encryptmap) {	unless ($encryptmap) {
if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.encrypturl")) eq 'yes') {	if ((ref($navmapref)) && (ref($$navmapref))) {
$encryptmap = 1;	if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.encrypturl")) eq 'yes') {
	$encryptmap = 1;
	}
}	}
}	}

# Append randompick number, hidden, and encrypted with ":" to foldername,	# Append randompick number, hidden, and encrypted with ":" to foldername,
# so it gets transferred between levels	# so it gets transferred between levels
$folderpath.=$containerarg.'&'.$foldername.	$folderpath.=$containerarg.'&'.$foldername.
Line 4139 $form_end;	Line 4249 $form_end;
}	}
} elsif ($supplementalflag && !$allowed) {	} elsif ($supplementalflag && !$allowed) {
my $isexttool;	my $isexttool;
if ($url=~m{^/adm/$coursedom/$coursenum/\d+/exttools?$}) {	if ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) {
$url='/adm/wrapper'.$url;	$url='/adm/wrapper'.$url;
$isexttool = 1;	$isexttool = 1;
}	}
Line 4157 $form_end;	Line 4267 $form_end;
}	}
my ($tdalign,$tdwidth);	my ($tdalign,$tdwidth);
if ($allowed) {	if ($allowed) {
my $fileloc =	my $fileloc =
&Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));	&Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));
if ($isexternal) {	if ($isexternal) {
($editlink,$extresform) =	($editlink,$extresform) =
&Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem,	&Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem,
undef,undef,undef,undef,undef,undef,	undef,undef,undef,undef,undef,undef,
undef,$disabled);	undef,$disabled);
} elsif ($orig_url =~ m{^/adm/$coursedom/$coursenum/\d+/exttools?$}) {	} elsif ($orig_url =~ m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) {
($editlink,$extresform) =	($editlink,$extresform) =
&Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem,	&Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem,
undef,undef,undef,'tool',$coursedom,	undef,undef,undef,'tool',$coursedom,
Line 4177 $form_end;	Line 4287 $form_end;
if ($supplementalflag) {	if ($supplementalflag) {
$suppanchor = $anchor;	$suppanchor = $anchor;
}	}
my $jscall =	my $jscall =
&Apache::lonhtmlcommon::jump_to_editres($cfile,$home,	&Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
$switchserver,	$switchserver,
$forceedit,	$forceedit,
undef,$symb,	undef,$symb,
&escape($env{'form.folderpath'}),	&escape($env{'form.folderpath'}),
$renametitle,'','',1,$suppanchor);	$renametitle,$hostname,
	'','',1,$suppanchor);
if ($jscall) {	if ($jscall) {
$editlink = '<a class="LC_docs_ext_edit" href="javascript:'.	$editlink = '<a class="LC_docs_ext_edit" href="javascript:'.
$jscall.'" >'.&mt('Edit').'</a> '."\n";	$jscall.'" >'.&mt('Edit').'</a> '."\n";
Line 4200 $form_end;	Line 4311 $form_end;
$reinit = &mt('(re-initialize course to access)');	$reinit = &mt('(re-initialize course to access)');
}	}
$line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink;	$line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink;
	if ($url =~ /$LONCAPA::assess_re/) {
	$line.= '<br />';
	if ($curralias ne '') {
	$line.='<span class="LC_nobreak"><a href="javascript:delalias('."'$esc_path','$orderidx'".');" class="LC_docs_alias">'.
	$lt{'da'}.'</a></span>';
	} else {
	$line.='<span class="LC_nobreak"><a href="javascript:setalias('."'$esc_path','$orderidx'".');" class="LC_docs_alias">'.
	$lt{'sa'}.'</a></span>';
	}
	}
	$line.='</td><td>';
	my $link;
if (($url=~m{/adm/(coursedocs\|supplemental)}) \|\| (!$allowed && $url)) {	if (($url=~m{/adm/(coursedocs\|supplemental)}) \|\| (!$allowed && $url)) {
$line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';	$line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
} elsif ($url) {	} elsif ($url) {
Line 4210 $form_end;	Line 4333 $form_end;
$anchor = '#'.&HTML::Entities::encode($anchor,'"<>&');	$anchor = '#'.&HTML::Entities::encode($anchor,'"<>&');
}	}
}	}
$line.=&Apache::loncommon::modal_link(&js_escape($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.	if ((!$supplementalflag) && ($nomodal) && ($hostname ne '')) {
(($anchor ne '')?$anchor:'')),	$link = 'http://'.$hostname.$url;
'<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);	} else {
	$link = $url;
	}
	$link = &js_escape($link.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.
	(($anchor ne '')?$anchor:''));
	if ($nomodal) {
	$line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'.
	'<img src="'.$icon.'" alt="" class="LC_icon" border="0" /></a>';
	} else {
	$line.=&Apache::loncommon::modal_link($link,
	'<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
	}
} else {	} else {
$line.='<img src="'.$icon.'" alt="" class="LC_icon" />';	$line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
}	}
Line 4220 $form_end;	Line 4354 $form_end;
if (($url=~m{/adm/(coursedocs\|supplemental)}) \|\| (!$allowed && $url)) {	if (($url=~m{/adm/(coursedocs\|supplemental)}) \|\| (!$allowed && $url)) {
$line.='<a href="'.$url.'">'.$title.'</a>';	$line.='<a href="'.$url.'">'.$title.'</a>';
} elsif ($url) {	} elsif ($url) {
$line.=&Apache::loncommon::modal_link(&js_escape($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.	if ($nomodal) {
(($anchor ne '')?$anchor:'')),	$line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'.
$title,600,500);	$title.'</a>';
	} else {
	$line.=&Apache::loncommon::modal_link($link,$title,600,500);
	}
} elsif (($hiddenfolder) \|\| ($hiddenres)) {	} elsif (($hiddenfolder) \|\| ($hiddenres)) {
$line.=$title.' <span class="LC_warning LC_docs_reinit_warn">'.&mt('(Hidden)').'</span>';	$line.=$title.' <span class="LC_warning LC_docs_reinit_warn">('.&mt('Hidden').')</span>';
} else {	} else {
$line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';	$line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
}	}
$line.="$extresform</td>";	if (($allowed) && ($curralias ne '')) {
	$line .= '<br /><span class="LC_docs_alias_name">('.$curralias.')</span>';
	} else {
	$line .= $extresform;
	}
	$line .= '</td>';
$rand_pick_text = ' ' if ($rand_pick_text eq '');	$rand_pick_text = ' ' if ($rand_pick_text eq '');
$rand_order_text = ' ' if ($rand_order_text eq '');	$rand_order_text = ' ' if ($rand_order_text eq '');
if (($allowed) && ($folder!~/^supplemental/)) {	if (($allowed) && ($folder!~/^supplemental/)) {
Line 4363 sub new_timebased_suffix {	Line 4505 sub new_timebased_suffix {
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.');	$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.');
} elsif ($type eq 'smppg') {	} elsif ($type eq 'smppg') {
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.');	$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.');
	} elsif ($type eq 'exttool') {
	$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new external tool.');
} else {	} else {
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new discussion board.');	$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new discussion board.');
}	}
Line 4371 sub new_timebased_suffix {	Line 4515 sub new_timebased_suffix {
}	}
}	}
if ($freedlock ne 'ok') {	if ($freedlock ne 'ok') {
$locknotfreed =	$locknotfreed =
'<div class="LC_error">'.	'<div class="LC_error">'.
&mt('There was a problem removing a lockfile.').' ';	&mt('There was a problem removing a lockfile.').' ';
if ($type eq 'paste') {	if ($type eq 'paste') {
Line 4391 sub new_timebased_suffix {	Line 4535 sub new_timebased_suffix {
} elsif ($type eq 'smppg') {	} elsif ($type eq 'smppg') {
$locknotfreed .=	$locknotfreed .=
&mt('This will prevent creation of additional simple pages in this course.');	&mt('This will prevent creation of additional simple pages in this course.');
	} elsif ($type eq 'exttool') {
	$locknotfreed .=
	&mt('This will prevent creation of additional external tools in this course.');
} else {	} else {
$locknotfreed .=	$locknotfreed .=
&mt('This will prevent creation of additional discussion boards in this course.');	&mt('This will prevent creation of additional discussion boards in this course.');
Line 5016 sub handler {	Line 5163 sub handler {
#	#
# --------------------------------------------- Initialize help topics for this	# --------------------------------------------- Initialize help topics for this
foreach my $topic ('Adding_Course_Doc','Main_Course_Documents',	foreach my $topic ('Adding_Course_Doc','Main_Course_Documents',
'Adding_External_Resource','Navigate_Content',	'Adding_External_Resource','Adding_External_Tool',
'Adding_Folders','Docs_Overview', 'Load_Map',	'Navigate_Content','Adding_Folders','Docs_Overview',
'Supplemental','Score_Upload_Form','Adding_Pages',	'Load_Map','Supplemental','Score_Upload_Form',
'Importing_LON-CAPA_Resource','Importing_IMS_Course',	'Adding_Pages','Importing_LON-CAPA_Resource',
'Uploading_From_Harddrive','Course_Roster','Web_Page',	'Importing_IMS_Course','Uploading_From_Harddrive',
'Dropbox','Simple_Problem') {	'Course_Roster','Web_Page','Dropbox','Simple_Problem') {
$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
}	}
# Composite help files	# Composite help files
Line 5053 sub handler {	Line 5200 sub handler {
$disabled = ' disabled="disabled"';	$disabled = ' disabled="disabled"';
}	}
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
	if ($env{'form.inhibitmenu'}) {
	unless ($env{'form.inhibitmenu'} eq 'yes') {
	delete($env{'form.inhibitmenu'});
	}
	}

if ($allowed && $env{'form.verify'}) {	if ($allowed && $env{'form.verify'}) {
&init_breadcrumbs('verify','Verify Content','Docs_Verify_Content');	&init_breadcrumbs('verify','Verify Content','Docs_Verify_Content');
&verifycontent($r);	&verifycontent($r);
Line 5135 sub handler {	Line 5288 sub handler {
'forcesupplement','forcestandard',	'forcesupplement','forcestandard',
'tools','symb','command','supppath']);	'tools','symb','command','supppath']);

	foreach my $item ('forcesupplement','forcestandard','tools') {
	next if ($env{'form.'.$item} eq '');
	unless ($env{'form.'.$item} eq '1') {
	delete($env{'form.'.$item});
	}
	}

	if ($env{'form.command'}) {
	unless ($env{'form.command'} =~ /^(direct\|directnav\|editdocs\|editsupp\|contents\|home)$/) {
	delete($env{'form.command'});
	}
	}

	if ($env{'form.symb'}) {
	my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'});
	unless (($id =~ /^\d+$/) && (&Apache::lonnet::is_on_map($resurl))) {
	delete($env{'form.symb'});
	}
	}

# standard=1: this is a "new-style" course with an uploaded map as top level	# standard=1: this is a "new-style" course with an uploaded map as top level
# standard=2: this is a "old-style" course, and there is nothing we can do	# standard=2: this is a "old-style" course, and there is nothing we can do

Line 5157 sub handler {	Line 5330 sub handler {
my $toolsflag=0;	my $toolsflag=0;
if ($env{'form.tools'}) { $toolsflag=1; }	if ($env{'form.tools'}) { $toolsflag=1; }

	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'});
	}
	}

	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'});
	}
	}

my $script='';	my $script='';
my $showdoc=0;	my $showdoc=0;
my $addentries = {};	my $addentries = {};
Line 5343 sub handler {	Line 5548 sub handler {
my $tabidstr = join("','",@tabids);	my $tabidstr = join("','",@tabids);
%ltitools = &Apache::lonnet::get_domain_ltitools($coursedom);	%ltitools = &Apache::lonnet::get_domain_ltitools($coursedom);
my $posslti = keys(%ltitools);	my $posslti = keys(%ltitools);
	my $hostname = $r->hostname();
$script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti,	$script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti,
$londocroot,$canedit,\$navmap).	$londocroot,$canedit,$hostname,\$navmap).
&history_tab_js().	&history_tab_js().
&inject_data_js().	&inject_data_js().
&Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid).	&Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid).
Line 5443 sub handler {	Line 5649 sub handler {
my ($destination,$dir_root) = &embedded_destination();	my ($destination,$dir_root) = &embedded_destination();
my $url_root = '/uploaded/'.$docudom.'/'.$docuname;	my $url_root = '/uploaded/'.$docudom.'/'.$docuname;
my $actionurl = '/adm/coursedocs';	my $actionurl = '/adm/coursedocs';
my ($result,$flag) =	my ($result,$flag) =
&Apache::loncommon::upload_embedded('coursedoc',$destination,	&Apache::loncommon::upload_embedded('coursedoc',$destination,
$docuname,$docudom,$dir_root,$url_root,undef,undef,undef,$state,	$docuname,$docudom,$dir_root,$url_root,undef,undef,undef,$state,
$actionurl);	$actionurl);
Line 5454 sub handler {	Line 5660 sub handler {
my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};	my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};	my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my ($destination,$dir_root) = &embedded_destination();	my ($destination,$dir_root) = &embedded_destination();
my $result =	my $result =
&Apache::loncommon::modify_html_refs('coursedoc',$destination,	&Apache::loncommon::modify_html_refs('coursedoc',$destination,
$docuname,$docudom,undef,	$docuname,$docudom,undef,
$dir_root);	$dir_root);
$r->print($result.&return_to_editor());	$r->print($result.&return_to_editor());
} elsif ($env{'form.phase'} eq 'decompress_uploaded') {	} elsif ($env{'form.phase'} eq 'decompress_uploaded') {
$uploadphase = 'decompress_phase_one';	$uploadphase = 'decompress_phase_one';
$r->print(&decompression_phase_one().	$r->print(&decompression_phase_one().
Line 5484 sub handler {	Line 5690 sub handler {
'impo' => 'Import',	'impo' => 'Import',
'lnks' => 'Import from Stored Links',	'lnks' => 'Import from Stored Links',
'impm' => 'Import from Assembled Map',	'impm' => 'Import from Assembled Map',
'imcr' => 'Import from Course Resources',	'imcr' => 'Import from Course Resources',
'extr' => 'External Resource',	'extr' => 'External Resource',
'extt' => 'External Tool',	'extt' => 'External Tool',
'selm' => 'Select Map',	'selm' => 'Select Map',
Line 5495 sub handler {	Line 5701 sub handler {
'navc' => 'Table of Contents',	'navc' => 'Table of Contents',
'sipa' => 'Simple Course Page',	'sipa' => 'Simple Course Page',
'sipr' => 'Simple Problem',	'sipr' => 'Simple Problem',
'webp' => 'Blank Web Page (editable)',	'webp' => 'Blank Web Page (editable)',
'stpr' => 'Standard Problem',	'stpr' => 'Standard Problem',
'news' => 'New sub-directory',	'news' => 'New sub-directory',
'crpr' => 'Create Problem',	'crpr' => 'Create Problem',
Line 5557 sub handler {	Line 5763 sub handler {
if ($disk_quota == 0) {	if ($disk_quota == 0) {
$percent = 100.0;	$percent = 100.0;
} else {	} else {
$percent = 100*($current_disk_usage/$disk_quota);	$percent = 100*($usage/$disk_quota);
}	}
$usage = sprintf("%.2f",$usage);	$usage = sprintf("%.2f",$usage);
$quota = sprintf("%.2f",$quota);	$quota = sprintf("%.2f",$quota);
Line 5724 CRSFORM	Line 5930 CRSFORM
<input type="hidden" name="copyfolder" />	<input type="hidden" name="copyfolder" />
$containertag	$containertag
</form>	</form>
	<form name="aliasform" method="post" action="/adm/coursedocs">
	<input type="hidden" name="alias" />
	<input type="hidden" name="cmd" />
	$containertag
	</form>

HIDDENFORM	HIDDENFORM
$r->print(&makesimpleeditform($pathitem)."\n".	$r->print(&makesimpleeditform($pathitem)."\n".
Line 5746 HIDDENFORM	Line 5957 HIDDENFORM
}	}

#	#
	my $hostname = $r->hostname();
my $savefolderpath;	my $savefolderpath;

if ($allowed) {	if ($allowed) {
Line 5944 NWEBFORM	Line 6155 NWEBFORM
$numauthor ++;	$numauthor ++;
}	}
}	}
my ($pickdir,$showtitle);;	my ($pickdir,$showtitle);
if ($numauthor) {	if ($numauthor) {
my @order;	my @order;
my $defrole;	my $defrole;
Line 6171 NGFFORM	Line 6382 NGFFORM
);	);
if (keys(%ltitools)) {	if (keys(%ltitools)) {
push(@importdoc,	push(@importdoc,
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extt}.'" onclick="toggleUpload(\'tool\');" />'=>$exttoolform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="toggleUpload(\'tool\');" />'=>$exttoolform},
);	);
}	}
unless ($container eq 'page') {	unless ($container eq 'page') {
Line 6216 unless ($container eq 'page') {	Line 6427 unless ($container eq 'page') {
unless (($supplementalflag \|\| $toolsflag)) {	unless (($supplementalflag \|\| $toolsflag)) {
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,	my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
$supplementalflag,\%orderhash,$iconpath,$pathitem,	$supplementalflag,\%orderhash,$iconpath,$pathitem,
\%ltitools,$canedit,\$navmap,$hiddentop);	\%ltitools,$canedit,$hostname,\$navmap,$hiddentop);
undef($navmap);	undef($navmap);
if ($error) {	if ($error) {
$r->print('<p><span class="LC_error">'.$error.'</span></p>');	$r->print('<p><span class="LC_error">'.$error.'</span></p>');
Line 6253 unless ($container eq 'page') {	Line 6464 unless ($container eq 'page') {
<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data">	<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data">
<fieldset id="uploadsuppdocform" style="display: none;">	<fieldset id="uploadsuppdocform" style="display: none;">
<legend>$lt{'upfi'}</legend>	<legend>$lt{'upfi'}</legend>
<input type="hidden" name="active" value="ee" />	<input type="hidden" name="active" value="ee" />
$fileupload	$fileupload
<br />	<br />
<br />	<br />
Line 6348 my @supimportdoc = (	Line 6559 my @supimportdoc = (
=>$supextform});	=>$supextform});
if (keys(%ltitools)) {	if (keys(%ltitools)) {
push(@supimportdoc,	push(@supimportdoc,
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extt}.'" onclick="javascript:toggleUpload(\'supptool\')" />'	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="javascript:toggleUpload(\'supptool\')" />'
=>$supexttoolform});	=>$supexttoolform});
}	}
push(@supimportdoc,	push(@supimportdoc,
Line 6365 my %suporderhash = (	Line 6576 my %suporderhash = (
if ($supplementalflag) {	if ($supplementalflag) {
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,	my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
$supplementalflag,\%suporderhash,$iconpath,$pathitem,	$supplementalflag,\%suporderhash,$iconpath,$pathitem,
\%ltitools,$canedit);	\%ltitools,$canedit,$hostname);
if ($error) {	if ($error) {
$r->print('<p><span class="LC_error">'.$error.'</span></p>');	$r->print('<p><span class="LC_error">'.$error.'</span></p>');
} else {	} else {
Line 6380 my %suporderhash = (	Line 6591 my %suporderhash = (
}	}
&Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);	&Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
undef($suppchanges);	undef($suppchanges);
}	}
}	}
}	}
} elsif ($supplementalflag) {	} elsif ($supplementalflag) {
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,	my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
$supplementalflag,'',$iconpath,$pathitem);	$supplementalflag,'',$iconpath,$pathitem,'','',$hostname);
if ($error) {	if ($error) {
$r->print('<p><span class="LC_error">'.$error.'</span></p>');	$r->print('<p><span class="LC_error">'.$error.'</span></p>');
}	}
Line 6412 my %suporderhash = (	Line 6623 my %suporderhash = (
&entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');	&entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');
}	}
}	}
unless ($noendpage) {	unless ($noendpage) {
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
}	}
return OK;	return OK;
Line 6421 my %suporderhash = (	Line 6632 my %suporderhash = (
sub embedded_form_elems {	sub embedded_form_elems {
my ($phase,$primaryurl,$newidx) = @_;	my ($phase,$primaryurl,$newidx) = @_;
my $folderpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');	my $folderpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
	$newidx =~s /\D+//g;
return <<STATE;	return <<STATE;
<input type="hidden" name="folderpath" value="$folderpath" />	<input type="hidden" name="folderpath" value="$folderpath" />
<input type="hidden" name="cmd" value="upload_embedded" />	<input type="hidden" name="cmd" value="upload_embedded" />
Line 6441 sub embedded_destination {	Line 6653 sub embedded_destination {
} elsif ($folder =~ /^(default\|supplemental)_(\d+)$/) {	} elsif ($folder =~ /^(default\|supplemental)_(\d+)$/) {
$destination .= $2.'/';	$destination .= $2.'/';
}	}
$destination .= $env{'form.newidx'};	my $newidx = $env{'form.newidx'};
	$newidx =~s /\D+//g;
	if ($newidx) {
	$destination .= $newidx;
	}
my $dir_root = '/userfiles';	my $dir_root = '/userfiles';
return ($destination,$dir_root);	return ($destination,$dir_root);
}	}
Line 6467 sub decompression_info {	Line 6683 sub decompression_info {
}	}
unshift(@hiddens,$pathitem);	unshift(@hiddens,$pathitem);
foreach my $item (@hiddens) {	foreach my $item (@hiddens) {
	if ($item eq 'newidx') {
	next if ($env{'form.'.$item} =~ /\D/);
	}
if ($env{'form.'.$item}) {	if ($env{'form.'.$item}) {
$hiddenelem .= '<input type="hidden" name="'.$item.'" value="'.	$hiddenelem .= '<input type="hidden" name="'.$item.'" value="'.
&HTML::Entities::encode($env{'form.'.$item},'<>&"').'" />'."\n";	&HTML::Entities::encode($env{'form.'.$item},'<>&"').'" />'."\n";
Line 6484 sub decompression_phase_one {	Line 6703 sub decompression_phase_one {
$error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'});	$error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'});
} else {	} else {
my $file = $1;	my $file = $1;
$output =	$output =
&Apache::loncommon::process_decompression($docudom,$docuname,$file,	&Apache::loncommon::process_decompression($docudom,$docuname,$file,
$destination,$dir_root,	$destination,$dir_root,
$hiddenelem);	$hiddenelem);
Line 6759 END	Line 6978 END
}	}

sub editing_js {	sub editing_js {
my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti,$londocroot,$canedit,$navmapref) = @_;	my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti,
	$londocroot,$canedit,$hostname,$navmapref) = @_;
my %js_lt = &Apache::lonlocal::texthash(	my %js_lt = &Apache::lonlocal::texthash(
p_mnf => 'Name of New Folder',	p_mnf => 'Name of New Folder',
t_mnf => 'New Folder',	t_mnf => 'New Folder',
Line 6790 sub editing_js {	Line 7010 sub editing_js {
p_ctr2b => '?',	p_ctr2b => '?',
p_ctr3a => 'Cut those',	p_ctr3a => 'Cut those',
p_ctr3b => 'items?',	p_ctr3b => 'items?',
	setal => 'Enter a (unique) alias',
	delal => 'Are you sure you want to eliminate the alias?',
rpck => 'Enter number to pick (e.g., 3)',	rpck => 'Enter number to pick (e.g., 3)',
imsfile => 'You must choose an IMS package for import',	imsfile => 'You must choose an IMS package for import',
imscms => 'You must select which Course Management System was the source of the IMS package',	imscms => 'You must select which Course Management System was the source of the IMS package',
Line 6836 sub editing_js {	Line 7058 sub editing_js {
}	}
$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"').'?symb='.	$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"').'?symb='.
&HTML::Entities::encode($caller,'<>&"');	&HTML::Entities::encode($caller,'<>&"');
	if ($backtourl =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) {
	if (($ENV{'SERVER_PORT'} == 443) &&
	($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
	if ($hostname ne '') {
	$backtourl = 'http://'.$hostname.$backtourl;
	}
	$backtourl .= (($backtourl =~ /\?/) ? '&':'?').'usehttp=1';
	}
	} elsif ($backtourl =~ m{^/adm/wrapper/ext/(?!https:)}) {
	if (($ENV{'SERVER_PORT'} == 443) && ($hostname ne '')) {
	$backtourl = 'http://'.$hostname.$backtourl;
	}
	}
if ($anchor ne '') {	if ($anchor ne '') {
$backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"');	$backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"');
}	}
Line 6979 function changename(folderpath,index,old	Line 7214 function changename(folderpath,index,old
}	}
}	}

	function setalias(folderpath,index) {
	var alias = prompt('$js_lt{"setal"}');
	if ((alias != null) && (alias != '')) {
	this.document.forms.aliasform.alias.value=alias;
	this.document.forms.aliasform.cmd.value='setalias_'+index;
	this.document.forms.aliasform.folderpath.value=folderpath;
	this.document.forms.aliasform.submit();
	}
	}

	function delalias(folderpath,index) {
	if (confirm('$js_lt{"delal"}')) {
	this.document.forms.aliasform.cmd.value='delalias_'+index;
	this.document.forms.aliasform.folderpath.value=folderpath;
	this.document.forms.aliasform.submit();
	}
	}

ENDNEWSCRIPT	ENDNEWSCRIPT
} else {	} else {
$jsmakefunctions = <<ENDNEWSCRIPT;	$jsmakefunctions = <<ENDNEWSCRIPT;
Line 7023 function changename() {	Line 7276 function changename() {
alert("$js_lt{'edri'}");	alert("$js_lt{'edri'}");
}	}

	function setalias() {
	alert("$js_lt{'edri'}");
	}

	function delalias() {
	alert("$js_lt{'edri'}");
	}

function makenew() {	function makenew() {
alert("$js_lt{'edri'}");	alert("$js_lt{'edri'}");
}	}

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

Removed from v.1.618
changed lines
	Added in v.1.635