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.581 and 1.610

version 1.581, 2014/04/02 22:19:56	version 1.610, 2016/10/31 19:48:59
Line 43 use Apache::lonnavdisplay();	Line 43 use Apache::lonnavdisplay();
use Apache::lonextresedit();	use Apache::lonextresedit();
use Apache::lontemplate();	use Apache::lontemplate();
use Apache::lonsimplepage();	use Apache::lonsimplepage();
	use Apache::lonhomework();
	use Apache::lonpublisher();
use HTML::Entities;	use HTML::Entities;
use HTML::TokeParser;	use HTML::TokeParser;
use GDBM_File;	use GDBM_File;
use File::MMagic;	use File::MMagic;
	use File::Copy;
use Apache::lonlocal;	use Apache::lonlocal;
use Cwd;	use Cwd;
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);
Line 586 sub recurse_html {	Line 589 sub recurse_html {
}	}

sub group_import {	sub group_import {
my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;	my ($coursenum, $coursedom, $folder, $container, $caller, $ltitoolsref, @files) = @_;
my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap,	my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap,
%removeparam,$importuploaded,$fixuperrors);	%removeparam,$importuploaded,$fixuperrors);
$allmaps = {};	$allmaps = {};
Line 615 sub group_import {	Line 618 sub group_import {
}	}
}	}
if ($url) {	if ($url) {
	if ($url =~ m{^(/adm/$coursedom/$coursenum/(\d+)/exttool)s?\:?(.*)$}) {
	$url = $1;
	my $marker = $2;
	my $info = $3;
	my ($toolid,%toolhash,%toolsettings);
	my @toolinfo = split(/:/,$info);
	if ($residx) {
	%toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum);
	$toolid = $toolsettings{'id'};
	} else {
	$toolid = shift(@toolinfo);
	}
	$toolid =~ s/\D//g;
	($toolhash{'target'},$toolhash{'width'},$toolhash{'height'},
	$toolhash{'crslabel'},$toolhash{'crstitle'}) = @toolinfo;
	$toolhash{'crslabel'} = &unescape($toolhash{'crslabel'});
	$toolhash{'crstitle'} = &unescape($toolhash{'crstitle'});
	if (ref($ltitoolsref) eq 'HASH') {
	my @deleted;
	if (ref($ltitoolsref->{$toolid}) eq 'HASH') {
	if ($ltitoolsref->{$toolid}->{'url'} =~ m{^https://}) {
	$url =~ s/exttool$/exttools/;
	}
	$toolhash{'id'} = $toolid;
	if (($toolhash{'target'} eq 'iframe') \|\| ($toolhash{'target'} eq 'window')) {
	if ($toolhash{'target'} eq 'window') {
	foreach my $item ('width','height') {
	$toolhash{$item} =~ s/^\s+//;
	$toolhash{$item} =~ s/\s+$//;
	}
	}
	} elsif ($residx) {
	$toolhash{'target'} = $toolsettings{'target'};
	if ($toolhash{'target'} eq 'window') {
	$toolhash{'width'} = $toolsettings{'width'};
	$toolhash{'height'} = $toolsettings{'height'};
	}
	} elsif (ref($ltitoolsref->{$toolid}->{'display'}) eq 'HASH') {
	$toolhash{'target'} = $ltitoolsref->{$toolid}->{'display'}->{'target'};
	if ($toolhash{'target'} eq 'window') {
	$toolhash{'width'} = $ltitoolsref->{$toolid}->{'display'}->{'width'};
	$toolhash{'height'} = $ltitoolsref->{$toolid}->{'display'}->{'height'};
	}
	}
	if ($toolhash{'target'} eq 'iframe') {
	delete($toolhash{'width'});
	delete($toolhash{'height'});
	if ($residx) {
	if ($toolsettings{'width'}) {
	push(@deleted,'width');
	}
	if ($toolsettings{'height'}) {
	push(@deleted,'height');
	}
	}
	}
	if (ref($ltitoolsref->{$toolid}->{'crsconf'}) eq 'HASH') {
	foreach my $item ('label','title') {
	if ($ltitoolsref->{$toolid}->{'crsconf'}->{$item}) {
	$toolhash{'crs'.$item} =~ s/^\s+//;
	$toolhash{'crs'.$item} =~ s/\s+$//;
	if ($toolhash{'crs'.$item} eq '') {
	delete($toolhash{'crs'.$item});
	}
	} else {
	delete($toolhash{'crs'.$item});
	}
	if (($residx) && (exists($toolsettings{'crs'.$item}))) {
	unless (exists($toolhash{'crs'.$item})) {
	push(@deleted,'crs'.$item);
	}
	}
	}
	}
	my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum);
	if ($putres eq 'ok') {
	if (@deleted) {
	&Apache::lonnet::del('exttool_'.$marker,\@deleted,$coursedom,$coursenum);
	}
	}
	}
	}
	}
if (($caller eq 'londocs') &&	if (($caller eq 'londocs') &&
($folder =~ /^default/)) {	($folder =~ /^default/)) {
if (($url =~ /\.(page\|sequence)$/) && (!$donechk)) {	if (($url =~ /\.(page\|sequence)$/) && (!$donechk)) {
Line 652 sub group_import {	Line 738 sub group_import {
} else {	} else {
$fname =~ s/\W/_/g;	$fname =~ s/\W/_/g;
}	}
if (length($fname > 15)) {	if (length($fname) > 15) {
$fname = substr($fname,0,14);	$fname = substr($fname,0,14);
}	}
my $initialtext = &mt('Replace with your own content.');	my $initialtext = &mt('Replace with your own content.');
Line 796 sub docs_change_log {	Line 882 sub docs_change_log {
my $js = '<script type="text/javascript">'."\n".	my $js = '<script type="text/javascript">'."\n".
'// <![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)."\n".	&editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag,
	$coursedom,$coursenum)."\n".
&history_tab_js()."\n".	&history_tab_js()."\n".
&Apache::lonratedt::editscript('simple')."\n".	&Apache::lonratedt::editscript('simple')."\n".
'// ]]>'."\n".	'// ]]>'."\n".
Line 977 sub docs_change_log {	Line 1064 sub docs_change_log {

sub update_paste_buffer {	sub update_paste_buffer {
my ($coursenum,$coursedom,$folder) = @_;	my ($coursenum,$coursedom,$folder) = @_;
my (@possibles,%removals,%cuts);	my (@possibles,%removals,%cuts,$output);
if ($env{'form.multiremove'}) {	if ($env{'form.multiremove'}) {
$env{'form.multiremove'} =~ s/,$//;	$env{'form.multiremove'} =~ s/,$//;
map { $removals{$_} = 1; } split(/,/,$env{'form.multiremove'});	map { $removals{$_} = 1; } split(/,/,$env{'form.multiremove'});
Line 1022 sub update_paste_buffer {	Line 1109 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};
if (($cid =~ /^$match_domain(?:_)$match_courseid$/) &&	if (($cid =~ /^$match_domain(?:_)$match_courseid$/) &&
($url ne '')) {	($url ne '')) {
$pasteurls{$cid.'_'.$url} = 1;	$pasteurls{$cid.'_'.$url.'_'.$mapidx} = 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[4];

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}));	next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$mapidx}));
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');
push(@newpaste,$suffix);	if ($suffix ne '') {
if ($locknotfreed) {	push(@newpaste,$suffix);
return $locknotfreed;	} else {
last;	if ($locknotfreed) {
	return $locknotfreed;
	}
}	}
if (&is_supplemental_title($title)) {	if (&is_supplemental_title($title)) {
&Apache::lonnet::appenv({'docs.markedcopy_supplemental_'.$suffix => $title});	&Apache::lonnet::appenv({'docs.markedcopy_supplemental_'.$suffix => $title});
Line 1059 sub update_paste_buffer {	Line 1154 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 1082 sub update_paste_buffer {	Line 1177 sub update_paste_buffer {
}	}
}	}
}	}
	if ($locknotfreed) {
	$output = $locknotfreed;
	last;
	}
}	}
if (@newpaste) {	if (@newpaste) {
$addtoenv{'docs.markedcopies'} = join(',',(@currpaste,@newpaste));	$addtoenv{'docs.markedcopies'} = join(',',(@currpaste,@newpaste));
}	}
&Apache::lonnet::appenv(\%addtoenv);	&Apache::lonnet::appenv(\%addtoenv);
delete($env{'form.markcopy'});	delete($env{'form.markcopy'});
return;	return $output;
}	}

sub recurse_uploaded_maps {	sub recurse_uploaded_maps {
Line 1133 sub print_paste_buffer {	Line 1232 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 ++;
my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent,	my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent,
$canpaste,$nopaste,$othercrs,$areachange);	$canpaste,$nopaste,$othercrs,$areachange,$is_exttool);
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?$}) {
	$is_exttool = 1;
}	}
if ($folder =~ /^supplemental/) {	if ($folder =~ /^supplemental/) {
$canpaste = &supp_pasteable($env{'docs.markedcopy_url_'.$suffix});	$canpaste = &supp_pasteable($env{'docs.markedcopy_url_'.$suffix});
Line 1158 sub print_paste_buffer {	Line 1260 sub print_paste_buffer {
if (($srcdom ne $coursedom) \|\| ($srcnum ne $coursenum)) {	if (($srcdom ne $coursedom) \|\| ($srcnum ne $coursenum)) {
$othercourse = 1;	$othercourse = 1;
if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {	if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
if ($canpaste) {	$othercrs = '<br />'.&mt('(from another course)');
$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.');
Line 1174 sub print_paste_buffer {	Line 1274 sub print_paste_buffer {
}	}
$is_uploaded_map = 1;	$is_uploaded_map = 1;
}	}
	} 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'}) {
	my ($srcdom,$srcnum) = split(/_/,$cid);
	if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
	$othercrs = '<br />'.&mt('(from another course)');
	} else {
	$canpaste = 0;
	$nopaste = &mt('Paste from another course unavailable.');
	}
	}
}	}
}	if ($canpaste) {
if ($canpaste) {	push(@pasteable,$suffix);
push(@pasteable,$suffix);	}
}	}
my $buffer;	my $buffer;
if ($is_external) {	if (($is_external) \|\| ($is_exttool)) {
$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).')';
Line 1191 sub print_paste_buffer {	Line 1302 sub print_paste_buffer {
$icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));	$icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
$icon .= '/navmap.folder.closed.gif';	$icon .= '/navmap.folder.closed.gif';
}	}
	my $title = $env{'docs.markedcopy_title_'.$suffix};
	if ($title eq '') {
	($title) = ($url =~ m{/([^/]+)$});
	}
$buffer = '<img src="'.$icon.'" alt="" class="LC_icon" />'.	$buffer = '<img src="'.$icon.'" alt="" class="LC_icon" />'.
': '.	': '.
&Apache::loncommon::parse_supplemental_title(	&Apache::loncommon::parse_supplemental_title(
&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}));	&LONCAPA::map::qtescape($title));
}	}
$pasteitems .= '<div class="LC_left_float">';	$pasteitems .= '<div class="LC_left_float">';
my ($options,$onclick);	my ($options,$onclick);
Line 1336 sub supp_pasteable {	Line 1451 sub supp_pasteable {
(($url =~ /\.sequence$/) && ($url =~ m{^/uploaded/})) \|\|	(($url =~ /\.sequence$/) && ($url =~ m{^/uploaded/})) \|\|
($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?$})) {
return 1;	return 1;
}	}
return;	return;
}	}

