loncom/interface/londocs.pm - diff

Return to londocs.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/londocs.pm between versions 1.484.2.18 and 1.513

version 1.484.2.18, 2012/12/13 04:15:30	version 1.513, 2012/12/01 15:59:01
Line 41 use Apache::lonclonecourse;	Line 41 use Apache::lonclonecourse;
use Apache::lonnavmaps;	use Apache::lonnavmaps;
use Apache::lonnavdisplay();	use Apache::lonnavdisplay();
use Apache::lonuserstate();	use Apache::lonuserstate();
	use Apache::lonextresedit();
use HTML::Entities;	use HTML::Entities;
use HTML::TokeParser;	use HTML::TokeParser;
use GDBM_File;	use GDBM_File;
Line 409 sub docs_change_log {	Line 410 sub docs_change_log {
if ($supplementalflag) {	if ($supplementalflag) {
$tid = 2;	$tid = 2;
}	}
my ($breadcrumbtrail) =	my ($breadcrumbtrail) =
&Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);	&Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);
$r->print($breadcrumbtrail.	$r->print($breadcrumbtrail.
&generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto,	&generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto,
Line 484 sub docs_change_log {	Line 485 sub docs_change_log {
':'.$docslog{$id}{'exe_udom'}.'</tt>'.	':'.$docslog{$id}{'exe_udom'}.'</tt>'.
$send_msg_link.'</td><td>'.	$send_msg_link.'</td><td>'.
$docslog{$id}{'logentry'}{'folder'}.'</td><td>');	$docslog{$id}{'logentry'}{'folder'}.'</td><td>');
my $is_supp = 0;	my $is_supp = 0;
if ($docslog{$id}{'logentry'}{'currentfolder'} =~ /^supplemental/) {	if ($docslog{$id}{'logentry'}{'currentfolder'} =~ /^supplemental/) {
$is_supp = 1;	$is_supp = 1;
}	}
Line 507 sub docs_change_log {	Line 508 sub docs_change_log {
if ($is_supp) {	if ($is_supp) {
$shown = &Apache::loncommon::parse_supplemental_title($shown);	$shown = &Apache::loncommon::parse_supplemental_title($shown);
}	}
$r->print('<li>'.$shown.'</li>');	$r->print('<li>'.$shown.'</li>');
}	}
}	}
$r->print('</ul>');	$r->print('</ul>');
Line 658 sub print_paste_buffer {	Line 659 sub print_paste_buffer {
$canpaste = &supp_pasteable($env{'docs.markedcopy_url'});	$canpaste = &supp_pasteable($env{'docs.markedcopy_url'});
unless ($canpaste) {	unless ($canpaste) {
$nopaste = &mt('Paste into Supplemental Content unavailable for this type of content.');	$nopaste = &mt('Paste into Supplemental Content unavailable for this type of content.');
}	}
} else {	} else {
$canpaste = 1;	$canpaste = 1;
}	}
Line 672 sub print_paste_buffer {	Line 673 sub print_paste_buffer {
$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) {	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.')
}	}
}	}
if ($rem =~ m{^(default\|supplemental)_?(\d*)\.(?:page\|sequence)$}) {	if ($rem =~ m{^(default\|supplemental)_?(\d*)\.(?:page\|sequence)$}) {
Line 694 sub print_paste_buffer {	Line 695 sub print_paste_buffer {
.'<legend>'.&mt('Clipboard').'</legend>');	.'<legend>'.&mt('Clipboard').'</legend>');
my ($type,$buffer);	my ($type,$buffer);
if ($is_external) {	if ($is_external) {
$type = &mt('External Resource');	$type = &mt('External Resource');
$buffer = $type.': '.	$buffer = $type.': '.
&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.	&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')';	&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')';
} else {	} else {
my $icon = &Apache::loncommon::icon($extension);	my $icon = &Apache::loncommon::icon($extension);
if ($extension eq 'sequence' &&	if ($extension eq 'sequence' &&
$env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {	$env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
$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';
}	}
$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';	$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
$buffer = $icon.$type.': '. &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}));	$buffer = $icon.$type.': '. &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}));
}	}
if ($canpaste) {	if ($canpaste) {
Line 719 sub print_paste_buffer {	Line 720 sub print_paste_buffer {
'<label>'.	'<label>'.
'<input type="radio" name="docs.markedcopy_options" value="new" checked="checked" />'.	'<input type="radio" name="docs.markedcopy_options" value="new" checked="checked" />'.
&mt('Copy to new folder').'</label>'.(' ' x2).	&mt('Copy to new folder').'</label>'.(' ' x2).
'<label>'.	'<label>'.
'<input type="radio" name="docs.markedcopy_options" value="move" />'.	'<input type="radio" name="docs.markedcopy_options" value="move" />'.
&mt('Move old folder').'</label><br />');	&mt('Move old folder').'</label><br />');
if ($env{'docs.markedcopy_nested'}) {	if ($env{'docs.markedcopy_nested'}) {
Line 731 sub print_paste_buffer {	Line 732 sub print_paste_buffer {
my %depths = (	my %depths = (
$lastdir => 0,	$lastdir => 0,
);	);
my (%display,%deps);	my (%display,%deps);
for (my $i=0; $i<@pastemaps; $i++) {	for (my $i=0; $i<@pastemaps; $i++) {
($lastdir,my $subfolderstr) = split(/\:/,$pastemaps[$i]);	($lastdir,my $subfolderstr) = split(/\:/,$pastemaps[$i]);
my ($namedir,$esctitlestr) = split(/\:/,$titles[$i]);	my ($namedir,$esctitlestr) = split(/\:/,$titles[$i]);
Line 743 sub print_paste_buffer {	Line 744 sub print_paste_buffer {
my $indent = (' ' x $offset);	my $indent = (' ' x $offset);
for (my $j=0; $j<@subfolders; $j++) {	for (my $j=0; $j<@subfolders; $j++) {
$depths{$subfolders[$j]} = $depth;	$depths{$subfolders[$j]} = $depth;
$display{$subfolders[$j]} =	$display{$subfolders[$j]} =
'<tr><td>'.$indent.$subfoldertitles[$j].' </td>'.	'<tr><td>'.$indent.$subfoldertitles[$j].' </td>'.
'<td><label>'.	'<td><label>'.
'<input type="radio" name="docs.markedcopy_'.$subfolders[$j].'" value="new" checked="checked" />'.&mt('Copy to new').'</label>'.(' ' x2).	'<input type="radio" name="docs.markedcopy_'.$subfolders[$j].'" value="new" checked="checked" />'.&mt('Copy to new').'</label>'.(' ' x2).
Line 761 sub print_paste_buffer {	Line 762 sub print_paste_buffer {
}	}
$r->print('<br /><input type="submit" name="pastemarked" value="'.&mt('Paste').'" />'.$othercrs);	$r->print('<br /><input type="submit" name="pastemarked" value="'.&mt('Paste').'" />'.$othercrs);
if ($container eq 'page') {	if ($container eq 'page') {
$r->print('	$r->print('
<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />	<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />
<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />	<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />
');	');
} else {	} else {
$r->print('	$r->print('
<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />	<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
');	');
}	}
Line 848 sub do_paste_from_buffer {	Line 849 sub do_paste_from_buffer {

my ($is_map,$srcdom,$srcnum,$prefixchg,%before,%after,%mapchanges,%tomove);	my ($is_map,$srcdom,$srcnum,$prefixchg,%before,%after,%mapchanges,%tomove);
if ($url=~/\.(page\|sequence)$/) {	if ($url=~/\.(page\|sequence)$/) {
$is_map = 1;	$is_map = 1;
}	}
if ($url =~ m{^/uploaded/($match_domain)/($match_courseid)/([^/]+)}) {	if ($url =~ m{^/uploaded/($match_domain)/($match_courseid)/([^/]+)}) {
$srcdom = $1;	$srcdom = $1;
$srcnum = $2;	$srcnum = $2;
my $oldprefix = $3;	my $oldprefix = $3;
# When paste buffer was populated using an active role in a different course	# When paste buffer was populated using an active role in a different course
# check for mdc privilege in the course from which the resource was pasted	# check for mdc privilege in the course from which the resource was pasted
if (($srcdom ne $coursedom) \|\| ($srcnum ne $coursenum)) {	if (($srcdom ne $coursedom) \|\| ($srcnum ne $coursenum)) {
unless ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {	unless ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
return (&mt('Paste failed: Item is from a different course which you do not have rights to edit.'));	return (&mt('Paste failed: Item is from a different course which you do not have rights to edit.'));
}	}
}	}
# 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 = 1;	$prefixchg = 1;
%before = ( map => 'default',	%before = ( map => 'default',
Line 907 sub do_paste_from_buffer {	Line 908 sub do_paste_from_buffer {
if ($folder =~ /^default/) {	if ($folder =~ /^default/) {
my $lastchange = &Apache::lonnet::get_coursechange($coursedom,$coursenum);	my $lastchange = &Apache::lonnet::get_coursechange($coursedom,$coursenum);
if ($lastchange > $env{'request.course.tied'}) {	if ($lastchange > $env{'request.course.tied'}) {
&reinit_role($coursedom,$coursenum,$env{"course.$env{'request.course.id'}.home"});	&reinit_role($coursedom,$coursenum,$env{"course.$env{'request.course.id'}.home"});
}	}
}	}
# If pasting a map, check if map contains other maps	# If pasting a map, check if map contains other maps
Line 925 sub do_paste_from_buffer {	Line 926 sub do_paste_from_buffer {
if ($url=~ m{^/uploaded/}) {	if ($url=~ m{^/uploaded/}) {
my $newurl;	my $newurl;
unless ($env{'form.docs.markedcopy_options'} eq 'move') {	unless ($env{'form.docs.markedcopy_options'} eq 'move') {
($newurl,my $error) =	($newurl,my $error) =
&get_newmap_url($url,$folder,$prefixchg,$coursedom,$coursenum,	&get_newmap_url($url,$folder,$prefixchg,$coursedom,$coursenum,
$srcdom,$srcnum,\$title,\%allmaps,\%newurls);	$srcdom,$srcnum,\$title,\%allmaps,\%newurls);
if ($error) {	if ($error) {
Line 952 sub do_paste_from_buffer {	Line 953 sub do_paste_from_buffer {
} elsif ($env{'docs.markedcopy_nested'}) {	} elsif ($env{'docs.markedcopy_nested'}) {
&url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,\%allmaps,\%rewrites,	&url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,\%allmaps,\%rewrites,
\%retitles,\%copies,\%dbcopies,\%zombies,\%params,\%mapmoves,	\%retitles,\%copies,\%dbcopies,\%zombies,\%params,\%mapmoves,
\%mapchanges,\%tomove,\%newsubdir,\%newurls);	\%mapchanges,\%tomove,\%newsubdir,\%newurls);
}	}
} elsif ($url=~m {^/res/}) {	} elsif ($url=~m {^/res/}) {
# published maps can only exists once, so remove it from paste buffer when done	# published maps can only exists once, so remove it from paste buffer when done
Line 966 sub do_paste_from_buffer {	Line 967 sub do_paste_from_buffer {
}	}
}	}
if ($url=~ m{/smppg$}) {	if ($url=~ m{/smppg$}) {
my $db_name = &Apache::lonsimplepage::get_db_name($url);	my $db_name = &Apache::lonsimplepage::get_db_name($url);
if ($db_name =~ /^smppage_/) {	if ($db_name =~ /^smppage_/) {
#simple pages, need to copy the db contents to a new one.	#simple pages, need to copy the db contents to a new one.
my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum);	my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum);
my $now = time();	my $now = time();
$db_name =~ s{_\d*$ }{_$now}x;	$db_name =~ s{_\d*$ }{_$now}x;
my $dbresult=&Apache::lonnet::put($db_name,\%contents,	my $dbresult=&Apache::lonnet::put($db_name,\%contents,
$coursedom,$coursenum);	$coursedom,$coursenum);
if ($dbresult eq 'ok') {	if ($dbresult eq 'ok') {
$url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;	$url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
$title=&mt('Copy of').' '.$title;	$title=&mt('Copy of').' '.$title;
} else {	} else {
return (&mt('Paste failed: An error occurred when copying the simple page.'));	return (&mt('Paste failed: An error occurred when copying the simple page.'));
}	}
}	}
}	}
$title = &LONCAPA::map::qtunescape($title);	$title = &LONCAPA::map::qtunescape($title);
my $ext='false';	my $ext='false';
Line 1023 sub do_paste_from_buffer {	Line 1024 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
my ($result,$save_err);	my ($result,$save_err);
$result =	$result =
&apply_fixups($folder,$is_map,$prefixchg,$coursedom,$coursenum,$oldurl,	&apply_fixups($folder,$is_map,$prefixchg,$coursedom,$coursenum,$oldurl,
Line 1031 sub do_paste_from_buffer {	Line 1032 sub do_paste_from_buffer {
\%copies,\%dbcopies,\%zombies,\%params,\%docmoves,	\%copies,\%dbcopies,\%zombies,\%params,\%docmoves,
\%mapmoves,\%newsubdir,$errors,\%before,\%after);	\%mapmoves,\%newsubdir,$errors,\%before,\%after);
if ($result eq 'ok') {	if ($result eq 'ok') {
if ($is_map) {	if ($is_map) {
my ($errtext,$fatal) = &mapread($coursenum,$coursedom,	my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
$folder.'.'.$container);	$folder.'.'.$container);
return $errtext if ($fatal);	return $errtext if ($fatal);
Line 1055 sub do_paste_from_buffer {	Line 1056 sub do_paste_from_buffer {
$env{'user.domain'}.'___&&&___'.$title;	$env{'user.domain'}.'___&&&___'.$title;
}	}
}	}
$LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res';	$LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res';
push(@LONCAPA::map::order, $newidx);	push(@LONCAPA::map::order, $newidx);

# Store the result	# Store the result
my ($errtext,$fatal) =	my ($errtext,$fatal) =
&storemap($coursenum,$coursedom,$folder.'.'.$container,1);	&storemap($coursenum,$coursedom,$folder.'.'.$container,1);
if ($fatal) {	if ($fatal) {
$save_err = $errtext;	$save_err = $errtext;
}	}
}	}

if ($env{'form.docs.markedcopy_options'} eq 'move') {	if ($env{'form.docs.markedcopy_options'} eq 'move') {
&Apache::lonnet::delenv('docs.markedcopy');	&Apache::lonnet::delenv('docs.markedcopy');
&Apache::lonnet::delenv('docs.markedcopy_nested');	&Apache::lonnet::delenv('docs.markedcopy_nested');
Line 1189 sub contained_map_check {	Line 1190 sub contained_map_check {
$titles->{$url}{$token->[2]->{'id'}} = $token->[2]->{'title'};	$titles->{$url}{$token->[2]->{'id'}} = $token->[2]->{'title'};
} else {	} else {
if ($allmaps->{$ressrc}) {	if ($allmaps->{$ressrc}) {
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;	$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
} elsif (ref($addedmaps->{$ressrc}) eq 'ARRAY') {	} elsif (ref($addedmaps->{$ressrc}) eq 'ARRAY') {
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;	$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
} else {	} else {
Line 1204 sub contained_map_check {	Line 1205 sub contained_map_check {
if (ref($removeparam->{$url}{$token->[2]->{'to'}}) eq 'ARRAY') {	if (ref($removeparam->{$url}{$token->[2]->{'to'}}) eq 'ARRAY') {
push(@{$removeparam->{$url}{$token->[2]->{'to'}}},$token->[2]->{'name'});	push(@{$removeparam->{$url}{$token->[2]->{'to'}}},$token->[2]->{'name'});
} else {	} else {
$removeparam->{$url}{$token->[2]->{'to'}} = [$token->[2]->{'name'}];	$removeparam->{$url}{$token->[2]->{'to'}} = [$token->[2]->{'name'}];
}	}
}	}
}	}
Line 1256 sub url_paste_fixups {	Line 1257 sub url_paste_fixups {
}	}
next if ($token->[2]->{'type'} eq 'external');	next if ($token->[2]->{'type'} eq 'external');
if ($token->[2]->{'type'} eq 'zombie') {	if ($token->[2]->{'type'} eq 'zombie') {
next if ($skip);	next if ($skip);
$zombies->{$oldurl}{$ressrc} = $id;	$zombies->{$oldurl}{$ressrc} = $id;
$changed = 1;	$changed = 1;
} elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {	} elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
Line 1288 sub url_paste_fixups {	Line 1289 sub url_paste_fixups {
}	}
if (($srcdom ne $cdom) \|\| ($srcnum ne $cnum) \|\| ($prefixchg) \|\|	if (($srcdom ne $cdom) \|\| ($srcnum ne $cnum) \|\| ($prefixchg) \|\|
($mapchanges->{$oldurl}) \|\| (($newurl ne '') && ($newurl ne $oldurl))) {	($mapchanges->{$oldurl}) \|\| (($newurl ne '') && ($newurl ne $oldurl))) {

if ($rem =~ /^(default\|supplemental)(_?\d*).(sequence\|page)$/) {	if ($rem =~ /^(default\|supplemental)(_?\d*).(sequence\|page)$/) {
$rewrites->{$oldurl}{$ressrc} = $id;	$rewrites->{$oldurl}{$ressrc} = $id;
$mapchanges->{$ressrc} = 1;	$mapchanges->{$ressrc} = 1;
Line 1306 sub url_paste_fixups {	Line 1307 sub url_paste_fixups {
}	}
}	}
} elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) {	} elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) {
next if ($skip);	next if ($skip);
my $srcdom = $1;	my $srcdom = $1;
my $srcnum = $2;	my $srcnum = $2;
if (($srcdom ne $cdom) \|\| ($srcnum ne $cnum)) {	if (($srcdom ne $cdom) \|\| ($srcnum ne $cnum)) {
Line 1326 sub url_paste_fixups {	Line 1327 sub url_paste_fixups {
}	}
} elsif ($token->[1] eq 'param') {	} elsif ($token->[1] eq 'param') {
next if ($skip);	next if ($skip);
my $to = $token->[2]->{'to'};	my $to = $token->[2]->{'to'};
if ($to ne '') {	if ($to ne '') {
if (ref($params->{$oldurl}{$to}) eq 'ARRAY') {	if (ref($params->{$oldurl}{$to}) eq 'ARRAY') {
push(@{$params->{$oldurl}{$to}},$token->[2]->{'name'});	push(@{$params->{$oldurl}{$to}},$token->[2]->{'name'});
Line 1364 sub apply_fixups {	Line 1365 sub apply_fixups {
}	}
if (@allcopies > 0) {	if (@allcopies > 0) {
foreach my $item (@allcopies) {	foreach my $item (@allcopies) {
my ($relpath,$oldsubdir,$fname) =	my ($relpath,$oldsubdir,$fname) =
($item =~ m{^(/uploaded/$match_domain/$match_courseid/(?:docs\|supplemental)/(default\|\d+)/.*/)([^/]+)$});	($item =~ m{^(/uploaded/$match_domain/$match_courseid/(?:docs\|supplemental)/(default\|\d+)/.*/)([^/]+)$});
if ($fname ne '') {	if ($fname ne '') {
my $content = &Apache::lonnet::getfile($item);	my $content = &Apache::lonnet::getfile($item);
Line 1383 sub apply_fixups {	Line 1384 sub apply_fixups {
}	}
}	}
&copy_dependencies($item,$storefn,$relpath,$errors,\$content);	&copy_dependencies($item,$storefn,$relpath,$errors,\$content);
my $copyurl =	my $copyurl =
&Apache::lonclonecourse::writefile($env{'request.course.id'},	&Apache::lonclonecourse::writefile($env{'request.course.id'},
$storefn.$fname,$content);	$storefn.$fname,$content);
if ($copyurl eq '/adm/notfound.html') {	if ($copyurl eq '/adm/notfound.html') {
Line 1529 sub apply_fixups {	Line 1530 sub apply_fixups {
}	}
foreach my $idx (keys(%remparam)) {	foreach my $idx (keys(%remparam)) {
if (ref($remparam{$idx}) eq 'ARRAY') {	if (ref($remparam{$idx}) eq 'ARRAY') {
foreach my $name (@{$remparam{$idx}}) {	foreach my $name (@{$remparam{$idx}}) {
&LONCAPA::map::delparameter($idx,'parameter_'.$name);	&LONCAPA::map::delparameter($idx,'parameter_'.$name);
}	}
}	}
Line 1693 sub editor {	Line 1694 sub editor {
$supplementalflag,$orderhash,$iconpath,$pathitem)=@_;	$supplementalflag,$orderhash,$iconpath,$pathitem)=@_;
my $container= ($env{'form.pagepath'}) ? 'page'	my $container= ($env{'form.pagepath'}) ? 'page'
: 'sequence';	: 'sequence';
	my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order);
my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =	if ($allowed) {
&Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);	(my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
$r->print($breadcrumbtrail);	&Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1);
	$r->print($breadcrumbtrail);
	}

my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";	my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";

Line 1742 sub editor {	Line 1745 sub editor {
&do_paste_from_buffer($coursenum,$coursedom,$folder,$container,	&do_paste_from_buffer($coursenum,$coursedom,$folder,$container,
\%paste_errors);	\%paste_errors);
if ($save_error ne '') {	if ($save_error ne '') {
return $save_error;	return $save_error;
}	}
if ($paste_res ne 'ok') {	if ($paste_res ne 'ok') {
$r->print('<p><span class="LC_error">'.$paste_res.'</span></p>');	$r->print('<p><span class="LC_error">'.$paste_res.'</span></p>');
Line 1776 sub editor {	Line 1779 sub editor {
my ($name,$url,$residx)=	my ($name,$url,$residx)=
map {&unescape($_)} split(/\=/,$item);	map {&unescape($_)} split(/\=/,$item);
if ($url=~ m{^\Q/uploaded/$coursedom/$coursenum/\E(default\|supplemental)_new\.(sequence\|page)$}) {	if ($url=~ m{^\Q/uploaded/$coursedom/$coursenum/\E(default\|supplemental)_new\.(sequence\|page)$}) {
my ($suffix,$errortxt,$locknotfreed) =	my ($suffix,$errortxt,$locknotfreed) =
&newmap_suffix($1,$2,$coursedom,$coursenum);	&newmap_suffix($1,$2,$coursedom,$coursenum);
if ($locknotfreed) {	if ($locknotfreed) {
$r->print($locknotfreed);	$r->print($locknotfreed);
}	}
if ($suffix) {	if ($suffix) {
$url =~ s/_new\./_$suffix./;	$url =~ s/_new\./_$suffix./;
} else {	} else {
return $errortxt;	return $errortxt;
}	}
Line 1864 sub editor {	Line 1867 sub editor {
$shown++;	$shown++;
}	}
&Apache::loncommon::end_data_table_count();	&Apache::loncommon::end_data_table_count();

if ($shown) {	if (($allowed) \|\| ($supplementalflag && $folder eq 'supplemental')) {
$to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll')	if ($shown) {
.&Apache::loncommon::start_data_table(undef,'contentlist');	if ($allowed) {
if ($allowed) {	$to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll')
$to_show .= &Apache::loncommon::start_data_table_header_row()	.&Apache::loncommon::start_data_table(undef,'contentlist')
.'<th colspan="2">'.&mt('Move').'</th>'	.&Apache::loncommon::start_data_table_header_row()
.'<th>'.&mt('Actions').'</th>'	.'<th colspan="2">'.&mt('Move').'</th>'
.'<th colspan="2">'.&mt('Document').'</th>';	.'<th>'.&mt('Actions').'</th>'
if ($folder !~ /^supplemental/) {	.'<th colspan="2">'.&mt('Document').'</th>';
$to_show .= '<th colspan="4">'.&mt('Settings').'</th>';	if ($folder !~ /^supplemental/) {
	$to_show .= '<th colspan="4">'.&mt('Settings').'</th>';
	}
	$to_show .= &Apache::loncommon::end_data_table_header_row()
	.$output.' '
	.&Apache::loncommon::end_data_table()
	.'<br style="line-height:2px;" />'
	.&Apache::loncommon::end_scrollbox();
	} else {
	$to_show = '<table><tr><td>'.&Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT')
	.'</td><td class="LC_middle">'.&mt('Tools:').'</td>'
	.'<td align="left"><ul id="LC_toolbar">'
	.'<li><a href="/adm/coursedocs?forcesupplement=1" '
	.'id="LC_content_toolbar_edittoplevel" '
	.'class="LC_toolbarItem" '
	.'title="'.&mt('Supplemental Content Editor').'">'
	.'</a></li></ul></td></tr></table><br />'
	.&Apache::loncommon::start_data_table('LC_tableOfContent')
	.$output.' '
	.&Apache::loncommon::end_data_table();
}	}
$to_show .= &Apache::loncommon::end_data_table_header_row();	} else {
	$to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
	.'<div class="LC_info" id="contentlist">'
	.&mt('Currently no documents.')
	.'</div>'
	.&Apache::loncommon::end_scrollbox();
}	}
$to_show .= $output.' '
.&Apache::loncommon::end_data_table()
.'<br style="line-height:2px;" />'
.&Apache::loncommon::end_scrollbox();
} else {	} else {
$to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')	if ($shown) {
.'<div class="LC_info" id="contentlist">'	$to_show = '<div>'
.&mt('Currently no documents.')	.&Apache::loncommon::start_data_table('LC_tableOfContent')
.'</div>'	.$output
.&Apache::loncommon::end_scrollbox();	.&Apache::loncommon::end_data_table()
	.'</div>';
	} else {
	$to_show = '<div class="LC_info" id="contentlist">'
	.&mt('Currently no documents.')
	.'</div>'
	}
}	}
my $tid = 1;	my $tid = 1;
if ($supplementalflag) {	if ($supplementalflag) {
Line 1899 sub editor {	Line 1928 sub editor {
$readfile));	$readfile));
&print_paste_buffer($r,$container,$folder,$coursedom,$coursenum);	&print_paste_buffer($r,$container,$folder,$coursedom,$coursenum);
} else {	} else {
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
#Function Box for Supplemental Content for users with mdc priv.
my $funcname = &mt('Folder Editor');
$r->print(
&Apache::loncommon::head_subbox(
&Apache::lonhtmlcommon::start_funclist().
&Apache::lonhtmlcommon::add_item_funclist(
'<a href="/adm/coursedocs?command=direct&forcesupplement=1&'.
'supppath='.&HTML::Entities::encode($env{'form.folderpath'}).'">'.
'<img src="/res/adm/pages/docs-22x22.png" alt="'.$funcname.'" class="LC_icon" />'.
'<span class="LC_menubuttons_inline_text">'.$funcname.'</span></a>').
&Apache::lonhtmlcommon::end_funclist()));
}
$r->print($to_show);	$r->print($to_show);
}	}
return;	return;
Line 2111 sub entryline {	Line 2127 sub entryline {
$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
}	}
my $isexternal;	my $isexternal;
if (!$supplementalflag && $residx) {	if ($residx) {
my $currurl = $url;	my $currurl = $url;
$currurl =~ s{^http(\|s)(&colon;\|:)//}{/adm/wrapper/ext/};	$currurl =~ s{^http(\|s)(&colon;\|:)//}{/adm/wrapper/ext/};
if ($currurl =~ m{^/adm/wrapper/ext/}) {	if ($currurl =~ m{^/adm/wrapper/ext/}) {
$isexternal = 1;	$isexternal = 1;
}	}
my $path = 'uploaded/'.	if (!$supplementalflag) {
$env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.	my $path = 'uploaded/'.
$env{'course.'.$env{'request.course.id'}.'.num'}.'/';	$env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.
$symb = &Apache::lonnet::encode_symb($path.$folder.".$container",	$env{'course.'.$env{'request.course.id'}.'.num'}.'/';
$residx,	$symb = &Apache::lonnet::encode_symb($path.$folder.".$container",
&Apache::lonnet::declutter($currurl));	$residx,
	&Apache::lonnet::declutter($currurl));
	}
}	}
my %lt;	my %lt;
if ($allowed) {	if ($allowed) {
Line 2165 sub entryline {	Line 2183 sub entryline {
my $nocut=0;	my $nocut=0;
my $noremove=0;	my $noremove=0;
if ($url=~ m{^/res/.+\.(page\|sequence)$}) {	if ($url=~ m{^/res/.+\.(page\|sequence)$}) {
# no copy for published maps	# no copy for published maps
$nocopy=1;	$nocopy=1;
}	}
if ($url=~/^\/res\/lib\/templates\//) {	if ($url=~/^\/res\/lib\/templates\//) {
$nocopy=1;	$nocopy=1;
$nocut=1;	$nocut=1;
Line 2222 sub entryline {	Line 2240 sub entryline {
}	}
}	}
my ($copylink,$cutlink,$removelink,$renamelink);	my ($copylink,$cutlink,$removelink,$renamelink);

my $skip_confirm = 0;	my $skip_confirm = 0;
if ( $folder =~ /^supplemental/	if ( $folder =~ /^supplemental/
\|\| ($url =~ m{( /smppg$	\|\| ($url =~ m{( /smppg$
Line 2231 sub entryline {	Line 2248 sub entryline {
\|/navmaps$	\|/navmaps$
\|/bulletinboard$	\|/bulletinboard$
\|\.html$)}x)	\|\.html$)}x)
\|\| $isexternal) {	\|\| $isexternal) {
$skip_confirm = 1;	$skip_confirm = 1;
}	}
if ($nocopy) {
	if ($nocopy) {
$copylink=(<<ENDCOPY);	$copylink=(<<ENDCOPY);
<span style="visibility: hidden;">$lt{'cp'}</span>	<span style="visibility: hidden;">$lt{'cp'}</span>
ENDCOPY	ENDCOPY
} else {	} else {
$copylink=(<<ENDCOPY);	$copylink=(<<ENDCOPY);
<a href="javascript:markcopy('$esc_path','$index','$renametitle','$container','$symb','$folder');" class="LC_docs_copy">$lt{'cp'}</a>	<a href="javascript:markcopy('$esc_path','$index','$renametitle','$container','$symb','$folder');" class="LC_docs_copy">$lt{'cp'}</a>
ENDCOPY	ENDCOPY
}	}
if ($nocut) {	if ($nocut) {
$cutlink=(<<ENDCUT);	$cutlink=(<<ENDCUT);
<span style="visibility: hidden;">$lt{'ct'}</span>	<span style="visibility: hidden;">$lt{'ct'}</span>
ENDCUT	ENDCUT
} else {	} else {
$cutlink=(<<ENDCUT);	$cutlink=(<<ENDCUT);
<a href="javascript:cutres('$esc_path','$index','$renametitle','$container','$symb','$folder',$skip_confirm);" class="LC_docs_cut">$lt{'ct'}</a>	<a href="javascript:cutres('$esc_path','$index','$renametitle','$container','$symb','$folder',$skip_confirm);" class="LC_docs_cut">$lt{'ct'}</a>
ENDCUT	ENDCUT
}	}
Line 2338 END	Line 2356 END
my $editlink;	my $editlink;
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//};
my $external = ($url=~s{^http(\|s)(&colon;\|:)//}{/adm/wrapper/ext/});	$url=~s{^http(\|s)(&colon;\|:)//}{/adm/wrapper/ext/};
if (!$supplementalflag && $residx && $symb) {	if (!$supplementalflag && $residx && $symb) {
if ($container eq 'page') {	if ($container eq 'page') {
$url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);	$url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
Line 2359 END	Line 2377 END
}	}
} elsif ($url=~m\|^/ext/\|) {	} elsif ($url=~m\|^/ext/\|) {
$url='/adm/wrapper'.$url;	$url='/adm/wrapper'.$url;
$external = 1;	}
}
if (&Apache::lonnet::symbverify($symb,$url)) {	if (&Apache::lonnet::symbverify($symb,$url)) {
$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);	$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
} else {	} else {
$url='';	$url='';
}	}
}	}
}	}
my ($rand_pick_text,$rand_order_text);	my ($rand_pick_text,$rand_order_text);
if ($isfolder \|\| $extension eq 'sequence') {	if ($isfolder \|\| $extension eq 'sequence') {
my $foldername=&escape($foldertitle);	my $foldername=&escape($foldertitle);
my $folderpath=$env{'form.folderpath'};	my $folderpath=$env{'form.folderpath'};
if ($folderpath) { $folderpath.='&' };	if ($folderpath) { $folderpath.='&' };
	if (!$allowed && $supplementalflag) {
	$folderpath.=$folderarg.'&'.$foldername;
	$url.='folderpath='.&escape($folderpath);
	} else {
# Append randompick number, hidden, and encrypted with ":" to foldername,	# Append randompick number, hidden, and encrypted with ":" to foldername,
# so it gets transferred between levels	# so it gets transferred between levels
$folderpath.=$folderarg.'&'.$foldername.':'.(&LONCAPA::map::getparameter($orderidx,	$folderpath.=$folderarg.'&'.$foldername.
	':'.(&LONCAPA::map::getparameter($orderidx,
'parameter_randompick'))[0]	'parameter_randompick'))[0]
.':'.((&LONCAPA::map::getparameter($orderidx,	.':'.((&LONCAPA::map::getparameter($orderidx,
'parameter_hiddenresource'))[0]=~/^yes$/i)	'parameter_hiddenresource'))[0]=~/^yes$/i)
Line 2383 END	Line 2405 END
'parameter_encrypturl'))[0]=~/^yes$/i)	'parameter_encrypturl'))[0]=~/^yes$/i)
.':'.((&LONCAPA::map::getparameter($orderidx,	.':'.((&LONCAPA::map::getparameter($orderidx,
'parameter_randomorder'))[0]=~/^yes$/i);	'parameter_randomorder'))[0]=~/^yes$/i);
$url.='folderpath='.&escape($folderpath);	$url.='folderpath='.&escape($folderpath);
my $rpicknum = (&LONCAPA::map::getparameter($orderidx,	my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
'parameter_randompick'))[0];	'parameter_randompick'))[0];
my $rpckchk;	my $rpckchk;
if ($rpicknum) {	if ($rpicknum) {
$rpckchk = ' checked="checked"';	$rpckchk = ' checked="checked"';
}	}
my $formname = 'edit_rpick_'.$orderidx;	my $formname = 'edit_rpick_'.$orderidx;
$rand_pick_text =	$rand_pick_text =
'<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n".	'<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n".
$form_common."\n".	$form_common."\n".
'<span class="LC_nobreak"><label><input type="checkbox" name="randpickon_'.$orderidx.'" id="rpick_'.$orderidx.'" onclick="'."updatePick(this.form,'$orderidx','check');".'"'.$rpckchk.' /> '.&mt('Randomly Pick').'</label><input type="hidden" name="randompick_'.$orderidx.'" id="rpicknum_'.$orderidx.'" value="'.$rpicknum.'" />';	'<span class="LC_nobreak"><label><input type="checkbox" name="randpickon_'.$orderidx.'" id="rpick_'.$orderidx.'" onclick="'."updatePick(this.form,'$orderidx','check');".'"'.$rpckchk.' /> '.&mt('Randomly Pick').'</label><input type="hidden" name="randompick_'.$orderidx.'" id="rpicknum_'.$orderidx.'" value="'.$rpicknum.'" />';
if ($rpicknum ne '') {	if ($rpicknum ne '') {
$rand_pick_text .= ': <a href="javascript:updatePick('."document.$formname,'$orderidx','link'".')">'.$rpicknum.'</a>';	$rand_pick_text .= ': <a href="javascript:updatePick('."document.$formname,'$orderidx','link'".')">'.$rpicknum.'</a>';
}	}
$rand_pick_text .= '</span></form>';	$rand_pick_text .= '</span></form>';
my $ro_set=	my $ro_set=
((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');	((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
$rand_order_text =	$rand_order_text =
$form_start.	$form_start.
$form_common.'	$form_common.'
<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onclick="'."this.form.changeparms.value='randomorder';this.form.submit()".'" '.$ro_set.' /> '.&mt('Random Order').' </label></span></form>';	<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onclick="'."this.form.changeparms.value='randomorder';this.form.submit()".'" '.$ro_set.' /> '.&mt('Random Order').' </label></span></form>';
	}
} elsif ($supplementalflag && !$allowed) {	} elsif ($supplementalflag && !$allowed) {
$url .= ($url =~ /\?/) ? 'amp;':'?';	$url .= ($url =~ /\?/) ? '&':'?';
$url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"');	$url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"');
	if ($title) {
	$url .= '&title='.&HTML::Entities::encode($renametitle,'<>&"');
	}
	if ($isexternal && $orderidx) {
	$url .= '&idx='.$orderidx;
	}
}	}
if ($ispage) {	if ($ispage) {
my $pagename=&escape($pagetitle);	my $pagename=&escape($pagetitle);
Line 2419 $form_common.'	Line 2448 $form_common.'
'&pagesymb='.&escape($symb);	'&pagesymb='.&escape($symb);
}	}
if ($allowed) {	if ($allowed) {
my $fileloc =	my $fileloc =
&Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));	&Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url));
	if ($isexternal) {
if ($external) {	$editlink = ' '.
$editlink = <<"EXTLNK";	&Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem);
	} elsif (!$isfolder && !$ispage) {
<a class="LC_docs_ext_edit" href="javascript:editext('$residx');">	my ($cfile,$home,$switchserver,$forceedit,$forceview) =
$lt{'ed'}</a>
<form action="/adm/coursedocs" method="post" name="editext_$residx">
<fieldset id="uploadext$residx" style="display: none;" />
<input type="hidden" name="active" value="aa" />
<span class="LC_nobreak">
<span class="LC_docs_ext_edit">$lt{'ul'} </span>
<input type="text" size="40" name="exturl" id="exturl_$residx" value="$orig_url" />
<a class="LC_docs_ext_edit" href="javascript:extUrlPreview('exturl_$residx');">$lt{'pr'}</a></span>
</span><br />
<span class="LC_nobreak">
<span class="LC_docs_ext_edit">$lt{'ti'} </span>
<input type="text" size="40" name="exttitle" value="$title" />
$pathitem
<input type="hidden" name="importdetail" value="" />
<input type="button" value="$lt{'sv'}" onclick="javascript:setExternal(this.form,'$residx')" />
</span>
</fieldset>
</form>
EXTLNK
} else {
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);
my $geteditlink;	if (($cfile ne '') && ($symb ne '' \|\| $supplementalflag)) {
if ($supplementalflag) {	my $jscall =
if ($orig_url eq "/adm/$env{'user.domain'}/$env{'user.name'}/aboutme") {
$geteditlink = 1;
}
} elsif (($cfile ne '') && ($symb ne '')) {
$geteditlink = 1;
}
if ($geteditlink) {
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'}),
	$renametitle);
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>';	$jscall.'" >'.&mt('Edit').'</a>';
Line 2914 ENDHEADERS	Line 2916 ENDHEADERS
'</b>');	'</b>');
foreach my $key (sort(keys(%changes))) {	foreach my $key (sort(keys(%changes))) {
#excludes not versionable problems from resource version history:	#excludes not versionable problems from resource version history:
next unless ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/);	if ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/) {
my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);	my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
my $currentversion=&Apache::lonnet::getversion($key);	my $currentversion=&Apache::lonnet::getversion($key);
if ($currentversion<0) {	if ($currentversion<0) {
Line 3105 sub startContentScreen {	Line 3107 sub startContentScreen {
if (($mode eq 'navmaps') \|\| ($mode eq 'supplemental')) {	if (($mode eq 'navmaps') \|\| ($mode eq 'supplemental')) {
$output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>    '.&mt('Content Overview').'    </b></a></li>'."\n";	$output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>    '.&mt('Content Overview').'    </b></a></li>'."\n";
$output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>     '.&mt('Content Search').'     </b></a></li>'."\n";	$output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>     '.&mt('Content Search').'     </b></a></li>'."\n";
	$output .= '<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>      '.&mt('Content Index').'      </b></a></li>'."\n";
$output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>';	$output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>';
} else {	} else {
$output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>      '.&mt('Content Editor').'      </b></a></li>'."\n";	$output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>      '.&mt('Content Editor').'      </b></a></li>'."\n";
Line 3151 sub handler {	Line 3154 sub handler {
'Adding_External_Resource','Navigate_Content',	'Adding_External_Resource','Navigate_Content',
'Adding_Folders','Docs_Overview', 'Load_Map',	'Adding_Folders','Docs_Overview', 'Load_Map',
'Supplemental','Score_Upload_Form','Adding_Pages',	'Supplemental','Score_Upload_Form','Adding_Pages',
'Importing_LON-CAPA_Resource','Importing_IMS_Course',	'Importing_LON-CAPA_Resource','Importing_IMS_Course',
'Uploading_From_Harddrive',	'Uploading_From_Harddrive',
'Check_Resource_Versions','Verify_Content') {	'Check_Resource_Versions','Verify_Content') {
$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
Line 3214 sub handler {	Line 3217 sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['folderpath','pagepath',	['folderpath','pagepath',
'pagesymb','forcesupplement','forcestandard',	'pagesymb','forcesupplement','forcestandard',
'tools','symb','command']);	'tools','symb','command','supppath']);

# standard=1: this is a "new-style" course with an uploaded map as top level	# standard=1: this is a "new-style" course with an uploaded map as top level
# standard=2: this is a "old-style" course, and there is nothing we can do	# standard=2: this is a "old-style" course, and there is nothing we can do
Line 3284 sub handler {	Line 3287 sub handler {
}	}
}	}
}	}
$path .= '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.	$path =~ s/^\&//;
&Apache::lonhtmlcommon::entity_encode($mapresobj->title()).	my $maptitle = $mapresobj->title();
	if ($mapurl eq 'default') {
	$maptitle = 'Main Course Documents';
	}
	$path .= (($path ne '')? '&' : '').
	&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
	&Apache::lonhtmlcommon::entity_encode($maptitle).
':'.$mapresobj->randompick().	':'.$mapresobj->randompick().
':'.$mapresobj->randomout().	':'.$mapresobj->randomout().
':'.$mapresobj->encrypted().	':'.$mapresobj->encrypted().
':'.$mapresobj->randomorder();	':'.$mapresobj->randomorder();
} else {	} else {
my $maptitle = &Apache::lonnet::gettitle($mapurl);	my $maptitle = &Apache::lonnet::gettitle($mapurl);
$path = '&default&...::::'.	if ($mapurl eq 'default') {
'&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.	$maptitle = 'Main Course Documents';
&Apache::lonhtmlcommon::entity_encode($maptitle).'::::';	}
	$path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
	&Apache::lonhtmlcommon::entity_encode($maptitle).'::::';
	}
	unless ($mapurl eq 'default') {
	$path = 'default&'.
	&Apache::lonhtmlcommon::entity_encode('Main Course Documents').
	'::::&'.$path;
}	}
$path = 'default&'.
&Apache::lonhtmlcommon::entity_encode('Main Course Documents').
$path;
if ($type eq 'sequence') {	if ($type eq 'sequence') {
$env{'form.folderpath'}=$path;	$env{'form.folderpath'}=$path;
$env{'form.pagepath'}='';	$env{'form.pagepath'}='';
Line 3325 sub handler {	Line 3338 sub handler {
$stored_folderpath='docs_sup_folderpath';	$stored_folderpath='docs_sup_folderpath';
}	}

# No folderpath, no pagepath, see if we have something stored	# No folderpath, no pagepath, and in edit mode, see if we have something stored
if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {	if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'}) && $allowed) {
&Apache::loncommon::restore_course_settings($stored_folderpath,	&Apache::loncommon::restore_course_settings($stored_folderpath,
{'folderpath' => 'scalar'});	{'folderpath' => 'scalar'});
}	}

# If we are not allowed to make changes, all we can see are supplemental docs	# If we are not allowed to make changes, all we can see are supplemental docs
Line 3360 sub handler {	Line 3373 sub handler {

# Store this	# Store this
unless ($toolsflag) {	unless ($toolsflag) {
&Apache::loncommon::store_course_settings($stored_folderpath,	if ($allowed) {
{'pagepath' => 'scalar',	&Apache::loncommon::store_course_settings($stored_folderpath,
'folderpath' => 'scalar'});	{'pagepath' => 'scalar',
	'folderpath' => 'scalar'});
	}
if ($env{'form.folderpath'}) {	if ($env{'form.folderpath'}) {
my (@folderpath)=split('&',$env{'form.folderpath'});	my (@folderpath)=split('&',$env{'form.folderpath'});
$env{'form.foldername'}=&unescape(pop(@folderpath));	$env{'form.foldername'}=&unescape(pop(@folderpath));
Line 3438 sub handler {	Line 3453 sub handler {
$script .= &editing_js($udom,$uname,$supplementalflag).	$script .= &editing_js($udom,$uname,$supplementalflag).
&history_tab_js().	&history_tab_js().
&inject_data_js().	&inject_data_js().
&Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr);	&Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr).
	&Apache::lonextresedit::extedit_javascript();
$addentries = {	$addentries = {
onload => "javascript:resize_scrollbox('contentscroll','1','1');",	onload => "javascript:resize_scrollbox('contentscroll','1','1');",
};	};
}	}
if ($env{'docs.markedcopy_url'}) {	if ($env{'docs.markedcopy_url'}) {
$script .= &paste_popup_js();	$script .= &paste_popup_js();
}	}
my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'.	my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'.
&mt('Switch server?');	&mt('Switch server?');


}	}
# -------------------------------------------------------------------- Body tag	# -------------------------------------------------------------------- Body tag
$script = '<script type="text/javascript">'."\n"	$script = '<script type="text/javascript">'."\n"
Line 3458 sub handler {	Line 3476 sub handler {

# Breadcrumbs	# Breadcrumbs
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::clear_breadcrumbs();
unless ($showdoc) {
	if ($showdoc) {
	$r->print(&Apache::loncommon::start_page("$crstype documents",undef,
	{'force_register' => $showdoc,}));
	} elsif ($r->uri eq '/adm/supplemental') {
	my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype);
	$r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef,
	{'bread_crumbs' => $brcrum,}));
	} else {
&Apache::lonhtmlcommon::add_breadcrumb({	&Apache::lonhtmlcommon::add_breadcrumb({
href=>"/adm/coursedocs",text=>"$crstype Contents"});	href=>"/adm/coursedocs",text=>"$crstype Contents"});

$r->print(&Apache::loncommon::start_page("$crstype Contents", $script,	$r->print(&Apache::loncommon::start_page("$crstype Contents", $script,
{'force_register' => $showdoc,	{'add_entries' => $addentries}
'add_entries' => $addentries,	)
})
.&Apache::loncommon::help_open_menu('','',273,'RAT')	.&Apache::loncommon::help_open_menu('','',273,'RAT')
.&Apache::lonhtmlcommon::breadcrumbs(	.&Apache::lonhtmlcommon::breadcrumbs(
'Editing '.$crstype.' Contents',	'Editing '.$crstype.' Contents',
'Docs_Adding_Course_Doc')	'Docs_Adding_Course_Doc')
);	);
} else {
$r->print(&Apache::loncommon::start_page("$crstype documents",undef,
{'force_register' => $showdoc,}));
}	}

my %allfiles = ();	my %allfiles = ();
Line 3544 sub handler {	Line 3566 sub handler {
'upld' => 'Import Content',	'upld' => 'Import Content',
'srch' => 'Search',	'srch' => 'Search',
'impo' => 'Import',	'impo' => 'Import',
'lnks' => 'Import from Stored Links',	'lnks' => 'Import from Stored Links',
'impm' => 'Import from Assembled Map',	'impm' => 'Import from Assembled Map',
'selm' => 'Select Map',	'selm' => 'Select Map',
'load' => 'Load Map',	'load' => 'Load Map',
Line 3566 sub handler {	Line 3588 sub handler {
'imsf' => 'IMS Import',	'imsf' => 'IMS Import',
'imsl' => 'Import IMS package',	'imsl' => 'Import IMS package',
'cms' => 'Origin of IMS package',	'cms' => 'Origin of IMS package',
'file' => 'File',
'se' => 'Select',	'se' => 'Select',
	'file' => 'File',
'title' => 'Title',	'title' => 'Title',
'comment' => 'Comment',	'comment' => 'Comment',
'url' => 'URL',	'url' => 'URL',
'prev' => 'Preview',	'prev' => 'Preview',
'lnk' => 'Add Link',	'lnk' => 'Add Link',
'parse' => 'Upload embedded images/multimedia files if HTML file',	'parse' => 'Upload embedded images/multimedia files if HTML file',
'nd' => 'Upload Document',
'pm' => 'Published Map',
'sd' => 'Special Document',
'mo' => 'More Options',
);	);
# -----------------------------------------------------------------------------	# -----------------------------------------------------------------------------
my $fileupload=(<<FIUP);	my $fileupload=(<<FIUP);
Line 3595 FIUP	Line 3613 FIUP
CHBO	CHBO
my $imsfolder = $env{'form.folder'};	my $imsfolder = $env{'form.folder'};
if ($imsfolder eq '') {	if ($imsfolder eq '') {
$imsfolder = 'default';	$imsfolder = 'default';
}	}
my $imspform=(<<IMSFORM);	my $imspform=(<<IMSFORM);
<a class="LC_menubuttons_link" href="javascript:toggleUpload('ims');">	<a class="LC_menubuttons_link" href="javascript:toggleUpload('ims');">
Line 3606 CHBO	Line 3624 CHBO
$fileupload	$fileupload
<br />	<br />
<p>	<p>
$lt{'cms'}:	$lt{'cms'}:
<select name="source">	<select name="source">
<option value="-1" selected="selected">$lt{'se'}</option>	<option value="-1" selected="selected">$lt{'se'}</option>
<option value="bb5">Blackboard 5</option>	<option value="bb5">Blackboard 5</option>
Line 3622 CHBO	Line 3640 CHBO
</form>	</form>
IMSFORM	IMSFORM

my $fileuploadform=(<<FUFORM);	my $fileuploadform=(<<FUFORM);
<a class="LC_menubuttons_link" href="javascript:toggleUpload('doc');">	<a class="LC_menubuttons_link" href="javascript:toggleUpload('doc');">
$lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}	$lt{'upfi'}</a> $help{'Uploading_From_Harddrive'}
<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">	<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
Line 3645 IMSFORM	Line 3663 IMSFORM
</form>	</form>
FUFORM	FUFORM

my $importpubform=(<<SEDFFORM);	my $importpubform=(<<SEDFFORM);
<a class="LC_menubuttons_link" href="javascript:toggleMap();">	<a class="LC_menubuttons_link" href="javascript:toggleMap();">
$lt{'impm'}</a>$help{'Load_Map'}	$lt{'impm'}</a>$help{'Load_Map'}
<form action="/adm/coursedocs" method="post" name="mapimportform">	<form action="/adm/coursedocs" method="post" name="mapimportform">
<fieldset id="importmapform" style="display: none;" />	<fieldset id="importmapform" style="display: none;" />
<legend>$lt{'impm'}</legend>	<legend>$lt{'impm'}</legend>
<input type="hidden" name="active" value="bb" />	<input type="hidden" name="active" value="bb" />
$lt{'copm'}<br />	$lt{'copm'}<br />
<span class="LC_nobreak">	<span class="LC_nobreak">
<input type="text" name="importmap" size="40" value=""	<input type="text" name="importmap" size="40" value=""
onfocus="this.blur();openbrowser('mapimportform','importmap','sequence,page','');" />	onfocus="this.blur();openbrowser('mapimportform','importmap','sequence,page','');" />
<a href="javascript:openbrowser('mapimportform','importmap','sequence,page','');">$lt{'selm'}</a><br />	<a href="javascript:openbrowser('mapimportform','importmap','sequence,page','');">$lt{'selm'}</a><br />
<input type="submit" name="loadmap" value="$lt{'load'}" />	<input type="submit" name="loadmap" value="$lt{'load'}" />
Line 3662 FUFORM	Line 3680 FUFORM
</form>	</form>

SEDFFORM	SEDFFORM
	my @importpubforma = (
my @simpleeditdefaultforma = (	{ '<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();" />' => $importpubform }	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap();" />' => $importpubform }
);	);
$importpubform = &create_form_ul(&create_list_elements(@importpubforma));	$importpubform = &create_form_ul(&create_list_elements(@importpubforma));
	my $extresourcesform =
my $extresourcesform=(<<ERFORM);	&Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
<a class="LC_menubuttons_link" href="javascript:toggleUpload('ext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}	$help{'Adding_External_Resource'});
<form action="/adm/coursedocs" method="post" name="newext">
<fieldset id="uploadextform" style="display: none;" />
<legend>$lt{'extr'}</legend>
<input type="hidden" name="active" value="aa" />
$lt{'url'}:<br />
<input type="text" size="60" name="exturl" id="exturl" value="http://" />
<input type="button" name="view" value="$lt{'prev'}" onclick="javascript:extUrlPreview('exturl');" /><br />
$lt{'title'}:<br />
<input type="text" size="60" name="exttitle" value="$lt{'extr'}" />
$pathitem
<br />
<input type="hidden" name="importdetail" value="" />
<input type="button" value="$lt{'lnk'}" onclick="javascript:setExternal(this.form,0)" />
</fieldset>
</form>
ERFORM


if ($allowed) {	if ($allowed) {
my $folder = $env{'form.folder'};	my $folder = $env{'form.folder'};
if ($folder eq '') {	if ($folder eq '') {
Line 3714 HIDDENFORM	Line 3713 HIDDENFORM
}	}

# Generate the tabs	# Generate the tabs
my $mode;	my ($mode,$needs_end);
if (($supplementalflag) && (!$allowed)) {	if (($supplementalflag) && (!$allowed)) {
&Apache::lonnavdisplay::startContentScreen($r,'supplemental');	my @folders = split('&',$env{'form.folderpath'});
	unless (@folders > 2) {
	&Apache::lonnavdisplay::startContentScreen($r,'supplemental');
	$needs_end = 1;
	}
} else {	} else {
$r->print(&startContentScreen(($supplementalflag?'suppdocs':'docs')));	$r->print(&startContentScreen(($supplementalflag?'suppdocs':'docs')));
	$needs_end = 1;
}	}

#	#
Line 3746 HIDDENFORM	Line 3750 HIDDENFORM
#$postexec='self.close();';	#$postexec='self.close();';
}	}
my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence';	my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence';
'.sequence';
my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page';	my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page';
'.page';
my $container='sequence';	my $container='sequence';
if ($env{'form.pagepath'}) {	if ($env{'form.pagepath'}) {
$container='page';	$container='page';
Line 3871 NPFORM	Line 3873 NPFORM

$newfolderform=(<<NFFORM);	$newfolderform=(<<NFFORM);
<form action="/adm/coursedocs" method="post" name="newfolder">	<form action="/adm/coursedocs" method="post" name="newfolder">
<input type="hidden" name="folderpath" value="$path" />	$pathitem
<input type="hidden" name="importdetail" value="" />	<input type="hidden" name="importdetail" value="" />
<input type="hidden" name="active" value="aa" />	<input type="hidden" name="active" value="aa" />
<a href="javascript:makenewfolder(document.newfolder,'$folderseq');">$lt{'newf'}</a>$help{'Adding_Folders'}	<a href="javascript:makenewfolder(document.newfolder,'$folderseq');">$lt{'newf'}</a>$help{'Adding_Folders'}
Line 3909 NGFFORM	Line 3911 NGFFORM
$specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));	$specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));



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},
{'<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 3996 unless ($env{'form.pagepath'}) {	Line 3997 unless ($env{'form.pagepath'}) {
$lt{'comment'}:<br />	$lt{'comment'}:<br />
<textarea cols="50" rows="4" name="comment"></textarea>	<textarea cols="50" rows="4" name="comment"></textarea>
<br />	<br />
$pathitem	$pathitem
<input type="hidden" name="cmd" value="upload_supplemental" />	<input type="hidden" name="cmd" value="upload_supplemental" />
<input type='submit' value="$lt{'upld'}" />	<input type='submit' value="$lt{'upld'}" />
</form>	</form>
	SUPDOCFORM

my $supnewfolderform=(<<SNFFORM);	my $supnewfolderform=(<<SNFFORM);
<form action="/adm/coursedocs" method="post" name="supnewfolder">	<form action="/adm/coursedocs" method="post" name="supnewfolder">
Line 4011 unless ($env{'form.pagepath'}) {	Line 4013 unless ($env{'form.pagepath'}) {
</form>	</form>
SNFFORM	SNFFORM

my $supextform=(<<ERFORM);	my $supextform =
<a class="LC_menubuttons_link" href="javascript:toggleUpload('suppext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}	&Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem,
<form action="/adm/coursedocs" method="post" name="newsuppext">	$help{'Adding_External_Resource'});
<fieldset id="uploadsuppextform" style="display: none;" />
<legend>$lt{'extr'}</legend>
<input type="hidden" name="active" value="ee" />
$lt{'url'}:<br />
<input type="text" size="60" name="exturl" id="exturl" value="http://" />
<input type="button" name="view" value="$lt{'prev'}" onclick="javascript:extUrlPreview('exturl');" /><br />
$lt{'title'}:<br />
<input type="text" size="60" name="exttitle" value="$lt{'extr'}" />
$pathitem
<br />
<input type="hidden" name="importdetail" value="" />
<input type="button" value="$lt{'lnk'}" onclick="javascript:setExternal(this.form,0)" />
</fieldset>
</form>
ERFORM

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" />
<input type="hidden" name="folderpath" value="$path" />	$pathitem
<input type="hidden" name="importdetail"	<input type="hidden" name="importdetail"
value="Syllabus=/public/$coursedom/$coursenum/syllabus" />	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
<a class="LC_menubuttons_link" href="javascript:document.supnewsyl.submit()">$lt{'syll'}</a>	<a class="LC_menubuttons_link" href="javascript:document.supnewsyl.submit()">$lt{'syll'}</a>
Line 4044 SNSFORM	Line 4031 SNSFORM
my $supnewaboutmeform=(<<SNAMFORM);	my $supnewaboutmeform=(<<SNAMFORM);
<form action="/adm/coursedocs" method="post" name="supnewaboutme">	<form action="/adm/coursedocs" method="post" name="supnewaboutme">
<input type="hidden" name="active" value="ff" />	<input type="hidden" name="active" value="ff" />
<input type="hidden" name="folderpath" value="$path" />	$pathitem
<input type="hidden" name="importdetail"	<input type="hidden" name="importdetail"
value="$plainname=/adm/$udom/$uname/aboutme" />	value="$plainname=/adm/$udom/$uname/aboutme" />
<a class="LC_menubuttons_link" href="javascript:document.supnewaboutme.submit()">$lt{'mypi'}</a>	<a class="LC_menubuttons_link" href="javascript:document.supnewaboutme.submit()">$lt{'mypi'}</a>
Line 4060 my @specialdocs = (	Line 4047 my @specialdocs = (
=>$supnewaboutmeform},	=>$supnewaboutmeform},
);	);
my @supimportdoc = (	my @supimportdoc = (
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'supext\');" />'	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'suppext\')" />'
=>$supextform},	=>$supextform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />'	{'<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 = (
'00' => ['Supnewfolder', $supnewfolderform],	'00' => ['Supnewfolder', $supnewfolderform],
Line 4086 my %suporderhash = (	Line 4074 my %suporderhash = (
}	}
}	}

$r->print(&endContentScreen());	if ($needs_end) {
	$r->print(&endContentScreen());
	}

if ($allowed) {	if ($allowed) {
$r->print('	$r->print('
Line 4353 sub generate_edit_table {	Line 4343 sub generate_edit_table {
my $backicon = $iconpath.'clickhere.gif';	my $backicon = $iconpath.'clickhere.gif';
my $backtext = &mt('To Overview');	my $backtext = &mt('To Overview');
$form = '<div class="LC_Box" style="margin:0;">'.	$form = '<div class="LC_Box" style="margin:0;">'.
'<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n".	'<ul id="navigation'.$tid.'" class="LC_TabContent">'."\n".
'<li class="goback">'.	'<li class="goback">'.
'<a href="javascript:toContents('."'$jumpto'".');">'.	'<a href="javascript:toContents('."'$jumpto'".');">'.
'<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'.	'<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'.
' alt="'.$backtext.'" />'.$backtext.'</a></li>'."\n".	' alt="'.$backtext.'" />'.$backtext.'</a></li>'."\n".
'<li>'.	'<li>'.
'<a href="javascript:groupopen('."'$readfile'".',1);">'.	'<a href="javascript:groupopen('."'$readfile'".',1);">'.
&mt('Undo Delete').'</a></li>'."\n";	&mt('Undo Delete').'</a></li>'."\n";
if ($env{'form.docslog'}) {	if ($env{'form.docslog'}) {
$form .= '<li class="active">';	$form .= '<li class="active">';
} else {	} else {
Line 4464 sub editing_js {	Line 4454 sub editing_js {
$fieldsets = "'suppext','suppdoc'";	$fieldsets = "'suppext','suppdoc'";
}	}

my $urlregexp = <<'ENDREGEXP';
/^([a-z]([a-z]\|\d\|\+\|-\|\.)):(\/\/(((([a-z]\|\d\|-\|\.\|_\|~\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\|(%[\da-f]{2})\|[!\$&'\\+,;=]\|:)@)?((\[(\|(v[\da-f]{1,}\.(([a-z]\|\d\|-\|\.\|_\|~)\|[!\$&'\\+,;=]\|:)+))\])\|((\d\|[1-9]\d\|1\d\d\|2[0-4]\d\|25[0-5])\.(\d\|[1-9]\d\|1\d\d\|2[0-4]\d\|25[0-5])\.(\d\|[1-9]\d\|1\d\d\|2[0-4]\d\|25[0-5])\.(\d\|[1-9]\d\|1\d\d\|2[0-4]\d\|25[0-5]))\|(([a-z]\|\d\|-\|\.\|_\|~\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\|(%[\da-f]{2})\|[!\$&'\\+,;=]))(:\d)?)(\/(([a-z]\|\d\|-\|\.\|_\|~\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\|(%[\da-f]{2})\|[!\$&'\\+,;=]\|:\|@))\|(\/((([a-z]\|\d\|-\|\.\|_\|~\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\|(%[\da-f]{2})\|[!\$&'\\+,;=]\|:\|@)+(\/(([a-z]\|\d\|-\|\.\|_\|~\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\|(%[\da-f]{2})\|[!\$&'\\+,;=]\|:\|@)))?)\|((([a-z]\|\d\|-\|\.\|_\|~\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\|(%[\da-f]{2})\|[!\$&'\\+,;=]\|:\|@)+(\/(([a-z]\|\d\|-\|\.\|_\|~\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\|(%[\da-f]{2})\|[!\$&'\\+,;=]\|:\|@)))\|((([a-z]\|\d\|-\|\.\|_\|~\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\|(%[\da-f]{2})\|[!\$&'\\+,;=]\|:\|@)){0})(\?((([a-z]\|\d\|-\|\.\|_\|~\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\|(%[\da-f]{2})\|[!\$&'\\+,;=]\|:\|@)\|[\uE000-\uF8FF]\|\/\|\?))?(\#((([a-z]\|\d\|-\|\.\|_\|~\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\|(%[\da-f]{2})\|[!\$&'\\+,;=]\|:\|@)\|\/\|\?)*)?$/i
ENDREGEXP

return <<ENDNEWSCRIPT;	return <<ENDNEWSCRIPT;
function makenewfolder(targetform,folderseq) {	function makenewfolder(targetform,folderseq) {
var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');	var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
Line 4485 function makenewpage(targetform,folderse	Line 4471 function makenewpage(targetform,folderse
}	}
}	}

function editext(residx) {
if (document.getElementById('uploadext'+residx)) {
var curr = document.getElementById('uploadext'+residx).style.display;
if (curr == 'none') {
disp = 'block';
} else {
disp = 'none';
}
document.getElementById('uploadext'+residx).style.display=disp;
}
resize_scrollbox('contentscroll','1','1');
return;
}

function makeexamupload() {	function makeexamupload() {
var title=prompt('$lt{"p_mxu"}');	var title=prompt('$lt{"p_mxu"}');
if (title) {	if (title) {
Line 4581 function toggleUpload(caller) {	Line 4553 function toggleUpload(caller) {

function toggleMap() {	function toggleMap() {
var disp = 'none';	var disp = 'none';
var curr = document.getElementById('importmapform').style.display;	if (document.getElementById('importmapform')) {
if (curr == 'none') {	var curr = document.getElementById('importmapform').style.display;
disp='block';	if (curr == 'none') {
}	disp='block';
document.getElementById('importmapform').style.display=disp;
resize_scrollbox('contentscroll','1','1');
return;
}


function extUrlPreview(caller) {
if (document.getElementById(caller)) {
var url = document.getElementById(caller).value;
var regexp = $urlregexp;
if (regexp.test(url)) {
openMyModal(url,500,400,'yes');
} else {
alert("$lt{'invurl'}");
}	}
	document.getElementById('importmapform').style.display=disp;
	resize_scrollbox('contentscroll','1','1');
}	}
	return;
}	}

function makeims(imsform) {	function makeims(imsform) {
Line 4616 function makeims(imsform) {	Line 4577 function makeims(imsform) {
imsform.submit();	imsform.submit();
}	}

function setExternal(extform,residx) {
var title=extform.exttitle.value;
if (!String.trim) {
String.prototype.trim = function() {return this.replace(\/^\\s+\|\\s+$\/g, "");}; }
var url=extform.exturl.value;
var regexp = $urlregexp;
if (title == null \|\| title.trim()=="") {
alert("$lt{'titbl'}");
extform.exttitle.focus();
return;
}
if (regexp.test(url)) {
url = escape(url);
if (residx > 0) {
eval("extform.importdetail.value=title+'='+url+'='+residx;extform.submit();");
} else {
eval("extform.importdetail.value=title+'='+url;extform.submit();");
}
} else {
alert("$lt{'invurl'}");
extform.exturl.focus();
return;
}
}

function changename(folderpath,index,oldtitle,container,pagesymb) {	function changename(folderpath,index,oldtitle,container,pagesymb) {
var title=prompt('$lt{"p_chn"}',oldtitle);	var title=prompt('$lt{"p_chn"}',oldtitle);
if (title) {	if (title) {

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

Removed from v.1.484.2.18
changed lines
	Added in v.1.513