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.79 and 1.484.2.91

version 1.484.2.79, 2019/04/11 16:32:33	version 1.484.2.91, 2021/02/10 12:46:11
Line 676 sub group_import {	Line 676 sub group_import {
}	}
my $ext = 'false';	my $ext = 'false';
if ($url=~m{^http://} \|\| $url=~m{^https://}) { $ext = 'true'; }	if ($url=~m{^http://} \|\| $url=~m{^https://}) { $ext = 'true'; }
$name = &LONCAPA::map::qtunescape($name);
if ($name eq '') {
$name = &LONCAPA::map::qtunescape(&mt('Web Page'));
}
if ($url =~ m{^/uploaded/$coursedom/$coursenum/((?:docs\|supplemental)/(?:default\|\d+))/new\.html$}) {	if ($url =~ m{^/uploaded/$coursedom/$coursenum/((?:docs\|supplemental)/(?:default\|\d+))/new\.html$}) {
my $filepath = $1;	my $filepath = $1;
my $fname = $name;	my $fname;
if ($fname =~ /^\W+$/) {	if ($name eq '') {
	$name = &mt('Web Page');
$fname = 'web';	$fname = 'web';
} else {	} else {
$fname =~ s/\W/_/g;	$fname = $name;
}	$fname=&Apache::lonnet::clean_filename($fname);
if (length($fname) > 15) {	if ($fname eq '') {
$fname = substr($fname,0,14);	$fname = 'web';
	} elsif (length($fname) > 15) {
	$fname = substr($fname,0,14);
	}
}	}
	my $title = &Apache::loncommon::cleanup_html($name);
my $initialtext = &mt('Replace with your own content.');	my $initialtext = &mt('Replace with your own content.');
my $newhtml = <<END;	my $newhtml = <<END;
<html>	<html>
<head>	<head>
<title>$name</title>	<title>$title</title>
</head>	</head>
<body bgcolor="#ffffff">	<body bgcolor="#ffffff">
$initialtext	$initialtext
Line 717 END	Line 718 END
return (&mt('Failed to save new web page.'),1);	return (&mt('Failed to save new web page.'),1);
}	}
}	}
	$name = &LONCAPA::map::qtunescape($name);
$url = &LONCAPA::map::qtunescape($url);	$url = &LONCAPA::map::qtunescape($url);
$LONCAPA::map::resources[$residx] =	$LONCAPA::map::resources[$residx] =
join(':', ($name, $url, $ext, 'normal', 'res'));	join(':', ($name, $url, $ext, 'normal', 'res'));
Line 834 sub docs_change_log {	Line 836 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 1059 sub update_paste_buffer {	Line 1061 sub update_paste_buffer {
# Construct identifiers for current contents of user's paste buffer	# Construct identifiers for current contents of user's paste buffer
if (@currpaste) {	if (@currpaste) {
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};
if (($cid =~ /^$match_domain(?:_)$match_courseid$/) &&	my $mapidx = $env{'docs.markedcopy_map_'.$suffix};
($url ne '')) {	if (($cid =~ /^$match_domain(?:_)$match_courseid$/) &&
$pasteurls{$cid.'_'.$url} = 1;	($url ne '')) {
}	if ($url eq '/res/lib/templates/simpleproblem.problem') {
	$pasteurls{$cid.'_'.$mapidx} = 1;
	} elsif ($url =~ m{^/res/$match_domain/$match_username/}) {
	$pasteurls{$url} = 1;
	} else {
	$pasteurls{$cid.'_'.$url} = 1;
	}
	}
}	}
}	}

# Mark items for copying (skip any items already in user's paste buffer)	# Mark items for copying (skip any items already in user's paste buffer)
my %addtoenv;	my %addtoenv;

	my @pathitems = split(/\&/,$env{'form.folderpath'});
	my @folderconf = split(/\:/,$pathitems[-1]);
	my $ispage = $folderconf[5];

foreach my $item (@possibles) {	foreach my $item (@possibles) {
my ($orderidx,$cmd) = split(/:/,$item);	my ($orderidx,$cmd) = split(/:/,$item);
next if ($orderidx =~ /\D/);	next if ($orderidx =~ /\D/);
next unless (($cmd eq 'cut') \|\| ($cmd eq 'copy') \|\| ($cmd eq 'remove'));	next unless (($cmd eq 'cut') \|\| ($cmd eq 'copy') \|\| ($cmd eq 'remove'));
	my $mapidx = $folder.':'.$orderidx.':'.$ispage;
my ($title,$url)=split(':',$LONCAPA::map::resources[$orderidx]);	my ($title,$url)=split(':',$LONCAPA::map::resources[$orderidx]);
my %denied = &action_restrictions($coursenum,$coursedom,	my %denied = &action_restrictions($coursenum,$coursedom,
&LONCAPA::map::qtescape($url),	&LONCAPA::map::qtescape($url),
$env{'form.folderpath'},\%curr_groups);	$env{'form.folderpath'},\%curr_groups);
next if ($denied{'copy'});	next if ($denied{'copy'});
$url=~s{http(&colon;\|:)//https(&colon;\|:)//}{https$2//};	$url=~s{http(&colon;\|:)//https(&colon;\|:)//}{https$2//};
next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$url}));	if ($url eq '/res/lib/templates/simpleproblem.problem') {
	next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$mapidx}));
	} elsif ($url =~ m{^/res/$match_domain/$match_username/}) {
	next if (exists($pasteurls{$url}));
	} else {
	next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$url}));
	}