sub paste_popup_js {	sub paste_popup_js {
my %lt = &Apache::lonlocal::texthash(	my %html_js_lt = &Apache::lonlocal::texthash(
show => 'Show Options',	show => 'Show Options',
hide => 'Hide Options',	hide => 'Hide Options',
	);
	my %js_lt = &Apache::lonlocal::texthash(
none => 'No items selected from clipboard.',	none => 'No items selected from clipboard.',
);	);
	&html_escape(\%html_js_lt);
	&js_escape(\%html_js_lt);
	&js_escape(\%js_lt);
return <<"END";	return <<"END";

function showPasteOptions(suffix) {	function showPasteOptions(suffix) {
document.getElementById('pasteoptions_'+suffix).style.display='block';	document.getElementById('pasteoptions_'+suffix).style.display='block';
document.getElementById('pasteoptionstext_'+suffix).innerHTML = '    <a href="javascript:hidePasteOptions(\\''+suffix+'\\');" class="LC_menubuttons_link">$lt{'hide'}</a>';	document.getElementById('pasteoptionstext_'+suffix).innerHTML = '    <a href="javascript:hidePasteOptions(\\''+suffix+'\\');" class="LC_menubuttons_link">$html_js_lt{'hide'}</a>';
return;	return;
}	}

function hidePasteOptions(suffix) {	function hidePasteOptions(suffix) {
document.getElementById('pasteoptions_'+suffix).style.display='none';	document.getElementById('pasteoptions_'+suffix).style.display='none';
document.getElementById('pasteoptionstext_'+suffix).innerHTML ='    <a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$lt{'show'}</a>';	document.getElementById('pasteoptionstext_'+suffix).innerHTML ='    <a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$html_js_lt{'show'}</a>';
return;	return;
}	}

function showOptions(caller,suffix) {	function showOptions(caller,suffix) {
if (document.getElementById('pasteoptionstext_'+suffix)) {	if (document.getElementById('pasteoptionstext_'+suffix)) {
if (caller.checked) {	if (caller.checked) {
document.getElementById('pasteoptionstext_'+suffix).innerHTML ='    <a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$lt{'show'}</a>';	document.getElementById('pasteoptionstext_'+suffix).innerHTML ='    <a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$html_js_lt{'show'}</a>';
} else {	} else {
document.getElementById('pasteoptionstext_'+suffix).innerHTML ='';	document.getElementById('pasteoptionstext_'+suffix).innerHTML ='';
}	}
Line 1394 function validateClipboard() {	Line 1515 function validateClipboard() {
if (numchk > 0) {	if (numchk > 0) {
return true;	return true;
} else {	} else {
alert("$lt{'none'}");	alert("$js_lt{'none'}");
return false;	return false;
}	}
}	}
Line 1454 sub do_paste_from_buffer {	Line 1575 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 $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 1479 sub do_paste_from_buffer {	Line 1602 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$}) \|\|
	($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard\|smppg)$})) {
	my ($srcd,$srcn) = split(/_/,$cid);
	# 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
	if (($srcd ne $coursedom) \|\| ($srcn ne $coursenum)) {
	unless ($env{"user.priv.cm./$srcd/$srcn"} =~ /\Q:mdc&F\E/) {
	$notincrs{$suffix} = 1;
	next;
	}
	}
	$srcdom{$suffix} = $srcd;
	$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 1490 sub do_paste_from_buffer {	Line 1626 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 1572 sub do_paste_from_buffer {	Line 1708 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}};
}	}
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});	my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});
my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix});	my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix});
	my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix});