my ($suffix,$errortxt,$locknotfreed) =	my ($suffix,$errortxt,$locknotfreed) =
&new_timebased_suffix($env{'user.domain'},$env{'user.name'},'paste');	&new_timebased_suffix($env{'user.domain'},$env{'user.name'},'paste');
if ($suffix ne '') {	if ($suffix ne '') {
Line 1100 sub update_paste_buffer {	Line 1120 sub update_paste_buffer {
$addtoenv{'docs.markedcopy_url_'.$suffix} = $url,	$addtoenv{'docs.markedcopy_url_'.$suffix} = $url,
$addtoenv{'docs.markedcopy_cmd_'.$suffix} = $cmd,	$addtoenv{'docs.markedcopy_cmd_'.$suffix} = $cmd,
$addtoenv{'docs.markedcopy_crs_'.$suffix} = $env{'request.course.id'};	$addtoenv{'docs.markedcopy_crs_'.$suffix} = $env{'request.course.id'};
	$addtoenv{'docs.markedcopy_map_'.$suffix} = $mapidx;
if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(default\|supplemental)_?(\d*)\.(page\|sequence)$}) {	if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(default\|supplemental)_?(\d*)\.(page\|sequence)$}) {
my $prefix = $1;	my $prefix = $1;
my $subdir =$2;	my $subdir =$2;
Line 1178 sub print_paste_buffer {	Line 1198 sub print_paste_buffer {
next if ($suffix =~ /\D/);	next if ($suffix =~ /\D/);
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};
if (($cid =~ /^$match_domain\_$match_courseid$/) &&	if (($cid =~ /^$match_domain\_$match_courseid$/) &&
($url ne '')) {	($url ne '')) {
$clipboardcount ++;	$clipboardcount ++;
Line 1217 sub print_paste_buffer {	Line 1238 sub print_paste_buffer {
}	}
$is_uploaded_map = 1;	$is_uploaded_map = 1;
}	}
} elsif ($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard\|smppg)$}) {	} elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) \|\|
	($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard\|smppg)$})) {
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/) {
Line 1516 sub do_paste_from_buffer {	Line 1538 sub do_paste_from_buffer {
}	}

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

foreach my $suffix (@topaste) {	foreach my $suffix (@topaste) {
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});	my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});
my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix});	my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix});
	my $mapidx=&LONCAPA::map::qtescape($env{'docs.markedcopy_map_'.$suffix});
# Supplemental content may only include certain types of content	# Supplemental content may only include certain types of content
# Early out if pasted content is not supported in Supplemental area	# Early out if pasted content is not supported in Supplemental area
if ($folder =~ /^supplemental/) {	if ($folder =~ /^supplemental/) {
Line 1542 sub do_paste_from_buffer {	Line 1565 sub do_paste_from_buffer {
}	}
$srcdom{$suffix} = $srcd;	$srcdom{$suffix} = $srcd;
$srcnum{$suffix} = $srcn;	$srcnum{$suffix} = $srcn;
} elsif ($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard\|smppg)$}) {	} elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) \|\|
	($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard\|smppg)$})) {
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 1555 sub do_paste_from_buffer {	Line 1579 sub do_paste_from_buffer {
$srcdom{$suffix} = $srcd;	$srcdom{$suffix} = $srcd;
$srcnum{$suffix} = $srcn;	$srcnum{$suffix} = $srcn;
}	}
	$srcmapidx{$suffix} = $mapidx;
push(@dopaste,$suffix);	push(@dopaste,$suffix);
if ($url=~/\.(page\|sequence)$/) {	if ($url=~/\.(page\|sequence)$/) {
$is_map{$suffix} = 1;	$is_map{$suffix} = 1;
Line 1564 sub do_paste_from_buffer {	Line 1589 sub do_paste_from_buffer {
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
# URLs will contain different paths (which depend on whether pasted item is	# URLs will contain different paths (which depend on whether pasted item is
# a folder/page or a document.	# a folder/page or a document).
if (($folder =~ /^supplemental/) && (($oldprefix =~ /^default/) \|\| ($oldprefix eq 'docs'))) {	if (($folder =~ /^supplemental/) && (($oldprefix =~ /^default/) \|\| ($oldprefix eq 'docs'))) {
$prefixchg{$suffix} = 'docstosupp';	$prefixchg{$suffix} = 'docstosupp';
} elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) {	} elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) {
Line 1639 sub do_paste_from_buffer {	Line 1664 sub do_paste_from_buffer {
# Maps need to be copied first	# Maps need to be copied first
my (%removefrommap,%removeparam,%addedmaps,%rewrites,%retitles,%copies,	my (%removefrommap,%removeparam,%addedmaps,%rewrites,%retitles,%copies,
%dbcopies,%zombies,%params,%docmoves,%mapmoves,%mapchanges,%newsubdir,	%dbcopies,%zombies,%params,%docmoves,%mapmoves,%mapchanges,%newsubdir,
%newurls,%tomove);	%newurls,%tomove,%resdatacopy);
if (ref($marktomove{$suffix}) eq 'ARRAY') {	if (ref($marktomove{$suffix}) eq 'ARRAY') {
map { $tomove{$_} = 1; } @{$marktomove{$suffix}};	map { $tomove{$_} = 1; } @{$marktomove{$suffix}};
}	}
Line 1688 sub do_paste_from_buffer {	Line 1713 sub do_paste_from_buffer {
\%retitles,\%copies,\%dbcopies,	\%retitles,\%copies,\%dbcopies,
\%zombies,\%params,\%mapmoves,	\%zombies,\%params,\%mapmoves,
\%mapchanges,\%tomove,\%newsubdir,	\%mapchanges,\%tomove,\%newsubdir,
\%newurls)) {	\%newurls,\%resdatacopy)) {
$mapmoves{$url} = 1;	$mapmoves{$url} = 1;
}	}
$url = $newurl;	$url = $newurl;
Line 1697 sub do_paste_from_buffer {	Line 1722 sub do_paste_from_buffer {
$coursenum,$srcdom{$suffix},$srcnum{$suffix},	$coursenum,$srcdom{$suffix},$srcnum{$suffix},
$allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies,	$allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies,
\%zombies,\%params,\%mapmoves,\%mapchanges,	\%zombies,\%params,\%mapmoves,\%mapchanges,
\%tomove,\%newsubdir,\%newurls);	\%tomove,\%newsubdir,\%newurls,\%resdatacopy);
}	}
} elsif ($url=~m {^/res/}) {	} elsif ($url=~m {^/res/}) {
# published map can only exists once, so remove from paste buffer when done	# published map can only exist once, so remove from paste buffer when done
push(@toclear,$suffix);	push(@toclear,$suffix);
# if pasting published map (main content area only) check map not already in course	# if pasting published map (main content area only) check map not already in course
if ($folder =~ /^default/) {	if ($folder =~ /^default/) {
Line 1803 sub do_paste_from_buffer {	Line 1828 sub do_paste_from_buffer {
}	}
}	}
}	}
	} elsif ($url =~ m{^/res/lib/templates/(\w+)\.problem$}) {
	my $template = $1;
	if ($newidx) {
	&copy_templated_files($url,$srcdom{$suffix},$srcnum{$suffix},$srcmapidx{$suffix},
	$coursedom,$coursenum,$template,$newidx,"$folder.$container");
	}
}	}
$LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url).	$LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url).
':'.$ext.':normal:res';	':'.$ext.':normal:res';
Line 1816 sub do_paste_from_buffer {	Line 1847 sub do_paste_from_buffer {
}	}
}	}