my $oldurl = $url;	my $oldurl = $url;
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
Line 1613 sub do_paste_from_buffer {	Line 1750 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 1622 sub do_paste_from_buffer {	Line 1759 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 1638 sub do_paste_from_buffer {	Line 1775 sub do_paste_from_buffer {
}	}
if ($url=~ m{/(bulletinboard\|smppg)$}) {	if ($url=~ m{/(bulletinboard\|smppg)$}) {
my $prefix = $1;	my $prefix = $1;
	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.
my %info = (	my %info = (
src => $url,	src => $url,
cdom => $coursedom,	cdom => $coursedom,
cnum => $coursenum,	cnum => $coursenum,
);	);
unless ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') {	if (($srcdom{$suffix} =~ /^$match_domain$/) && ($srcnum{$suffix} =~ /^$match_courseid$/)) {
	unless (($srcdom{$suffix} eq $coursedom) && ($srcnum{$suffix} eq $coursenum)) {
	$fromothercrs = 1;
	$info{'cdom'} = $srcdom{$suffix};
	$info{'cnum'} = $srcnum{$suffix};
	}
	}
	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);
Line 1720 sub do_paste_from_buffer {	Line 1865 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 1733 sub do_paste_from_buffer {	Line 1884 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 1741 sub do_paste_from_buffer {	Line 1893 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 1905 sub get_newmap_url {	Line 2058 sub get_newmap_url {
sub dbcopy {	sub dbcopy {
my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_;	my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_;
my ($url,$result,$errtext);	my ($url,$result,$errtext);
$url = $dbref->{'src'};
if (ref($dbref) eq 'HASH') {	if (ref($dbref) eq 'HASH') {
	$url = $dbref->{'src'};
if ($url =~ m{/(smppg\|bulletinboard)$}) {	if ($url =~ m{/(smppg\|bulletinboard)$}) {
my $prefix = $1;	my $prefix = $1;
if (($dbref->{'cdom'} =~ /^$match_domain$/) &&	if (($dbref->{'cdom'} =~ /^$match_domain$/) &&
Line 1944 sub dbcopy {	Line 2097 sub dbcopy {
my $photo = $contents{'uploaded.photourl'};	my $photo = $contents{'uploaded.photourl'};
my ($subdir,$fname) =	my ($subdir,$fname) =
($photo =~ m{^/uploaded/$match_domain/$match_courseid/+(bulletin\|simplepage)/(?:\|\d+/)([^/]+)$});	($photo =~ m{^/uploaded/$match_domain/$match_courseid/+(bulletin\|simplepage)/(?:\|\d+/)([^/]+)$});
my $newphoto;	my $newphoto;
if ($fname ne '') {	if ($fname ne '') {
my $content = &Apache::lonnet::getfile($photo);	my $content = &Apache::lonnet::getfile($photo);
unless ($content eq '-1') {	unless ($content eq '-1') {
Line 1997 sub dbcopy {	Line 2150 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;
	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 2062 sub contained_map_check {	Line 2304 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 2111 sub url_paste_fixups {	Line 2353 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 2135 sub url_paste_fixups {	Line 2377 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 2164 sub url_paste_fixups {	Line 2406 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 2195 sub apply_fixups {	Line 2443 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 2215 sub apply_fixups {	Line 2463 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 2365 sub apply_fixups {	Line 2616 sub apply_fixups {
}	}
}	}
}	}
	if (ref($resdatacopy{$key}) eq 'HASH') {
	if ($newsubdir{$key}) {

	}
	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'};
	my ($newmapname) = ($key =~ m{/([^/]+)$});
	my ($srcfolder,$srccontainer) = split(/\./,$newmapname);
	my $srcmapinfo = $srcfolder.':'.$idx;
	if ($srccontainer eq 'page') {
	$srcmapinfo .= ':1';
	}
	if ($newsubdir{$key}) {
	$newmapname =~ s/^((?:default\|supplemental)_)(\d+)/$1$newsubdir{$key}/;
	}
	&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 2603 sub update_parameter {	Line 2883 sub update_parameter {
}	}
return $haschanges;	return $haschanges;
} else {	} else {
return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);	my $haschanges = 0;
	return $haschanges if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);

my $which = $env{'form.changeparms'};	my $which = $env{'form.changeparms'};
my $idx = $env{'form.setparms'};	my $idx = $env{'form.setparms'};
	my $oldvalue = 0;
	my $newvalue = 0;
	my $current = (&LONCAPA::map::getparameter($idx,'parameter_'.$which))[0];
	if ($which eq 'randompick') {
	if ($current =~ /^(\d+)$/) {
	$oldvalue = $1;
	}
	} elsif ($current =~ /^yes$/i) {
	$oldvalue = 1;
	}
if ($env{'form.'.$which.'_'.$idx}) {	if ($env{'form.'.$which.'_'.$idx}) {
my $value = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx}	$newvalue = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx}
: 'yes';	: 1;
&LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value,
$parameter_type{$which});
&remember_parms($idx,$which,'set',$value);
} else {
&LONCAPA::map::delparameter($idx,'parameter_'.$which);

&remember_parms($idx,$which,'del');
}	}
return 1;	if ($oldvalue ne $newvalue) {
	$haschanges = 1;
	if ($newvalue) {
	my $storeval = 'yes';
	if ($which eq 'randompick') {
	$storeval = $newvalue;
	}
	&LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $storeval,
	$parameter_type{$which});
	&remember_parms($idx,$which,'set',$storeval);
	} else {
	&LONCAPA::map::delparameter($idx,'parameter_'.$which);
	&remember_parms($idx,$which,'del');
	}
	}
	return $haschanges;
}	}
}	}


sub handle_edit_cmd {	sub handle_edit_cmd {
my ($coursenum,$coursedom) =@_;	my ($coursenum,$coursedom) =@_;
if ($env{'form.cmd'} eq '') {	if ($env{'form.cmd'} eq '') {
Line 2672 sub handle_edit_cmd {	Line 2970 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)=@_;	$supplementalflag,$orderhash,$iconpath,$pathitem,$ltitoolsref)=@_;
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 2714 sub editor {	Line 3012 sub editor {
&snapshotbefore();	&snapshotbefore();

if (&update_parameter()) {	if (&update_parameter()) {
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);	($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,1);
return $errtext if ($fatal);	return $errtext if ($fatal);
}	}

Line 2776 sub editor {	Line 3074 sub editor {
$r->print($upload_output);	$r->print($upload_output);

# Rename, cut, copy or remove a single resource	# Rename, cut, copy or remove a single resource
if (&handle_edit_cmd()) {	if (&handle_edit_cmd($coursenum,$coursedom)) {
my $contentchg;	my $contentchg;
if ($env{'form.cmd'} =~ m{^(del\|cut)_}) {	if ($env{'form.cmd'} =~ m{^(remove\|cut)_}) {
$contentchg = 1;	$contentchg = 1;
}	}
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg);	($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg);
Line 2810 sub editor {	Line 3108 sub editor {
my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);	my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
$name=&LONCAPA::map::qtescape($name);	$name=&LONCAPA::map::qtescape($name);
$url=&LONCAPA::map::qtescape($url);	$url=&LONCAPA::map::qtescape($url);
next unless ($name && $url);	next unless $url;
my %denied =	my %denied =
&action_restrictions($coursenum,$coursedom,$url,	&action_restrictions($coursenum,$coursedom,$url,
$env{'form.folderpath'},\%curr_groups);	$env{'form.folderpath'},\%curr_groups);
Line 2871 sub editor {	Line 3169 sub editor {
} else {	} else {
return $errortxt;	return $errortxt;
}	}
	} elsif ($url =~ m{^/adm/$coursedom/$coursenum/new/exttool}) {
	my ($suffix,$errortxt,$locknotfreed) =
	&new_timebased_suffix($coursedom,$coursenum,'exttool');
	if ($locknotfreed) {
	$r->print($locknotfreed);
	}
	if ($suffix) {
	$url =~ s{^(/adm/$coursedom/$coursenum)/new}{$1/$suffix};
	} else {
	return $errortxt;
	}
} elsif ($url =~ m{^/uploaded/$coursedom/$coursenum/(docs\|supplemental)/(default\|\d+)/new.html$}) {	} elsif ($url =~ m{^/uploaded/$coursedom/$coursenum/(docs\|supplemental)/(default\|\d+)/new.html$}) {
if ($supplementalflag) {	if ($supplementalflag) {
next unless ($1 eq 'supplemental');	next unless ($1 eq 'supplemental');
Line 2893 sub editor {	Line 3202 sub editor {
}	}
($errtext,$fatal,my $fixuperrors) =	($errtext,$fatal,my $fixuperrors) =
&group_import($coursenum, $coursedom, $folder,$container,	&group_import($coursenum, $coursedom, $folder,$container,
'londocs',@imports);	'londocs',$ltitoolsref,@imports);
return $errtext if ($fatal);	return $errtext if ($fatal);
if ($fixuperrors) {	if ($fixuperrors) {
$r->print($fixuperrors);	$r->print($fixuperrors);
Line 2978 sub editor {	Line 3287 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);	\%filters,\%curr_groups,$ltitoolsref);
$idx++;	$idx++;
$shown++;	$shown++;
}	}
Line 3174 sub process_file_upload {	Line 3483 sub process_file_upload {
}	}
my $quotatype = 'unofficial';	my $quotatype = 'unofficial';
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$quotatype = 'community';	$quotatype = 'community';
	} elsif ($crstype eq 'Placement') {
	$quotatype = 'placement';
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) {	} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) {
$quotatype = 'official';	$quotatype = 'official';
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) {	} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) {
Line 3344 sub is_supplemental_title {	Line 3655 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)=@_;
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 3358 sub entryline {	Line 3670 sub entryline {

$renametitle=~s/\\/\\\\/g;	$renametitle=~s/\\/\\\\/g;
$renametitle=~s/\&quot\;/\\\"/g;	$renametitle=~s/\&quot\;/\\\"/g;
	$renametitle=~s/"/%22/g;
$renametitle=~s/ /%20/g;	$renametitle=~s/ /%20/g;
$oldtitle = $renametitle;	$oldtitle = $renametitle;
$renametitle=~s/\'/\\\'/g;	$renametitle=~s/\'/\\\'/g;
Line 3434 END	Line 3747 END
'rn' => 'Rename',	'rn' => 'Rename',
'cp' => 'Copy',	'cp' => 'Copy',
'ex' => 'External Resource',	'ex' => 'External Resource',
	'et' => 'External Tool',
'ed' => 'Edit',	'ed' => 'Edit',
'pr' => 'Preview',	'pr' => 'Preview',
'sv' => 'Save',	'sv' => 'Save',
Line 3445 END	Line 3759 END
$currgroups);	$currgroups);
my ($copylink,$cutlink,$removelink);	my ($copylink,$cutlink,$removelink);
my $skip_confirm = 0;	my $skip_confirm = 0;
	my $confirm_removal = 0;
if ( $folder =~ /^supplemental/	if ( $folder =~ /^supplemental/
\|\| ($url =~ m{( /smppg$	\|\| ($url =~ m{( /smppg$
\|/syllabus$	\|/syllabus$
\|/aboutme$	\|/aboutme$
\|/navmaps$	\|/navmaps$
\|/bulletinboard$	\|/bulletinboard$
	\|/exttools?$
\|\.html$)}x)	\|\.html$)}x)
\|\| $isexternal) {	\|\| $isexternal) {
$skip_confirm = 1;	$skip_confirm = 1;
}	}
	if (($url=~m\|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/\|) &&
	($url!~/$LONCAPA::assess_page_seq_re/)) {
	$confirm_removal = 1;
	}

if ($denied{'copy'}) {	if ($denied{'copy'}) {
$copylink=(<<ENDCOPY)	$copylink=(<<ENDCOPY)
Line 3497 ENDCUT	Line 3817 ENDCUT
ENDREM	ENDREM
} else {	} else {
my $formname = 'edit_remove_'.$orderidx;	my $formname = 'edit_remove_'.$orderidx;
my $js = "javascript:checkForSubmit(document.forms.renameform,'remove','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm);";	my $js = "javascript:checkForSubmit(document.forms.renameform,'remove','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm,'$container','$folder',$confirm_removal);";
$removelink=(<<ENDREM);	$removelink=(<<ENDREM);
<form name="$formname" method="post" action="/adm/coursedocs">	<form name="$formname" method="post" action="/adm/coursedocs">
$form_common	$form_common
<input type="hidden" name="skip_$orderidx" id="skip_remove_$orderidx" value="$skip_confirm" />	<input type="hidden" name="skip_$orderidx" id="skip_remove_$orderidx" value="$skip_confirm" />
	<input type="hidden" name="confirm_rem_$orderidx" id="confirm_removal_$orderidx" value="$confirm_removal" />
<input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a>	<input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a>
$form_end	$form_end
ENDREM	ENDREM
Line 3567 END	Line 3888 END
}	}
}	}

my ($editlink,$extresform);	my ($editlink,$extresform,$anchor);
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 3587 END	Line 3908 END
}	}
} elsif ($url=~m\|^/ext/\|) {	} elsif ($url=~m\|^/ext/\|) {
$url='/adm/wrapper'.$url;	$url='/adm/wrapper'.$url;
}	} elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/exttools?$}) {
	$url='/adm/wrapper'.$url;
	}
if (&Apache::lonnet::symbverify($symb,$url)) {	if (&Apache::lonnet::symbverify($symb,$url)) {
$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);	my $shownsymb = $symb;
	if ($isexternal) {
	if ($url =~ /^([^#]+)#([^#]+)$/) {
	$url = $1;
	$anchor = $2;
	if ($symb =~ m{^([^#]+)\Q#$anchor\E$}) {
	$shownsymb = $1.&escape('#').$anchor;
	}
	}
	}
	$url.=(($url=~/\?/)?'&':'?').'symb='.&HTML::Entities::encode($shownsymb,'"<>&');
} else {	} else {
$url='';	$url='';
}	}
}	}
	} elsif ($supplementalflag) {
	if ($isexternal) {
	if ($url =~ /^([^#]+)#([^#]+)$/) {
	$url = $1;
	$anchor = $2;
	}
	}
}	}
my ($rand_pick_text,$rand_order_text);	my ($rand_pick_text,$rand_order_text);
if ($isfolder \|\| $ispage \|\| $extension eq 'sequence' \|\| $extension eq 'page') {	if ($isfolder \|\| $ispage \|\| $extension eq 'sequence' \|\| $extension eq 'page') {
Line 3653 $form_common."\n".	Line 3993 $form_common."\n".
$form_end;	$form_end;
}	}
} elsif ($supplementalflag && !$allowed) {	} elsif ($supplementalflag && !$allowed) {
	my $isexttool;
	if ($url=~m{^/adm/$coursedom/$coursenum/\d+/exttools?$}) {
	$url='/adm/wrapper'.$url;
	$isexttool = 1;
	}
$url .= ($url =~ /\?/) ? '&':'?';	$url .= ($url =~ /\?/) ? '&':'?';
$url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"');	$url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"');
if ($title) {	if ($title) {
$url .= '&title='.&HTML::Entities::encode($renametitle,'<>&"');	$url .= '&title='.&HTML::Entities::encode($renametitle,'<>&"');
}	}
if ($isexternal && $orderidx) {	if ((($isexternal) \|\| ($isexttool)) && $orderidx) {
$url .= '&idx='.$orderidx;	$url .= '&idx='.$orderidx;
}	}
	if ($anchor ne '') {
	$url .= '&anchor='.&HTML::Entities::encode($anchor,'"<>&');
	}
}	}
my ($tdalign,$tdwidth);	my ($tdalign,$tdwidth);
if ($allowed) {	if ($allowed) {
Line 3669 $form_end;	Line 4017 $form_end;
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);
	} elsif ($orig_url =~ m{^/adm/$coursedom/$coursenum/\d+/exttools?$}) {
	($editlink,$extresform) =
	&Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem,
	undef,undef,undef,'tool',$coursedom,
	$coursenum,$ltitoolsref);
} elsif (!$isfolder && !$ispage) {	} elsif (!$isfolder && !$ispage) {
my ($cfile,$home,$switchserver,$forceedit,$forceview) =	my ($cfile,$home,$switchserver,$forceedit,$forceview) =
&Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);	&Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
if (($cfile ne '') && ($symb ne '' \|\| $supplementalflag)) {	if (($cfile ne '') && ($symb ne '' \|\| $supplementalflag)) {
	my $suppanchor;
	if ($supplementalflag) {
	$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);	$renametitle,'','',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 3699 $form_end;	Line 4056 $form_end;
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.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes',	if ($anchor ne '') {
	if ($supplementalflag) {
	$anchor = '&anchor='.&HTML::Entities::encode($anchor,'"<>&');
	} else {
	$anchor = '#'.&HTML::Entities::encode($anchor,'"<>&');
	}
	}
	$line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.
	(($anchor ne '')?$anchor:''),
'<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);	'<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 3708 $form_end;	Line 4073 $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($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes',	$line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.
	(($anchor ne '')?$anchor:''),
$title,600,500);	$title,600,500);
} else {	} else {
$line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';	$line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
Line 3767 sub action_restrictions {	Line 4133 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 3825 sub new_timebased_suffix {	Line 4193 sub new_timebased_suffix {
if ($type eq 'paste') {	if ($type eq 'paste') {
$prefix = $type;	$prefix = $type;
$namespace = 'courseeditor';	$namespace = 'courseeditor';
	$idtype = 'addcode';
} elsif ($type eq 'map') {	} elsif ($type eq 'map') {
$prefix = 'docs';	$prefix = 'docs';
if ($area eq 'supplemental') {	if ($area eq 'supplemental') {
Line 3836 sub new_timebased_suffix {	Line 4205 sub new_timebased_suffix {
$prefix = $type;	$prefix = $type;
$namespace = 'templated';	$namespace = 'templated';
}	}
$idtype = 'concat';
my ($suffix,$freedlock,$error) =	my ($suffix,$freedlock,$error) =
&Apache::lonnet::get_timebased_id($prefix,'num',$namespace,$dom,$num);	&Apache::lonnet::get_timebased_id($prefix,'num',$namespace,$dom,$num,$idtype);
if (!$suffix) {	if (!$suffix) {
if ($type eq 'paste') {	if ($type eq 'paste') {
$errtext = &mt('Failed to acquire a unique timestamp-based suffix when adding to the paste buffer.');	$errtext = &mt('Failed to acquire a unique timestamp-based suffix when adding to the paste buffer.');
Line 3858 sub new_timebased_suffix {	Line 4226 sub new_timebased_suffix {
'<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') {
&mt('This will prevent use of the paste buffer until th next log-in.');	if ($freedlock eq 'nolock') {
	$locknotfreed =
	'<div class="LC_error">'.
	&mt('A lockfile was not released when you added content to the clipboard earlier in this session.').' '.

	&mt('As a result addition of items to the clipboard will be unavailable until your next log-in.');
	} else {
	$locknotfreed .=
	&mt('This will prevent addition of items to the clipboard until your next log-in.');
	}
} elsif ($type eq 'map') {	} elsif ($type eq 'map') {
&mt('This will prevent creation of additional folders or composite pages in this course.');	$locknotfreed .=
	&mt('This will prevent creation of additional folders or composite pages in this course.');
} 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.');
Line 4473 sub handler {	Line 4851 sub handler {
my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};	my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};	my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};

	# get docroot
	my $londocroot = $r->dir_config('lonDocRoot');

# graphics settings	# graphics settings
$iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL').'/');	$iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL').'/');

Line 4499 sub handler {	Line 4880 sub handler {
$help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');	$help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
$help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');	$help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');

my $allowed;	my ($allowed,$noendpage);
# URI is /adm/supplemental when viewing supplemental docs in non-edit mode.	# URI is /adm/supplemental when viewing supplemental docs in non-edit mode.
unless ($r->uri eq '/adm/supplemental') {	unless ($r->uri eq '/adm/supplemental') {
# does this user have privileges to modify content.	# does this user have privileges to modify content.
$allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});	$allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
}	}

&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['chooseserver',	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
'inhibitmenu']);	if ($allowed && $env{'form.verify'}) {
if ($allowed && $env{'form.chooseserver'}) {
&choose_dump_server($r);
return OK;
} elsif ($allowed && $env{'form.verify'}) {
&init_breadcrumbs('verify','Verify Content','Docs_Verify_Content');	&init_breadcrumbs('verify','Verify Content','Docs_Verify_Content');
&verifycontent($r);	&verifycontent($r);
} elsif ($allowed && $env{'form.listsymbs'}) {	} elsif ($allowed && $env{'form.listsymbs'}) {
Line 4534 sub handler {	Line 4911 sub handler {
&init_breadcrumbs('exportcourse','IMS Export');	&init_breadcrumbs('exportcourse','IMS Export');
&Apache::imsexport::exportcourse($r);	&Apache::imsexport::exportcourse($r);
} else {	} else {
	if ($allowed && $env{'form.authorrole'}) {
	$noendpage = 1;
	my ($redirect,$error) = &makenewproblem($r,$coursedom,$coursenum);
	if ($redirect) {
	if (($env{'form.newresourceadd'}) && ($env{'form.folderpath'})) {
	my $container = 'sequence';
	my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,
	$is_random_order,$container) =
	&Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);
	my (@folders)=split('&',$env{'form.folderpath'});
	$env{'form.foldername'}=&unescape(pop(@folders));
	my $folder=pop(@folders);
	my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
	$folder.'.'.$container);
	my $warning;
	if ($fatal) {
	if ($container eq 'page') {
	$warning = &mt('An error occurred retrieving the contents of the current page.');
	} else {
	$warning = &mt('An error occurred retrieving the contents of the current folder.');
	}
	} else {
	my $url = $redirect;
	my $srcfile = $londocroot.$url;
	$url =~ s{^/priv/}{/res/};
	my $targetfile = $londocroot.$url;
	my $nokeyref = &Apache::lonpublisher::getnokey($r->dir_config('lonIncludes'));
	my $output = &Apache::lonpublisher::batchpublish($r,$srcfile,$targetfile,$nokeyref,1);
	$env{'form.folder'} = $folder;
	&snapshotbefore();
	my $title = &LONCAPA::map::qtunescape($env{'form.newresourcetitle'});
	my $ext = 'false';
	my $newidx = &LONCAPA::map::getresidx(&LONCAPA::map::qtunescape($url));
	$LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url).
	':'.$ext.':normal:res';
	push(@LONCAPA::map::order,$newidx);
	&LONCAPA::map::storeparameter($newidx,'parameter_hiddenresource','yes',
	'string_yesno');
	&remember_parms($newidx,'hiddenresource','set','yes');
	($errtext,$fatal) =
	&storemap($coursenum, $coursedom, $folder.'.'.$container,1);
	&log_differences($plain);
	&mark_hash_old();
	$r->internal_redirect($redirect);
	return OK;
	}
	}
	}
	}
#	#
# Done catching special calls	# Done catching special calls
# The whole rest is for course and supplemental documents and utilities menu	# The whole rest is for course and supplemental documents and utilities menu
Line 4572 sub handler {	Line 4998 sub handler {
my $container;	my $container;
my $containertag;	my $containertag;
my $pathitem;	my $pathitem;
	my %ltitools;

# Do we directly jump somewhere?	# Do we directly jump somewhere?

Line 4709 sub handler {	Line 5136 sub handler {
}	}
}	}
my $tabidstr = join("','",@tabids);	my $tabidstr = join("','",@tabids);
$script .= &editing_js($udom,$uname,$supplementalflag).	%ltitools = &Apache::lonnet::get_domain_ltitools($coursedom);
	my $posslti = keys(%ltitools);
	$script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti,
	$londocroot).
&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).
&Apache::lonextresedit::extedit_javascript();	&Apache::lonextresedit::extedit_javascript(\%ltitools);
$addentries = {	$addentries = {
onload => "javascript:resize_scrollbox('contentscroll','1','1');",	onload => "javascript:resize_scrollbox('contentscroll','1','1');",
};	};
Line 4729 sub handler {	Line 5159 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 4829 sub handler {	Line 5261 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',
	'extr' => 'External Resource',
	'extt' => 'External Tool',
'selm' => 'Select Map',	'selm' => 'Select Map',
'load' => 'Load Map',	'load' => 'Load Map',
'newf' => 'New Folder',	'newf' => 'New Folder',
Line 4838 sub handler {	Line 5273 sub handler {
'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',
	'news' => 'New sub-directory',
	'crpr' => 'Create Problem',
'drbx' => 'Drop Box',	'drbx' => 'Drop Box',
'scuf' => 'External Scores (handgrade, upload, clicker)',	'scuf' => 'External Scores (handgrade, upload, clicker)',
'bull' => 'Discussion Board',	'bull' => 'Discussion Board',
Line 4851 sub handler {	Line 5289 sub handler {
'se' => 'Select',	'se' => 'Select',
'file' => 'File',	'file' => 'File',
'title' => 'Title',	'title' => 'Title',
	'addp' => 'Add Placeholder to course?',
	'uste' => 'Use Template?',
	'fnam' => 'File Name:',
	'loca' => 'Location:',
	'dire' => 'Directory:',
	'cate' => 'Category:',
	'tmpl' => 'Template:',
'comment' => 'Comment',	'comment' => 'Comment',
'parse' => 'Upload embedded images/multimedia files if HTML file',	'parse' => 'Upload embedded images/multimedia files if HTML file',
'bb5' => 'Blackboard 5',	'bb5' => 'Blackboard 5',
'bb6' => 'Blackboard 6',	'bb6' => 'Blackboard 6',
'angel5' => 'ANGEL 5.5',	'angel5' => 'ANGEL 5.5',
'webctce4' => 'WebCT 4 Campus Edition',	'webctce4' => 'WebCT 4 Campus Edition',
	'yes' => 'Yes',
	'no' => 'No',
);	);
# -----------------------------------------------------------------------------	# -----------------------------------------------------------------------------

	# 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';
	if ($crstype eq 'Community') {
	$quotatype = 'community';
	} elsif ($crstype eq 'Placement') {
	$quotatype = 'placement';
	} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) {
	$quotatype = 'official';
	} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) {
	$quotatype = 'textbook';
	}
	my $disk_quota = &Apache::loncommon::get_user_quota($coursenum,$coursedom,
	'course',$quotatype); # expressed in MB
	my $current_disk_usage = 0;
	foreach my $subdir ('docs','supplemental') {
	$current_disk_usage += &Apache::lonnet::diskusage($coursedom,$coursenum,
	"userfiles/$subdir",1); # expressed in kB
	}
	my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage);
	my $usage = $current_disk_usage/1024; # in MB
	my $quota = $disk_quota;
	my $percent;
	if ($disk_quota == 0) {
	$percent = 100.0;
	} else {
	$percent = 100*($current_disk_usage/$disk_quota);
	}
	$usage = sprintf("%.2f",$usage);
	$quota = sprintf("%.2f",$quota);
	$percent = sprintf("%.0f",$percent);
	my $quotainfo = '<p>'.&mt('Currently using [_1] of the [_2] available.',
	$percent.'%',$quota.' MB').'</p>';

my $fileupload=(<<FIUP);	my $fileupload=(<<FIUP);
	$quotainfo
$lt{'file'}:<br />	$lt{'file'}:<br />
<input type="file" name="uploaddoc" size="40" />	<input type="file" name="uploaddoc" class="flUpload" size="40" />
	<input type="hidden" id="free_space" value="$free_space" />
FIUP	FIUP

my $checkbox=(<<CHBO);	my $checkbox=(<<CHBO);
Line 4908 IMSFORM	Line 5392 IMSFORM
<fieldset id="uploaddocform" style="display: none;">	<fieldset id="uploaddocform" style="display: none;">
<legend>$lt{'upfi'}</legend>	<legend>$lt{'upfi'}</legend>
<input type="hidden" name="active" value="aa" />	<input type="hidden" name="active" value="aa" />
$fileupload	$fileupload
<br />	<br />
$lt{'title'}:<br />	$lt{'title'}:<br />
<input type="text" size="60" name="comment" />	<input type="text" size="60" name="comment" />
Line 4941 FUFORM	Line 5425 FUFORM
</form>	</form>

SEDFFORM	SEDFFORM
	my $importcrsresform;
	my ($numdirs,$pickfile) =
	&Apache::loncommon::import_crsauthor_form('crsresimportform','coursepath','coursefile',
	"resize_scrollbox('contentscroll','1','0');",
	undef,'res');
	if ($pickfile) {
	$importcrsresform=(<<CRSFORM);
	<a class="LC_menubuttons_link" href="javascript:toggleImportCrsres('res','$numdirs');">
	$lt{'imcr'}</a>$help{'Course_Resources'}
	<form action="/adm/coursedocs" method="post" name="crsresimportform" onsubmit="return validImportCrsRes();">
	<fieldset id="importcrsresform" style="display: none;">
	<legend>$lt{'imcr'}</legend>
	<input type="hidden" name="active" value="bb" />
	$pickfile
	<p>
	$lt{'title'}: <input type="textbox" name="crsrestitle" value="" />
	</p>
	<input type="hidden" name="importdetail" value="" />
	<input type="submit" name="crsres" value="$lt{'impo'}" />
	</fieldset>
	</form>
	CRSFORM
	}

my @importpubforma = (	my @importpubforma = (
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'" onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'" onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'" onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'" onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:open_StoredLinks_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_StoredLinks_Import();'>$lt{'lnks'}</a>" },	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:open_StoredLinks_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_StoredLinks_Import();'>$lt{'lnks'}</a>" },
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform }	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform },
);	);
	if ($pickfile) {
	push(@importpubforma,{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{imcr}.'" onclick="javascript:toggleImportCrsres(\'res\','."'$numdirs'".');"/>' => $importcrsresform});
	}
$importpubform = &create_form_ul(&create_list_elements(@importpubforma));	$importpubform = &create_form_ul(&create_list_elements(@importpubforma));
my $extresourcesform =	my $extresourcesform =
&Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,	&Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
$help{'Adding_External_Resource'});	$help{'Adding_External_Resource'});
	my $exttoolform =
	&Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
	$help{'Adding_External_Tool'},undef,
	undef,'tool',$coursedom,$coursenum,
	\%ltitools);
if ($allowed) {	if ($allowed) {
my $folder = $env{'form.folder'};	my $folder = $env{'form.folder'};
if ($folder eq '') {	if ($folder eq '') {
Line 5128 NROSTFORM	Line 5644 NROSTFORM
$help{'Web_Page'}	$help{'Web_Page'}
</form>	</form>
NWEBFORM	NWEBFORM

	my @ids=&Apache::lonnet::current_machine_ids();
	my %select_menus;
	my $numauthor = 0;
	my $numcrsdirs = 0;
	my $toppath = "/priv/$env{'user.domain'}/$env{'user.name'}";
	if ($env{'user.author'}) {
	$numauthor ++;
	$select_menus{'author'}->{'text'} = &Apache::lonnet::plaintext('au');
	if (grep(/^\Q$env{'user.home'}\E$/,@ids)) {
	my $is_home = 1;
	my %subdirs;
	&Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs);
	$select_menus{'author'}->{'default'} = '/';
	$select_menus{'author'}->{'select2'}->{'/'} = '/';
	my @ordered = ('/');
	foreach my $relpath (sort { lc($a) cmp lc($b) } (keys(%subdirs))) {
	$select_menus{'author'}->{'select2'}->{$relpath} = $relpath;
	push(@ordered,$relpath);
	}
	$select_menus{'author'}->{'order'} = \@ordered;
	} else {
	$select_menus{'author'}->{'select2'}->{'switch'} = &mt('Switch server required');
	$select_menus{'author'}->{'default'} = 'switch';
	$select_menus{'author'}->{'order'} = ['switch'];
	}
	}
	my %roleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',
	['active'],['ca','aa']);
	my $crshome = $env{'course.'.$env{'request.course.id'}.'.home'};
	my %by_roletype;
	if (keys(%roleshash)) {
	foreach my $entry (keys(%roleshash)) {
	my ($auname,$audom,$roletype) = split(/:/,$entry);
	my $key = $entry;
	$key =~ s/:/___/g;
	$by_roletype{$roletype}{$auname.'___'.$audom} = 1;
	$select_menus{$key}->{'text'} = &Apache::lonnet::plaintext($roletype)." ($audom/$auname)";
	my $rolehome = &Apache::lonnet::homeserver($auname,$audom);
	if (grep(/^\Q$rolehome\E$/,@ids)) {
	my $is_home = 1;
	my (%subdirs,@ordered);
	my $toppath="/priv/$audom/$auname";
	&Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs);
	$select_menus{$key}->{'default'} = '/';
	$select_menus{$key}->{'select2'}->{'/'} = '/';
	my @ordered = ('/');
	foreach my $relpath (sort { lc($a) cmp lc($b) } (keys(%subdirs))) {
	$select_menus{$key}->{'select2'}->{$relpath} = $relpath;
	push(@ordered,$relpath);
	}
	$select_menus{$key}->{'order'} = \@ordered;
	} else {
	$select_menus{$key}->{'select2'}->{'switch'} = &mt('Switch server required');
	$select_menus{$key}->{'default'} = 'switch';
	$select_menus{$key}->{'order'} = ['switch'];
	}
	$numauthor ++;
	}
	}
	my ($pickdir,$showtitle);;
	if ($numauthor) {
	my @order;
	my $defrole;
	if ($env{'user.author'}) {
	push(@order,'author');
	$defrole = 'author';
	}
	if (keys(%by_roletype)) {
	foreach my $possrole ('ca','aa') {
	if (ref($by_roletype{$possrole}) eq 'HASH') {
	foreach my $author (sort { lc($a) cmp lc($b) } (keys(%{$by_roletype{$possrole}}))) {
	unless ($defrole) {
	$defrole = $author;
	}
	push(@order,$author.'___'.$possrole);
	}
	}
	}
	}
	$select_menus{'course'}->{'text'} = &mt('Course Resource');
	if (grep(/^\Q$crshome\E$/,@ids)) {
	my $is_home = 1;
	my %subdirs;
	my $toppath="/priv/$coursedom/$coursenum";
	&Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs);
	$numcrsdirs = keys(%subdirs);
	$select_menus{'course'}->{'default'} = '/';
	$select_menus{'course'}->{'select2'}->{'/'} = '/';
	my @ordered = ('/');
	foreach my $relpath (sort { lc($a) cmp lc($b) } (keys(%subdirs))) {
	$select_menus{'course'}->{'select2'}->{$relpath} = $relpath;
	push(@ordered,$relpath);
	}
	$select_menus{'course'}->{'order'} = \@ordered;
	} else {
	$select_menus{'course'}->{'select2'}->{'switch'} = &mt('Switch server required');
	$select_menus{'course'}->{'default'} = 'switch';
	$select_menus{'course'}->{'order'} = ['switch'];
	}
	push(@order,'course');
	$pickdir = $lt{'loca'}.
	&Apache::loncommon::linked_select_forms('courseresform','<br />'.$lt{'dire'},
	$defrole,'authorrole','authorpath',
	\%select_menus,\@order,'toggleCrsResTitle();',
	'','priv').'<br />';
	$showtitle = 'none';
	} else {
	my $is_home;
	$showtitle = 'inline';
	if (grep(/^\Q$crshome\E$/,@ids)) {
	$is_home = 1;
	$pickdir .= '<input type="hidden" name="authorrole" value="course" />';
	my $toppath="/priv/$coursedom/$coursenum'}";
	my %subdirs;
	&Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs);
	$numcrsdirs = keys(%subdirs);
	if ($numcrsdirs) {
	$pickdir .= &mt('Directory: ').'<select name="authorpath">'."\n".
	'<option value="/">/</option>'."\n";
	foreach my $key (sort { lc($a) cmp lc($b) } (keys(%subdirs))) {
	$pickdir .= '<option value="'.$key.'">'.$key.'</option>'."\n";
	}
	$pickdir .= '</select>';
	} else {
	$pickdir .= '<input type="hidden" name="authorpath" value="/" />'."\n";
	}
	}
	}

	my %seltemplate_menus;
	my @files = &Apache::lonhomework::get_template_list('problem');
	my @noexamplelink = ('blank.problem','blank.library','script.library');
	my $currentcategory = '';
	my @ordered = ('');
	my %templatehelp;
	my $defcategory = '';
	my @catorder = ($defcategory);
	$seltemplate_menus{$defcategory}->{'order'} = [''];
	$seltemplate_menus{$defcategory}->{'text'} = '';
	foreach my $file (@files) {
	if (ref($file) eq 'ARRAY') {
	my ($path,$title,$category,$help) = @{$file};
	next if ($title !~ /\S/);
	if (&js_escape($category) ne $currentcategory) {
	$currentcategory = &js_escape($category);
	push(@catorder,&js_escape($currentcategory));
	$seltemplate_menus{$currentcategory}->{'text'} = $category;
	$seltemplate_menus{$currentcategory}->{'default'} = '';
	$seltemplate_menus{$currentcategory}->{'select2'}->{''} = '';
	push(@{$seltemplate_menus{$currentcategory}->{'order'}},'');
	}
	if ($path) {
	$seltemplate_menus{$currentcategory}->{'select2'}->{&js_escape($path)} = $title;
	push(@{$seltemplate_menus{$currentcategory}->{'order'}},&js_escape($path));
	if ($help) {
	$templatehelp{$path} = $help;
	}
	}
	}
	}

	my $templates = $lt{'cate'}.' '.
	&Apache::loncommon::linked_select_forms('courseresform','<br />'.$lt{'tmpl'}.' ',
	$defcategory,'tempcategory','template',
	\%seltemplate_menus,\@catorder,
	"resize_scrollbox('contentscroll','1','0');",
	"toggleExampleText();",'template').'<br />';
	my $templatepreview = '<a href="#" target="sample" onclick="javascript:getExample(600,420,\'yes\',true); return false;">'.
	'<span id="newresexample">'.&mt('Example').'<span></a>';
	my $crsresform=(<<RESFORM);
	<a class="LC_menubuttons_link" href="javascript:toggleCrsRes('res','$numauthor','$numcrsdirs');">
	$lt{'stpr'}</a>$help{'Course_Resource'}
	<form action="/adm/coursedocs" method="post" name="courseresform">
	<fieldset id="crsresform" style="display:none;">
	<legend>$lt{'stpr'}</legend>
	<input type="hidden" name="active" value="ee" />
	<p>
	$pickdir
	<span class="LC_nobreak">$lt{'news'}?
	<label><input type="radio" name="newsubdir" value="0" onclick="toggleNewsubdir(this.form);" checked="checked" />No</label>

	<label><input type="radio" name="newsubdir" value="1" onclick="toggleNewsubdir(this.form);" />Yes</label>
	</span><span id="newsubdir"></span>
	<input type="hidden" name="newsubdirname" id="newsubdirname" value="" autocomplete="off" />
	</p>
	$lt{'fnam'}
	<input type="text" size="20" name="newresourcename" autocomplete="off" />
	<p>
	<div id="newresource" style="display:$showtitle">
	$lt{'addp'}
	<label><input type="radio" name="newresourceadd" value="0" checked="checked" onclick="toggleNewInCourse(this.form);" />
	$lt{'no'}</label>
	<label><input type="radio" name="newresourceadd" value="1" onclick="toggleNewInCourse(this.form);" />
	$lt{'yes'}</label>
	<span id="newrestitle"></span>
	<input type="hidden" size="20" name="newresourcetitle" id="newresourcetitle" autocomplete="off" />
	</div>
	</p>
	<p>
	$lt{'uste'}
	<label><input type="radio" name="newresusetemp" value="0" checked="checked" onclick="toggleWithTemplate(this.form);" />
	$lt{'no'}</label>
	<label><input type="radio" name="newresusetemp" value="1" onclick="toggleWithTemplate(this.form);" />
	$lt{'yes'}</label>
	<div id="newrestemplate" style="display:none">
	$templates
	$templatepreview
	</div>
	</p>
	<span class="LC_nobreak">
	<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
	<input type="submit" name="newcrs" value="$lt{'crpr'}" />
	</span>
	</fieldset>
	</form>

	RESFORM

my $specialdocumentsform;	my $specialdocumentsform;
my @specialdocumentsforma;	my @specialdocumentsforma;
Line 5196 NGFFORM	Line 5929 NGFFORM
my @importdoc = (	my @importdoc = (
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'ext\');" />'=>$extresourcesform}	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'ext\');" />'=>$extresourcesform}
);	);
	if (keys(%ltitools)) {
	push(@importdoc,
	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extt}.'" onclick="toggleUpload(\'tool\');" />'=>$exttoolform},
	);
	}
unless ($container eq 'page') {	unless ($container eq 'page') {
push(@importdoc,	push(@importdoc,
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform}	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform}
Line 5210 NGFFORM	Line 5948 NGFFORM
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform},
	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{stpr}.'" onclick="javascript:toggleCrsRes(\'res\','."'$numauthor','$numcrsdirs'".');" />'=>$crsresform},
);	);
$gradingform = &create_form_ul(&create_list_elements(@gradingforma));	$gradingform = &create_form_ul(&create_list_elements(@gradingforma));

Line 5237 unless ($container eq 'page') {	Line 5975 unless ($container eq 'page') {
$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,\%ltitools);
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 5304 SNFFORM	Line 6042 SNFFORM
&Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem,	&Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem,
$help{'Adding_External_Resource'});	$help{'Adding_External_Resource'});

	my $supexttoolform =
	&Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem,
	$help{'Adding_External_Tool'},
	undef,undef,'tool',$coursedom,
	$coursenum,\%ltitools);

my $supnewsylform=(<<SNSFORM);	my $supnewsylform=(<<SNSFORM);
<form action="/adm/coursedocs" method="post" name="supnewsyl">	<form action="/adm/coursedocs" method="post" name="supnewsyl">
<input type="hidden" name="active" value="ff" />	<input type="hidden" name="active" value="ff" />
Line 5357 my @specialdocs = (	Line 6101 my @specialdocs = (
);	);
my @supimportdoc = (	my @supimportdoc = (
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleUpload(\'suppext\')" />'	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleUpload(\'suppext\')" />'
=>$supextform},	=>$supextform});
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />'	if (keys(%ltitools)) {
	push(@supimportdoc,
	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extt}.'" onclick="javascript:toggleUpload(\'supptool\')" />'
	=>$supexttoolform});
	}
	push(@supimportdoc,
	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />'
=>$supupdocform},	=>$supupdocform},
);	);