# Apply any changes to maps, or copy dependencies for uploaded HTML pages	# Apply any changes to maps, or copy dependencies for uploaded HTML pages, or update
	# resourcedata for simpleproblems copied from another course
unless ($allresult eq 'fail') {	unless ($allresult eq 'fail') {
my %updated = (	my %updated = (
rewrites => \%rewrites,	rewrites => \%rewrites,
Line 1824 sub do_paste_from_buffer {	Line 1856 sub do_paste_from_buffer {
removefrommap => \%removefrommap,	removefrommap => \%removefrommap,
removeparam => \%removeparam,	removeparam => \%removeparam,
dbcopies => \%dbcopies,	dbcopies => \%dbcopies,
	resdatacopy => \%resdatacopy,
retitles => \%retitles,	retitles => \%retitles,
);	);
my %info = (	my %info = (
Line 2080 sub dbcopy {	Line 2113 sub dbcopy {
return ($url,$result,$errtext);	return ($url,$result,$errtext);
}	}

	sub copy_templated_files {
	my ($srcurl,$srcdom,$srcnum,$srcmapinfo,$coursedom,$coursenum,$template,$newidx,$newmapname) = @_;
	my ($srcfolder,$srcid,$srcwaspage) = split(/:/,$srcmapinfo);
	my $srccontainer = 'sequence';
	if ($srcwaspage) {
	$srccontainer = 'page';
	}
	my $srcsymb = "uploaded/$srcdom/$srcnum/$srcfolder.$srccontainer".
	'___'.$srcid.'___'.&Apache::lonnet::declutter($srcurl);
	my $srcprefix = $srcdom.'_'.$srcnum.'.'.$srcsymb;
	my %srcparms=&Apache::lonnet::dump('resourcedata',$srcdom,$srcnum,$srcprefix);
	my $newsymb = "uploaded/$coursedom/$coursenum/$newmapname".'___'.$newidx.'___lib/templates/'.
	$template.'.problem';
	my $newprefix = $coursedom.'_'.$coursenum.'.'.$newsymb;
	if ($template eq 'simpleproblem') {
	$srcprefix .= '.0.';
	my $weightprefix = $newprefix;
	$newprefix .= '.0.';
	my @simpleprobqtypes = qw(radio option string essay numerical);
	my $qtype=$srcparms{$srcprefix.'questiontype'};
	if (grep(/^\Q$qtype\E$/,@simpleprobqtypes)) {
	my %newdata = (
	$newprefix.'questiontype' => $qtype,
	);
	foreach my $type (@simpleprobqtypes) {
	if ($type eq $qtype) {
	$newdata{"$weightprefix.$type.weight"}=1;
	} else {
	$newdata{"$weightprefix.$type.weight"}=0;
	}
	}
	$newdata{$newprefix.'hiddenparts'} = '!'.$qtype;
	$newdata{$newprefix.'questiontext'} = $srcparms{$srcprefix.'questiontext'};
	$newdata{$newprefix.'hinttext'} = $srcparms{$srcprefix.'hinttext'};
	if ($qtype eq 'numerical') {
	$newdata{$newprefix.'numericalscript'} = $srcparms{$srcprefix.'numericalscript'};
	$newdata{$newprefix.'numericalanswer'} = $srcparms{$srcprefix.'numericalanswer'};
	$newdata{$newprefix.'numericaltolerance'} = $srcparms{$srcprefix.'numericaltolerance'};
	$newdata{$newprefix.'numericalsigfigs'} = $srcparms{$srcprefix.'numericalsigfigs'};
	} elsif (($qtype eq 'option') \|\| ($qtype eq 'radio')) {
	my $maxfoils=$srcparms{$srcprefix.'maxfoils'};
	unless (defined($maxfoils)) { $maxfoils=10; }
	unless ($maxfoils=~/^\d+$/) { $maxfoils=10; }
	if ($maxfoils<=0) { $maxfoils=10; }
	my $randomize=$srcparms{$srcprefix.'randomize'};
	unless (defined($randomize)) { $randomize='yes'; }
	unless ($randomize eq 'no') { $randomize='yes'; }
	$newdata{$newprefix.'maxfoils'} = $maxfoils;
	$newdata{$newprefix.'randomize'} = $randomize;
	if ($qtype eq 'option') {
	$newdata{$newprefix.'options'} = $srcparms{$srcprefix.'options'};
	}
	for (my $i=1; $i<=10; $i++) {
	$newdata{$newprefix.'value'.$i} = $srcparms{$srcprefix.'value'.$i};
	$newdata{$newprefix.'position'.$i} = $srcparms{$srcprefix.'position'.$i};
	$newdata{$newprefix.'text'.$i} = $srcparms{$srcprefix.'text'.$i};
	}

	} elsif (($qtype eq 'option') \|\| ($qtype eq 'radio')) {
	my $maxfoils=$srcparms{$srcprefix.'maxfoils'};
	unless (defined($maxfoils)) { $maxfoils=10; }
	unless ($maxfoils=~/^\d+$/) { $maxfoils=10; }
	if ($maxfoils<=0) { $maxfoils=10; }
	my $randomize=$srcparms{$srcprefix.'randomize'};
	unless (defined($randomize)) { $randomize='yes'; }
	unless ($randomize eq 'no') { $randomize='yes'; }
	$newdata{$newprefix.'maxfoils'} = $maxfoils;
	$newdata{$newprefix.'randomize'} = $randomize;
	if ($qtype eq 'option') {
	$newdata{$newprefix.'options'} = $srcparms{$srcprefix.'options'};
	}
	for (my $i=1; $i<=10; $i++) {
	$newdata{$newprefix.'value'.$i} = $srcparms{$srcprefix.'value'.$i};
	$newdata{$newprefix.'position'.$i} = $srcparms{$srcprefix.'position'.$i};
	$newdata{$newprefix.'text'.$i} = $srcparms{$srcprefix.'text'.$i};
	}
	} elsif ($qtype eq 'string') {
	$newdata{$newprefix.'stringanswer'} = $srcparms{$srcprefix.'stringanswer'};
	$newdata{$newprefix.'stringtype'} = $srcparms{$srcprefix.'stringtype'};
	}
	if (keys(%newdata)) {
	my $putres = &Apache::lonnet::cput('resourcedata',\%newdata,$coursedom,
	$coursenum);
	if ($putres eq 'ok') {
	&Apache::lonnet::devalidatecourseresdata($coursenum,$coursedom);
	}
	}
	}
	}
	}

sub uniqueness_check {	sub uniqueness_check {
my ($newurl) = @_;	my ($newurl) = @_;
my $unique = 1;	my $unique = 1;
Line 2145 sub contained_map_check {	Line 2269 sub contained_map_check {
sub url_paste_fixups {	sub url_paste_fixups {
my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$fromcdom,$fromcnum,$allmaps,	my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$fromcdom,$fromcnum,$allmaps,
$rewrites,$retitles,$copies,$dbcopies,$zombies,$params,$mapmoves,	$rewrites,$retitles,$copies,$dbcopies,$zombies,$params,$mapmoves,
$mapchanges,$tomove,$newsubdir,$newurls) = @_;	$mapchanges,$tomove,$newsubdir,$newurls,$resdatacopy) = @_;
my $checktitle;	my $checktitle;
if (($prefixchg) &&	if (($prefixchg) &&
($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/supplemental})) {	($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/supplemental})) {
Line 2194 sub url_paste_fixups {	Line 2318 sub url_paste_fixups {
$srcdom,$srcnum,$allmaps,$rewrites,	$srcdom,$srcnum,$allmaps,$rewrites,
$retitles,$copies,$dbcopies,$zombies,	$retitles,$copies,$dbcopies,$zombies,
$params,$mapmoves,$mapchanges,$tomove,	$params,$mapmoves,$mapchanges,$tomove,
$newsubdir,$newurls);	$newsubdir,$newurls,$resdatacopy);
next;	next;
} else {	} else {
($newurl,my $error) =	($newurl,my $error) =
Line 2218 sub url_paste_fixups {	Line 2342 sub url_paste_fixups {
$cnum,$srcdom,$srcnum,$allmaps,	$cnum,$srcdom,$srcnum,$allmaps,
$rewrites,$retitles,$copies,$dbcopies,	$rewrites,$retitles,$copies,$dbcopies,
$zombies,$params,$mapmoves,$mapchanges,	$zombies,$params,$mapmoves,$mapchanges,
$tomove,$newsubdir,$newurls)) {	$tomove,$newsubdir,$newurls,$resdatacopy)) {
$mapmoves->{$ressrc} = 1;	$mapmoves->{$ressrc} = 1;
}	}
$changed = 1;	$changed = 1;
Line 2247 sub url_paste_fixups {	Line 2371 sub url_paste_fixups {
$dbcopies->{$oldurl}{$id}{'cnum'} = $fromcnum;	$dbcopies->{$oldurl}{$id}{'cnum'} = $fromcnum;
$changed = 1;	$changed = 1;
}	}
	} elsif ($ressrc eq '/res/lib/templates/simpleproblem.problem') {
	if (($fromcdom ne $cdom) \|\| ($fromcnum ne $cnum)) {
	$resdatacopy->{$oldurl}{$id}{'src'} = $ressrc;
	$resdatacopy->{$oldurl}{$id}{'cdom'} = $fromcdom;
	$resdatacopy->{$oldurl}{$id}{'cnum'} = $fromcnum;
	}
} elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) {	} elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) {
next if ($skip);	next if ($skip);
my $srcdom = $1;	my $srcdom = $1;
Line 2278 sub apply_fixups {	Line 2408 sub apply_fixups {
$oldurl,$url,$caller) = @_;	$oldurl,$url,$caller) = @_;
my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles,	my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles,
%params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs,	%params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs,
%lockerrors,$lockmsg);	%resdatacopy,%lockerrors,$lockmsg);
if (ref($updated) eq 'HASH') {	if (ref($updated) eq 'HASH') {
if (ref($updated->{'rewrites'}) eq 'HASH') {	if (ref($updated->{'rewrites'}) eq 'HASH') {
%rewrites = %{$updated->{'rewrites'}};	%rewrites = %{$updated->{'rewrites'}};
Line 2298 sub apply_fixups {	Line 2428 sub apply_fixups {
if (ref($updated->{'retitles'}) eq 'HASH') {	if (ref($updated->{'retitles'}) eq 'HASH') {
%retitles = %{$updated->{'retitles'}};	%retitles = %{$updated->{'retitles'}};
}	}
	if (ref($updated->{'resdatacopy'}) eq 'HASH') {
	%resdatacopy = %{$updated->{'resdatacopy'}};
	}
}	}
if (ref($info) eq 'HASH') {	if (ref($info) eq 'HASH') {
if (ref($info->{'newsubdir'}) eq 'HASH') {	if (ref($info->{'newsubdir'}) eq 'HASH') {
Line 2448 sub apply_fixups {	Line 2581 sub apply_fixups {
}	}
}	}
}	}
	if (ref($resdatacopy{$key}) eq 'HASH') {
	my ($gotnewmapname,$newmapname,$srcfolder,$srccontainer);
	foreach my $idx (keys(%{$resdatacopy{$key}})) {
	if (ref($resdatacopy{$key}{$idx}) eq 'HASH') {
	my $srcurl = $resdatacopy{$key}{$idx}{'src'};
	if ($srcurl =~ m{^/res/lib/templates/(\w+)\.problem$}) {
	my $template = $1;
	if (($resdatacopy{$key}{$idx}{'cdom'} =~ /^$match_domain$/) &&
	($resdatacopy{$key}{$idx}{'cnum'} =~ /^$match_courseid$/)) {
	my $srcdom = $resdatacopy{$key}{$idx}{'cdom'};
	my $srcnum = $resdatacopy{$key}{$idx}{'cnum'};
	unless ($gotnewmapname) {
	($newmapname) = ($key =~ m{/([^/]+)$});
	($srcfolder,$srccontainer) = split(/\./,$newmapname);
	if ($newsubdir{$key}) {
	$newmapname =~ s/^((?:default\|supplemental)_)(\d+)/$1$newsubdir{$key}/;
	}
	$gotnewmapname = 1;
	}
	my $srcmapinfo = $srcfolder.':'.$idx;
	if ($srccontainer eq 'page') {
	$srcmapinfo .= ':1';
	}
	&copy_templated_files($srcurl,$srcdom,$srcnum,$srcmapinfo,$cdom,
	$cnum,$template,$idx,$newmapname);
	}
	}
	}
	}
	}
if (ref($params{$key}) eq 'HASH') {	if (ref($params{$key}) eq 'HASH') {
%currparam = %{$params{$key}};	%currparam = %{$params{$key}};
}	}
Line 2775 sub handle_edit_cmd {	Line 2938 sub handle_edit_cmd {

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,$canedit,$navmapref,	$supplementalflag,$orderhash,$iconpath,$pathitem,$canedit,
$hiddentop)=@_;	$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 3096 sub editor {	Line 3259 sub editor {
$coursenum,$coursedom,$crstype,	$coursenum,$coursedom,$crstype,
$pathitem,$supplementalflag,$container,	$pathitem,$supplementalflag,$container,
\%filters,\%curr_groups,$canedit,	\%filters,\%curr_groups,$canedit,
$isencrypted,$navmapref);	$isencrypted,$navmapref,$hostname);
$idx++;	$idx++;
$shown++;	$shown++;
}	}
Line 3475 sub is_supplemental_title {	Line 3638 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,
$canedit,$isencrypted,$navmapref)=@_;	$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 3725 END	Line 3888 END
my ($editlink,$extresform,$anchor,$hiddenres,$nomodal);	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/};	if ($container eq 'page') {
	$url=~s{^http(\|s)(&colon;\|:)//}{/ext/};
	} else {
	$url=~s{^http(\|s)(&colon;\|:)//}{/adm/wrapper/ext/};
	}
if (!$supplementalflag && $residx && $symb) {	if (!$supplementalflag && $residx && $symb) {
if ((!$isfolder) && (!$ispage)) {	if ((!$isfolder) && (!$ispage)) {
(undef,undef,$url)=&Apache::lonnet::decode_symb($symb);	(undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
$url=&Apache::lonnet::clutter($url);	if (($url =~ m{^ext/}) && ($container eq 'page')) {
	$url=&Apache::lonnet::clutter_with_no_wrapper($url);
	} else {
	$url=&Apache::lonnet::clutter($url);
	}
if ($url=~/^\/*uploaded\//) {	if ($url=~/^\/*uploaded\//) {
$url=~/\.(\w+)$/;	$url=~/\.(\w+)$/;
my $embstyle=&Apache::loncommon::fileembstyle($1);	my $embstyle=&Apache::loncommon::fileembstyle($1);
Line 3743 END	Line 3914 END
} elsif ($url=~m{^(\|/adm/wrapper)/ext/([^#]+)}) {	} elsif ($url=~m{^(\|/adm/wrapper)/ext/([^#]+)}) {
my $wrapped = $1;	my $wrapped = $1;
my $exturl = $2;	my $exturl = $2;
if ($wrapped eq '') {	if (($wrapped eq '') && ($container ne 'page')) {
$url='/adm/wrapper'.$url;	$url='/adm/wrapper'.$url;
}	}
if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) {	if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) {
Line 3752 END	Line 3923 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()) {
	$url .= '?usehttp=1';
	}
$nomodal = 1;	$nomodal = 1;
}	}
}	}
if (&Apache::lonnet::symbverify($symb,$url)) {	if (&Apache::lonnet::symbverify($symb,$url)) {
my $shownsymb = $symb;	my $shownsymb = $symb;
if ($isexternal) {	if ($isexternal) {
if ($url =~ /^([^#]+)#([^#]+)$/) {	$url =~ s/\#[^#]+$//;
$url = $1;	if ($container eq 'page') {
$anchor = $2;	$url = &Apache::lonnet::clutter($url);
if ($symb =~ m{^([^#]+)\Q#$anchor\E$}) {
$shownsymb = $1.&escape('#').$anchor;
}
}	}
}	}
unless ($env{'request.role.adv'}) {	unless ($env{'request.role.adv'}) {
Line 3797 END	Line 3968 END
my $shownsymb = &Apache::lonenc::encrypted($symb);	my $shownsymb = &Apache::lonenc::encrypted($symb);
my $shownurl = &Apache::lonenc::encrypted($url);	my $shownurl = &Apache::lonenc::encrypted($url);
if (&Apache::lonnet::symbverify($shownsymb,$shownurl)) {	if (&Apache::lonnet::symbverify($shownsymb,$shownurl)) {
$url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&HTML::Entities::encode($shownsymb,'"<>&');	$url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&escape($shownsymb);
if ($env{'request.enc'} ne '') {	if ($env{'request.enc'} ne '') {
delete($env{'request.enc'});	delete($env{'request.enc'});
}	}
Line 3817 END	Line 3988 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()) {
	if ($hostname ne '') {
	$url = 'http://'.$hostname.$url;
	}
	$url .= (($url =~ /\?/) ? '&':'?').'usehttp=1';
	}
$nomodal = 1;	$nomodal = 1;
}	}
}	}
} 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()) {
	if ($hostname ne '') {
	$url = 'http://'.$hostname.$url;
	}
	$url .= (($url =~ /\?/) ? '&':'?').'usehttp=1';
	}
$nomodal = 1;	$nomodal = 1;
}	}
}	}
Line 3947 $form_end;	Line 4130 $form_end;
$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 3975 $form_end;	Line 4159 $form_end;
$anchor = '#'.&HTML::Entities::encode($anchor,'"<>&');	$anchor = '#'.&HTML::Entities::encode($anchor,'"<>&');
}	}
}	}
$link = &js_escape($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.
(($anchor ne '')?$anchor:''));	if ((!$supplementalflag) && ($nomodal) && ($hostname ne '')) {
	$link = 'http://'.$hostname.$url;
	} else {
	$link = $url;
	}
	$link = &js_escape($link.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.$anchor);
if ($nomodal) {	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;" />'.	$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>';	'<img src="'.$icon.'" alt="" class="LC_icon" border="0" /></a>';
Line 4056 sub action_restrictions {	Line 4245 sub action_restrictions {
if ($url=~ m{^/res/.+\.(page\|sequence)$}) {	if ($url=~ m{^/res/.+\.(page\|sequence)$}) {
# no copy for published maps	# no copy for published maps
$denied{'copy'} = 1;	$denied{'copy'} = 1;
} elsif ($url=~m{^/res/lib/templates/}) {	} elsif ($url=~m{^/res/lib/templates/([^/]+)\.problem$}) {
$denied{'copy'} = 1;	unless ($1 eq 'simpleproblem') {
$denied{'cut'} = 1;	$denied{'copy'} = 1;
	}
	$denied{'cut'} = 1;
} elsif ($url eq "/uploaded/$cdom/$cnum/group_allfolders.sequence") {	} elsif ($url eq "/uploaded/$cdom/$cnum/group_allfolders.sequence") {
if ($folderpath =~ /^default&[^\&]+$/) {	if ($folderpath =~ /^default&[^\&]+$/) {
if ((ref($currgroups) eq 'HASH') && (keys(%{$currgroups}) > 0)) {	if ((ref($currgroups) eq 'HASH') && (keys(%{$currgroups}) > 0)) {
Line 4360 sub contentverifyform {	Line 4551 sub contentverifyform {
&mt('No').'</label>'.(' 'x2).	&mt('No').'</label>'.(' 'x2).
'<label><input type="radio" name="checkstale" value="1" />'.	'<label><input type="radio" name="checkstale" value="1" />'.
&mt('Yes').'</label></span></p><p>'.	&mt('Yes').'</label></span></p><p>'.
'<input type="submit" value="'.&mt('Verify content').' "/>'.	'<input type="submit" value="'.&mt('Verify Content').' "/>'.
'<input type="hidden" value="1" name="tools" />'.	'<input type="hidden" value="1" name="tools" />'.
'<input type="hidden" value="1" name="verify" /></p></form>');	'<input type="hidden" value="1" name="verify" /></p></form>');
$r->print(&endContentScreen());	$r->print(&endContentScreen());
Line 5058 sub handler {	Line 5249 sub handler {
undef($env{'form.folderpath'});	undef($env{'form.folderpath'});
} else {	} else {
$folderurl = "uploaded/$coursedom/$coursenum/$folder";	$folderurl = "uploaded/$coursedom/$coursenum/$folder";
if ((split(/\:/,$pathitems[-1]))[4]) {	if ((split(/\:/,$pathitems[-1]))[5]) {
$folderurl .= '.page';	$folderurl .= '.page';
} else {	} else {
$folderurl .= '.sequence';	$folderurl .= '.sequence';
Line 5162 sub handler {	Line 5353 sub handler {
}	}
}	}
my $tabidstr = join("','",@tabids);	my $tabidstr = join("','",@tabids);
	my $hostname = $r->hostname();
$script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,	$script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,
$canedit,\$navmap).	$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 5183 sub handler {	Line 5375 sub handler {
.'// <![CDATA['."\n"	.'// <![CDATA['."\n"
.$script."\n"	.$script."\n"
.'// ]]>'."\n"	.'// ]]>'."\n"
.'</script>'."\n";	.'</script>'."\n"
	.'<script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>'."\n";

# Breadcrumbs	# Breadcrumbs
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::clear_breadcrumbs();
Line 5333 sub handler {	Line 5526 sub handler {
'er' => 'Editing rights unavailable for your current role.',	'er' => 'Editing rights unavailable for your current role.',
);	);
# -----------------------------------------------------------------------------	# -----------------------------------------------------------------------------
# Calculate free quota space for a user or course.	# Calculate free quota space for a user or course. A javascript function checks
	# file size to determine if upload should be allowed.
my $quotatype = 'unofficial';	my $quotatype = 'unofficial';
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$quotatype = 'community';	$quotatype = 'community';
Line 5367 sub handler {	Line 5561 sub handler {
my $fileupload=(<<FIUP);	my $fileupload=(<<FIUP);
$quotainfo	$quotainfo
$lt{'file'}:<br />	$lt{'file'}:<br />
<input type="file" name="uploaddoc" size="40" $disabled />	<input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled />
	<input type="hidden" id="LC_free_space" value="$free_space" />
FIUP	FIUP

my $checkbox=(<<CHBO);	my $checkbox=(<<CHBO);
Line 5515 HIDDENFORM	Line 5710 HIDDENFORM
#	#

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

if ($allowed) {	if ($allowed) {
my $folder=$env{'form.folder'};	my $folder=$env{'form.folder'};
Line 5706 NSYLFORM	Line 5902 NSYLFORM
$help{'Group Portfolio'}	$help{'Group Portfolio'}
</form>	</form>
NGFFORM	NGFFORM
@specialdocumentsforma=(	if ($container eq 'page') {
	@specialdocumentsforma=(
	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage();" />'=>$newwebpageform},
	);
	} else {
	@specialdocumentsforma=(
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'" onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'" onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="javascript:makenew(document.newsyl);" />'=>$newsylform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="javascript:makenew(document.newsyl);" />'=>$newsylform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="javascript:makenew(document.newnav);" />'=>$newnavform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="javascript:makenew(document.newnav);" />'=>$newnavform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage();" />'=>$newwebpageform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage();" />'=>$newwebpageform},
);	);
	}
$specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));	$specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));


Line 5750 my %orderhash = (	Line 5952 my %orderhash = (
'aa' => ['Upload',$fileuploadform],	'aa' => ['Upload',$fileuploadform],
'bb' => ['Import',$importpubform],	'bb' => ['Import',$importpubform],
'cc' => ['Grading',$gradingform],	'cc' => ['Grading',$gradingform],
	'ee' => ['Other',$specialdocumentsform],
);	);
unless ($container eq 'page') {	unless ($container eq 'page') {
$orderhash{'00'} = ['Newfolder',$newfolderform];	$orderhash{'00'} = ['Newfolder',$newfolderform];
$orderhash{'dd'} = ['Collaboration',$communityform];	$orderhash{'dd'} = ['Collaboration',$communityform];
$orderhash{'ee'} = ['Other',$specialdocumentsform];
}	}

$hadchanges=0;	$hadchanges=0;
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,
$canedit,\$navmap,$hiddentop);	$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 5899 my %suporderhash = (	Line 6101 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,
$canedit);	$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 5919 my %suporderhash = (	Line 6121 my %suporderhash = (
}	}
} 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 6299 END	Line 6501 END
}	}

sub editing_js {	sub editing_js {
my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$canedit,$navmapref) = @_;	my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,
	$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 6371 sub editing_js {	Line 6574 sub editing_js {
} else {	} else {
$url = $res;	$url = $res;
}	}
$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"').'?symb='.	$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"');
&HTML::Entities::encode($caller,'<>&"');	if ($backtourl =~ m{^\Q/uploaded/$coursedom/$coursenum/\Edefault_\d+\.sequence$}) {
	$backtourl .= '?navmap=1';
	} else {
	$backtourl .= '?symb='.
	&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://})) {
	unless (&Apache::lonnet::uses_sts()) {
	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 '')) {
	unless (&Apache::lonnet::uses_sts()) {
	if ($hostname ne '') {
	$backtourl = 'http://'.$hostname.$backtourl;
	}
	$backtourl .= (($backtourl =~ /\?/) ? '&':'?').'usehttp=1';
	}
	}
	}
if ($anchor ne '') {	if ($anchor ne '') {
$backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"');	$backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"');
}	}
Line 6403 sub editing_js {	Line 6631 sub editing_js {
function makenewfolder(targetform,folderseq) {	function makenewfolder(targetform,folderseq) {
var foldername=prompt('$js_lt{"p_mnf"}','$js_lt{"t_mnf"}');	var foldername=prompt('$js_lt{"p_mnf"}','$js_lt{"t_mnf"}');
if (foldername) {	if (foldername) {
targetform.importdetail.value=escape(foldername)+"="+folderseq;	targetform.importdetail.value=encodeURIComponent(foldername)+"="+folderseq;
targetform.submit();	targetform.submit();
}	}
}	}
Line 6411 function makenewfolder(targetform,folder	Line 6639 function makenewfolder(targetform,folder
function makenewpage(targetform,folderseq) {	function makenewpage(targetform,folderseq) {
var pagename=prompt('$js_lt{"p_mnp"}','$js_lt{"t_mnp"}');	var pagename=prompt('$js_lt{"p_mnp"}','$js_lt{"t_mnp"}');
if (pagename) {	if (pagename) {
targetform.importdetail.value=escape(pagename)+"="+folderseq;	targetform.importdetail.value=encodeURIComponent(pagename)+"="+folderseq;
targetform.submit();	targetform.submit();
}	}
}	}
Line 6420 function makeexamupload() {	Line 6648 function makeexamupload() {
var title=prompt('$js_lt{"p_mxu"}');	var title=prompt('$js_lt{"p_mxu"}');
if (title) {	if (title) {
this.document.forms.newexamupload.importdetail.value=	this.document.forms.newexamupload.importdetail.value=
escape(title)+'=/res/lib/templates/examupload.problem';	encodeURIComponent(title)+'=/res/lib/templates/examupload.problem';
this.document.forms.newexamupload.submit();	this.document.forms.newexamupload.submit();
}	}
}	}
Line 6429 function makesmppage() {	Line 6657 function makesmppage() {
var title=prompt('$js_lt{"p_msp"}');	var title=prompt('$js_lt{"p_msp"}');
if (title) {	if (title) {
this.document.forms.newsmppg.importdetail.value=	this.document.forms.newsmppg.importdetail.value=
escape(title)+'=/adm/$udom/$uname/new/smppg';	encodeURIComponent(title)+'=/adm/$udom/$uname/new/smppg';
this.document.forms.newsmppg.submit();	this.document.forms.newsmppg.submit();
}	}
}	}
Line 6444 function makewebpage(type) {	Line 6672 function makewebpage(type) {
}	}
if (title) {	if (title) {
var webpage = formname.importdetail.value;	var webpage = formname.importdetail.value;
formname.importdetail.value = escape(title)+'='+webpage;	formname.importdetail.value = encodeURIComponent(title)+'='+webpage;
formname.submit();	formname.submit();
}	}
}	}
Line 6453 function makesmpproblem() {	Line 6681 function makesmpproblem() {
var title=prompt('$js_lt{"p_msb"}');	var title=prompt('$js_lt{"p_msb"}');
if (title) {	if (title) {
this.document.forms.newsmpproblem.importdetail.value=	this.document.forms.newsmpproblem.importdetail.value=
escape(title)+'=/res/lib/templates/simpleproblem.problem';	encodeURIComponent(title)+'=/res/lib/templates/simpleproblem.problem';
this.document.forms.newsmpproblem.submit();	this.document.forms.newsmpproblem.submit();
}	}
}	}
Line 6462 function makedropbox() {	Line 6690 function makedropbox() {
var title=prompt('$js_lt{"p_mdb"}');	var title=prompt('$js_lt{"p_mdb"}');
if (title) {	if (title) {
this.document.forms.newdropbox.importdetail.value=	this.document.forms.newdropbox.importdetail.value=
escape(title)+'=/res/lib/templates/DropBox.problem';	encodeURIComponent(title)+'=/res/lib/templates/DropBox.problem';
this.document.forms.newdropbox.submit();	this.document.forms.newdropbox.submit();
}	}
}	}
Line 6471 function makebulboard() {	Line 6699 function makebulboard() {
var title=prompt('$js_lt{"p_mbb"}');	var title=prompt('$js_lt{"p_mbb"}');
if (title) {	if (title) {
this.document.forms.newbul.importdetail.value=	this.document.forms.newbul.importdetail.value=
escape(title)+'=/adm/$udom/$uname/new/bulletinboard';	encodeURIComponent(title)+'=/adm/$udom/$uname/new/bulletinboard';
this.document.forms.newbul.submit();	this.document.forms.newbul.submit();
}	}
}	}

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

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