$supupdocform = &create_form_ul(&create_list_elements(@supimportdoc));	$supupdocform = &create_form_ul(&create_list_elements(@supimportdoc));
my %suporderhash = (	my %suporderhash = (
Line 5370 my %suporderhash = (	Line 6120 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);
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 5417 my %suporderhash = (	Line 6167 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>');
}	}
}	}
$r->print(&Apache::loncommon::end_page());	unless ($noendpage) {
	$r->print(&Apache::loncommon::end_page());
	}
return OK;	return OK;
}	}

Line 5464 sub decompression_info {	Line 6216 sub decompression_info {
my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};	my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
my $container='sequence';	my $container='sequence';
my ($pathitem,$hiddenelem);	my ($pathitem,$hiddenelem);
my @hiddens = ('newidx','comment','position','folderpath');	my @hiddens = ('newidx','comment','position','folderpath','archiveurl');
if ($env{'form.folderpath'} =~ /\:1$/) {	if ($env{'form.folderpath'} =~ /\:1$/) {
$container='page';	$container='page';
}	}
Line 5472 sub decompression_info {	Line 6224 sub decompression_info {
foreach my $item (@hiddens) {	foreach my $item (@hiddens) {
if ($env{'form.'.$item}) {	if ($env{'form.'.$item}) {
$hiddenelem .= '<input type="hidden" name="'.$item.'" value="'.	$hiddenelem .= '<input type="hidden" name="'.$item.'" value="'.
$env{'form.'.$item}.'" />'."\n";	&HTML::Entities::encode($env{'form.'.$item},'<>&"').'" />'."\n";
}	}
}	}
return ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,	return ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,
Line 5529 sub remove_archive {	Line 6281 sub remove_archive {
} else {	} else {
$delwarning = &mt('An error occurred retrieving the contents of the current folder.');	$delwarning = &mt('An error occurred retrieving the contents of the current folder.');
}	}
$delwarning .= &mt('As a result the archive file has not been removed.');	$delwarning .= ' '.&mt('As a result the archive file has not been removed.');
} else {	} else {
my $currcmd = $env{'form.cmd'};	my $currcmd = $env{'form.cmd'};
my $position = $env{'form.position'};	my $position = $env{'form.position'};
	my $archiveidx = $position;
if ($position > 0) {	if ($position > 0) {
$env{'form.cmd'} = 'remove_'.$position;	if (($env{'form.autoextract_camtasia'}) && (scalar(@LONCAPA::map::order) == 2)) {
my ($title,$url,@rrest) =	$archiveidx = $position-1;
split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$position]]);	}
if (&handle_edit_cmd($docuname,$docudom)) {	$env{'form.cmd'} = 'remove_'.$archiveidx;
($errtext,$fatal) = &storemap($docuname,$docudom,$map,1);	my ($title,$url,@rrest) =
if ($fatal) {	split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$archiveidx]]);
if ($container eq 'page') {	if ($url eq $env{'form.archiveurl'}) {
$delwarning = &mt('An error occurred updating the contents of the current page.');	if (&handle_edit_cmd($docuname,$docudom)) {
	($errtext,$fatal) = &storemap($docuname,$docudom,$map,1);
	if ($fatal) {
	if ($container eq 'page') {
	$delwarning = &mt('An error occurred updating the contents of the current page.');
	} else {
	$delwarning = &mt('An error occurred updating the contents of the current folder.');
	}
} else {	} else {
$delwarning = &mt('An error occurred updating the contents of the current folder.');	$delresult = &mt('Archive file removed.');
}	}
} else {
$delresult = &mt('Archive file removed.');
}	}
	} else {
	$delwarning .= &mt('Archive file had unexpected item number in folder.').
	' '.&mt('As a result the archive file has not been removed.');
}	}
}	}
$env{'form.cmd'} = $currcmd;	$env{'form.cmd'} = $currcmd;
Line 5749 END	Line 6510 END
}	}

sub editing_js {	sub editing_js {
my ($udom,$uname,$supplementalflag) = @_;	my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti,$londocroot) = @_;
my %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',
p_mnp => 'Name of New Page',	p_mnp => 'Name of New Page',
Line 5760 sub editing_js {	Line 6521 sub editing_js {
p_msb => 'Title for the Problem',	p_msb => 'Title for the Problem',
p_mdb => 'Title for the Drop Box',	p_mdb => 'Title for the Drop Box',
p_mbb => 'Title for the Discussion Board',	p_mbb => 'Title for the Discussion Board',
p_mwp => 'Title for Web Page',	p_mwp => 'Title for Web Page',
	p_mnr => 'Title for the Resource',
p_mab => "Enter user:domain for User's Personal Information Page",	p_mab => "Enter user:domain for User's Personal Information Page",
p_mab2 => 'Personal Information Page of ',	p_mab2 => 'Personal Information Page of ',
p_mab_alrt1 => 'Not a valid user:domain',	p_mab_alrt1 => 'Not a valid user:domain',
p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',	p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',
p_chn => 'New Title',	p_chn => 'New Title',
p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!',	p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!',
p_rmr2a => 'Remove[_99]',	p_rmr2a => 'Remove',
p_rmr2b => '?[_99]',	p_rmr2b => '?',
p_rmr3a => 'Remove those [_2]',	p_rmr3a => 'Remove those',
p_rmr3b => 'items?[_2]',	p_rmr3b => 'items?',
	p_rmr4 => 'WARNING: Removing a resource uploaded to a course cannot be undone via "Undo Delete".',
	p_rmr5 => 'Push "Cancel" and then use "Cut" instead if you might need to undo this change.',
p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!',	p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!',
p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.',	p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.',
p_ctr2a => 'Cut[_98]',	p_ctr2a => 'Cut',
p_ctr2b => '?[_98]',	p_ctr2b => '?',
p_ctr3a => 'Cut those[_2]',	p_ctr3a => 'Cut those',
p_ctr3b => 'items?[_2]',	p_ctr3b => 'items?',
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 5787 sub editing_js {	Line 6551 sub editing_js {
noor => 'No actions selected or changes to settings specified.',	noor => 'No actions selected or changes to settings specified.',
noch => 'No changes to settings specified.',	noch => 'No changes to settings specified.',
noac => 'No actions selected.',	noac => 'No actions selected.',
	nofi => 'No file selected',
	tinc => 'Title in course',
	sunm => 'Sub-directory name',
);	);
	&js_escape(\%js_lt);
my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"');	my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"');
my $main_container_page;	my $main_container_page;
Line 5808 sub editing_js {	Line 6575 sub editing_js {
my ($map,$id,$res)=&Apache::lonnet::decode_symb($caller);	my ($map,$id,$res)=&Apache::lonnet::decode_symb($caller);
$res = &Apache::lonnet::clutter($res);	$res = &Apache::lonnet::clutter($res);
if (&Apache::lonnet::is_on_map($res)) {	if (&Apache::lonnet::is_on_map($res)) {
$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($res),'<>&"').'?symb='.	my ($url,$anchor);
	if ($res =~ /^([^#]+)#([^#]+)$/) {
	$url = $1;
	$anchor = $2;
	if (($caller =~ m{^([^#]+)\Q#$anchor\E$})) {
	$caller = $1.&escape('#').$anchor;
	}
	}
	$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"').'?symb='.
&HTML::Entities::encode($caller,'<>&"');	&HTML::Entities::encode($caller,'<>&"');
	if ($anchor ne '') {
	$backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"');
	}
	$backtourl = &Apache::loncommon::escape_single($backtourl);
} else {	} else {
$backtourl = '/adm/navmaps';	$backtourl = '/adm/navmaps';
}	}
Line 5823 sub editing_js {	Line 6602 sub editing_js {
}	}

my $fieldsets = "'ext','doc'";	my $fieldsets = "'ext','doc'";
	if ($posslti) {
	$fieldsets .= ",'tool'";
	}
unless ($main_container_page) {	unless ($main_container_page) {
$fieldsets .=",'ims'";	$fieldsets .=",'ims'";
}	}
if ($supplementalflag) {	if ($supplementalflag) {
$fieldsets = "'suppext','suppdoc'";	$fieldsets = "'suppext','suppdoc'";
	if ($posslti) {
	$fieldsets .= ",'supptool'";
	}
}	}

return <<ENDNEWSCRIPT;	return <<ENDNEWSCRIPT;
function makenewfolder(targetform,folderseq) {	function makenewfolder(targetform,folderseq) {
var foldername=prompt('$lt{"p_mnf"}','$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=escape(foldername)+"="+folderseq;
targetform.submit();	targetform.submit();
Line 5840 function makenewfolder(targetform,folder	Line 6625 function makenewfolder(targetform,folder
}	}

function makenewpage(targetform,folderseq) {	function makenewpage(targetform,folderseq) {
var pagename=prompt('$lt{"p_mnp"}','$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=escape(pagename)+"="+folderseq;
targetform.submit();	targetform.submit();
Line 5848 function makenewpage(targetform,folderse	Line 6633 function makenewpage(targetform,folderse
}	}

function makeexamupload() {	function makeexamupload() {
var title=prompt('$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';	escape(title)+'=/res/lib/templates/examupload.problem';
Line 5857 function makeexamupload() {	Line 6642 function makeexamupload() {
}	}

function makesmppage() {	function makesmppage() {
var title=prompt('$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';	escape(title)+'=/adm/$udom/$uname/new/smppg';
Line 5866 function makesmppage() {	Line 6651 function makesmppage() {
}	}

function makewebpage(type) {	function makewebpage(type) {
var title=prompt('$lt{"p_mwp"}');	var title=prompt('$js_lt{"p_mwp"}');
var formname;	var formname;
if (type == 'supp') {	if (type == 'supp') {
formname = this.document.forms.supwebpage;	formname = this.document.forms.supwebpage;
Line 5881 function makewebpage(type) {	Line 6666 function makewebpage(type) {
}	}

function makesmpproblem() {	function makesmpproblem() {
var title=prompt('$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';	escape(title)+'=/res/lib/templates/simpleproblem.problem';
Line 5890 function makesmpproblem() {	Line 6675 function makesmpproblem() {
}	}

function makedropbox() {	function makedropbox() {
var title=prompt('$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';	escape(title)+'=/res/lib/templates/DropBox.problem';
Line 5899 function makedropbox() {	Line 6684 function makedropbox() {
}	}

function makebulboard() {	function makebulboard() {
var title=prompt('$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';	escape(title)+'=/adm/$udom/$uname/new/bulletinboard';
Line 5908 function makebulboard() {	Line 6693 function makebulboard() {
}	}

function makeabout() {	function makeabout() {
var user=prompt("$lt{'p_mab'}");	var user=prompt("$js_lt{'p_mab'}");
if (user) {	if (user) {
var comp=new Array();	var comp=new Array();
comp=user.split(':');	comp=user.split(':');
if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {	if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
if ((comp[0]) && (comp[1])) {	if ((comp[0]) && (comp[1])) {
this.document.forms.newaboutsomeone.importdetail.value=	this.document.forms.newaboutsomeone.importdetail.value=
'$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';	'$js_lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
this.document.forms.newaboutsomeone.submit();	this.document.forms.newaboutsomeone.submit();
} else {	} else {
alert("$lt{'p_mab_alrt1'}");	alert("$js_lt{'p_mab_alrt1'}");
}	}
} else {	} else {
alert("$lt{'p_mab_alrt2'}");	alert("$js_lt{'p_mab_alrt2'}");
}	}
}	}
}	}
Line 5937 function toggleUpload(caller) {	Line 6722 function toggleUpload(caller) {
}	}
}	}
document.getElementById('upload'+blocks[i]+'form').style.display=disp;	document.getElementById('upload'+blocks[i]+'form').style.display=disp;
	if ((caller == 'tool') \|\| (caller == 'supptool')) {
	if (disp == 'block') {
	if (document.getElementById('LC_exttoolid')) {
	var toolselector = document.getElementById('LC_exttoolid');
	var suppflag = 0;
	if (caller == 'supptool') {
	suppflag = 1;
	}
	currForm = document.getElementById('new'+caller);
	updateExttool(toolselector,currForm,suppflag);
	}
	}
	}
}	}
resize_scrollbox('contentscroll','1','1');	resize_scrollbox('contentscroll','1','1');
return;	return;
Line 5957 function toggleMap(caller) {	Line 6755 function toggleMap(caller) {
return;	return;
}	}

	function toggleCrsRes(caller,numauthorrole,numcrsdirs) {
	var disp = 'none';
	if (document.getElementById('crsresform')) {
	if (caller == 'res') {
	var curr = document.getElementById('crsresform').style.display;
	if (curr == 'none') {
	disp='block';
	numauthor = parseInt(numauthorrole);
	if (numauthor > 0) {
	document.courseresform.authorrole.selectedIndex = 0;
	select1priv_changed();
	document.courseresform.authorpath.selectedIndex = 0;
	document.courseresform.newresourceadd.selectedIndex = 0;
	toggleNewInCourse(document.courseresform);
	if (document.getElementById('newresource')) {
	document.getElementById('newresource').style.display = 'none';
	}
	} else {
	if (numcrsdirs) {
	document.courseresform.authorpath.selectedIndex = 0;
	}
	}
	if (document.courseresform.newresusetemp.length) {
	document.courseresform.newresusetemp[0].checked = true;
	toggleWithTemplate(document.courseresform);
	}
	document.courseresform.newresourcename.value = '';
	}
	}
	if (document.courseresform.newsubdir.length) {
	for (var j=0; j<document.courseresform.newsubdir.length; j++) {
	if (document.courseresform.newsubdir[j].value == 0) {
	document.courseresform.newsubdir[j].checked = true;
	}
	break;
	}
	if (document.getElementById('newsubdirname')) {
	document.getElementById('newsubdirname').type = "hidden";
	document.getElementById('newsubdirname').value = "";
	}
	if (document.getElementById('newsubdir')) {
	document.getElementById('newsubdir').innerHTML = "";
	}
	}
	document.getElementById('crsresform').style.display=disp;
	resize_scrollbox('contentscroll','1','0');
	}
	return;
	}

	function toggleNewsubdir(form) {
	if (form.newsubdir.length) {
	for (var j=0; j<form.newsubdir.length; j++) {
	if (form.newsubdir[j].checked) {
	if (document.getElementById('newsubdirname')) {
	if (form.newsubdir[j].value == '1') {
	document.getElementById('newsubdirname').type = "text";
	if (document.getElementById('newsubdir')) {
	document.getElementById('newsubdir').innerHTML = '<br />$js_lt{'sunm'}';
	}
	} else {
	document.getElementById('newsubdirname').type = "hidden";
	document.getElementById('newsubdirname').value = "";
	document.getElementById('newsubdir').innerHTML = "";
	}
	}
	break;
	}
	}
	}
	}

	function toggleCrsResTitle() {
	if (document.getElementById('newresource')) {
	if (document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value == 'course') {
	document.getElementById('newresource').style.display = 'inline';
	document.courseresform.newresourceadd[0].checked = true;
	toggleNewInCourse(document.courseresform);
	} else {
	document.getElementById('newresource').style.display = 'none';
	}
	}
	}

	function toggleNewInCourse(form) {
	if (form.newresourceadd.length) {
	for (var i=0; i<form.newresourceadd.length; i++) {
	if (form.newresourceadd[i].checked) {
	if (document.getElementById('newresourcetitle')) {
	if (form.newresourceadd[i].value == '1') {
	document.getElementById('newresourcetitle').type = 'text';
	if (document.getElementById('newrestitle')) {
	document.getElementById('newrestitle').innerHTML = "<br />$js_lt{'tinc'}";
	}
	} else {
	document.getElementById('newresourcetitle').type = 'hidden';
	document.getElementById('newresourcetitle').value = '';
	if (document.getElementById('newrestitle')) {
	document.getElementById('newrestitle').innerHTML = '';
	}
	}
	}
	break;
	}
	}
	}
	}

	function toggleWithTemplate(form) {
	if (form.newresusetemp.length) {
	for (var i=0; i<form.newresusetemp.length; i++) {
	if (form.newresusetemp[i].checked) {
	if (document.getElementById('newrestemplate')) {
	if (form.newresusetemp[i].value == '1') {
	document.getElementById('newrestemplate').style.display = 'inline';
	toggleExampleText();
	} else {
	form.tempcategory.selectedIndex = 0;
	select1template_changed();
	document.getElementById('newrestemplate').style.display = 'none';
	}
	}
	}
	}
	}
	}

	function toggleExampleText() {
	if (document.getElementById('newresexample')) {
	var url = document.courseresform.template.options[document.courseresform.template.selectedIndex].value;
	if (url == '') {
	document.getElementById('newresexample').style.fontWeight = 'normal';
	} else {
	document.getElementById('newresexample').style.fontWeight = 'bold';
	}
	}
	}

	function getExample(width,height,scrolling,transparency) {
	var url;
	if (document.courseresform.newresusetemp.length) {
	for (var i=0; i<document.courseresform.newresusetemp.length; i++) {
	if (document.courseresform.newresusetemp[i].checked) {
	if (document.courseresform.newresusetemp[i].value == '1') {
	var url = document.courseresform.template.options[document.courseresform.template.selectedIndex].value;
	if (url == '') {
	alert('Pick a category and template');
	} else {
	url = url.replace("$londocroot","");
	url += '?inhibitmenu=yes';
	}
	}
	break;
	}
	}
	}
	if (url != '') {
	openMyModal(url,width,height,scrolling,transparency,'');
	}
	}

	function toggleImportCrsres(caller,dircount) {
	var disp = 'none';
	if (document.getElementById('importcrsresform')) {
	if (caller == 'res') {
	var numdirs = parseInt(dircount);
	var curr = document.getElementById('importcrsresform').style.display;
	if (curr == 'none') {
	disp='block';
	if (numdirs > 1) {
	select1res_changed();
	}
	}
	}
	document.getElementById('importcrsresform').style.display=disp;
	resize_scrollbox('contentscroll','1','0');
	}
	return;
	}

function makeims(imsform) {	function makeims(imsform) {
if ((imsform.uploaddoc.value == '') \|\| (!imsform.uploaddoc.value)) {	if ((imsform.uploaddoc.value == '') \|\| (!imsform.uploaddoc.value)) {
alert("$lt{'imsfile'}");	alert("$js_lt{'imsfile'}");
return;	return;
}	}
if (imsform.source.selectedIndex == 0) {	if (imsform.source.selectedIndex == 0) {
alert("$lt{'imscms'}");	alert("$js_lt{'imscms'}");
return;	return;
}	}
newWindow = window.open('', 'IMSimport',"HEIGHT=700,WIDTH=750,scrollbars=yes");	newWindow = window.open('', 'IMSimport',"HEIGHT=700,WIDTH=750,scrollbars=yes");
Line 5971 function makeims(imsform) {	Line 6949 function makeims(imsform) {
}	}

function changename(folderpath,index,oldtitle) {	function changename(folderpath,index,oldtitle) {
var title=prompt('$lt{"p_chn"}',oldtitle);	var title=prompt('$js_lt{"p_chn"}',oldtitle);
if (title) {	if (title) {
this.document.forms.renameform.markcopy.value='';	this.document.forms.renameform.markcopy.value='';
this.document.forms.renameform.title.value=title;	this.document.forms.renameform.title.value=title;
Line 5995 function updatePick(targetform,index,cal	Line 6973 function updatePick(targetform,index,cal
picknumtext = document.getElementById('randompicknum_'+index);	picknumtext = document.getElementById('randompicknum_'+index);
}	}
if (pickitem.checked) {	if (pickitem.checked) {
var picknum=prompt('$lt{"rpck"}',picknumitem.value);	var picknum=prompt('$js_lt{"rpck"}',picknumitem.value);
if (picknum == '' \|\| picknum == null) {	if (picknum == '' \|\| picknum == null) {
if (caller == 'check') {	if (caller == 'check') {
pickitem.checked=false;	pickitem.checked=false;
Line 6145 function propagateState(form,param) {	Line 7123 function propagateState(form,param) {
return;	return;
}	}

function checkForSubmit(targetform,param,context,idx,folderpath,index,oldtitle,skip_confirm,container,folder) {	function checkForSubmit(targetform,param,context,idx,folderpath,index,oldtitle,skip_confirm,container,folder,confirm_removal) {
var dosettings;	var dosettings;
var doaction;	var doaction;
var control = document.togglemultsettings;	var control = document.togglemultsettings;
Line 6183 function checkForSubmit(targetform,param	Line 7161 function checkForSubmit(targetform,param
targetform.markcopy.value=idx+':'+param;	targetform.markcopy.value=idx+':'+param;
targetform.copyfolder.value=folder+'.'+container;	targetform.copyfolder.value=folder+'.'+container;
if (param == 'remove') {	if (param == 'remove') {
if (skip_confirm \|\| confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {	var doremove = 0;
	if (skip_confirm) {
	if (confirm_removal) {
	if (confirm('$js_lt{"p_rmr4"}\\n$js_lt{"p_rmr5"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'"$js_lt{"p_rmr2b"}')) {
	doremove = 1;
	}
	} else {
	doremove = 1;
	}
	} else {
	if (confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'" $js_lt{"p_rmr2b"}')) {
	doremove = 1;
	}
	}
	if (doremove) {
targetform.markcopy.value='';	targetform.markcopy.value='';
targetform.copyfolder.value='';	targetform.copyfolder.value='';
targetform.submit();	targetform.submit();
}	}
}	}
if (param == 'cut') {	if (param == 'cut') {
if (skip_confirm \|\| confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {	if (skip_confirm \|\| confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr2a"} "'+oldtitle+'" $js_lt{"p_ctr2b"}')) {
targetform.submit();	targetform.submit();
return;	return;
}	}
Line 6304 function showPage(current, pageId, nav,	Line 7296 function showPage(current, pageId, nav,
activeTab = '';	activeTab = '';
toggleUpload();	toggleUpload();
toggleMap();	toggleMap();
	toggleCrsRes();
	toggleImportCrsres();
resize_scrollbox('contentscroll','1','0');	resize_scrollbox('contentscroll','1','0');
return;	return;
} else {	} else {
Line 6314 function showPage(current, pageId, nav,	Line 7308 function showPage(current, pageId, nav,
activeTab = pageId;	activeTab = pageId;
toggleUpload();	toggleUpload();
toggleMap();	toggleMap();
	toggleCrsRes();
	toggleImportCrsres();
if (nav == 'mainnav') {	if (nav == 'mainnav') {
var storedpath = "$docs_folderpath";	var storedpath = "$docs_folderpath";
var storedpage = "$main_container_page";	var storedpage = "$main_container_page";
Line 6369 function togglePick(caller,value) {	Line 7365 function togglePick(caller,value) {
}	}
document.getElementById('multi'+caller).style.display=disp;	document.getElementById('multi'+caller).style.display=disp;
if (value == 1) {	if (value == 1) {
document.getElementById('more'+caller).innerHTML = '  <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$lt{'more'}</a>';	document.getElementById('more'+caller).innerHTML = '  <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$js_lt{'more'}</a>';
} else {	} else {
document.getElementById('more'+caller).innerHTML = '';	document.getElementById('more'+caller).innerHTML = '';
}	}
Line 6395 function togglePick(caller,value) {	Line 7391 function togglePick(caller,value) {

function toggleCheckUncheck(caller,more) {	function toggleCheckUncheck(caller,more) {
if (more == 1) {	if (more == 1) {
document.getElementById('more'+caller).innerHTML = '  <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',0);" style="text-decoration:none;">$lt{'less'}</a>';	document.getElementById('more'+caller).innerHTML = '  <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',0);" style="text-decoration:none;">$js_lt{'less'}</a>';
document.getElementById('allfields'+caller).style.display='block';	document.getElementById('allfields'+caller).style.display='block';
} else {	} else {
document.getElementById('more'+caller).innerHTML = '  <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$lt{'more'}</a>';	document.getElementById('more'+caller).innerHTML = '  <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$js_lt{'more'}</a>';
document.getElementById('allfields'+caller).style.display='none';	document.getElementById('allfields'+caller).style.display='none';
}	}
resize_scrollbox('contentscroll','1','1');	resize_scrollbox('contentscroll','1','1');
Line 6440 function checkSubmits() {	Line 7436 function checkSubmits() {
var doactions = multiActions();	var doactions = multiActions();
var cutwarnings = 0;	var cutwarnings = 0;
var remwarnings = 0;	var remwarnings = 0;
	var removalinfo = 0;
if (doactions == 1) {	if (doactions == 1) {
var remidxlist = document.cumulativeactions.allremoveidx.value;	var remidxlist = document.cumulativeactions.allremoveidx.value;
if ((remidxlist != '') && (remidxlist != null)) {	if ((remidxlist != '') && (remidxlist != null)) {
Line 6454 function checkSubmits() {	Line 7451 function checkSubmits() {
remwarnings ++;	remwarnings ++;
}	}
}	}
	if (document.getElementById('confirm_removal_'+remidxs[i])) {
	if (document.getElementById('confirm_removal_'+remidxs[i]).value == 1) {
	removalinfo ++;
	}
	}
}	}
}	}
}	}
Line 6552 function checkSubmits() {	Line 7554 function checkSubmits() {
}	}
if (doactions == 1) {	if (doactions == 1) {
if (numchanges > 0) {	if (numchanges > 0) {
if ((cutwarnings > 0) \|\| (remwarnings > 0)) {	if ((cutwarnings > 0) \|\| (remwarnings > 0) \|\| (removalinfo > 0)) {
if (remwarnings > 0) {	if (remwarnings > 0) {
if (!confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr3a"} '+remwarnings+' $lt{"p_rmr3b"}')) {	if (!confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr3a"} '+remwarnings+' $js_lt{"p_rmr3b"}')) {
	return false;
	}
	}
	if (removalinfo > 0) {
	if (!confirm('$js_lt{"p_rmr4"}\\n$js_lt{"p_rmr5"}\\n\\n$js_lt{"p_rmr3a"} '+removalinfo+' $js_lt{"p_rmr3b"}')) {
return false;	return false;
}	}
}	}
if (cutwarnings > 0) {	if (cutwarnings > 0) {
if (!confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr3a"} '+cutwarnings+' $lt{"p_ctr3b"}')) {	if (!confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr3a"} '+cutwarnings+' $js_lt{"p_ctr3b"}')) {
return false;	return false;
}	}
}	}
Line 6575 function checkSubmits() {	Line 7582 function checkSubmits() {
}	}
}	}
if ((dosettings == 1) && (doactions == 1)) {	if ((dosettings == 1) && (doactions == 1)) {
alert("$lt{'noor'}");	alert("$js_lt{'noor'}");
} else {	} else {
if (dosettings == 1) {	if (dosettings == 1) {
alert("$lt{'noch'}");	alert("$js_lt{'noch'}");
} else {	} else {
alert("$lt{'noac'}");	alert("$js_lt{'noac'}");
}	}
}	}
return false;	return false;
Line 6666 function setBoxes(value) {	Line 7673 function setBoxes(value) {
return;	return;
}	}

	function validImportCrsRes() {
	var path = document.crsresimportform.coursepath.options[document.crsresimportform.coursepath.selectedIndex].value;
	var fname = document.crsresimportform.coursefile.options[document.crsresimportform.coursefile.selectedIndex].value;
	if ((fname == '') \|\| (fname == null)) {
	alert("$js_lt{'nofi'}");
	return false;
	}
	var url = '/res/$coursedom/$coursenum/';
	if (path && path != '/') {
	url += path+'/';
	}
	if (fname != '') {
	url += fname;
	}
	var title = document.crsresimportform.crsrestitle.value;
	document.crsresimportform.importdetail.value=escape(title)+'='+escape(url);
	return true;
	}

	function validateNewRes(caller) {
	if (caller == 'single') {
	var role = document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value;
	var authorpath = document.courseresform.authorpath.options[document.courseresform.authorpath.selectedIndex].value;
	var resname = document.courseresform.newresourcename.value;
	}
	}

ENDNEWSCRIPT	ENDNEWSCRIPT
}	}

Line 6695 ENDINJECT	Line 7729 ENDINJECT

sub dump_switchserver_js {	sub dump_switchserver_js {
my @hosts = @_;	my @hosts = @_;
my %lt = &Apache::lonlocal::texthash(	my %js_lt = &Apache::lonlocal::texthash(
dump => 'Copying content to Authoring Space requires switching server.',	dump => 'Copying content to Authoring Space requires switching server.',
swit => 'Switch server?',	swit => 'Switch server?',
	);
	my %html_js_lt = &Apache::lonlocal::texthash(
	swit => 'Switch server?',
duco => 'Copying Content to Authoring Space',	duco => 'Copying Content to Authoring Space',
yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.',	yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.',
chos => 'Choose server',	chos => 'Choose server',
);	);
	&js_escape(\%js_lt);
	&html_escape(\%html_js_lt);
	&js_escape(\%html_js_lt);
my $role = $env{'request.role'};	my $role = $env{'request.role'};
my $js = <<"ENDSWJS";	my $js = <<"ENDSWJS";
<script type="text/javascript">	<script type="text/javascript">
Line 6742 ENDSWJS	Line 7782 ENDSWJS

function dump_needs_switchserver(url) {	function dump_needs_switchserver(url) {
if (url!='' && url!= null) {	if (url!='' && url!= null) {
if (confirm("$lt{'dump'}\\n$lt{'swit'}")) {	if (confirm("$js_lt{'dump'}\\n$js_lt{'swit'}")) {
go(url);	go(url);
}	}
}	}
Line 6753 function choose_switchserver_window() {	Line 7793 function choose_switchserver_window() {
newWindow = window.open('','ChooseServer','height=400,width=500,scrollbars=yes')	newWindow = window.open('','ChooseServer','height=400,width=500,scrollbars=yes')
newWindow.document.open();	newWindow.document.open();
newWindow.document.writeln('$startpage');	newWindow.document.writeln('$startpage');
newWindow.document.write('<h3>$lt{'duco'}<\\/h3>\\n'+	newWindow.document.write('<h3>$html_js_lt{'duco'}<\\/h3>\\n'+
'<p>$lt{'yone'}<\\/p>\\n'+	'<p>$html_js_lt{'yone'}<\\/p>\\n'+
'<div class="LC_left_float"><fieldset><legend>$lt{'chos'}<\\/legend>\\n'+	'<div class="LC_left_float"><fieldset><legend>$html_js_lt{'chos'}<\\/legend>\\n'+
'<form name="setserver" method="post" action="" \\/>\\n'+	'<form name="setserver" method="post" action="" \\/>\\n'+
'$hostpicker\\n'+	'$hostpicker\\n'+
'<br \\/><br \\/>\\n'+	'<br \\/><br \\/>\\n'+
'<input type="button" name="makeswitch" value="$lt{'swit'}" '+	'<input type="button" name="makeswitch" value="$html_js_lt{'swit'}" '+
'onclick="write_switchserver();" \\/>\\n'+	'onclick="write_switchserver();" \\/>\\n'+
'<\\/form><\\/fieldset><\\/div><br clear="all" \\/>\\n');	'<\\/form><\\/fieldset><\\/div><br clear="all" \\/>\\n');
newWindow.document.writeln('$endpage');	newWindow.document.writeln('$endpage');
Line 6790 sub makesimpleeditform {	Line 7830 sub makesimpleeditform {
SIMPFORM	SIMPFORM
}	}

	sub makenewproblem {
	my ($r,$coursedom,$coursenum) = @_;
	# Creating a new problem
	my ($redirect,$error);
	if ($env{'form.authorrole'}) {
	my ($newsubdir,$filename);
	if ($env{'form.newsubdir'}) {
	if ($env{'form.newsubdirname'} ne '') {
	$newsubdir = $env{'form.newsubdirname'};
	}
	}
	if ($env{'form.newresourcename'}) {
	$filename = $env{'form.newresourcename'};
	$filename =~ s/\.(\d+)(\.\w+)$/$2/;
	$filename =~ s/`//g;
	$filename =~ s{/\.\./}{_}g;
	$filename =~ s/\.+/./g;
	$filename =~ s{/+}{_}g;
	if ($filename ne '') {
	my ($name,$ext) = ($filename =~ /(.+)\.([^.]+)$/);
	if (($ext) && ($ext ne '.problem')) {
	$filename = $name.'.problem';
	} elsif ($ext eq '') {
	$filename .= '.problem';
	}
	my $docroot = $r->dir_config('lonDocRoot');
	my @ids=&Apache::lonnet::current_machine_ids();
	if ($env{'form.authorrole'} eq 'author') {
	if ($env{'user.author'}) {
	if ($env{'user.home'} && grep(/^\Q$env{'user.home'}\E$/,@ids)) {
	my $url = "/priv/$env{'user.domain'}/$env{'user.name'}";
	my $path = $docroot.$url;
	my $subdir = $env{'form.authorpath'};
	$redirect = &finishnewprob($url,$path,$subdir,$newsubdir,$filename);
	}
	}
	} elsif ($env{'form.authorrole'} eq 'course') {
	my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
	if ($chome && grep(/^\Q$chome\E$/,@ids)) {
	my $url = "/priv/$coursedom/$coursenum";
	my $path=$docroot.$url;
	my $subdir = $env{'form.authorpath'};
	$redirect = &finishnewprob($url,$path,$subdir,$newsubdir,$filename);
	if ($redirect) {
	my $rightsfile = 'default.rights';
	my $sourcerights = "$path/$rightsfile";
	my $targetrights = $docroot."/res/$coursedom/$coursenum/$rightsfile";
	my $now = time;
	if (!-e $sourcerights) {
	my $cid = $coursedom.'_'.$coursenum;
	if (open(my $fh,">$sourcerights")) {
	print $fh <<END;
	<accessrule effect="deny" realm="" type="course" role="" />
	<accessrule effect="allow" realm="$cid" type="course" role="" />
	END
	close($fh);
	}
	}
	if (!-e "$sourcerights.meta") {
	if (open(my $fh,">$sourcerights.meta")) {
	my $author=$env{'environment.firstname'}.' '.
	$env{'environment.middlename'}.' '.
	$env{'environment.lastname'}.' '.
	$env{'environment.generation'};
	$author =~ s/\s+$//;
	print $fh <<"END";

	<abstract></abstract>
	<author>$author</author>
	<authorspace>$coursenum:$coursedom</authorspace>
	<copyright>private</copyright>
	<creationdate>$now</creationdate>
	<customdistributionfile></customdistributionfile>
	<dependencies></dependencies>
	<domain>$coursedom</domain>
	<highestgradelevel>0</highestgradelevel>
	<keywords></keywords>
	<language>notset </language>
	<lastrevisiondate>$now</lastrevisiondate>
	<lowestgradelevel>0</lowestgradelevel>
	<mime>rights</mime>
	<modifyinguser>$env{'user.name'}:$env{'user.domain'}</modifyinguser>
	<notes></notes>
	<obsolete></obsolete>
	<obsoletereplacement></obsoletereplacement>
	<owner>$coursenum:$coursedom</owner>
	<rule>deny:::course,allow:$cid::course</rule>
	<sourceavail></sourceavail>
	<standards></standards>
	<subject></subject>
	<title></title>
	END
	close($fh);
	}
	if ((-e $sourcerights) && (-e "$sourcerights.meta")) {
	if (!-e "$docroot/res/$coursedom") {
	mkdir("$docroot/res/$coursedom",0755);
	}
	if (!-e "$docroot/res/$coursedom/$coursenum") {
	mkdir("$docroot/res/$coursedom/$coursenum",0755);
	}
	if ((-e "$docroot/res/$coursedom/$coursenum") && (!-e $targetrights)) {
	my $nokeyref = &Apache::lonpublisher::getnokey($r->dir_config('lonIncludes'));
	my $output = &Apache::lonpublisher::batchpublish($r,$sourcerights,$targetrights,$nokeyref,1);
	}
	}
	}
	if ($env{'form.newresourceadd'}) {
	my $template = $env{'form.template'};
	my $source = $docroot.$redirect;
	my $target = $redirect;
	$target =~ s{^/priv/}{/res/};
	$target = $docroot.$target;
	if (!-e $source) {
	my $copyfrom;
	if ($template) {
	my %templates;
	my @files = &Apache::lonhomework::get_template_list('problem');
	foreach my $poss (@files) {
	if (ref($poss) eq 'ARRAY') {
	if ($template eq $poss->[0]) {
	$templates{$template} = 1;
	last;
	}
	}
	}
	if ($templates{$template}) {
	$copyfrom = $template;
	}
	}
	unless ($copyfrom) {
	$copyfrom = $r->dir_config('lonIncludes').'/templates/blank.problem';
	}
	&File::Copy::copy($copyfrom,$source);
	}
	if (!-e "$source.meta") {
	my $cid = $coursedom.'_'.$coursenum;
	my $now = time;
	if (open(my $fh,">$source.meta")) {
	my $author=$env{'environment.firstname'}.' '.
	$env{'environment.middlename'}.' '.
	$env{'environment.lastname'}.' '.
	$env{'environment.generation'};
	$author =~ s/\s+$//;
	my $title = $env{'form.newresourcetitle'};
	$title =~ s/^\s+\|\s+$//g;
	print $fh <<END;

	<abstract></abstract>
	<author>$author</author>
	<authorspace>$coursenum:$coursedom</authorspace>
	<copyright>custom</copyright>
	<creationdate>$now</creationdate>
	<customdistributionfile>/res/$coursedom/$coursenum/default.rights</customdistributionfile>
	<dependencies></dependencies>
	<domain>$coursedom</domain>
	<highestgradelevel>0</highestgradelevel>
	<keywords></keywords>
	<language>notset </language>
	<lastrevisiondate>$now</lastrevisiondate>
	<lowestgradelevel>0</lowestgradelevel>
	<mime>problem</mime>
	<modifyinguser>$coursenum:$coursedom</modifyinguser>
	<notes></notes>
	<obsolete></obsolete>
	<obsoletereplacement></obsoletereplacement>
	<owner>$coursenum:$coursedom</owner>
	<sourceavail></sourceavail>
	<standards></standards>
	<subject></subject>
	<title>$title</title>
	END
	close($fh);
	}
	}
	}
	}
	}
	} else {
	my ($auname,$audom,$role) = split('___',$env{'form.authorrole'});
	my $rolehome = &Apache::lonnet::homeserver($auname,$audom);
	if (grep(/^\Q$rolehome\E$/,@ids)) {
	my $now = time;
	if (exists($env{'user.role.'.$role.'./'.$audom.'/'.$auname})) {
	my ($start,$end) = split(/\./,$env{'user.role.'.$role.'./'.$audom.'/'.$auname});
	if (($start <= $now) && (($end == 0) \|\| ($end >= $now))) {
	my $url = "/priv/$audom/$auname";
	my $path = $r->dir_config('lonDocRoot').$url;
	my $subdir = $env{'form.authorpath'};
	$redirect = &finishnewprob($url,$path,$subdir,$newsubdir,$filename);
	}
	}
	}
	}
	}
	}
	}
	return ($redirect,$error);
	}

	sub finishnewprob {
	my ($url,$path,$subdir,$newsubdir,$filename) = @_;
	unless (-d $path) {
	unless (mkdir($path,02770)) {
	return;
	}
	}
	my $redirect;
	if ($subdir ne '/') {
	$subdir = &cleandir($subdir);
	if (($subdir ne '') && (-d "$path/$subdir")) {
	$path .= "/$subdir";
	$url .= "/$subdir";
	}
	}
	my $dest;
	if ($newsubdir ne '') {
	$newsubdir = &cleandir($newsubdir);
	}
	if ($newsubdir ne '') {
	if (-d "$path/$newsubdir") {
	$dest = "$path/$newsubdir/$filename";
	} else {
	my $dirok;
	unless (-e "$path/$newsubdir") {
	if (mkdir("$path/$newsubdir",02770)) {
	if (chmod(02770,"$path/$newsubdir")) {
	$dirok = 1;
	}
	}
	}
	if ($dirok) {
	$dest = "$path/$newsubdir/$filename";
	}
	}
	if (($dest ne '') && (!-e $dest)) {
	$redirect = "$url/$newsubdir/$filename";
	}
	} else {
	$dest = "$path/$filename";
	if (($dest ne '') && (!-e $dest)) {
	$redirect = "$url/$filename";
	}
	}
	return $redirect;
	}

	sub cleandir {
	my ($dir) = @_;
	$dir =~ s/^\s+//;
	$dir =~ s/\s+$//;
	$dir =~ s/\.+//g;
	$dir =~ s/[\#\?&%\":]//g;
	return $dir;
	}

1;	1;
__END__	__END__

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

Removed from v.1.581
changed lines
	Added in v.1.610