|
version 1.484.2.29, 2013/03/17 23:55:01
|
version 1.485, 2012/05/09 19:46:30
|
|
Line 40 use Apache::lonxml;
|
Line 40 use Apache::lonxml;
|
| use Apache::lonclonecourse; |
use Apache::lonclonecourse; |
| use Apache::lonnavmaps; |
use Apache::lonnavmaps; |
| use Apache::lonnavdisplay(); |
use Apache::lonnavdisplay(); |
| use Apache::lonextresedit(); |
|
| use HTML::Entities; |
use HTML::Entities; |
| use HTML::TokeParser; |
|
| use GDBM_File; |
use GDBM_File; |
| use Apache::lonlocal; |
use Apache::lonlocal; |
| use Cwd; |
use Cwd; |
|
Line 69 sub mapread {
|
Line 67 sub mapread {
|
| } |
} |
| |
|
| sub storemap { |
sub storemap { |
| my ($coursenum,$coursedom,$map,$contentchg)=@_; |
my ($coursenum,$coursedom,$map)=@_; |
| my $report; |
|
| if (($contentchg) && ($map =~ /^default/)) { |
|
| $report = 1; |
|
| } |
|
| my ($outtext,$errtext)= |
my ($outtext,$errtext)= |
| &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. |
&LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. |
| $map,1,$report); |
$map,1); |
| if ($errtext) { return ($errtext,2); } |
if ($errtext) { return ($errtext,2); } |
| |
|
| $hadchanges=1; |
$hadchanges=1; |
|
Line 152 sub dumpcourse {
|
Line 146 sub dumpcourse {
|
| $r->print(&endContentScreen()); |
$r->print(&endContentScreen()); |
| return ''; |
return ''; |
| } |
} |
| my ($ca,$cd)=split(/\:/,$env{'form.authorspace'}); |
my ($ca,$cd)=split(/\@/,$env{'form.authorspace'}); |
| $r->print('<h3>'.&mt('Copying Files').'</h3>'); |
$r->print('<h3>'.&mt('Copying Files').'</h3>'); |
| my $title=$env{'form.authorfolder'}; |
my $title=$env{'form.authorfolder'}; |
| $title=&clean($title); |
$title=&clean($title); |
|
Line 270 sub dumpcourse {
|
Line 264 sub dumpcourse {
|
| |
|
| sub group_import { |
sub group_import { |
| my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_; |
my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_; |
| my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap, |
|
| %removeparam,$importuploaded,$fixuperrors); |
|
| $allmaps = {}; |
|
| while (@files) { |
while (@files) { |
| my ($name, $url, $residx) = @{ shift(@files) }; |
my ($name, $url, $residx) = @{ shift(@files) }; |
| if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) |
if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) |
|
Line 289 sub group_import {
|
Line 281 sub group_import {
|
| $env{'form.output'}=$newmapstr; |
$env{'form.output'}=$newmapstr; |
| my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom, |
my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom, |
| 'output',$1.$2); |
'output',$1.$2); |
| if ($result !~ m{^/uploaded/}) { |
if ($result != m|^/uploaded/|) { |
| $errtext.='Map not saved: A network error occurred when trying to save the new map. '; |
$errtext.='Map not saved: A network error occurred when trying to save the new map. '; |
| $fatal = 2; |
$fatal = 2; |
| } |
} |
|
Line 298 sub group_import {
|
Line 290 sub group_import {
|
| } |
} |
| } |
} |
| if ($url) { |
if ($url) { |
| if (($caller eq 'londocs') && |
|
| ($folder =~ /^default/)) { |
|
| if (($url =~ /\.(page|sequence)$/) && (!$donechk)) { |
|
| my $chome = &Apache::lonnet::homeserver($coursenum,$coursedom); |
|
| my $cid = $coursedom.'_'.$coursenum; |
|
| $allmaps = |
|
| &Apache::loncommon::allmaps_incourse($coursedom,$coursenum, |
|
| $chome,$cid); |
|
| $donechk = 1; |
|
| } |
|
| if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) { |
|
| &contained_map_check($url,$folder,\%removefrommap,\%removeparam, |
|
| \%addedmaps,\%hierarchy,\%titles,$allmaps); |
|
| $importuploaded = 1; |
|
| } elsif ($url =~ m{^/res/.+\.(page|sequence)$}) { |
|
| next if ($allmaps->{$url}); |
|
| } |
|
| } |
|
| if (!$residx |
if (!$residx |
| || defined($LONCAPA::map::zombies[$residx])) { |
|| defined($LONCAPA::map::zombies[$residx])) { |
| $residx = &LONCAPA::map::getresidx($url,$residx); |
$residx = &LONCAPA::map::getresidx($url,$residx); |
|
Line 325 sub group_import {
|
Line 299 sub group_import {
|
| if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; } |
if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; } |
| $url = &LONCAPA::map::qtunescape($url); |
$url = &LONCAPA::map::qtunescape($url); |
| $name = &LONCAPA::map::qtunescape($name); |
$name = &LONCAPA::map::qtunescape($name); |
| if ($name eq '') { |
|
| $name = &mt('Web Page'); |
|
| } |
|
| if ($url =~ m{^/uploaded/$coursedom/$coursenum/((?:docs|supplemental)/(?:default|\d+))/new\.html$}) { |
|
| my $filepath = $1; |
|
| my $fname = $name; |
|
| if ($fname =~ /^\W+$/) { |
|
| $fname = 'web'; |
|
| } else { |
|
| $fname =~ s/\W/_/g; |
|
| } |
|
| if (length($fname > 15)) { |
|
| $fname = substr($fname,0,14); |
|
| } |
|
| my $initialtext = &mt('Replace with your own content.'); |
|
| my $newhtml = <<END; |
|
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
|
| <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> |
|
| <head> |
|
| <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
|
| <title>$name</title> |
|
| </head> |
|
| <body bgcolor="#ffffff"> |
|
| $initialtext |
|
| </body> |
|
| </html> |
|
| END |
|
| $env{'form.output'}=$newhtml; |
|
| my $result = |
|
| &Apache::lonnet::finishuserfileupload($coursenum,$coursedom, |
|
| 'output', |
|
| "$filepath/$residx/$fname.html"); |
|
| if ($result =~ m{^/uploaded/}) { |
|
| $url = $result; |
|
| if ($filepath =~ /^supplemental/) { |
|
| $name = time.'___&&&___'.$env{'user.name'}.'___&&&___'. |
|
| $env{'user.domain'}.'___&&&___'.$name; |
|
| } |
|
| } else { |
|
| return (&mt('Failed to save new web page.'),1); |
|
| } |
|
| } |
|
| $LONCAPA::map::resources[$residx] = |
$LONCAPA::map::resources[$residx] = |
| join(':', ($name, $url, $ext, 'normal', 'res')); |
join(':', ($name, $url, $ext, 'normal', 'res')); |
| } |
} |
| } |
} |
| if ($importuploaded) { |
return &storemap($coursenum, $coursedom, $folder.'.'.$container); |
| my %import_errors; |
} |
| my %updated = ( |
|
| removefrommap => \%removefrommap, |
sub breadcrumbs { |
| removeparam => \%removeparam, |
my ($allowed,$crstype)=@_; |
| ); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
| my ($result,$msgsarray,$lockerror) = |
my (@folders); |
| &apply_fixups($folder,1,$coursedom,$coursenum,\%import_errors,\%updated); |
if ($env{'form.pagepath'}) { |
| if (keys(%import_errors) > 0) { |
@folders = split('&',$env{'form.pagepath'}); |
| $fixuperrors = |
} else { |
| '<p span class="LC_warning">'."\n". |
@folders=split('&',$env{'form.folderpath'}); |
| &mt('The following files are either dependencies of a web page or references within a folder and/or composite page for which errors occurred during import:')."\n". |
} |
| '<ul>'."\n"; |
my $folderpath; |
| foreach my $key (sort(keys(%import_errors))) { |
my $cpinfo=''; |
| $fixuperrors .= '<li>'.$key.'</li>'."\n"; |
my $plain=''; |
| } |
my $randompick=-1; |
| $fixuperrors .= '</ul></p>'."\n"; |
my $isencrypted=0; |
| } |
my $ishidden=0; |
| if (ref($msgsarray) eq 'ARRAY') { |
my $is_random_order=0; |
| if (@{$msgsarray} > 0) { |
while (@folders) { |
| $fixuperrors .= '<p class="LC_info">'. |
my $folder=shift(@folders); |
| join('<br />',@{$msgsarray}). |
my $foldername=shift(@folders); |
| '</p>'; |
if ($folderpath) {$folderpath.='&';} |
| } |
$folderpath.=$folder.'&'.$foldername; |
| } |
my $url; |
| if ($lockerror) { |
if ($allowed) { |
| $fixuperrors .= '<p class="LC_error">'. |
$url = '/adm/coursedocs?folderpath='; |
| $lockerror. |
} else { |
| '</p>'; |
$url = '/adm/supplemental?folderpath='; |
| } |
} |
| } |
$url .= &escape($folderpath); |
| my ($errtext,$fatal) = |
my $name=&unescape($foldername); |
| &storemap($coursenum, $coursedom, $folder.'.'.$container,1); |
# randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername |
| return ($errtext,$fatal,$fixuperrors); |
$name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//; |
| |
if ($1 ne '') { |
| |
$randompick=$1; |
| |
} else { |
| |
$randompick=-1; |
| |
} |
| |
if ($2) { $ishidden=1; } |
| |
if ($3) { $isencrypted=1; } |
| |
if ($4 ne '') { $is_random_order = 1; } |
| |
if ($folder eq 'supplemental') { |
| |
$name = &mt('Supplemental '.$crstype.' Content'); |
| |
} |
| |
&Apache::lonhtmlcommon::add_breadcrumb( |
| |
{'href'=>$url.$cpinfo, |
| |
'title'=>$name, |
| |
'text'=>$name, |
| |
'no_mt'=>1, |
| |
}); |
| |
$plain.=$name.' > '; |
| |
} |
| |
$plain=~s/\>\;\s*$//; |
| |
return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp', |
| |
undef, undef, 1 ),$randompick,$ishidden, |
| |
$isencrypted,$plain,$is_random_order); |
| } |
} |
| |
|
| sub log_docs { |
sub log_docs { |
| return &Apache::lonnet::write_log('course','docslog',@_); |
return &Apache::lonnet::instructor_log('docslog',@_); |
| } |
} |
| |
|
| { |
{ |
|
Line 470 sub log_docs {
|
Line 425 sub log_docs {
|
| |
|
| sub docs_change_log { |
sub docs_change_log { |
| my ($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath)=@_; |
my ($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath)=@_; |
| my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/); |
|
| 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". |
|
| &history_tab_js()."\n". |
&history_tab_js()."\n". |
| &Apache::lonratedt::editscript('simple')."\n". |
&Apache::lonratedt::editscript('simple')."\n". |
| '// ]]>'."\n". |
'// ]]>'."\n". |
| '</script>'."\n"; |
'</script>'."\n"; |
| $r->print(&Apache::loncommon::start_page('Content Change Log',$js)); |
$r->print(&Apache::loncommon::start_page('Content Change Log',$js)); |
| $r->print(&Apache::lonhtmlcommon::breadcrumbs('Content Change Log')); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Content Change Log')); |
| $r->print(&startContentScreen(($supplementalflag?'suppdocs':'docs'))); |
$r->print(&startContentScreen('docs')); |
| my %orderhash; |
my %orderhash; |
| my $container='sequence'; |
my $container='sequence'; |
| my $pathitem; |
my $pathitem; |
| if ($env{'form.folderpath'} =~ /\:1$/) { |
if ($env{'form.pagepath'}) { |
| $container='page'; |
$container='page'; |
| |
$pathitem = '<input type="hidden" name="pagepath" value="'. |
| |
&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'; |
| |
} else { |
| |
my $folderpath=$env{'form.folderpath'}; |
| |
if ($folderpath eq '') { |
| |
$folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Documents')); |
| |
} |
| |
$pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />'; |
| } |
} |
| my $folderpath=$env{'form.folderpath'}; |
|
| if ($folderpath eq '') { |
|
| $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Documents').':::::'); |
|
| } |
|
| $pathitem = '<input type="hidden" name="folderpath" value="'. |
|
| &HTML::Entities::encode($folderpath,'<>&"').'" />'; |
|
| my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container"; |
my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container"; |
| my $jumpto = $readfile; |
my $jumpto = $readfile; |
| $jumpto =~ s{^/}{}; |
$jumpto =~ s{^/}{}; |
| my $tid = 1; |
my $tid = 1; |
| if ($supplementalflag) { |
my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype); |
| $tid = 2; |
|
| } |
|
| my ($breadcrumbtrail) = |
|
| &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, |
| $readfile)); |
$readfile)); |
|
Line 576 sub docs_change_log {
|
Line 527 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; |
|
| if ($docslog{$id}{'logentry'}{'currentfolder'} =~ /^supplemental/) { |
|
| $is_supp = 1; |
|
| } |
|
| # Before |
# Before |
| for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) { |
for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) { |
| my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0]; |
my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0]; |
| my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0]; |
my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0]; |
| if ($oldname ne $newname) { |
if ($oldname ne $newname) { |
| my $shown = &LONCAPA::map::qtescape($oldname); |
$r->print(&LONCAPA::map::qtescape($oldname)); |
| if ($is_supp) { |
|
| $shown = &Apache::loncommon::parse_supplemental_title($shown); |
|
| } |
|
| $r->print($shown); |
|
| } |
} |
| } |
} |
| $r->print('<ul>'); |
$r->print('<ul>'); |
| for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) { |
for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) { |
| if ($docslog{$id}{'logentry'}{'before_order_res_'.$idx}) { |
if ($docslog{$id}{'logentry'}{'before_order_res_'.$idx}) { |
| my $shown = &LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]); |
$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]).'</li>'); |
| if ($is_supp) { |
|
| $shown = &Apache::loncommon::parse_supplemental_title($shown); |
|
| } |
|
| $r->print('<li>'.$shown.'</li>'); |
|
| } |
} |
| } |
} |
| $r->print('</ul>'); |
$r->print('</ul>'); |
|
Line 610 sub docs_change_log {
|
Line 549 sub docs_change_log {
|
| my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0]; |
my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0]; |
| my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0]; |
my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0]; |
| if ($oldname ne '' && $oldname ne $newname) { |
if ($oldname ne '' && $oldname ne $newname) { |
| my $shown = &LONCAPA::map::qtescape($newname); |
$r->print(&LONCAPA::map::qtescape($newname)); |
| if ($is_supp) { |
|
| $shown = &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($newname)); |
|
| } |
|
| $r->print($shown); |
|
| } |
} |
| } |
} |
| $r->print('<ul>'); |
$r->print('<ul>'); |
| for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) { |
for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) { |
| if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) { |
if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) { |
| my $shown = &LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]); |
$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]).'</li>'); |
| if ($is_supp) { |
|
| $shown = &Apache::loncommon::parse_supplemental_title($shown); |
|
| } |
|
| $r->print('<li>'.$shown.'</li>'); |
|
| } |
} |
| } |
} |
| $r->print('</ul>'); |
$r->print('</ul>'); |
|
Line 654 sub docs_change_log {
|
Line 585 sub docs_change_log {
|
| } |
} |
| |
|
| sub update_paste_buffer { |
sub update_paste_buffer { |
| my ($coursenum,$coursedom,$folder) = @_; |
my ($coursenum,$coursedom) = @_; |
| |
|
| return if (!defined($env{'form.markcopy'})); |
return if (!defined($env{'form.markcopy'})); |
| return if (!defined($env{'form.copyfolder'})); |
return if (!defined($env{'form.copyfolder'})); |
|
Line 669 sub update_paste_buffer {
|
Line 600 sub update_paste_buffer {
|
| my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]); |
my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]); |
| if (&is_supplemental_title($title)) { |
if (&is_supplemental_title($title)) { |
| &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title}); |
&Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title}); |
| ($title) = &Apache::loncommon::parse_supplemental_title($title); |
($title) = &parse_supplemental_title($title); |
| } elsif ($env{'docs.markedcopy_supplemental'}) { |
} elsif ($env{'docs.markedcopy_supplemental'}) { |
| &Apache::lonnet::delenv('docs.markedcopy_supplemental'); |
&Apache::lonnet::delenv('docs.markedcopy_supplemental'); |
| } |
} |
| $url=~s{http(:|:)//https(:|:)//}{https$2//}; |
$url=~s{http(:|:)//https(:|:)//}{https$2//}; |
| |
|
| (my $cmd,undef)=split('_',$env{'form.cmd'}); |
&Apache::lonnet::appenv({'docs.markedcopy_title' => $title, |
| |
'docs.markedcopy_url' => $url}); |
| my %addtoenv = ( |
|
| 'docs.markedcopy_title' => $title, |
|
| 'docs.markedcopy_url' => $url, |
|
| 'docs.markedcopy_cmd' => $cmd, |
|
| ); |
|
| &Apache::lonnet::delenv('docs.markedcopy_nested'); |
|
| &Apache::lonnet::delenv('docs.markedcopy_nestednames'); |
|
| if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(default|supplemental)_?(\d*)\.(page|sequence)$}) { |
|
| my $prefix = $1; |
|
| my $subdir =$2; |
|
| if ($subdir eq '') { |
|
| $subdir = $prefix; |
|
| } |
|
| my (%addedmaps,%removefrommap,%removeparam,%hierarchy,%titles,%allmaps); |
|
| &contained_map_check($url,$folder,\%removefrommap,\%removeparam,\%addedmaps, |
|
| \%hierarchy,\%titles,\%allmaps); |
|
| if (ref($hierarchy{$url}) eq 'HASH') { |
|
| my ($nested,$nestednames); |
|
| &recurse_uploaded_maps($url,$subdir,\%hierarchy,\%titles,\$nested,\$nestednames); |
|
| $nested =~ s/\&$//; |
|
| $nestednames =~ s/\Q___&&&___\E$//; |
|
| if ($nested ne '') { |
|
| $addtoenv{'docs.markedcopy_nested'} = $nested; |
|
| } |
|
| if ($nestednames ne '') { |
|
| $addtoenv{'docs.markedcopy_nestednames'} = $nestednames; |
|
| } |
|
| } |
|
| } |
|
| &Apache::lonnet::appenv(\%addtoenv); |
|
| delete($env{'form.markcopy'}); |
delete($env{'form.markcopy'}); |
| } |
} |
| |
|
| sub recurse_uploaded_maps { |
|
| my ($url,$dir,$hierarchy,$titlesref,$nestref,$namesref) = @_; |
|
| if (ref($hierarchy->{$url}) eq 'HASH') { |
|
| my @maps = map { $hierarchy->{$url}{$_}; } sort { $a <=> $b } (keys(%{$hierarchy->{$url}})); |
|
| my @titles = map { $titlesref->{$url}{$_}; } sort { $a <=> $b } (keys(%{$titlesref->{$url}})); |
|
| my (@uploaded,@names,%shorter); |
|
| for (my $i=0; $i<@maps; $i++) { |
|
| my ($inner) = ($maps[$i] =~ m{^/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_(\d+)\.(?:page|sequence)$}); |
|
| if ($inner ne '') { |
|
| push(@uploaded,$inner); |
|
| push(@names,&escape($titles[$i])); |
|
| $shorter{$maps[$i]} = $inner; |
|
| } |
|
| } |
|
| $$nestref .= "$dir:".join(',',@uploaded).'&'; |
|
| $$namesref .= "$dir:".(join(',',@names)).'___&&&___'; |
|
| foreach my $map (@maps) { |
|
| if ($shorter{$map} ne '') { |
|
| &recurse_uploaded_maps($map,$shorter{$map},$hierarchy,$titlesref,$nestref,$namesref); |
|
| } |
|
| } |
|
| } |
|
| return; |
|
| } |
|
| |
|
| sub print_paste_buffer { |
sub print_paste_buffer { |
| my ($r,$container,$folder,$coursedom,$coursenum) = @_; |
my ($r,$container) = @_; |
| return if (!defined($env{'docs.markedcopy_url'})); |
return if (!defined($env{'docs.markedcopy_url'})); |
| |
|
| my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent); |
$r->print('<fieldset>' |
| my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1]; |
.'<legend>'.&mt('Clipboard').'</legend>' |
| if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { |
.'<form name="pasteform" action="/adm/coursedocs" method="post">' |
| $is_external = 1; |
.'<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ' |
| } |
); |
| |
|
| my ($canpaste,$nopaste,$othercrs,$areachange); |
|
| if ($folder =~ /^supplemental/) { |
|
| $canpaste = &supp_pasteable($env{'docs.markedcopy_url'}); |
|
| unless ($canpaste) { |
|
| $nopaste = &mt('Paste into Supplemental Content unavailable for this type of content.'); |
|
| } |
|
| } else { |
|
| $canpaste = 1; |
|
| } |
|
| |
|
| if ($canpaste) { |
my $type; |
| if ($env{'docs.markedcopy_url'} =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) { |
if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { |
| my $srcdom = $1; |
$type = &mt('External Resource'); |
| my $srcnum = $2; |
$r->print($type.': '. |
| my $rem = $3; |
&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('. |
| if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) { |
&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')'); |
| $othercourse = 1; |
} else { |
| if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) { |
my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1]; |
| if ($canpaste) { |
my $icon = &Apache::loncommon::icon($extension); |
| $othercrs = '<br />'.&mt('(from another course).'); |
if ($extension eq 'sequence' && |
| } |
$env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) { |
| } else { |
$icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
| $canpaste = 0; |
$icon .= '/navmap.folder.closed.gif'; |
| $nopaste = &mt('Paste from another course unavailable.') |
} |
| } |
$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />'; |
| } |
$r->print($icon.$type.': '. &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}))); |
| if ($rem =~ m{^(default|supplemental)_?(\d*)\.(?:page|sequence)$}) { |
|
| my $prefix = $1; |
|
| $parent = $2; |
|
| if ($folder !~ /^\Q$prefix\E/) { |
|
| $areachange = 1; |
|
| } |
|
| $is_uploaded_map = 1; |
|
| } |
|
| } |
|
| } |
} |
| |
if ($container eq 'page') { |
| $r->print('<fieldset>' |
$r->print(' |
| .'<legend>'.&mt('Clipboard').'</legend>'); |
<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" /> |
| my ($type,$buffer); |
<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" /> |
| if ($is_external) { |
'); |
| $type = &mt('External Resource'); |
|
| $buffer = $type.': '. |
|
| &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('. |
|
| &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')'; |
|
| } else { |
} else { |
| my $icon = &Apache::loncommon::icon($extension); |
$r->print(' |
| if ($extension eq 'sequence' && |
|
| $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) { |
|
| $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
|
| $icon .= '/navmap.folder.closed.gif'; |
|
| } |
|
| $icon = '<img src="'.$icon.'" alt="" class="LC_icon" />'; |
|
| $buffer = $icon.$type.': '. &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})); |
|
| } |
|
| if ($canpaste) { |
|
| $r->print('<form name="pasteform" action="/adm/coursedocs" method="post">'.$buffer); |
|
| if ((!$areachange) && (!$othercourse) && |
|
| ($env{'docs.markedcopy_cmd'} eq 'cut')) { |
|
| if (($is_uploaded_map) || |
|
| ($env{'docs.markedcopy_url'} =~ /(bulletinboard|smppg)$/) || |
|
| ($env{'docs.markedcopy_url'} =~ m{^/uploaded/$coursedom/$coursenum/(?:docs|supplemental)/(.+)$})) { |
|
| my ($copytext,$movetext); |
|
| if ($is_uploaded_map) { |
|
| $copytext = &mt('Copy to new folder'); |
|
| $movetext = &mt('Move old folder'); |
|
| } elsif ($env{'docs.markedcopy_url'} =~ /bulletinboard$/) { |
|
| $copytext = &mt('Copy to new bulletin board (not posts)'); |
|
| $movetext = &mt('Move old bulletin board (not posts)'); |
|
| } elsif ($env{'docs.markedcopy_url'} =~ /smppg$/) { |
|
| $copytext = &mt('Copy to new simple page'); |
|
| $movetext = &mt('Move old simple page'); |
|
| } else { |
|
| $copytext = &mt('Copy to new uploaded document'); |
|
| $movetext = &mt('Move old uploaded document'); |
|
| } |
|
| $r->print((' 'x 4).'<span id="pasteoptionstext">'. |
|
| '<a href="javascript:showPasteOptions();" class="LC_menubuttons_link">'. |
|
| &mt('Show Paste Options').'</a></span><br />'. |
|
| '<div id="pasteoptions" class="LC_dccid">'.(' 'x 4). |
|
| '<label>'. |
|
| '<input type="radio" name="docs.markedcopy_options" value="new" checked="checked" />'. |
|
| $copytext.'</label>'.(' ' x2). |
|
| '<label>'. |
|
| '<input type="radio" name="docs.markedcopy_options" value="move" />'. |
|
| $movetext.'</label><br />'); |
|
| if (($is_uploaded_map) && ($env{'docs.markedcopy_nested'})) { |
|
| $r->print('<br />'.&mt('Folder to paste contains sub-folders'). |
|
| '<br /><table border="0">'); |
|
| my @pastemaps = split(/\&/,$env{'docs.markedcopy_nested'}); |
|
| my @titles = split(/\Q___&&&___\E/,$env{'docs.markedcopy_nestednames'}); |
|
| my $lastdir = $parent; |
|
| my %depths = ( |
|
| $lastdir => 0, |
|
| ); |
|
| my (%display,%deps); |
|
| for (my $i=0; $i<@pastemaps; $i++) { |
|
| ($lastdir,my $subfolderstr) = split(/\:/,$pastemaps[$i]); |
|
| my ($namedir,$esctitlestr) = split(/\:/,$titles[$i]); |
|
| my @subfolders = split(/,/,$subfolderstr); |
|
| $deps{$lastdir} = \@subfolders; |
|
| my @subfoldertitles = map { &unescape($_); } split(/,/,$esctitlestr); |
|
| my $depth = $depths{$lastdir} + 1; |
|
| my $offset = int($depth * 4); |
|
| my $indent = (' ' x $offset); |
|
| for (my $j=0; $j<@subfolders; $j++) { |
|
| $depths{$subfolders[$j]} = $depth; |
|
| $display{$subfolders[$j]} = |
|
| '<tr><td>'.$indent.$subfoldertitles[$j].' </td>'. |
|
| '<td><label>'. |
|
| '<input type="radio" name="docs.markedcopy_'.$subfolders[$j].'" value="new" checked="checked" />'.&mt('Copy to new').'</label>'.(' ' x2). |
|
| '<label>'. |
|
| '<input type="radio" name="docs.markedcopy_'.$subfolders[$j].'" value="move" />'. |
|
| &mt('Move old').'</label>'. |
|
| '</td></tr>'; |
|
| } |
|
| } |
|
| &recurse_print($r,$parent,\%deps,\%display); |
|
| $r->print('</table>'); |
|
| } |
|
| $r->print('</div>'); |
|
| } |
|
| } |
|
| $r->print('<br /><input type="submit" name="pastemarked" value="'.&mt('Paste').'" />'.$othercrs); |
|
| $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'},'<>&"').'" /> |
| '); |
'); |
| $r->print('</form>'); |
|
| } else { |
|
| $r->print(&mt('Paste buffer contains:').' '.$buffer. |
|
| '<br /><p class="LC_info">'.$nopaste.'</p>'); |
|
| } |
} |
| $r->print('</fieldset>'); |
$r->print('</form></fieldset>'); |
| } |
} |
| |
|
| sub recurse_print { |
|
| my ($r,$dir,$deps,$display) = @_; |
|
| $r->print($display->{$dir}."\n"); |
|
| if (ref($deps->{$dir}) eq 'ARRAY') { |
|
| foreach my $subdir (@{$deps->{$dir}}) { |
|
| &recurse_print($r,$subdir,$deps,$display); |
|
| } |
|
| } |
|
| } |
|
| |
|
| sub supp_pasteable { |
|
| my ($url) = @_; |
|
| if (($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//}) || |
|
| (($url =~ /\.sequence$/) && ($url =~ m{^/uploaded/})) || |
|
| ($url =~ m{^/uploaded/$match_domain/$match_courseid/(docs|supplemental)/(default|\d+)/\d+/}) || |
|
| ($url =~ m{^/adm/$match_domain/$match_username/aboutme}) || |
|
| ($url =~ m{^/public/$match_domain/$match_courseid/syllabus})) { |
|
| return 1; |
|
| } |
|
| return; |
|
| } |
|
| |
|
| sub paste_popup_js { |
|
| my %lt = &Apache::lonlocal::texthash( |
|
| show => 'Show Paste Options', |
|
| hide => 'Hide Paste Options', |
|
| ); |
|
| return <<"END"; |
|
| |
|
| function showPasteOptions() { |
|
| document.getElementById('pasteoptions').style.display='block'; |
|
| document.getElementById('pasteoptions').style.textAlign='left'; |
|
| document.getElementById('pasteoptions').style.textFace='normal'; |
|
| document.getElementById('pasteoptionstext').innerHTML ='<a href="javascript:hidePasteOptions();" class="LC_menubuttons_link">$lt{'hide'}</a><br />'; |
|
| return; |
|
| } |
|
| |
|
| function hidePasteOptions() { |
|
| document.getElementById('pasteoptions').style.display='none'; |
|
| document.getElementById('pasteoptionstext').innerHTML ='<a href="javascript:showPasteOptions()" class="LC_menubuttons_link">$lt{'show'}</a>'; |
|
| return; |
|
| } |
|
| |
|
| END |
|
| |
|
| } |
|
| |
|
| |
|
| sub do_paste_from_buffer { |
sub do_paste_from_buffer { |
| my ($coursenum,$coursedom,$folder,$container,$errors) = @_; |
my ($coursenum,$coursedom,$folder) = @_; |
| |
|
| # Early out if paste buffer is empty |
|
| if (!$env{'form.pastemarked'}) { |
if (!$env{'form.pastemarked'}) { |
| return (); |
return; |
| } |
|
| |
|
| # Supplemental content may only include certain types of content |
|
| # Early out if pasted content is not supported in Supplemental area |
|
| if ($folder =~ /^supplemental/) { |
|
| unless (&supp_pasteable($env{'docs.markedcopy_url'})) { |
|
| return (&mt('Paste failed: content type is not supported within Supplemental Content')); |
|
| } |
|
| } |
} |
| |
|
| # Prepare to paste resource at end of list |
# paste resource to end of list |
| my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}); |
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}); |
| my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}); |
my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}); |
| |
# Maps need to be copied first |
| my ($is_map,$srcdom,$srcnum,$prefixchg,%before,%after,%mapchanges,%tomove); |
if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) { |
| if ($url=~/\.(page|sequence)$/) { |
$title=&mt('Copy of').' '.$title; |
| $is_map = 1; |
my $newid=$$.int(rand(100)).time; |
| } |
my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/); |
| if ($url =~ m{^/uploaded/($match_domain)/($match_courseid)/([^/]+)}) { |
if ($oldid =~ m{^(/uploaded/\Q$coursedom\E/\Q$coursenum\E/)(\D+)(\d+)$}) { |
| $srcdom = $1; |
my $path = $1; |
| $srcnum = $2; |
my $prefix = $2; |
| my $oldprefix = $3; |
my $ancestor = $3; |
| # When paste buffer was populated using an active role in a different course |
if (length($ancestor) > 10) { |
| # check for mdc privilege in the course from which the resource was pasted |
$ancestor = substr($ancestor,-10,10); |
| if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) { |
|
| 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.')); |
|
| } |
} |
| |
$oldid = $path.$prefix.$ancestor; |
| } |
} |
| # When pasting content from Main Content to Supplemental Content and vice versa |
my $counter = 0; |
| # URLs will contain different paths (which depend on whether pasted item is |
my $newurl=$oldid.$newid.'.'.$ext; |
| # a folder/page or a document. |
my $is_unique = &uniqueness_check($newurl); |
| if (($folder =~ /^supplemental/) && (($oldprefix =~ /^default/) || ($oldprefix eq 'docs'))) { |
while (!$is_unique && $counter < 100) { |
| $prefixchg = 1; |
$counter ++; |
| %before = ( map => 'default', |
$newid ++; |
| doc => 'docs'); |
$newurl = $oldid.$newid; |
| %after = ( map => 'supplemental', |
$is_unique = &uniqueness_check($newurl); |
| doc => 'supplemental' ); |
|
| } elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) { |
|
| $prefixchg = 1; |
|
| %before = ( map => 'supplemental', |
|
| doc => 'supplemental'); |
|
| %after = ( map => 'default', |
|
| doc => 'docs'); |
|
| } |
|
| |
|
| # If pasting an uploaded map, get list of contained uploaded maps. |
|
| my @nested; |
|
| if ($env{'docs.markedcopy_nested'}) { |
|
| my ($type) = ($oldprefix =~ /^(default|supplemental)/); |
|
| my @items = split(/\&/,$env{'docs.markedcopy_nested'}); |
|
| my @deps = map { /\d+:([\d,]+$)/ } @items; |
|
| foreach my $dep (@deps) { |
|
| if ($dep =~ /,/) { |
|
| push(@nested,split(/,/,$dep)); |
|
| } else { |
|
| push(@nested,$dep); |
|
| } |
|
| } |
|
| foreach my $item (@nested) { |
|
| if ($env{'form.docs.markedcopy_'.$item} eq 'move') { |
|
| $tomove{$type.'_'.$item} = 1; |
|
| } |
|
| } |
|
| } |
} |
| } |
if (!$is_unique) { |
| |
if ($url=~/\.page$/) { |
| # Maps need to be copied first |
return &mt('Paste failed: an error occurred creating a unique URL for the composite page'); |
| my ($oldurl,%removefrommap,%removeparam,%addedmaps,%rewrites,%retitles,%copies, |
} else { |
| %dbcopies,%zombies,%params,%docmoves,%mapmoves,%newsubdir,%newurls); |
return &mt('Paste failed: an error occurred creating a unique URL for the folder'); |
| $oldurl = $url; |
|
| if ($is_map) { |
|
| # If pasting a map, check if map contains other maps |
|
| my ($allmaps,%hierarchy,%titles); |
|
| $allmaps = {}; |
|
| if ($folder =~ /^default/) { |
|
| $allmaps = |
|
| &Apache::loncommon::allmaps_incourse($coursedom,$coursenum, |
|
| $env{"course.$env{'request.course.id'}.home"}, |
|
| $env{'request.course.id'}); |
|
| } |
|
| &contained_map_check($url,$folder,\%removefrommap,\%removeparam, |
|
| \%addedmaps,\%hierarchy,\%titles,$allmaps); |
|
| if ($url=~ m{^/uploaded/}) { |
|
| my $newurl; |
|
| unless ($env{'form.docs.markedcopy_options'} eq 'move') { |
|
| ($newurl,my $error) = |
|
| &get_newmap_url($url,$folder,$prefixchg,$coursedom,$coursenum, |
|
| $srcdom,$srcnum,\$title,$allmaps,\%newurls); |
|
| if ($error) { |
|
| return ($error); |
|
| } |
|
| if ($newurl ne '') { |
|
| if ($newurl ne $url) { |
|
| if ($newurl =~ /(?:default|supplemental)_(\d+).(?:sequence|page)$/) { |
|
| $newsubdir{$url} = $1; |
|
| } |
|
| $mapchanges{$url} = 1; |
|
| } |
|
| } |
|
| } |
|
| if (($srcdom ne $coursedom) || ($srcnum ne $coursenum) || ($prefixchg) || |
|
| (($newurl ne '') && ($newurl ne $url))) { |
|
| unless (&url_paste_fixups($url,$folder,$prefixchg,$coursedom, |
|
| $coursenum,$srcdom,$srcnum,$allmaps, |
|
| \%rewrites,\%retitles,\%copies,\%dbcopies, |
|
| \%zombies,\%params,\%mapmoves,\%mapchanges,\%tomove, |
|
| \%newsubdir,\%newurls)) { |
|
| $mapmoves{$url} = 1; |
|
| } |
|
| $url = $newurl; |
|
| } elsif ($env{'docs.markedcopy_nested'}) { |
|
| &url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum, |
|
| $srcdom,$srcnum,$allmaps,\%rewrites, |
|
| \%retitles,\%copies,\%dbcopies,\%zombies,\%params,\%mapmoves, |
|
| \%mapchanges,\%tomove,\%newsubdir,\%newurls); |
|
| } |
|
| } elsif ($url=~m {^/res/}) { |
|
| # published maps can only exists once, so remove it from paste buffer when done |
|
| &Apache::lonnet::delenv('docs.markedcopy'); |
|
| # if pasting published map (main content are only) check map is not already in course |
|
| if ($folder =~ /^default/) { |
|
| if ((ref($allmaps) eq 'HASH') && ($allmaps->{$url})) { |
|
| return (&mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.')); |
|
| } |
|
| } |
} |
| } |
} |
| } |
my $storefn=$newurl; |
| my $lockerrors; |
$storefn=~s{^/\w+/$match_domain/$match_username/}{}; |
| if ($url=~ m{/(bulletinboard|smppg)$}) { |
my $paste_map_result = |
| my $prefix = $1; |
&Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn, |
| #need to copy the db contents to a new one, unless this is a move. |
&Apache::lonnet::getfile($url)); |
| my %info = ( |
if ($paste_map_result eq '/adm/notfound.html') { |
| src => $url, |
if ($url=~/\.page$/) { |
| cdom => $coursedom, |
return &mt('Paste failed: an error occurred saving the composite page'); |
| cnum => $coursenum, |
|
| ); |
|
| my (%lockerr,$msg); |
|
| unless ($env{'form.docs.markedcopy_options'} eq 'move') { |
|
| my ($newurl,$result,$errtext) = |
|
| &dbcopy(\%info,$coursedom,$coursenum,\%lockerr); |
|
| if ($result eq 'ok') { |
|
| $url = $newurl; |
|
| $title=&mt('Copy of').' '.$title; |
|
| } else { |
} else { |
| if ($prefix eq 'smppg') { |
return &mt('Paste failed: an error occurred saving the folder'); |
| $msg = &mt('Paste failed: An error occurred when copying the simple page.').' '.$errtext; |
|
| } elsif ($prefix eq 'bulletinboard') { |
|
| $msg = &mt('Paste failed: An error occurred when copying the bulletin board.').' '.$errtext; |
|
| } |
|
| return ($result,undef,[$msg],$lockerr{$prefix}); |
|
| } |
|
| if ($lockerr{$prefix}) { |
|
| $lockerrors = $lockerr{$prefix}; |
|
| } |
} |
| } |
} |
| |
$url = $newurl; |
| |
} |
| |
# published maps can only exists once, so remove it from paste buffer when done |
| |
if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) { |
| |
&Apache::lonnet::delenv('docs.markedcopy'); |
| |
} |
| |
if ($url=~ m{/smppg$}) { |
| |
my $db_name = &Apache::lonsimplepage::get_db_name($url); |
| |
if ($db_name =~ /^smppage_/) { |
| |
#simple pages, need to copy the db contents to a new one. |
| |
my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum); |
| |
my $now = time(); |
| |
$db_name =~ s{_\d*$ }{_$now}x; |
| |
my $result=&Apache::lonnet::put($db_name,\%contents, |
| |
$coursedom,$coursenum); |
| |
$url =~ s{/(\d*)/smppg$ }{/$now/smppg}x; |
| |
$title=&mt('Copy of').' '.$title; |
| |
} |
| } |
} |
| $title = &LONCAPA::map::qtunescape($title); |
$title = &LONCAPA::map::qtunescape($title); |
| my $ext='false'; |
my $ext='false'; |
| if ($url=~m{^http(|s)://}) { $ext='true'; } |
if ($url=~m{^http(|s)://}) { $ext='true'; } |
| $url = &LONCAPA::map::qtunescape($url); |
$url = &LONCAPA::map::qtunescape($url); |
| |
|
| # For uploaded files (excluding pages/sequences) path in copied file is changed |
|
| # if paste is from Main to Supplemental (or vice versa), or if pasting between |
|
| # courses. |
|
| |
|
| my $newidx; |
|
| unless ($is_map) { |
|
| # Now insert the URL at the bottom |
# Now insert the URL at the bottom |
| $newidx = &LONCAPA::map::getresidx($url); |
my $newidx = &LONCAPA::map::getresidx($url); |
| if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(?:docs|supplemental)/(.+)$}) { |
if ($env{'docs.markedcopy_supplemental'}) { |
| my $relpath = $1; |
if ($folder =~ /^supplemental/) { |
| if ($relpath ne '') { |
$title = $env{'docs.markedcopy_supplemental'}; |
| my ($prefix,$subdir,$rem) = ($relpath =~ m{^(default|\d+)/(\d+)/(.+)$}); |
|
| my ($newloc,$newdocsdir) = ($folder =~ /^(default|supplemental)_?(\d*)/); |
|
| my $newprefix = $newloc; |
|
| if ($newloc eq 'default') { |
|
| $newprefix = 'docs'; |
|
| } |
|
| if ($newdocsdir eq '') { |
|
| $newdocsdir = 'default'; |
|
| } |
|
| if (($prefixchg) || |
|
| ($srcdom ne $coursedom) || ($srcnum ne $coursenum) || |
|
| ($env{'form.docs.markedcopy_options'} ne 'move')) { |
|
| my $newpath = "$newprefix/$newdocsdir/$newidx/$rem"; |
|
| $url = |
|
| &Apache::lonclonecourse::writefile($env{'request.course.id'},$newpath, |
|
| &Apache::lonnet::getfile($oldurl)); |
|
| if ($url eq '/adm/notfound.html') { |
|
| return (&mt('Paste failed: an error occurred saving the file.')); |
|
| } else { |
|
| my ($newsubpath) = ($newpath =~ m{^(.*/)[^/]*$}); |
|
| $newsubpath =~ s{/+$}{/}; |
|
| $docmoves{$oldurl} = $newsubpath; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| # Apply any changes to maps, or copy dependencies for uploaded HTML pages |
|
| my ($result,$save_err); |
|
| my %updated = ( |
|
| rewrites => \%rewrites, |
|
| zombies => \%zombies, |
|
| removefrommap => \%removefrommap, |
|
| removeparam => \%removeparam, |
|
| dbcopies => \%dbcopies, |
|
| retitles => \%retitles, |
|
| ); |
|
| my %info = ( |
|
| newsubdir => \%newsubdir, |
|
| params => \%params, |
|
| before => \%before, |
|
| after => \%after, |
|
| ); |
|
| my %moves = ( |
|
| copies => \%copies, |
|
| docmoves => \%docmoves, |
|
| mapmoves => \%mapmoves, |
|
| ); |
|
| ($result,my $msgsarray,my $lockerror) = |
|
| &apply_fixups($folder,$is_map,$coursedom,$coursenum,$errors, |
|
| \%updated,\%info,\%moves,$prefixchg,$oldurl,$url,'paste'); |
|
| $lockerrors .= $lockerror; |
|
| if ($result eq 'ok') { |
|
| if ($is_map) { |
|
| my ($errtext,$fatal) = &mapread($coursenum,$coursedom, |
|
| $folder.'.'.$container); |
|
| return ($errtext,$save_err,$msgsarray,$lockerrors) if ($fatal); |
|
| |
|
| if ($#LONCAPA::map::order<1) { |
|
| my $idx=&LONCAPA::map::getresidx(); |
|
| if ($idx<=0) { $idx=1; } |
|
| $LONCAPA::map::order[0]=$idx; |
|
| $LONCAPA::map::resources[$idx]=''; |
|
| } |
|
| $newidx = &LONCAPA::map::getresidx($url); |
|
| } |
|
| if ($env{'docs.markedcopy_supplemental'}) { |
|
| if ($folder !~ /^supplemental/) { |
|
| (undef,undef,$title) = |
|
| &Apache::loncommon::parse_supplemental_title($env{'docs.markedcopy_supplemental'}); |
|
| } |
|
| } else { |
|
| if ($folder=~/^supplemental/) { |
|
| $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'. |
|
| $env{'user.domain'}.'___&&&___'.$title; |
|
| } |
|
| } |
|
| $LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res'; |
|
| push(@LONCAPA::map::order, $newidx); |
|
| |
|
| # Store the result |
|
| my ($errtext,$fatal) = |
|
| &storemap($coursenum,$coursedom,$folder.'.'.$container,1); |
|
| if ($fatal) { |
|
| $save_err = $errtext; |
|
| } |
|
| } |
|
| |
|
| if ($env{'form.docs.markedcopy_options'} eq 'move') { |
|
| &Apache::lonnet::delenv('docs.markedcopy'); |
|
| &Apache::lonnet::delenv('docs.markedcopy_nested'); |
|
| &Apache::lonnet::delenv('docs.markedcopy_nestednames'); |
|
| } |
|
| return ($result,$save_err,$msgsarray,$lockerrors); |
|
| } |
|
| |
|
| sub get_newmap_url { |
|
| my ($url,$folder,$prefixchg,$coursedom,$coursenum,$srcdom,$srcnum, |
|
| $titleref,$allmaps,$newurls) = @_; |
|
| my $newurl; |
|
| if ($url=~ m{^/uploaded/}) { |
|
| $$titleref=&mt('Copy of').' '.$$titleref; |
|
| } |
|
| my $now = time; |
|
| my $suffix=$$.int(rand(100)).$now; |
|
| my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/); |
|
| if ($oldid =~ m{^(/uploaded/$match_domain/$match_courseid/)(\D+)(\d+)$}) { |
|
| my $path = $1; |
|
| my $prefix = $2; |
|
| my $ancestor = $3; |
|
| if (length($ancestor) > 10) { |
|
| $ancestor = substr($ancestor,-10,10); |
|
| } |
|
| my $newid; |
|
| if ($prefixchg) { |
|
| if ($folder =~ /^supplemental/) { |
|
| $prefix =~ s/^default/supplemental/; |
|
| } else { |
|
| $prefix =~ s/^supplemental/default/; |
|
| } |
|
| } |
|
| if (($srcdom eq $coursedom) && ($srcnum eq $coursenum)) { |
|
| $newurl = $path.$prefix.$ancestor.$suffix.'.'.$ext; |
|
| } else { |
} else { |
| $newurl = "/uploaded/$coursedom/$coursenum/$prefix".$now.'.'.$ext; |
(undef,undef,$title) = |
| |
&parse_supplemental_title($env{'docs.markedcopy_supplemental'}); |
| } |
} |
| my $counter = 0; |
} else { |
| my $is_unique = &uniqueness_check($newurl); |
if ($folder=~/^supplemental/) { |
| if ($folder =~ /^default/) { |
$title=time.'___&&&___'.$env{'user.name'}.'___&&&___'. |
| if ($allmaps->{$newurl}) { |
$env{'user.domain'}.'___&&&___'.$title; |
| $is_unique = 0; |
|
| } |
|
| } |
|
| while ((!$is_unique || $allmaps->{$newurl} || $newurls->{$newurl}) && ($counter < 100)) { |
|
| $counter ++; |
|
| $suffix ++; |
|
| if (($srcdom eq $coursedom) && ($srcnum eq $coursenum)) { |
|
| $newurl = $path.$prefix.$ancestor.$suffix.'.'.$ext; |
|
| } else { |
|
| $newurl = "/uploaded/$coursedom/$coursenum/$prefix".$ancestor.$suffix.'.'.$ext; |
|
| } |
|
| $is_unique = &uniqueness_check($newurl); |
|
| } |
|
| if ($is_unique) { |
|
| $newurls->{$newurl} = 1; |
|
| } else { |
|
| if ($url=~/\.page$/) { |
|
| return (undef,&mt('Paste failed: an error occurred creating a unique URL for the composite page')); |
|
| } else { |
|
| return (undef,&mt('Paste failed: an error occurred creating a unique URL for the folder')); |
|
| } |
|
| } |
} |
| } |
} |
| return ($newurl); |
|
| } |
|
| |
|
| sub dbcopy { |
$LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res'; |
| my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_; |
push(@LONCAPA::map::order, $newidx); |
| my ($url,$result,$errtext); |
return 'ok'; |
| my $url = $dbref->{'src'}; |
# Store the result |
| if (ref($dbref) eq 'HASH') { |
|
| if ($url =~ m{/(smppg|bulletinboard)$}) { |
|
| my $prefix = $1; |
|
| if (($dbref->{'cdom'} =~ /^$match_domain$/) && |
|
| ($dbref->{'cnum'} =~ /^$match_courseid$/)) { |
|
| my $db_name; |
|
| my $marker = (split(m{/},$url))[4]; |
|
| $marker=~s/\D//g; |
|
| if ($dbref->{'src'} =~ m{/smppg$}) { |
|
| $db_name = |
|
| &Apache::lonsimplepage::get_db_name($url,$marker, |
|
| $dbref->{'cdom'}, |
|
| $dbref->{'cnum'}); |
|
| } else { |
|
| $db_name = 'bulletinpage_'.$marker; |
|
| } |
|
| my ($suffix,$freedlock,$error) = |
|
| &Apache::lonnet::get_timebased_id($prefix,'num','templated', |
|
| $coursedom,$coursenum, |
|
| 'concat'); |
|
| if (!$suffix) { |
|
| if ($prefix eq 'smppg') { |
|
| $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url); |
|
| } else { |
|
| $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a bulletin board [_1].',$url); |
|
| } |
|
| if ($error) { |
|
| $errtext .= '<br />'.$error; |
|
| } |
|
| } else { |
|
| #need to copy the db contents to a new one. |
|
| my %contents=&Apache::lonnet::dump($db_name, |
|
| $dbref->{'cdom'}, |
|
| $dbref->{'cnum'}); |
|
| if (exists($contents{'uploaded.photourl'})) { |
|
| my $photo = $contents{'uploaded.photourl'}; |
|
| my ($subdir,$fname) = |
|
| ($photo =~ m{^/uploaded/$match_domain/$match_courseid/+(bulletin|simplepage)/(?:|\d+/)([^/]+)$}); |
|
| my $newphoto; |
|
| if ($fname ne '') { |
|
| my $content = &Apache::lonnet::getfile($photo); |
|
| unless ($content eq '-1') { |
|
| $env{'form.'.$suffix.'.photourl'} = $content; |
|
| $newphoto = |
|
| &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.photourl',"$subdir/$suffix/$fname"); |
|
| delete($env{'form.'.$suffix.'.photourl'}); |
|
| } |
|
| } |
|
| if ($newphoto =~ m{^/uploaded/}) { |
|
| $contents{'uploaded.photourl'} = $newphoto; |
|
| } |
|
| } |
|
| $db_name =~ s{_\d*$ }{_$suffix}x; |
|
| $result=&Apache::lonnet::put($db_name,\%contents, |
|
| $coursedom,$coursenum); |
|
| if ($result eq 'ok') { |
|
| $url =~ s{/(\d*)/(smppg|bulletinboard)$}{/$suffix/$2}x; |
|
| } |
|
| } |
|
| if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) { |
|
| $lockerrorsref->{$prefix} = |
|
| '<div class="LC_error">'. |
|
| &mt('There was a problem removing a lockfile.'); |
|
| if ($prefix eq 'smppg') { |
|
| $lockerrorsref->{$prefix} .= |
|
| &mt('This will prevent creation of additional simple pages in this course.'); |
|
| } else { |
|
| $lockerrorsref->{$prefix} .= &mt('This will prevent creation of additional bulletin boards in this course.'); |
|
| } |
|
| $lockerrorsref->{$prefix} .= &mt('Please contact the domain coordinator for your LON-CAPA domain.').'</div>'; |
|
| } |
|
| } |
|
| } elsif ($url =~ m{/syllabus$}) { |
|
| if (($dbref->{'cdom'} =~ /^$match_domain$/) && |
|
| ($dbref->{'cnum'} =~ /^$match_courseid$/)) { |
|
| if (($dbref->{'cdom'} ne $coursedom) || |
|
| ($dbref->{'cnum'} ne $coursenum)) { |
|
| my %contents=&Apache::lonnet::dump('syllabus', |
|
| $dbref->{'cdom'}, |
|
| $dbref->{'cnum'}); |
|
| $result=&Apache::lonnet::put('syllabus',\%contents, |
|
| $coursedom,$coursenum); |
|
| } |
|
| } |
|
| } |
|
| } |
|
| return ($url,$result,$errtext); |
|
| } |
} |
| |
|
| sub uniqueness_check { |
sub uniqueness_check { |
|
Line 1370 sub uniqueness_check {
|
Line 762 sub uniqueness_check {
|
| return $unique; |
return $unique; |
| } |
} |
| |
|
| sub contained_map_check { |
|
| my ($url,$folder,$removefrommap,$removeparam,$addedmaps,$hierarchy,$titles, |
|
| $allmaps) = @_; |
|
| my $content = &Apache::lonnet::getfile($url); |
|
| unless ($content eq '-1') { |
|
| my $parser = HTML::TokeParser->new(\$content); |
|
| $parser->attr_encoded(1); |
|
| while (my $token = $parser->get_token) { |
|
| next if ($token->[0] ne 'S'); |
|
| if ($token->[1] eq 'resource') { |
|
| next if ($token->[2]->{'type'} eq 'zombie'); |
|
| my $ressrc = $token->[2]->{'src'}; |
|
| if ($folder =~ /^supplemental/) { |
|
| unless (&supp_pasteable($ressrc)) { |
|
| $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
|
| next; |
|
| } |
|
| } |
|
| if ($ressrc =~ m{^/(res|uploaded)/.+\.(sequence|page)$}) { |
|
| if ($1 eq 'uploaded') { |
|
| $hierarchy->{$url}{$token->[2]->{'id'}} = $ressrc; |
|
| $titles->{$url}{$token->[2]->{'id'}} = $token->[2]->{'title'}; |
|
| } else { |
|
| if ($allmaps->{$ressrc}) { |
|
| $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
|
| } elsif (ref($addedmaps->{$ressrc}) eq 'ARRAY') { |
|
| $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
|
| } else { |
|
| $addedmaps->{$ressrc} = [$url]; |
|
| } |
|
| } |
|
| &contained_map_check($ressrc,$folder,$removefrommap,$removeparam, |
|
| $addedmaps,$hierarchy,$titles,$allmaps); |
|
| } |
|
| } elsif ($token->[1] eq 'param') { |
|
| if ($folder =~ /^supplemental/) { |
|
| if (ref($removeparam->{$url}{$token->[2]->{'to'}}) eq 'ARRAY') { |
|
| push(@{$removeparam->{$url}{$token->[2]->{'to'}}},$token->[2]->{'name'}); |
|
| } else { |
|
| $removeparam->{$url}{$token->[2]->{'to'}} = [$token->[2]->{'name'}]; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| return; |
|
| } |
|
| |
|
| sub url_paste_fixups { |
|
| my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$fromcdom,$fromcnum,$allmaps, |
|
| $rewrites,$retitles,$copies,$dbcopies,$zombies,$params,$mapmoves, |
|
| $mapchanges,$tomove,$newsubdir,$newurls) = @_; |
|
| my $checktitle; |
|
| if (($prefixchg) && |
|
| ($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/supplemental})) { |
|
| $checktitle = 1; |
|
| } |
|
| my $skip; |
|
| if ($oldurl =~ m{^\Q/uploaded/$cdom/$cnum/\E(default|supplemental)(_?\d*)\.(?:page|sequence)$}) { |
|
| my $mapid = $1.$2; |
|
| if ($tomove->{$mapid}) { |
|
| $skip = 1; |
|
| } |
|
| } |
|
| my $file = &Apache::lonnet::getfile($oldurl); |
|
| return if ($file eq '-1'); |
|
| my $parser = HTML::TokeParser->new(\$file); |
|
| $parser->attr_encoded(1); |
|
| my $changed = 0; |
|
| while (my $token = $parser->get_token) { |
|
| next if ($token->[0] ne 'S'); |
|
| if ($token->[1] eq 'resource') { |
|
| my $ressrc = $token->[2]->{'src'}; |
|
| next if ($ressrc eq ''); |
|
| my $id = $token->[2]->{'id'}; |
|
| my $title = $token->[2]->{'title'}; |
|
| if ($checktitle) { |
|
| if ($title =~ m{\d+\Q___&&&___\E$match_username\Q___&&&___\E$match_domain\Q___&&&___\E(.+)$}) { |
|
| $retitles->{$oldurl}{$id} = $ressrc; |
|
| } |
|
| } |
|
| next if ($token->[2]->{'type'} eq 'external'); |
|
| if ($token->[2]->{'type'} eq 'zombie') { |
|
| next if ($skip); |
|
| $zombies->{$oldurl}{$id} = $ressrc; |
|
| $changed = 1; |
|
| } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) { |
|
| my $srcdom = $1; |
|
| my $srcnum = $2; |
|
| my $rem = $3; |
|
| my $newurl; |
|
| my $mapname; |
|
| if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) { |
|
| my $prefix = $1; |
|
| $mapname = $prefix.$2; |
|
| if ($tomove->{$mapname}) { |
|
| &url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,$cnum, |
|
| $srcdom,$srcnum,$allmaps,$rewrites, |
|
| $retitles,$copies,$dbcopies,$zombies, |
|
| $params,$mapmoves,$mapchanges,$tomove, |
|
| $newsubdir,$newurls); |
|
| next; |
|
| } else { |
|
| ($newurl,my $error) = |
|
| &get_newmap_url($ressrc,$folder,$prefixchg,$cdom,$cnum, |
|
| $srcdom,$srcnum,\$title,$allmaps,$newurls); |
|
| if ($newurl =~ /(?:default|supplemental)_(\d+)\.(?:sequence|page)$/) { |
|
| $newsubdir->{$ressrc} = $1; |
|
| } |
|
| if ($error) { |
|
| next; |
|
| } |
|
| } |
|
| } |
|
| if (($srcdom ne $cdom) || ($srcnum ne $cnum) || ($prefixchg) || |
|
| ($mapchanges->{$oldurl}) || (($newurl ne '') && ($newurl ne $oldurl))) { |
|
| |
|
| if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) { |
|
| $rewrites->{$oldurl}{$id} = $ressrc; |
|
| $mapchanges->{$ressrc} = 1; |
|
| unless (&url_paste_fixups($ressrc,$folder,$prefixchg,$cdom, |
|
| $cnum,$srcdom,$srcnum,$allmaps, |
|
| $rewrites,$retitles,$copies,$dbcopies, |
|
| $zombies,$params,$mapmoves,$mapchanges, |
|
| $tomove,$newsubdir,$newurls)) { |
|
| $mapmoves->{$ressrc} = 1; |
|
| } |
|
| $changed = 1; |
|
| } else { |
|
| $rewrites->{$oldurl}{$id} = $ressrc; |
|
| $copies->{$oldurl}{$ressrc} = $id; |
|
| $changed = 1; |
|
| } |
|
| } |
|
| } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/.+$}) { |
|
| next if ($skip); |
|
| my $srcdom = $1; |
|
| my $srcnum = $2; |
|
| if (($srcdom ne $cdom) || ($srcnum ne $cnum)) { |
|
| $rewrites->{$oldurl}{$id} = $ressrc; |
|
| $dbcopies->{$oldurl}{$id}{'src'} = $ressrc; |
|
| $dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom; |
|
| $dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum; |
|
| $changed = 1; |
|
| } |
|
| } elsif ($ressrc =~ m{^/adm/$match_domain/$match_username/\d+/(smppg|bulletinboard)$}) { |
|
| if (($fromcdom ne $cdom) || ($fromcnum ne $cnum) || |
|
| ($env{'form.docs.markedcopy_options'} ne 'move')) { |
|
| $dbcopies->{$oldurl}{$id}{'src'} = $ressrc; |
|
| $dbcopies->{$oldurl}{$id}{'cdom'} = $fromcdom; |
|
| $dbcopies->{$oldurl}{$id}{'cnum'} = $fromcnum; |
|
| $changed = 1; |
|
| } |
|
| } elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) { |
|
| next if ($skip); |
|
| my $srcdom = $1; |
|
| my $srcnum = $2; |
|
| if (($srcdom ne $cdom) || ($srcnum ne $cnum)) { |
|
| $dbcopies->{$oldurl}{$id}{'src'} = $ressrc; |
|
| $dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom; |
|
| $dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum; |
|
| $changed = 1; |
|
| } |
|
| } |
|
| } elsif ($token->[1] eq 'param') { |
|
| next if ($skip); |
|
| my $to = $token->[2]->{'to'}; |
|
| if ($to ne '') { |
|
| if (ref($params->{$oldurl}{$to}) eq 'ARRAY') { |
|
| push(@{$params->{$oldurl}{$to}},$token->[2]->{'name'}); |
|
| } else { |
|
| @{$params->{$oldurl}{$to}} = ($token->[2]->{'name'}); |
|
| } |
|
| } |
|
| } |
|
| } |
|
| return $changed; |
|
| } |
|
| |
|
| sub apply_fixups { |
|
| my ($folder,$is_map,$cdom,$cnum,$errors,$updated,$info,$moves,$prefixchg, |
|
| $oldurl,$url,$caller) = @_; |
|
| my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles, |
|
| %params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs, |
|
| %lockerrors,$lockmsg); |
|
| if (ref($updated) eq 'HASH') { |
|
| if (ref($updated->{'rewrites'}) eq 'HASH') { |
|
| %rewrites = %{$updated->{'rewrites'}}; |
|
| } |
|
| if (ref($updated->{'zombies'}) eq 'HASH') { |
|
| %zombies = %{$updated->{'zombies'}}; |
|
| } |
|
| if (ref($updated->{'removefrommap'}) eq 'HASH') { |
|
| %removefrommap = %{$updated->{'removefrommap'}}; |
|
| } |
|
| if (ref($updated->{'removeparam'}) eq 'HASH') { |
|
| %removeparam = %{$updated->{'removeparam'}}; |
|
| } |
|
| if (ref($updated->{'dbcopies'}) eq 'HASH') { |
|
| %dbcopies = %{$updated->{'dbcopies'}}; |
|
| } |
|
| if (ref($updated->{'retitles'}) eq 'HASH') { |
|
| %retitles = %{$updated->{'retitles'}}; |
|
| } |
|
| } |
|
| if (ref($info) eq 'HASH') { |
|
| if (ref($info->{'newsubdir'}) eq 'HASH') { |
|
| %newsubdir = %{$info->{'newsubdir'}}; |
|
| } |
|
| if (ref($info->{'params'}) eq 'HASH') { |
|
| %params = %{$info->{'params'}}; |
|
| } |
|
| if (ref($info->{'before'}) eq 'HASH') { |
|
| %before = %{$info->{'before'}}; |
|
| } |
|
| if (ref($info->{'after'}) eq 'HASH') { |
|
| %after = %{$info->{'after'}}; |
|
| } |
|
| } |
|
| if (ref($moves) eq 'HASH') { |
|
| if (ref($moves->{'copies'}) eq 'HASH') { |
|
| %copies = %{$moves->{'copies'}}; |
|
| } |
|
| if (ref($moves->{'docmoves'}) eq 'HASH') { |
|
| %docmoves = %{$moves->{'docmoves'}}; |
|
| } |
|
| if (ref($moves->{'mapmoves'}) eq 'HASH') { |
|
| %mapmoves = %{$moves->{'mapmoves'}}; |
|
| } |
|
| } |
|
| foreach my $key (keys(%copies),keys(%docmoves)) { |
|
| my @allcopies; |
|
| if (exists($copies{$key})) { |
|
| if (ref($copies{$key}) eq 'HASH') { |
|
| my %added; |
|
| foreach my $innerkey (keys(%{$copies{$key}})) { |
|
| if (($innerkey ne '') && (!$added{$innerkey})) { |
|
| push(@allcopies,$innerkey); |
|
| $added{$innerkey} = 1; |
|
| } |
|
| } |
|
| undef(%added); |
|
| } |
|
| } |
|
| if ($key eq $oldurl) { |
|
| if ((exists($docmoves{$key}))) { |
|
| unless (grep(/^\Q$oldurl\E$/,@allcopies)) { |
|
| push(@allcopies,$oldurl); |
|
| } |
|
| } |
|
| } |
|
| if (@allcopies > 0) { |
|
| foreach my $item (@allcopies) { |
|
| my ($relpath,$oldsubdir,$fname) = |
|
| ($item =~ m{^(/uploaded/$match_domain/$match_courseid/(?:docs|supplemental)/(default|\d+)/.*/)([^/]+)$}); |
|
| if ($fname ne '') { |
|
| my $content = &Apache::lonnet::getfile($item); |
|
| unless ($content eq '-1') { |
|
| my $storefn; |
|
| if (($key eq $oldurl) && (exists($docmoves{$key}))) { |
|
| $storefn = $docmoves{$key}; |
|
| } else { |
|
| $storefn = $relpath; |
|
| $storefn =~s{^/uploaded/$match_domain/$match_courseid/}{}; |
|
| if ($prefixchg && $before{'doc'} && $after{'doc'}) { |
|
| $storefn =~ s/^\Q$before{'doc'}\E/$after{'doc'}/; |
|
| } |
|
| if ($newsubdir{$key}) { |
|
| $storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir{$key}/#; |
|
| } |
|
| } |
|
| ©_dependencies($item,$storefn,$relpath,$errors,\$content); |
|
| my $copyurl = |
|
| &Apache::lonclonecourse::writefile($env{'request.course.id'}, |
|
| $storefn.$fname,$content); |
|
| if ($copyurl eq '/adm/notfound.html') { |
|
| if (exists($docmoves{$oldurl})) { |
|
| return &mt('Paste failed: an error occurred copying the file.'); |
|
| } elsif (ref($errors) eq 'HASH') { |
|
| $errors->{$item} = 1; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| foreach my $key (keys(%mapmoves)) { |
|
| my $storefn=$key; |
|
| $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{}; |
|
| if ($prefixchg && $before{'map'} && $after{'map'}) { |
|
| $storefn =~ s/^\Q$before{'map'}\E/$after{'map'}/; |
|
| } |
|
| if ($newsubdir{$key}) { |
|
| $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/; |
|
| } |
|
| my $mapcontent = &Apache::lonnet::getfile($key); |
|
| if ($mapcontent eq '-1') { |
|
| if (ref($errors) eq 'HASH') { |
|
| $errors->{$key} = 1; |
|
| } |
|
| } else { |
|
| my $newmap = |
|
| &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn, |
|
| $mapcontent); |
|
| if ($newmap eq '/adm/notfound.html') { |
|
| if (ref($errors) eq 'HASH') { |
|
| $errors->{$key} = 1; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| my %updates; |
|
| if ($is_map) { |
|
| if (ref($updated) eq 'HASH') { |
|
| foreach my $type (keys(%{$updated})) { |
|
| if (ref($updated->{$type}) eq 'HASH') { |
|
| foreach my $key (keys(%{$updated->{$type}})) { |
|
| $updates{$key} = 1; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| foreach my $key (keys(%updates)) { |
|
| my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb); |
|
| if (ref($rewrites{$key}) eq 'HASH') { |
|
| %torewrite = %{$rewrites{$key}}; |
|
| } |
|
| if (ref($retitles{$key}) eq 'HASH') { |
|
| %toretitle = %{$retitles{$key}}; |
|
| } |
|
| if (ref($removefrommap{$key}) eq 'HASH') { |
|
| %toremove = %{$removefrommap{$key}}; |
|
| } |
|
| if (ref($removeparam{$key}) eq 'HASH') { |
|
| %remparam = %{$removeparam{$key}}; |
|
| } |
|
| if (ref($zombies{$key}) eq 'HASH') { |
|
| %zombie = %{$zombies{$key}}; |
|
| } |
|
| if (ref($dbcopies{$key}) eq 'HASH') { |
|
| foreach my $idx (keys(%{$dbcopies{$key}})) { |
|
| if (ref($dbcopies{$key}{$idx}) eq 'HASH') { |
|
| my ($newurl,$result,$errtext) = |
|
| &dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors); |
|
| if ($result eq 'ok') { |
|
| $newdb{$idx} = $newurl; |
|
| } elsif (ref($errors) eq 'HASH') { |
|
| $errors->{$key} = 1; |
|
| } |
|
| push(@msgs,$errtext); |
|
| } |
|
| } |
|
| } |
|
| if (ref($params{$key}) eq 'HASH') { |
|
| %currparam = %{$params{$key}}; |
|
| } |
|
| my ($errtext,$fatal) = &LONCAPA::map::mapread($key); |
|
| if ($fatal) { |
|
| return ($errtext); |
|
| } |
|
| for (my $i=0; $i<@LONCAPA::map::zombies; $i++) { |
|
| if (defined($LONCAPA::map::zombies[$i])) { |
|
| my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::zombies[$i]); |
|
| if ($zombie{$i} eq $src) { |
|
| undef($LONCAPA::map::zombies[$i]); |
|
| } |
|
| } |
|
| } |
|
| for (my $i=0; $i<@LONCAPA::map::order; $i++) { |
|
| my $idx = $LONCAPA::map::order[$i]; |
|
| if (defined($LONCAPA::map::resources[$idx])) { |
|
| my $changed; |
|
| my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$idx]); |
|
| if ((exists($toremove{$idx})) && ($toremove{$idx} eq $src)) { |
|
| splice(@LONCAPA::map::order,$i,1); |
|
| if (ref($currparam{$idx}) eq 'ARRAY') { |
|
| foreach my $name (@{$currparam{$idx}}) { |
|
| &LONCAPA::map::delparameter($idx,'parameter_'.$name); |
|
| } |
|
| } |
|
| next; |
|
| } |
|
| my $origsrc = $src; |
|
| if ((exists($toretitle{$idx})) && ($toretitle{$idx} eq $src)) { |
|
| if ($title =~ m{^\d+\Q___&&&___\E$match_username\Q___&&&___\E$match_domain\Q___&&&___\E(.+)$}) { |
|
| $changed = 1; |
|
| } |
|
| } |
|
| if ((exists($torewrite{$idx})) && ($torewrite{$idx} eq $src)) { |
|
| $src =~ s{^/(uploaded|adm|public)/$match_domain/$match_courseid/}{/$1/$cdom/$cnum/}; |
|
| if ($origsrc =~ m{^/uploaded/}) { |
|
| if ($prefixchg && $before{'map'} && $after{'map'}) { |
|
| if ($src =~ /\.(page|sequence)$/) { |
|
| $src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before{'map'}\E#$1$after{'map'}#; |
|
| } else { |
|
| $src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before{'doc'}\E#$1$after{'doc'}#; |
|
| } |
|
| } |
|
| if ($origsrc =~ /\.(page|sequence)$/) { |
|
| if ($newsubdir{$origsrc}) { |
|
| $src =~ s#^(/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_)(\d+)#$1$newsubdir{$origsrc}#; |
|
| } |
|
| } elsif ($newsubdir{$key}) { |
|
| $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir{$key}#; |
|
| } |
|
| } |
|
| $changed = 1; |
|
| } elsif ($newdb{$idx} ne '') { |
|
| $src = $newdb{$idx}; |
|
| $changed = 1; |
|
| } |
|
| if ($changed) { |
|
| $LONCAPA::map::resources[$idx] = join(':',($title,$src,$ext,$type)); |
|
| } |
|
| } |
|
| } |
|
| foreach my $idx (keys(%remparam)) { |
|
| if (ref($remparam{$idx}) eq 'ARRAY') { |
|
| foreach my $name (@{$remparam{$idx}}) { |
|
| &LONCAPA::map::delparameter($idx,'parameter_'.$name); |
|
| } |
|
| } |
|
| } |
|
| if (values(%lockerrors) > 0) { |
|
| $lockmsg = join('<br />',values(%lockerrors)); |
|
| } |
|
| my $storefn; |
|
| if ($key eq $oldurl) { |
|
| $storefn = $url; |
|
| $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{}; |
|
| } else { |
|
| $storefn = $key; |
|
| $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{}; |
|
| if ($prefixchg && $before{'map'} && $after{'map'}) { |
|
| $storefn =~ s/^\Q$before{'map'}\E/$after{'map'}/; |
|
| } |
|
| if ($newsubdir{$key}) { |
|
| $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/; |
|
| } |
|
| } |
|
| my $report; |
|
| if ($folder !~ /^supplemental/) { |
|
| $report = 1; |
|
| } |
|
| (my $outtext,$errtext) = |
|
| &LONCAPA::map::storemap("/uploaded/$cdom/$cnum/$storefn",1,$report); |
|
| if ($errtext) { |
|
| if ($caller eq 'paste') { |
|
| return (&mt('Paste failed: an error occurred saving the folder or page.')); |
|
| } |
|
| } |
|
| } |
|
| } |
|
| return ('ok',\@msgs,$lockmsg); |
|
| } |
|
| |
|
| sub copy_dependencies { |
|
| my ($item,$storefn,$relpath,$errors,$contentref) = @_; |
|
| my $content; |
|
| if (ref($contentref)) { |
|
| $content = $$contentref; |
|
| } else { |
|
| $content = &Apache::lonnet::getfile($item); |
|
| } |
|
| unless ($content eq '-1') { |
|
| my $mm = new File::MMagic; |
|
| my $mimetype = $mm->checktype_contents($content); |
|
| if ($mimetype eq 'text/html') { |
|
| my (%allfiles,%codebase,$state); |
|
| my $res = &Apache::lonnet::extract_embedded_items(undef,\%allfiles,\%codebase,\$content); |
|
| if ($res eq 'ok') { |
|
| my ($numexisting,$numpathchanges,$existing); |
|
| (undef,$numexisting,$numpathchanges,$existing) = |
|
| &Apache::loncommon::ask_for_embedded_content( |
|
| '/adm/coursedocs',$state,\%allfiles,\%codebase, |
|
| {'error_on_invalid_names' => 1, |
|
| 'ignore_remote_references' => 1, |
|
| 'docs_url' => $item, |
|
| 'context' => 'paste'}); |
|
| if ($numexisting > 0) { |
|
| if (ref($existing) eq 'HASH') { |
|
| foreach my $dep (keys(%{$existing})) { |
|
| my $depfile = $dep; |
|
| unless ($depfile =~ m{^\Q$relpath\E}) { |
|
| $depfile = $relpath.$dep; |
|
| } |
|
| my $depcontent = &Apache::lonnet::getfile($depfile); |
|
| unless ($depcontent eq '-1') { |
|
| my $storedep = $dep; |
|
| $storedep =~ s{^\Q$relpath\E}{}; |
|
| my $dep_url = |
|
| &Apache::lonclonecourse::writefile( |
|
| $env{'request.course.id'}, |
|
| $storefn.$storedep,$depcontent); |
|
| if ($dep_url eq '/adm/notfound.html') { |
|
| if (ref($errors) eq 'HASH') { |
|
| $errors->{$depfile} = 1; |
|
| } |
|
| } else { |
|
| ©_dependencies($depfile,$storefn,$relpath,$errors,\$depcontent); |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| return; |
|
| } |
|
| |
|
| my %parameter_type = ( 'randompick' => 'int_pos', |
my %parameter_type = ( 'randompick' => 'int_pos', |
| 'hiddenresource' => 'string_yesno', |
'hiddenresource' => 'string_yesno', |
| 'encrypturl' => 'string_yesno', |
'encrypturl' => 'string_yesno', |
|
Line 1889 my %parameter_type = ( 'randompick'
|
Line 769 my %parameter_type = ( 'randompick'
|
| my $valid_parameters_re = join('|',keys(%parameter_type)); |
my $valid_parameters_re = join('|',keys(%parameter_type)); |
| # set parameters |
# set parameters |
| sub update_parameter { |
sub update_parameter { |
| if ($env{'form.changeparms'} eq 'all') { |
|
| my (@allidx,@allmapidx,%allchecked,%currchecked); |
|
| %allchecked = ( |
|
| 'hiddenresource' => {}, |
|
| 'encrypturl' => {}, |
|
| 'randompick' => {}, |
|
| 'randomorder' => {}, |
|
| ); |
|
| foreach my $which (keys(%allchecked)) { |
|
| $env{'form.all'.$which} =~ s/,$//; |
|
| if ($which eq 'randompick') { |
|
| foreach my $item (split(/,/,$env{'form.all'.$which})) { |
|
| my ($res,$value) = split(/:/,$item); |
|
| if ($value =~ /^\d+$/) { |
|
| $allchecked{$which}{$res} = $value; |
|
| } |
|
| } |
|
| } else { |
|
| map { $allchecked{$which}{$_} = 1; } split(/,/,$env{'form.all'.$which}); |
|
| } |
|
| } |
|
| my $haschanges = 0; |
|
| foreach my $res (@LONCAPA::map::order) { |
|
| my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); |
|
| $name=&LONCAPA::map::qtescape($name); |
|
| $url=&LONCAPA::map::qtescape($url); |
|
| next unless ($name && $url); |
|
| my $is_map; |
|
| if ($url =~ m{/uploaded/.+\.(page|sequence)$}) { |
|
| $is_map = 1; |
|
| } |
|
| foreach my $which (keys(%allchecked)) { |
|
| if (($which eq 'randompick' || $which eq 'randomorder')) { |
|
| next if (!$is_map); |
|
| } |
|
| my $oldvalue = 0; |
|
| my $newvalue = 0; |
|
| if ($allchecked{$which}{$res}) { |
|
| $newvalue = $allchecked{$which}{$res}; |
|
| } |
|
| my $current = (&LONCAPA::map::getparameter($res,'parameter_'.$which))[0]; |
|
| if ($which eq 'randompick') { |
|
| if ($current =~ /^(\d+)$/) { |
|
| $oldvalue = $1; |
|
| } |
|
| } else { |
|
| if ($current =~ /^yes$/i) { |
|
| $oldvalue = 1; |
|
| } |
|
| } |
|
| if ($oldvalue ne $newvalue) { |
|
| $haschanges = 1; |
|
| if ($newvalue) { |
|
| my $storeval = 'yes'; |
|
| if ($which eq 'randompick') { |
|
| $storeval = $newvalue; |
|
| } |
|
| &LONCAPA::map::storeparameter($res,'parameter_'.$which, |
|
| $storeval, |
|
| $parameter_type{$which}); |
|
| &remember_parms($res,$which,'set',$storeval); |
|
| } elsif ($oldvalue) { |
|
| &LONCAPA::map::delparameter($res,'parameter_'.$which); |
|
| &remember_parms($res,$which,'del'); |
|
| } |
|
| } |
|
| } |
|
| } |
|
| return $haschanges; |
|
| } else { |
|
| return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/); |
|
| |
|
| my $which = $env{'form.changeparms'}; |
return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/); |
| my $idx = $env{'form.setparms'}; |
|
| if ($env{'form.'.$which.'_'.$idx}) { |
|
| my $value = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx} |
|
| : 'yes'; |
|
| &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'); |
my $which = $env{'form.changeparms'}; |
| } |
my $idx = $env{'form.setparms'}; |
| return 1; |
if ($env{'form.'.$which.'_'.$idx}) { |
| |
my $value = ($which eq 'randompick') ? $env{'form.'.$which.'_'.$idx} |
| |
: 'yes'; |
| |
&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; |
| } |
} |
| |
|
| |
|
|
Line 2025 sub handle_edit_cmd {
|
Line 835 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)=@_; |
| my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container); |
my $container= ($env{'form.pagepath'}) ? 'page' |
| if ($allowed) { |
: 'sequence'; |
| (my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain, |
|
| $is_random_order,$container) = |
my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) = |
| &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1); |
&breadcrumbs($allowed,$crstype); |
| $r->print($breadcrumbtrail); |
$r->print($breadcrumbtrail); |
| } elsif ($env{'form.folderpath'} =~ /\:1$/) { |
|
| $container = 'page'; |
|
| } else { |
|
| $container = 'sequence'; |
|
| } |
|
| |
|
| my $jumpto; |
|
| |
|
| unless ($supplementalflag) { |
my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container"; |
| $jumpto = "'uploaded/$coursedom/$coursenum/$folder.$container'"; |
|
| } |
|
| |
|
| unless ($allowed) { |
unless ($allowed) { |
| $randompick = -1; |
$randompick = -1; |
|
Line 2081 sub editor {
|
Line 882 sub editor {
|
| } |
} |
| |
|
| if ($env{'form.pastemarked'}) { |
if ($env{'form.pastemarked'}) { |
| my %paste_errors; |
my $paste_res = |
| my ($paste_res,$save_error,$pastemsgarray,$lockerror) = |
&do_paste_from_buffer($coursenum,$coursedom,$folder); |
| &do_paste_from_buffer($coursenum,$coursedom,$folder,$container, |
if ($paste_res eq 'ok') { |
| \%paste_errors); |
($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container); |
| if (ref($pastemsgarray) eq 'ARRAY') { |
return $errtext if ($fatal); |
| if (@{$pastemsgarray} > 0) { |
} elsif ($paste_res ne '') { |
| |
|
| $r->print('<p class="LC_info">'. |
|
| join('<br />',@{$pastemsgarray}). |
|
| '</p>'); |
|
| } |
|
| } |
|
| if ($lockerror) { |
|
| $r->print('<p class="LC_error">'. |
|
| $lockerror. |
|
| '</p>'); |
|
| } |
|
| if ($save_error ne '') { |
|
| return $save_error; |
|
| } |
|
| 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>'); |
| } |
} |
| if (keys(%paste_errors) > 0) { |
|
| $r->print('<p span class="LC_warning">'."\n". |
|
| &mt('The following files are either dependencies of a web page or references within a folder and/or composite page which could not be copied during the paste operation:')."\n". |
|
| '<ul>'."\n"); |
|
| foreach my $key (sort(keys(%paste_errors))) { |
|
| $r->print('<li>'.$key.'</li>'."\n"); |
|
| } |
|
| $r->print('</ul></p>'."\n"); |
|
| } |
|
| } |
} |
| |
|
| $r->print($upload_output); |
$r->print($upload_output); |
| |
|
| if (&handle_edit_cmd()) { |
if (&handle_edit_cmd()) { |
| my $contentchg; |
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); |
| if ($env{'form.cmd'} =~ /^(del|cut)_/) { |
|
| $contentchg = 1; |
|
| } |
|
| ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg); |
|
| return $errtext if ($fatal); |
return $errtext if ($fatal); |
| } |
} |
| # Group import/search |
# Group import/search |
|
Line 2131 sub editor {
|
Line 904 sub editor {
|
| foreach my $item (split(/\&/,$env{'form.importdetail'})) { |
foreach my $item (split(/\&/,$env{'form.importdetail'})) { |
| if (defined($item)) { |
if (defined($item)) { |
| 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)$}) { |
|
| my ($suffix,$errortxt,$locknotfreed) = |
|
| &new_timebased_suffix($coursedom,$coursenum,'map',$1,$2); |
|
| if ($locknotfreed) { |
|
| $r->print($locknotfreed); |
|
| } |
|
| if ($suffix) { |
|
| $url =~ s/_new\./_$suffix./; |
|
| } else { |
|
| return $errortxt; |
|
| } |
|
| } elsif ($url =~ m{^/adm/$match_domain/$match_username/new/(smppg|bulletinboard)$}) { |
|
| my $type = $1; |
|
| my ($suffix,$errortxt,$locknotfreed) = |
|
| &new_timebased_suffix($coursedom,$coursenum,$type); |
|
| if ($locknotfreed) { |
|
| $r->print($locknotfreed); |
|
| } |
|
| if ($suffix) { |
|
| $url =~ s{^(/adm/$match_domain/$match_username)/new}{$1/$suffix}; |
|
| } else { |
|
| return $errortxt; |
|
| } |
|
| } elsif ($url =~ m{^/uploaded/$coursedom/$coursenum/(docs|supplemental)/(default|\d+)/new.html$}) { |
|
| if ($supplementalflag) { |
|
| next unless ($1 eq 'supplemental'); |
|
| if ($folder eq 'supplemental') { |
|
| next unless ($2 eq 'default'); |
|
| } else { |
|
| next unless ($folder eq 'supplemental_'.$2); |
|
| } |
|
| } else { |
|
| next unless ($1 eq 'docs'); |
|
| if ($folder eq 'default') { |
|
| next unless ($2 eq 'default'); |
|
| } else { |
|
| next unless ($folder eq 'default_'.$2); |
|
| } |
|
| } |
|
| } |
|
| push(@imports, [$name, $url, $residx]); |
push(@imports, [$name, $url, $residx]); |
| } |
} |
| } |
} |
| ($errtext,$fatal,my $fixuperrors) = |
($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder, |
| &group_import($coursenum, $coursedom, $folder,$container, |
$container,'londocs',@imports); |
| 'londocs',@imports); |
|
| return $errtext if ($fatal); |
return $errtext if ($fatal); |
| if ($fixuperrors) { |
|
| $r->print($fixuperrors); |
|
| } |
|
| } |
} |
| # Loading a complete map |
# Loading a complete map |
| if ($env{'form.loadmap'}) { |
if ($env{'form.loadmap'}) { |
|
Line 2193 sub editor {
|
Line 922 sub editor {
|
| $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx; |
$LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx; |
| } |
} |
| ($errtext,$fatal)=&storemap($coursenum,$coursedom, |
($errtext,$fatal)=&storemap($coursenum,$coursedom, |
| $folder.'.'.$container,1); |
$folder.'.'.$container); |
| return $errtext if ($fatal); |
return $errtext if ($fatal); |
| } else { |
} else { |
| $r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>'); |
$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>'); |
|
Line 2237 sub editor {
|
Line 966 sub editor {
|
| $r->print('</div>'); |
$r->print('</div>'); |
| } |
} |
| |
|
| my ($to_show,$output,@allidx,@allmapidx); |
my ($to_show,$output); |
| |
|
| &Apache::loncommon::start_data_table_count(); #setup a row counter |
&Apache::loncommon::start_data_table_count(); #setup a row counter |
| foreach my $res (@LONCAPA::map::order) { |
foreach my $res (@LONCAPA::map::order) { |
|
Line 2246 sub editor {
|
Line 975 sub editor {
|
| $url=&LONCAPA::map::qtescape($url); |
$url=&LONCAPA::map::qtescape($url); |
| unless ($name) { $name=(split(/\//,$url))[-1]; } |
unless ($name) { $name=(split(/\//,$url))[-1]; } |
| unless ($name) { $idx++; next; } |
unless ($name) { $idx++; next; } |
| push(@allidx,$res); |
|
| if ($url =~ m{/uploaded/.+\.(page|sequence)$}) { |
|
| push(@allmapidx,$res); |
|
| } |
|
| $output .= &entryline($idx,$name,$url,$folder,$allowed,$res, |
$output .= &entryline($idx,$name,$url,$folder,$allowed,$res, |
| $coursenum,$coursedom,$crstype, |
$coursenum,$crstype); |
| $pathitem,$supplementalflag,$container); |
|
| $idx++; |
$idx++; |
| $shown++; |
$shown++; |
| } |
} |
| &Apache::loncommon::end_data_table_count(); |
&Apache::loncommon::end_data_table_count(); |
| |
|
| if (($allowed) || ($supplementalflag && $folder eq 'supplemental')) { |
if ($shown) { |
| my $toolslink = '<table><tr><td>' |
$to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll') |
| .&Apache::loncommon::help_open_menu('Navigation Screen', |
.&Apache::loncommon::start_data_table(undef,'contentlist'); |
| 'Navigation_Screen',undef,'RAT') |
if ($allowed) { |
| .'</td><td class="LC_middle">'.&mt('Tools:').'</td>' |
$to_show .= &Apache::loncommon::start_data_table_header_row() |
| .'<td align="left"><ul id="LC_toolbar">' |
.'<th colspan="2">'.&mt('Move').'</th>' |
| .'<li><a href="/adm/coursedocs?forcesupplement=1&command=editsupp" ' |
.'<th>'.&mt('Actions').'</th>' |
| .'id="LC_content_toolbar_edittoplevel" ' |
.'<th colspan="2">'.&mt('Document').'</th>'; |
| .'class="LC_toolbarItem" ' |
if ($folder !~ /^supplemental/) { |
| .'title="'.&mt('Supplemental Content Editor').'">' |
$to_show .= '<th colspan="4">'.&mt('Settings').'</th>'; |
| .'</a></li></ul></td></tr></table><br />'; |
|
| if ($shown) { |
|
| if ($allowed) { |
|
| $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll') |
|
| .&Apache::loncommon::start_data_table(undef,'contentlist') |
|
| .&Apache::loncommon::start_data_table_header_row() |
|
| .'<th colspan="2">'.&mt('Move').'</th>' |
|
| .'<th>'.&mt('Actions').'</th>' |
|
| .'<th colspan="2">'.&mt('Document').'</th>'; |
|
| if ($folder !~ /^supplemental/) { |
|
| $to_show .= '<th colspan="4">'.&mt('Settings').'</th>'; |
|
| } |
|
| $to_show .= &Apache::loncommon::end_data_table_header_row(); |
|
| if ($folder !~ /^supplemental/) { |
|
| my $idxlist = join(',',@allidx); |
|
| my $mapidxlist = join(',',@allmapidx); |
|
| if (@allidx > 0) { |
|
| my $path; |
|
| if ($env{'form.folderpath'}) { |
|
| $path = |
|
| &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); |
|
| } |
|
| $to_show .= |
|
| &Apache::loncommon::continue_data_table_row(). |
|
| '<td colspan="5"> </td>'. |
|
| '<td colspan="4">'. |
|
| '<form action="/adm/coursedocs" method="post" name="togglemultchecks">'. |
|
| '<span class="LC_nobreak" style="font-size:x-small;font-weight:bold;">'.&mt('Select:').' '. |
|
| '<label><input type="radio" name="showmultpick" value="0" onclick="javascript:togglePick();" checked="checked" />'.&mt('single').'</label>'.(' 'x2).'<label><input type="radio" name="showmultpick" value="1" onclick="javascript:togglePick();" />'.&mt('multiple').'</label></span></form>'. |
|
| '<div id="multiclick" style="display: none">'. |
|
| '<form action="/adm/coursedocs" method="post" name="cumulativechecks" onsubmit="return submitSettings(this);">'."\n". |
|
| '<fieldset><legend style="font-size:x-small;">'.&mt('check/uncheck all').'</legend>'."\n". |
|
| '<table><tr><td class="LC_docs_entry_parameter"><span class="LC_nobreak"><input type="checkbox" name="hiddenresourceall" id="hiddenresourceall" onclick="propagateState(this.form,'."'hiddenresource'".')" />'.&mt('Hidden').'</span></td><td class="LC_docs_entry_parameter"><span class="LC_nobreak"><input type="checkbox" name="randompickall" id="randompickall" onclick="updatePick(this.form,'."'all','check'".');propagateState(this.form,'."'randompick'".');propagateState(this.form,'."'rpicknum'".');" />'.&mt('Randomly Pick').'<span id="rpicktextall"></span><input type="hidden" name="rpicknumall" id="rpicknumall" value="" /></span></td>'. |
|
| '</tr>'."\n". |
|
| '<tr><td class="LC_docs_entry_parameter"><span class="LC_nobreak"><input type="checkbox" name="encrypturlall" id="encrypturlall" onclick="propagateState(this.form,'."'encrypturl'".')" />'.&mt('URL hidden').'</span></td><td class="LC_docs_entry_parameter"><span class="LC_nobreak"><input type="checkbox" name="randomorderall" id="randomorderall" onclick="propagateState(this.form,'."'randomorder'".')" />'.&mt('Random Order').'</span></td></tr></table>'."\n". |
|
| '</fieldset>'. |
|
| '<input type="hidden" name="folderpath" value="'.$path.'" />'. |
|
| '<input type="hidden" name="symb" value="'.$env{'form.symb'}.'" />'. |
|
| '<input type="hidden" name="allhiddenresource" value="" />'. |
|
| '<input type="hidden" name="allencrypturl" value="" />'. |
|
| '<input type="hidden" name="allrandompick" value="" />'. |
|
| '<input type="hidden" name="allrandomorder" value="" />'. |
|
| '<input type="hidden" name="allidx" value="'.$idxlist.'" />'. |
|
| '<input type="hidden" name="allmapidx" value="'.$mapidxlist.'" />'. |
|
| '<input type="hidden" name="changeparms" value="all" />'. |
|
| '<input type="submit" name="multiplesettings" value="'.&mt('Save settings below').'" />'. |
|
| '</form>'. |
|
| '</div>'. |
|
| |
|
| '</td>'. |
|
| &Apache::loncommon::end_data_table_row(); |
|
| } |
|
| } |
|
| $to_show .= $output.' ' |
|
| .&Apache::loncommon::end_data_table() |
|
| .'<br style="line-height:2px;" />' |
|
| .&Apache::loncommon::end_scrollbox(); |
|
| } else { |
|
| $to_show .= $toolslink |
|
| .&Apache::loncommon::start_data_table('LC_tableOfContent') |
|
| .$output.' ' |
|
| .&Apache::loncommon::end_data_table(); |
|
| } |
|
| } else { |
|
| if (!$allowed) { |
|
| $to_show .= $toolslink; |
|
| } |
} |
| $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll') |
$to_show .= &Apache::loncommon::end_data_table_header_row(); |
| .'<div class="LC_info" id="contentlist">' |
|
| .&mt('Currently no documents.') |
|
| .'</div>' |
|
| .&Apache::loncommon::end_scrollbox(); |
|
| } |
|
| } else { |
|
| if ($shown) { |
|
| $to_show = '<div>' |
|
| .&Apache::loncommon::start_data_table('LC_tableOfContent') |
|
| .$output |
|
| .&Apache::loncommon::end_data_table() |
|
| .'</div>'; |
|
| } else { |
|
| $to_show = '<div class="LC_info" id="contentlist">' |
|
| .&mt('Currently no documents.') |
|
| .'</div>' |
|
| } |
} |
| |
$to_show .= $output.' ' |
| |
.&Apache::loncommon::end_data_table() |
| |
.'<br style="line-height:2px;" />' |
| |
.&Apache::loncommon::end_scrollbox(); |
| |
} 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(); |
| } |
} |
| my $tid = 1; |
my $tid = 1; |
| if ($supplementalflag) { |
if ($supplementalflag) { |
|
Line 2362 sub editor {
|
Line 1014 sub editor {
|
| my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container"; |
my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container"; |
| $r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,$jumpto, |
$r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,$jumpto, |
| $readfile)); |
$readfile)); |
| &print_paste_buffer($r,$container,$folder,$coursedom,$coursenum); |
&print_paste_buffer($r,$container); |
| } 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.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 2384 sub process_file_upload {
|
Line 1049 sub process_file_upload {
|
| my $errtext=''; |
my $errtext=''; |
| my $fatal=0; |
my $fatal=0; |
| my $container='sequence'; |
my $container='sequence'; |
| if ($env{'form.folderpath'} =~ /:1$/) { |
if ($env{'form.pagepath'}) { |
| $container='page'; |
$container='page'; |
| } |
} |
| ($errtext,$fatal)= |
($errtext,$fatal)= |
| &mapread($coursenum,$coursedom,$folder.'.'.$container); |
&mapread($coursenum,$coursedom,$folder.'.'.$container); |
| if ($#LONCAPA::map::order<1) { |
if ($#LONCAPA::map::order<1) { |
| $LONCAPA::map::order[0]=1; |
$LONCAPA::map::order[0]=1; |
| $LONCAPA::map::resources[1]=''; |
$LONCAPA::map::resources[1]=''; |
| } |
} |
| |
if ($fatal) { |
| |
$$upload_output = '<div class="LC_error" id="uploadfileresult">'.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'</div>'; |
| |
return; |
| |
} |
| my $destination = 'docs/'; |
my $destination = 'docs/'; |
| if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
| $destination = 'supplemental/'; |
$destination = 'supplemental/'; |
|
Line 2402 sub process_file_upload {
|
Line 1071 sub process_file_upload {
|
| } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) { |
} elsif ($folder =~ /^(default|supplemental)_(\d+)$/) { |
| $destination .= $2.'/'; |
$destination .= $2.'/'; |
| } |
} |
| if ($fatal) { |
|
| $$upload_output = '<div class="LC_error" id="uploadfileresult">'.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'</div>'; |
|
| return; |
|
| } |
|
| # this is for a course, not a user, so set context to coursedoc. |
# this is for a course, not a user, so set context to coursedoc. |
| my $newidx=&LONCAPA::map::getresidx(); |
my $newidx=&LONCAPA::map::getresidx(); |
| $destination .= $newidx; |
$destination .= $newidx; |
|
Line 2437 sub process_file_upload {
|
Line 1102 sub process_file_upload {
|
| $comment.':'.$url.':'.$ext.':normal:res'; |
$comment.':'.$url.':'.$ext.':normal:res'; |
| $LONCAPA::map::order[$#LONCAPA::map::order+1]= $newidx; |
$LONCAPA::map::order[$#LONCAPA::map::order+1]= $newidx; |
| ($errtext,$fatal)=&storemap($coursenum,$coursedom, |
($errtext,$fatal)=&storemap($coursenum,$coursedom, |
| $folder.'.'.$container,1); |
$folder.'.'.$container); |
| if ($fatal) { |
if ($fatal) { |
| $$upload_output = '<div class="LC_error" id="uploadfileresult">'.$errtext.'</div>'; |
$$upload_output = '<div class="LC_error" id="uploadfileresult">'.$errtext.'</div>'; |
| return; |
return; |
|
Line 2474 sub process_file_upload {
|
Line 1139 sub process_file_upload {
|
| my $archiveurl = &HTML::Entities::encode($url,'<>&"'); |
my $archiveurl = &HTML::Entities::encode($url,'<>&"'); |
| my %archiveitems = ( |
my %archiveitems = ( |
| folderpath => $env{'form.folderpath'}, |
folderpath => $env{'form.folderpath'}, |
| |
pagepath => $env{'form.pagepath'}, |
| cmd => $nextphase, |
cmd => $nextphase, |
| newidx => $newidx, |
newidx => $newidx, |
| position => $position, |
position => $position, |
|
Line 2524 sub is_supplemental_title {
|
Line 1190 sub is_supplemental_title {
|
| return scalar($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/); |
return scalar($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/); |
| } |
} |
| |
|
| |
sub parse_supplemental_title { |
| |
my ($title) = @_; |
| |
|
| |
my ($foldertitle,$renametitle); |
| |
if ($title =~ /&&&/) { |
| |
$title = &HTML::Entites::decode($title); |
| |
} |
| |
if ($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/) { |
| |
$renametitle=$4; |
| |
my ($time,$uname,$udom) = ($1,$2,$3); |
| |
$foldertitle=&Apache::lontexconvert::msgtexconverted($4); |
| |
my $name = &Apache::loncommon::plainname($uname,$udom); |
| |
$name = &HTML::Entities::encode($name,'"<>&\''); |
| |
$renametitle = &HTML::Entities::encode($renametitle,'"<>&\''); |
| |
$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '. |
| |
$name.': <br />'.$foldertitle; |
| |
} |
| |
if (wantarray) { |
| |
return ($title,$foldertitle,$renametitle); |
| |
} |
| |
return $title; |
| |
} |
| |
|
| # --------------------------------------------------------------- An entry line |
# --------------------------------------------------------------- An entry line |
| |
|
| sub entryline { |
sub entryline { |
| my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, |
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$crstype)=@_; |
| $crstype,$pathitem,$supplementalflag,$container)=@_; |
my ($foldertitle,$pagetitle,$renametitle); |
| my ($foldertitle,$renametitle); |
|
| if (&is_supplemental_title($title)) { |
if (&is_supplemental_title($title)) { |
| ($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); |
($title,$foldertitle,$renametitle) = &parse_supplemental_title($title); |
| |
$pagetitle = $foldertitle; |
| } else { |
} else { |
| $title=&HTML::Entities::encode($title,'"<>&\''); |
$title=&HTML::Entities::encode($title,'"<>&\''); |
| $renametitle=$title; |
$renametitle=$title; |
| $foldertitle=$title; |
$foldertitle=$title; |
| |
$pagetitle=$title; |
| } |
} |
| |
|
| my $orderidx=$LONCAPA::map::order[$index]; |
my $orderidx=$LONCAPA::map::order[$index]; |
| |
|
| |
|
| $renametitle=~s/\\/\\\\/g; |
$renametitle=~s/\\/\\\\/g; |
| $renametitle=~s/\"\;/\\\"/g; |
$renametitle=~s/\"\;/\\\"/g; |
| $renametitle=~s/ /%20/g; |
$renametitle=~s/ /%20/g; |
| my $line=&Apache::loncommon::start_data_table_row(); |
my $line=&Apache::loncommon::start_data_table_row(); |
| my ($form_start,$form_end,$form_common); |
my ($form_start,$form_end,$form_common); |
| # Edit commands |
# Edit commands |
| my ($esc_path, $path, $symb); |
my ($container, $type, $esc_path, $path, $symb); |
| if ($env{'form.folderpath'}) { |
if ($env{'form.folderpath'}) { |
| |
$type = 'folder'; |
| |
$container = 'sequence'; |
| $esc_path=&escape($env{'form.folderpath'}); |
$esc_path=&escape($env{'form.folderpath'}); |
| $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); |
$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); |
| # $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"'); |
# $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"'); |
| } |
} |
| my $isexternal; |
if ($env{'form.pagepath'}) { |
| if ($residx) { |
$type = $container = 'page'; |
| my $currurl = $url; |
$esc_path=&escape($env{'form.pagepath'}); |
| $currurl =~ s{^http(|s)(:|:)//}{/adm/wrapper/ext/}; |
$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"'); |
| if ($currurl =~ m{^/adm/wrapper/ext/}) { |
$symb=&escape($env{'form.pagesymb'}); |
| $isexternal = 1; |
|
| } |
|
| if (!$supplementalflag) { |
|
| my $path = 'uploaded/'. |
|
| $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'. |
|
| $env{'course.'.$env{'request.course.id'}.'.num'}.'/'; |
|
| $symb = &Apache::lonnet::encode_symb($path.$folder.".$container", |
|
| $residx, |
|
| &Apache::lonnet::declutter($currurl)); |
|
| } |
|
| } |
} |
| my ($renamelink,%lt); |
my $cpinfo=''; |
| if ($allowed) { |
if ($allowed) { |
| my $incindex=$index+1; |
my $incindex=$index+1; |
| my $selectbox=''; |
my $selectbox=''; |
|
Line 2591 sub entryline {
|
Line 1274 sub entryline {
|
| } |
} |
| $selectbox.='</select>'; |
$selectbox.='</select>'; |
| } |
} |
| %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
| 'up' => 'Move Up', |
'up' => 'Move Up', |
| 'dw' => 'Move Down', |
'dw' => 'Move Down', |
| 'rm' => 'Remove', |
'rm' => 'Remove', |
| 'ct' => 'Cut', |
'ct' => 'Cut', |
| 'rn' => 'Rename', |
'rn' => 'Rename', |
| 'cp' => 'Copy', |
'cp' => 'Copy'); |
| 'ex' => 'External Resource', |
|
| 'ed' => 'Edit', |
|
| 'pr' => 'Preview', |
|
| 'sv' => 'Save', |
|
| 'ul' => 'URL', |
|
| 'ti' => 'Title', |
|
| ); |
|
| my $nocopy=0; |
my $nocopy=0; |
| my $nocut=0; |
my $nocut=0; |
| my $noremove=0; |
if ($url=~/\.(page|sequence)$/) { |
| if ($url=~ m{^/res/.+\.(page|sequence)$}) { |
if ($url =~ m{/res/}) { |
| # no copy for published maps |
# no copy for published maps |
| $nocopy=1; |
$nocopy = 1; |
| |
} else { |
| |
foreach my $item (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) { |
| |
my ($title,$url,$ext,$type)=split(/\:/,$item); |
| |
if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) { |
| |
$nocopy=1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| } |
} |
| if ($url=~/^\/res\/lib\/templates\//) { |
if ($url=~/^\/res\/lib\/templates\//) { |
| $nocopy=1; |
$nocopy=1; |
| $nocut=1; |
$nocut=1; |
| } |
} |
| my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $copylink=' '; |
| my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cutlink=' '; |
| if ($url eq "/uploaded/$cdom/$cnum/group_allfolders.sequence") { |
|
| if ($env{'form.folderpath'} =~ /^default&[^\&]+$/) { |
|
| my %curr_groups = &Apache::longroup::coursegroups(); |
|
| if (keys(%curr_groups) > 0) { |
|
| $noremove=1; |
|
| } |
|
| $nocut=1; |
|
| $nocopy=1; |
|
| } |
|
| } elsif ($url =~ m{^\Q/uploaded/$cdom/$cnum/group_folder_\E(\w+)\.sequence$}) { |
|
| my $group = $1; |
|
| if ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+$/) { |
|
| my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group); |
|
| if (keys(%curr_group) > 0) { |
|
| $noremove=1; |
|
| } |
|
| } |
|
| $nocut=1; |
|
| $nocopy=1; |
|
| } elsif ($url =~ m{^\Q/adm/$cdom/$cnum/\E(\w+)/smppg$}) { |
|
| my $group = $1; |
|
| if ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+\&\Qgroup_folder_$group\E\&[^\&]+$/) { |
|
| my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group); |
|
| my %groupsettings = &Apache::longroup::get_group_settings($curr_group{$group}); |
|
| if (keys(%groupsettings) > 0) { |
|
| $noremove=1; |
|
| } |
|
| $nocut=1; |
|
| $nocopy=1; |
|
| } |
|
| } elsif ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+\&group_folder_(\w+)\&/) { |
|
| my $group = $1; |
|
| my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group); |
|
| if ($url =~ /group_boards_\Q$group\E/) { |
|
| my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group); |
|
| my %groupsettings = &Apache::longroup::get_group_settings($curr_group{$group}); |
|
| if (keys(%groupsettings) > 0) { |
|
| if (ref($groupsettings{'functions'}) eq 'HASH') { |
|
| if ($groupsettings{'functions'}{'discussion'} eq 'on') { |
|
| $noremove=1; |
|
| } |
|
| } |
|
| } |
|
| $nocut=1; |
|
| $nocopy=1; |
|
| } |
|
| } |
|
| my ($copylink,$cutlink,$removelink); |
|
| my $skip_confirm = 0; |
my $skip_confirm = 0; |
| if ( $folder =~ /^supplemental/ |
if ( $folder =~ /^supplemental/ |
| || ($url =~ m{( /smppg$ |
|| ($url =~ m{( /smppg$ |
|
Line 2673 sub entryline {
|
Line 1311 sub entryline {
|
| |/aboutme$ |
|/aboutme$ |
| |/navmaps$ |
|/navmaps$ |
| |/bulletinboard$ |
|/bulletinboard$ |
| |\.html$)}x) |
|\.html$ |
| || $isexternal) { |
|^/adm/wrapper/ext)}x)) { |
| $skip_confirm = 1; |
$skip_confirm = 1; |
| } |
} |
| |
|
| if ($nocopy) { |
if (!$nocopy) { |
| $copylink=(<<ENDCOPY); |
|
| <span style="visibility: hidden;">$lt{'cp'}</span> |
|
| ENDCOPY |
|
| } else { |
|
| $copylink=(<<ENDCOPY); |
$copylink=(<<ENDCOPY); |
| <a href="javascript:markcopy('$esc_path','$index','$renametitle','$container','$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); |
|
| <span style="visibility: hidden;">$lt{'ct'}</span> |
|
| ENDCUT |
|
| } else { |
|
| $cutlink=(<<ENDCUT); |
$cutlink=(<<ENDCUT); |
| <a href="javascript:cutres('$esc_path','$index','$renametitle','$container','$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 |
| } |
} |
| if ($noremove) { |
|
| $removelink=(<<ENDREM); |
|
| <span style="visibility: hidden;">$lt{'rm'}</a> |
|
| ENDREM |
|
| } else { |
|
| $removelink=(<<ENDREM); |
|
| <a href='javascript:removeres("$esc_path","$index","$renametitle",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a> |
|
| ENDREM |
|
| } |
|
| unless ($isexternal) { |
|
| $renamelink=(<<ENDREN); |
|
| <a href='javascript:changename("$esc_path","$index","$renametitle");' class="LC_docs_rename">$lt{'rn'}</a> |
|
| ENDREN |
|
| } |
|
| $form_start = ' |
$form_start = ' |
| <form action="/adm/coursedocs" method="post"> |
<form action="/adm/coursedocs" method="post"> |
| '; |
'; |
| $form_common=(<<END); |
$form_common=(<<END); |
| <input type="hidden" name="folderpath" value="$path" /> |
<input type="hidden" name="${type}path" value="$path" /> |
| <input type="hidden" name="symb" value="$symb" /> |
<input type="hidden" name="${type}symb" value="$symb" /> |
| <input type="hidden" name="setparms" value="$orderidx" /> |
<input type="hidden" name="setparms" value="$orderidx" /> |
| <input type="hidden" name="changeparms" value="0" /> |
<input type="hidden" name="changeparms" value="0" /> |
| END |
END |
|
Line 2723 END
|
Line 1339 END
|
| $line.=(<<END); |
$line.=(<<END); |
| <td> |
<td> |
| <div class="LC_docs_entry_move"> |
<div class="LC_docs_entry_move"> |
| <a href='/adm/coursedocs?cmd=up_$index&folderpath=$esc_path&symb=$symb'> |
<a href='/adm/coursedocs?cmd=up_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'> |
| <img src="${iconpath}move_up.gif" alt="$lt{'up'}" class="LC_icon" /> |
<img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /> |
| </a> |
</a> |
| </div> |
</div> |
| <div class="LC_docs_entry_move"> |
<div class="LC_docs_entry_move"> |
| <a href='/adm/coursedocs?cmd=down_$index&folderpath=$esc_path&symb=$symb'> |
<a href='/adm/coursedocs?cmd=down_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'> |
| <img src="${iconpath}move_down.gif" alt="$lt{'dw'}" class="LC_icon" /> |
<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /> |
| </a> |
</a> |
| </div> |
</div> |
| </td> |
</td> |
|
Line 2739 END
|
Line 1355 END
|
| $selectbox |
$selectbox |
| $form_end |
$form_end |
| </td> |
</td> |
| <td class="LC_docs_entry_commands"><span class="LC_nobreak"> |
<td class="LC_docs_entry_commands"> |
| $removelink |
<a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a> |
| $cutlink |
$cutlink |
| |
<a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a> |
| $copylink |
$copylink |
| </span> |
|
| </td> |
</td> |
| END |
END |
| |
|
|
Line 2752 END
|
Line 1368 END
|
| my ($extension)=($url=~/\.(\w+)$/); |
my ($extension)=($url=~/\.(\w+)$/); |
| my $uploaded=($url=~/^\/*uploaded\//); |
my $uploaded=($url=~/^\/*uploaded\//); |
| my $icon=&Apache::loncommon::icon($url); |
my $icon=&Apache::loncommon::icon($url); |
| my $isfolder; |
my $isfolder=0; |
| my $ispage; |
my $ispage=0; |
| my $containerarg; |
my $folderarg; |
| |
my $pagearg; |
| |
my $pagefile; |
| if ($uploaded) { |
if ($uploaded) { |
| if (($extension eq 'sequence') || ($extension eq 'page')) { |
if (($extension eq 'sequence') || ($extension eq 'page')) { |
| $url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/; |
$url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/; |
| $containerarg = $1; |
my $containerarg = $1; |
| if ($extension eq 'sequence') { |
if ($extension eq 'sequence') { |
| $icon=$iconpath.'navmap.folder.closed.gif'; |
$icon=$iconpath.'navmap.folder.closed.gif'; |
| |
$folderarg=$containerarg; |
| $isfolder=1; |
$isfolder=1; |
| } else { |
} else { |
| $icon=$iconpath.'page.gif'; |
$icon=$iconpath.'page.gif'; |
| |
$pagearg=$containerarg; |
| $ispage=1; |
$ispage=1; |
| } |
} |
| if ($allowed) { |
if ($allowed) { |
|
Line 2776 END
|
Line 1396 END
|
| } |
} |
| } |
} |
| |
|
| my ($editlink,$extresform); |
|
| my $orig_url = $url; |
my $orig_url = $url; |
| $orig_url=~s{http(:|:)//https(:|:)//}{https$2//}; |
$orig_url=~s{http(:|:)//https(:|:)//}{https$2//}; |
| $url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/}; |
my $external = ($url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/}); |
| if (!$supplementalflag && $residx && $symb) { |
if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) { |
| if ((!$isfolder) && (!$ispage)) { |
my $symb=&Apache::lonnet::symbclean( |
| (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
&Apache::lonnet::declutter('uploaded/'. |
| $url=&Apache::lonnet::clutter($url); |
$env{'course.'.$env{'request.course.id'}.'.domain'}.'/'. |
| if ($url=~/^\/*uploaded\//) { |
$env{'course.'.$env{'request.course.id'}.'.num'}.'/'.$folder. |
| $url=~/\.(\w+)$/; |
'.sequence'). |
| my $embstyle=&Apache::loncommon::fileembstyle($1); |
'___'.$residx.'___'. |
| if (($embstyle eq 'img') || ($embstyle eq 'emb')) { |
&Apache::lonnet::declutter($url)); |
| $url='/adm/wrapper'.$url; |
(undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
| } elsif ($embstyle eq 'ssi') { |
$url=&Apache::lonnet::clutter($url); |
| #do nothing with these |
if ($url=~/^\/*uploaded\//) { |
| } elsif ($url!~/\.(sequence|page)$/) { |
$url=~/\.(\w+)$/; |
| $url='/adm/coursedocs/showdoc'.$url; |
my $embstyle=&Apache::loncommon::fileembstyle($1); |
| } |
if (($embstyle eq 'img') || ($embstyle eq 'emb')) { |
| } elsif ($url=~m|^/ext/|) { |
$url='/adm/wrapper'.$url; |
| $url='/adm/wrapper'.$url; |
} elsif ($embstyle eq 'ssi') { |
| } |
#do nothing with these |
| if (&Apache::lonnet::symbverify($symb,$url)) { |
} elsif ($url!~/\.(sequence|page)$/) { |
| $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb); |
$url='/adm/coursedocs/showdoc'.$url; |
| } else { |
} |
| $url=''; |
} elsif ($url=~m|^/ext/|) { |
| } |
$url='/adm/wrapper'.$url; |
| |
$external = 1; |
| |
} |
| |
if (&Apache::lonnet::symbverify($symb,$url)) { |
| |
$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb); |
| |
} else { |
| |
$url=''; |
| |
} |
| |
if ($container eq 'page') { |
| |
my $symb=$env{'form.pagesymb'}; |
| |
|
| |
$url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]); |
| |
$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb); |
| } |
} |
| } |
} |
| 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 || $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.=$containerarg.'&'.$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.=$containerarg.'&'.$foldername. |
$folderpath.=$folderarg.'&'.$foldername.':'.(&LONCAPA::map::getparameter($orderidx, |
| ':'.(&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) |
| .':'.((&LONCAPA::map::getparameter($orderidx, |
.':'.((&LONCAPA::map::getparameter($orderidx, |
| '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); |
| .':'.$ispage; |
$url.='folderpath='.&escape($folderpath).$cpinfo; |
| $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_randompick_'.$orderidx; |
$rand_pick_text = |
| $rand_pick_text = |
|
| '<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n". |
|
| $form_common."\n". |
|
| '<span class="LC_nobreak"><label><input type="checkbox" name="randompick_'.$orderidx.'" id="randompick_'.$orderidx.'" onclick="'."updatePick(this.form,'$orderidx','check');".'"'.$rpckchk.' /> '.&mt('Randomly Pick').'</label><input type="hidden" name="rpicknum_'.$orderidx.'" id="rpicknum_'.$orderidx.'" value="'.$rpicknum.'" /><span id="randompicknum_'.$orderidx.'">'; |
|
| if ($rpicknum ne '') { |
|
| $rand_pick_text .= ': <a href="javascript:updatePick('."document.$formname,'$orderidx','link'".')">'.$rpicknum.'</a>'; |
|
| } |
|
| $rand_pick_text .= '</span></span>'. |
|
| $form_end; |
|
| my $ro_set= |
|
| ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':''); |
|
| my $formname = 'edit_rorder_'.$orderidx; |
|
| $rand_order_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="randomorder_'.$orderidx.'" id="randomorder_'.$orderidx.'" onclick="checkForSubmit(this.form,'."'randomorder'".')"; '.$ro_set.' /> '.&mt('Random Order').' </label></span>'. |
'<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.'" />'; |
| $form_end; |
if ($rpicknum ne '') { |
| } |
$rand_pick_text .= ': <a href="javascript:updatePick('."document.$formname,'$orderidx','link'".')">'.$rpicknum.'</a>'; |
| } elsif ($supplementalflag && !$allowed) { |
} |
| $url .= ($url =~ /\?/) ? '&':'?'; |
$rand_pick_text .= '</span></form>'; |
| $url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"'); |
my $ro_set= |
| if ($title) { |
((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':''); |
| $url .= '&title='.&HTML::Entities::encode($renametitle,'<>&"'); |
$rand_order_text = |
| } |
$form_start. |
| if ($isexternal && $orderidx) { |
$form_common.' |
| $url .= '&idx='.$orderidx; |
<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>'; |
| } |
} |
| } |
if ($ispage) { |
| my ($tdalign,$tdwidth); |
my $pagename=&escape($pagetitle); |
| if ($allowed) { |
my $pagepath; |
| my $fileloc = |
my $folderpath=$env{'form.folderpath'}; |
| &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url)); |
if ($folderpath) { $pagepath = $folderpath.'&' }; |
| if ($isexternal) { |
$pagepath.=$pagearg.'&'.$pagename; |
| ($editlink,$extresform) = |
my $symb=$env{'form.pagesymb'}; |
| &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem); |
if (!$symb) { |
| } elsif (!$isfolder && !$ispage) { |
my $path='uploaded/'. |
| my ($cfile,$home,$switchserver,$forceedit,$forceview) = |
$env{'course.'.$env{'request.course.id'}.'.domain'}.'/'. |
| &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url); |
$env{'course.'.$env{'request.course.id'}.'.num'}.'/'; |
| if (($cfile ne '') && ($symb ne '' || $supplementalflag)) { |
$symb=&Apache::lonnet::encode_symb($path.$folder.'.sequence', |
| my $jscall = |
$residx, |
| &Apache::lonhtmlcommon::jump_to_editres($cfile,$home, |
$path.$pagearg.'.page'); |
| $switchserver, |
} |
| $forceedit, |
$url.='pagepath='.&escape($pagepath). |
| undef,$symb, |
'&pagesymb='.&escape($symb).$cpinfo; |
| &escape($env{'form.folderpath'}), |
} |
| $renametitle,'','',1); |
if (($external) && ($allowed)) { |
| if ($jscall) { |
my $form = ($folder =~ /^default/)? 'newext' : 'supnewext'; |
| $editlink = '<a class="LC_docs_ext_edit" href="javascript:'. |
$external = ' <a class="LC_docs_ext_edit" href="javascript:edittext(\''.$form.'\',\''.$residx.'\',\''.&escape($title).'\',\''.&escape($orig_url).'\');" >'.&mt('Edit').'</a>'; |
| $jscall.'" >'.&mt('Edit').'</a> '."\n"; |
} else { |
| } |
undef($external); |
| } |
|
| } |
|
| $tdalign = ' align="right" valign="top"'; |
|
| $tdwidth = ' width="80%"'; |
|
| } |
} |
| my $reinit; |
my $reinit; |
| if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
| $reinit = &mt('(re-initialize community to access)'); |
$reinit = &mt('(re-initialize community to access)'); |
| } else { |
} else { |
| $reinit = &mt('(re-initialize course to access)'); |
$reinit = &mt('(re-initialize course to access)'); |
| } |
} |
| $line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink; |
$line.='<td>'; |
| 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 2903 $form_end;
|
Line 1512 $form_end;
|
| } else { |
} else { |
| $line.='<img src="'.$icon.'" alt="" class="LC_icon" />'; |
$line.='<img src="'.$icon.'" alt="" class="LC_icon" />'; |
| } |
} |
| $line.='</span></td><td'.$tdwidth.'>'; |
$line.='</td><td>'; |
| 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 2912 $form_end;
|
Line 1521 $form_end;
|
| } else { |
} else { |
| $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>'; |
$line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>'; |
| } |
} |
| $line.="$extresform</td>"; |
$line.=$external."</td>"; |
| $rand_pick_text = ' ' if ($rand_pick_text eq ''); |
$rand_pick_text = ' ' if ($rand_pick_text eq ''); |
| $rand_order_text = ' ' if ($rand_order_text eq ''); |
$rand_order_text = ' ' if ($rand_order_text eq ''); |
| if (($allowed) && ($folder!~/^supplemental/)) { |
if (($allowed) && ($folder!~/^supplemental/)) { |
|
Line 2923 $form_end;
|
Line 1532 $form_end;
|
| ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="checked"':''); |
((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="checked"':''); |
| my $hidtext= |
my $hidtext= |
| ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="checked"':''); |
((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="checked"':''); |
| my $formhidden = 'edit_hiddenresource_'.$orderidx; |
|
| my $formurlhidden = 'edit_encrypturl_'.$orderidx; |
|
| $line.=(<<ENDPARMS); |
$line.=(<<ENDPARMS); |
| <td class="LC_docs_entry_parameter"> |
<td class="LC_docs_entry_parameter"> |
| <form action="/adm/coursedocs" method="post" name="$formhidden"> |
$form_start |
| $form_common |
$form_common |
| <label><input type="checkbox" name="hiddenresource_$orderidx" id="hiddenresource_$orderidx" onclick="checkForSubmit(this.form,'."'hiddenresource'".');" $hidtext /> $lt{'hd'}</label> |
<label><input type="checkbox" name="hiddenresource_$orderidx" onclick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label> |
| $form_end |
$form_end |
| <br /> |
<br /> |
| <form action="/adm/coursedocs" method="post" name="$formurlhidden"> |
$form_start |
| $form_common |
$form_common |
| <label><input type="checkbox" name="encrypturl_$orderidx" id="encrypturl_$orderidx" onclick="checkForSubmit(this.form,'."'encrypturl'".');" $enctext /> $lt{'ec'}</label> |
<label><input type="checkbox" name="encrypturl_$orderidx" onclick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label> |
| $form_end |
$form_end |
| </td> |
</td> |
| <td class="LC_docs_entry_parameter">$rand_pick_text<br /> |
<td class="LC_docs_entry_parameter">$rand_pick_text<br /> |
|
Line 2945 ENDPARMS
|
Line 1552 ENDPARMS
|
| return $line; |
return $line; |
| } |
} |
| |
|
| sub new_timebased_suffix { |
|
| my ($coursedom,$coursenum,$type,$area,$container) = @_; |
|
| my ($prefix,$namespace,$idtype,$errtext,$locknotfreed); |
|
| if ($type eq 'map') { |
|
| $prefix = 'docs'; |
|
| if ($area eq 'supplemental') { |
|
| $prefix = 'supp'; |
|
| } |
|
| $prefix .= $container; |
|
| $namespace = 'uploadedmaps'; |
|
| } else { |
|
| $prefix = $type; |
|
| $namespace = 'templated'; |
|
| } |
|
| $idtype = 'concat'; |
|
| my ($suffix,$freedlock,$error) = |
|
| &Apache::lonnet::get_timebased_id($prefix,'num',$namespace, |
|
| $coursedom,$coursenum); |
|
| if (!$suffix) { |
|
| if ($type eq 'map') { |
|
| $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.'); |
|
| } elsif ($type eq 'smppg') { |
|
| $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.'); |
|
| } else { |
|
| $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new bulletin board.'); |
|
| } |
|
| if ($error) { |
|
| $errtext .= '<br />'.$error; |
|
| } |
|
| } |
|
| if ($freedlock ne 'ok') { |
|
| $locknotfreed = |
|
| '<div class="LC_error">'. |
|
| &mt('There was a problem removing a lockfile.').' '; |
|
| if ($type eq 'map') { |
|
| &mt('This will prevent creation of additional folders or composite pages in this course.'); |
|
| } elsif ($type eq 'smppg') { |
|
| $locknotfreed .= |
|
| &mt('This will prevent creation of additional simple pages in this course.'); |
|
| } else { |
|
| $locknotfreed .= |
|
| &mt('This will prevent creation of additional bulletin boards in this course.'); |
|
| } |
|
| $locknotfreed .= |
|
| ' '.&mt('Please contact the domain coordinator for your LON-CAPA domain.'). |
|
| '</div>'; |
|
| } |
|
| return ($suffix,$errtext,$locknotfreed); |
|
| } |
|
| |
|
| =pod |
=pod |
| |
|
| =item tiehash() |
=item tiehash() |
|
Line 3090 sub checkonthis {
|
Line 1647 sub checkonthis {
|
| $r->print('<span class="LC_error">'.&mt('connection down').'</span>'); |
$r->print('<span class="LC_error">'.&mt('connection down').'</span>'); |
| } elsif ($result eq 'not_found') { |
} elsif ($result eq 'not_found') { |
| unless ($url=~/\$/) { |
unless ($url=~/\$/) { |
| $r->print('<span class="LC_error">'.&mt('not found').'</span>'); |
$r->print('<span class="LC_error">'.&mt('not found').'</b></span>'); |
| } else { |
} else { |
| $r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>'); |
$r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>'); |
| } |
} |
|
Line 3136 sub list_symbs {
|
Line 1693 sub list_symbs {
|
| $r->print(&Apache::loncommon::start_data_table_row(). |
$r->print(&Apache::loncommon::start_data_table_row(). |
| '<td>'.$res->compTitle().'</td>'. |
'<td>'.$res->compTitle().'</td>'. |
| '<td>'.$res->symb().'</td>'. |
'<td>'.$res->symb().'</td>'. |
| &Apache::loncommon::end_data_table_row()); |
&Apache::loncommon::start_data_table_row()); |
| $count ++; |
$count ++; |
| } |
} |
| if (!$count) { |
if (!$count) { |
|
Line 3146 sub list_symbs {
|
Line 1703 sub list_symbs {
|
| } |
} |
| $r->print(&Apache::loncommon::end_data_table()); |
$r->print(&Apache::loncommon::end_data_table()); |
| } |
} |
| $r->print(&endContentScreen()); |
|
| } |
} |
| |
|
| |
|
|
Line 3177 sub verifycontent {
|
Line 1733 sub verifycontent {
|
| } |
} |
| &untiehash(); |
&untiehash(); |
| $r->print('<p class="LC_success">'.&mt('Done').'</p>'); |
$r->print('<p class="LC_success">'.&mt('Done').'</p>'); |
| $r->print(&endContentScreen()); |
|
| } |
} |
| |
|
| |
|
|
Line 3257 sub checkversions {
|
Line 1812 sub checkversions {
|
| if ($env{'form.timerange'} eq 'all') { |
if ($env{'form.timerange'} eq 'all') { |
| # show all documents |
# show all documents |
| $header=&mt('All Documents in '.$crstype); |
$header=&mt('All Documents in '.$crstype); |
| $allsel=' selected="selected"'; |
$allsel=1; |
| foreach my $key (keys(%hash)) { |
foreach my $key (keys(%hash)) { |
| if ($key=~/^ids\_(\/res\/.+)$/) { |
if ($key=~/^ids\_(\/res\/.+)$/) { |
| my $src=$1; |
my $src=$1; |
|
Line 3278 sub checkversions {
|
Line 1833 sub checkversions {
|
| .&mt('seconds'); |
.&mt('seconds'); |
| if ($env{'form.timerange'}==-1) { |
if ($env{'form.timerange'}==-1) { |
| $seltext='since start of course'; |
$seltext='since start of course'; |
| $startsel=' selected="selected"'; |
$startsel='selected'; |
| $env{'form.timerange'}=time; |
$env{'form.timerange'}=time; |
| } |
} |
| $starttime=time-$env{'form.timerange'}; |
$starttime=time-$env{'form.timerange'}; |
| if ($env{'form.timerange'}==2592000) { |
if ($env{'form.timerange'}==2592000) { |
| $seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; |
$seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; |
| $monthsel=' selected="selected"'; |
$monthsel='selected'; |
| } elsif ($env{'form.timerange'}==604800) { |
} elsif ($env{'form.timerange'}==604800) { |
| $seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; |
$seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; |
| $weeksel=' selected="selected"'; |
$weeksel='selected'; |
| } elsif ($env{'form.timerange'}==86400) { |
} elsif ($env{'form.timerange'}==86400) { |
| $seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; |
$seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; |
| $daysel=' selected="selected"'; |
$daysel='selected'; |
| } |
} |
| $header=&mt('Content changed').' '.$seltext; |
$header=&mt('Content changed').' '.$seltext; |
| } else { |
} else { |
|
Line 3328 sub checkversions {
|
Line 1883 sub checkversions {
|
| <fieldset> |
<fieldset> |
| <legend>$lt{'cd'}</legend> |
<legend>$lt{'cd'}</legend> |
| <select name="timerange"> |
<select name="timerange"> |
| <option value='all'$allsel>$lt{'al'}</option> |
<option value='all' $allsel>$lt{'al'}</option> |
| <option value="-1"$startsel>$lt{'st'}</option> |
<option value="-1" $startsel>$lt{'st'}</option> |
| <option value="2592000"$monthsel>$lt{'lm'}</option> |
<option value="2592000" $monthsel>$lt{'lm'}</option> |
| <option value="604800"$weeksel>$lt{'lw'}</option> |
<option value="604800" $weeksel>$lt{'lw'}</option> |
| <option value="86400"$daysel>$lt{'sy'}</option> |
<option value="86400" $daysel>$lt{'sy'}</option> |
| </select> |
</select> |
| <input type="submit" name="display" value="$lt{'sd'}" /> |
<input type="submit" name="display" value="$lt{'sd'}" /> |
| </fieldset> |
</fieldset> |
|
Line 3348 $lt{'sc'}: <input type="submit" name="se
|
Line 1903 $lt{'sc'}: <input type="submit" name="se
|
| <hr /> |
<hr /> |
| <h4>$lt{'vers'}</h4> |
<h4>$lt{'vers'}</h4> |
| <input type="submit" name="setversions" value="$lt{'save'}" /> |
<input type="submit" name="setversions" value="$lt{'save'}" /> |
| |
<table border="0"> |
| ENDHEADERS |
ENDHEADERS |
| #number of columns for version history |
#number of columns for version history |
| |
my $num_ver_col = 1; |
| $r->print( |
$r->print( |
| &Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
| &Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
| '<th>'.&mt('Resources').'</th>'. |
'<th>'.&mt('Resources').'</th>'. |
| "<th>$lt{'mr'}</th>". |
"<th>$lt{'mr'}</th>". |
| "<th>$lt{'ve'}</th>". |
"<th>$lt{'ve'}</th>". |
| "<th>$lt{'vu'}</th>". |
"<th>$lt{'vu'}</th>". |
| '<th>'.&mt('History').'</th>'. |
'<th colspan="'.$num_ver_col.'">'.&mt('History').'</th>'. |
| &Apache::loncommon::end_data_table_header_row() |
'</b>'); |
| ); |
|
| foreach my $key (sort(keys(%changes))) { |
foreach my $key (sort(keys(%changes))) { |
| #excludes not versionable problems from resource version history: |
if ($changes{$key}>$starttime) { |
| next unless ($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) { |
$currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>'; |
| $currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>'; |
} |
| } |
my $linkurl=&Apache::lonnet::clutter($key); |
| my $linkurl=&Apache::lonnet::clutter($key); |
|
| $r->print( |
$r->print( |
| |
&Apache::loncommon::end_data_table_header_row(). |
| &Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
| '<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br />'. |
'<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br>'. |
| '<a href="'.$linkurl.'" target="cat">'.$linkurl.'</a></td>'. |
'<a href="'.$linkurl.'" target="cat">'.$linkurl.'</a></td>'. |
| '<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br />('. |
'<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br>('. |
| &Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate')).')</span></td>'. |
&Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate')).')</span></td>'. |
| '<td align="right">' |
'<td align="right">'); |
| ); |
# Used in course |
| # Used in course |
my $usedversion=$hash{'version_'.$linkurl}; |
| my $usedversion=$hash{'version_'.$linkurl}; |
if (($usedversion) && ($usedversion ne 'mostrecent')) { |
| if (($usedversion) && ($usedversion ne 'mostrecent')) { |
if($usedversion != $currentversion){ |
| if ($usedversion != $currentversion) { |
|
| $r->print('<span class="LC_warning">'.$usedversion.'</span>'); |
$r->print('<span class="LC_warning">'.$usedversion.'</span>'); |
| } else { |
}else{ |
| $r->print($usedversion); |
$r->print($usedversion); |
| } |
} |
| |
} else { |
| |
$r->print($currentversion); |
| |
} |
| |
$r->print('</td><td title="'.$lt{'vu'}.'">'); |
| |
# Set version |
| |
$r->print(&Apache::loncommon::select_form($setversions{$linkurl}, |
| |
'set_version_'.$linkurl, |
| |
{'select_form_order' => |
| |
['',1..$currentversion,'mostrecent'], |
| |
'' => '', |
| |
'mostrecent' => &mt('most recent'), |
| |
map {$_,$_} (1..$currentversion)})); |
| |
my $lastold=1; |
| |
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { |
| |
my $url=$root.'.'.$prevvers.'.'.$extension; |
| |
if (&Apache::lonnet::metadata($url,'lastrevisiondate')< |
| |
$starttime) { |
| |
$lastold=$prevvers; |
| |
} |
| |
} |
| |
# |
| |
# Code to figure out how many version entries should go in |
| |
# each of the four columns |
| |
my $entries_per_col = 0; |
| |
my $num_entries = ($currentversion-$lastold); |
| |
if ($num_entries % $num_ver_col == 0) { |
| |
$entries_per_col = $num_entries/$num_ver_col; |
| } else { |
} else { |
| $r->print($currentversion); |
$entries_per_col = $num_entries/$num_ver_col + 1; |
| } |
|
| $r->print('</td><td title="'.$lt{'vu'}.'">'); |
|
| # Set version |
|
| $r->print(&Apache::loncommon::select_form( |
|
| $setversions{$linkurl}, |
|
| 'set_version_'.$linkurl, |
|
| {'select_form_order' => ['',1..$currentversion,'mostrecent'], |
|
| '' => '', |
|
| 'mostrecent' => &mt('most recent'), |
|
| map {$_,$_} (1..$currentversion)})); |
|
| my $lastold=1; |
|
| for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { |
|
| my $url=$root.'.'.$prevvers.'.'.$extension; |
|
| if (&Apache::lonnet::metadata($url,'lastrevisiondate')<$starttime) { |
|
| $lastold=$prevvers; |
|
| } |
} |
| } |
my $entries_count = 0; |
| $r->print('</td>'); |
$r->print('<td valign="top"><span class="LC_fontsize_medium">'); |
| # List all available versions |
my $cols_output = 1; |
| $r->print('<td valign="top"><span class="LC_fontsize_medium">'); |
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { |
| for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { |
my $url=$root.'.'.$prevvers.'.'.$extension; |
| my $url=$root.'.'.$prevvers.'.'.$extension; |
$r->print('<span class="LC_nobreak"><a href="'.&Apache::lonnet::clutter($url). |
| $r->print( |
'">'.&mt('Version').' '.$prevvers.'</a> ('. |
| '<span class="LC_nobreak">' |
&Apache::lonlocal::locallocaltime( |
| .'<a href="'.&Apache::lonnet::clutter($url).'">' |
&Apache::lonnet::metadata($url, |
| .&mt('Version [_1]',$prevvers).'</a>' |
'lastrevisiondate') |
| .' ('.&Apache::lonlocal::locallocaltime( |
). |
| &Apache::lonnet::metadata($url,'lastrevisiondate')) |
')'); |
| .')'); |
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { |
| if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { |
$r->print(' <a href="/adm/diff?filename='. |
| $r->print( |
&Apache::lonnet::clutter($root.'.'.$extension). |
| ' <a href="/adm/diff?filename='. |
'&versionone='.$prevvers. |
| &Apache::lonnet::clutter($root.'.'.$extension). |
'" target="diffs">'.&mt('Diffs').'</a>'); |
| &HTML::Entities::encode('&versionone='.$prevvers,'"<>&'). |
} |
| '" target="diffs">'.&mt('Diffs').'</a>'); |
$r->print('</span><br />'); |
| |
if (++$entries_count % $entries_per_col == 0) { |
| |
$r->print('</span></td>'); |
| |
if ($cols_output != $num_ver_col) { |
| |
$r->print('<td valign="top"><span class="LC_fontsize_medium">'); |
| |
$cols_output++; |
| |
} |
| |
} |
| |
} |
| |
while($cols_output++ < $num_ver_col) { |
| |
$r->print('</span></td><td>'); |
| } |
} |
| $r->print('</span><br />'); |
} |
| } |
|
| $r->print('</span></td>'.&Apache::loncommon::end_data_table_row()); |
|
| } |
} |
| $r->print( |
$r->print('</td>'.&Apache::loncommon::end_data_table_row(). |
| &Apache::loncommon::end_data_table(). |
&Apache::loncommon::end_data_table(). |
| '<input type="submit" name="setversions" value="'.$lt{'save'}.'" />'. |
'<input type="submit" name="setversions" value="'.$lt{'save'}.'" />'); |
| '</form>' |
|
| ); |
|
| |
|
| &untiehash(); |
&untiehash(); |
| $r->print(&endContentScreen()); |
|
| } |
} |
| |
|
| sub mark_hash_old { |
sub mark_hash_old { |
|
Line 3466 sub changewarning {
|
Line 2038 sub changewarning {
|
| my $pathvar='folderpath'; |
my $pathvar='folderpath'; |
| my $path=&escape($env{'form.folderpath'}); |
my $path=&escape($env{'form.folderpath'}); |
| if (!defined($url)) { |
if (!defined($url)) { |
| |
if (defined($env{'form.pagepath'})) { |
| |
$pathvar='pagepath'; |
| |
$path=&escape($env{'form.pagepath'}); |
| |
$path.='&pagesymb='.&escape($env{'form.pagesymb'}); |
| |
} |
| $url='/adm/coursedocs?'.$pathvar.'='.$path; |
$url='/adm/coursedocs?'.$pathvar.'='.$path; |
| } |
} |
| my $course_type = &Apache::loncommon::course_type(); |
my $course_type = &Apache::loncommon::course_type(); |
|
Line 3506 sub init_breadcrumbs {
|
Line 2083 sub init_breadcrumbs {
|
| sub create_list_elements { |
sub create_list_elements { |
| my @formarr = @_; |
my @formarr = @_; |
| my $list = ''; |
my $list = ''; |
| foreach my $button (@formarr){ |
for my $button (@formarr){ |
| foreach my $picture (keys(%{$button})) { |
for my $picture(keys %$button) { |
| $list .= &Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text', id => ''}); |
$list .= &Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'}); |
| } |
} |
| } |
} |
| return $list; |
return $list; |
|
Line 3531 sub startContentScreen {
|
Line 2108 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 3577 sub handler {
|
Line 2155 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','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 3595 sub handler {
|
Line 2172 sub handler {
|
| 'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages'); |
'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages'); |
| $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'); |
| $help{'Course Roster'} = &Apache::loncommon::help_open_topic('Docs_Course_Roster'); |
|
| $help{'Web Page'} = &Apache::loncommon::help_open_topic('Docs_Web_Page'); |
|
| |
|
| my $allowed; |
my $allowed; |
| # URI is /adm/supplemental when viewing supplemental docs in non-edit mode. |
# URI is /adm/supplemental when viewing supplemental docs in non-edit mode. |
|
Line 3639 sub handler {
|
Line 2215 sub handler {
|
| # Get the parameters that may be needed |
# Get the parameters that may be needed |
| # |
# |
| &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
| ['folderpath', |
['folderpath','pagepath', |
| 'forcesupplement','forcestandard', |
'pagesymb','forcesupplement','forcestandard', |
| 'tools','symb','command','supppath']); |
'tools','symb','command']); |
| |
|
| # 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 3655 sub handler {
|
Line 2231 sub handler {
|
| |
|
| |
|
| my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/); |
my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/); |
| if (($env{'form.folderpath'}=~/^default/) || ($env{'form.folderpath'} eq "")) { |
if (($env{'form.folderpath'}=~/^default/) || $env{'form.folderpath'} eq "" || ($env{'form.pagepath'})) { |
| $supplementalflag=0; |
$supplementalflag=0; |
| } |
} |
| if ($env{'form.forcesupplement'}) { $supplementalflag=1; } |
if ($env{'form.forcesupplement'}) { $supplementalflag=1; } |
|
Line 3670 sub handler {
|
Line 2246 sub handler {
|
| my $addentries = {}; |
my $addentries = {}; |
| my $container; |
my $container; |
| my $containertag; |
my $containertag; |
| my $pathitem; |
my $uploadtag; |
| |
|
| # Do we directly jump somewhere? |
# Do we directly jump somewhere? |
| |
|
| if (($env{'form.command'} eq 'direct') || ($env{'form.command'} eq 'directnav')) { |
if ($env{'form.command'} eq 'direct') { |
| |
my ($mapurl,$id,$resurl); |
| if ($env{'form.symb'} ne '') { |
if ($env{'form.symb'} ne '') { |
| $env{'form.folderpath'}= |
($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'}); |
| &Apache::loncommon::symb_to_docspath($env{'form.symb'}); |
if ($resurl=~/\.(sequence|page)$/) { |
| &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => |
$mapurl=$resurl; |
| $env{'form.command'}.'_'.$env{'form.symb'}}); |
} elsif ($resurl eq 'adm/navmaps') { |
| |
$mapurl=$env{'course.'.$env{'request.course.id'}.'.url'}; |
| |
} |
| |
my $mapresobj; |
| |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
if (ref($navmap)) { |
| |
$mapresobj = $navmap->getResourceByUrl($mapurl); |
| |
} |
| |
$mapurl=~s{^.*/([^/]+)\.(\w+)$}{$1}; |
| |
my $type=$2; |
| |
my $path; |
| |
if (ref($mapresobj)) { |
| |
my $pcslist = $mapresobj->map_hierarchy(); |
| |
if ($pcslist ne '') { |
| |
foreach my $pc (split(/,/,$pcslist)) { |
| |
next if ($pc <= 1); |
| |
my $res = $navmap->getByMapPc($pc); |
| |
if (ref($res)) { |
| |
my $thisurl = $res->src(); |
| |
$thisurl=~s{^.*/([^/]+)\.\w+$}{$1}; |
| |
my $thistitle = $res->title(); |
| |
$path .= '&'. |
| |
&Apache::lonhtmlcommon::entity_encode($thisurl).'&'. |
| |
&Apache::lonhtmlcommon::entity_encode($thistitle). |
| |
':'.$res->randompick(). |
| |
':'.$res->randomout(). |
| |
':'.$res->encrypted(). |
| |
':'.$res->randomorder(); |
| |
} |
| |
} |
| |
} |
| |
$path .= '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'. |
| |
&Apache::lonhtmlcommon::entity_encode($mapresobj->title()). |
| |
':'.$mapresobj->randompick(). |
| |
':'.$mapresobj->randomout(). |
| |
':'.$mapresobj->encrypted(). |
| |
':'.$mapresobj->randomorder(); |
| |
} else { |
| |
my $maptitle = &Apache::lonnet::gettitle($mapurl); |
| |
$path = '&default&...::::'. |
| |
'&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'. |
| |
&Apache::lonhtmlcommon::entity_encode($maptitle).'::::'; |
| |
} |
| |
$path = 'default&'. |
| |
&Apache::lonhtmlcommon::entity_encode('Main Course Documents'). |
| |
$path; |
| |
if ($type eq 'sequence') { |
| |
$env{'form.folderpath'}=$path; |
| |
$env{'form.pagepath'}=''; |
| |
} else { |
| |
$env{'form.pagepath'}=$path; |
| |
$env{'form.folderpath'}=''; |
| |
} |
| } elsif ($env{'form.supppath'} ne '') { |
} elsif ($env{'form.supppath'} ne '') { |
| $env{'form.folderpath'}=$env{'form.supppath'}; |
$env{'form.folderpath'}=$env{'form.supppath'}; |
| &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => |
|
| $env{'form.command'}.'_'.$env{'form.supppath'}}); |
|
| } |
} |
| } elsif ($env{'form.command'} eq 'editdocs') { |
} elsif ($env{'form.command'} eq 'editdocs') { |
| $env{'form.folderpath'} = 'default&'. |
$env{'form.folderpath'} = 'default&'. |
| &Apache::lonhtmlcommon::entity_encode('Main Course Content'). |
&Apache::lonhtmlcommon::entity_encode('Main Course Content'); |
| ':::::'; |
$env{'form.pagepath'}=''; |
| &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}}); |
|
| } elsif ($env{'form.command'} eq 'editsupp') { |
} elsif ($env{'form.command'} eq 'editsupp') { |
| $env{'form.folderpath'} = 'supplemental&'. |
$env{'form.folderpath'} = 'default&'. |
| &Apache::lonhtmlcommon::entity_encode('Supplemental Content'); |
&Apache::lonhtmlcommon::entity_encode('Supplemental Content'); |
| &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/supplemental'}); |
$env{'form.pagepath'}=''; |
| } elsif ($env{'form.command'} eq 'contents') { |
|
| &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/navmaps'}); |
|
| } elsif ($env{'form.command'} eq 'home') { |
|
| &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/menu'}); |
|
| } |
} |
| |
|
| |
|
| # Where do we store these for when we come back? |
# Where do we store these for when we come back? |
| my $stored_folderpath='docs_folderpath'; |
my $stored_folderpath='docs_folderpath'; |
| if ($supplementalflag) { |
if ($supplementalflag) { |
| $stored_folderpath='docs_sup_folderpath'; |
$stored_folderpath='docs_sup_folderpath'; |
| } |
} |
| |
|
| # No folderpath, and in edit mode, see if we have something stored |
# No folderpath, no pagepath, see if we have something stored |
| if ((!$env{'form.folderpath'}) && $allowed) { |
if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) { |
| &Apache::loncommon::restore_course_settings($stored_folderpath, |
&Apache::loncommon::restore_course_settings($stored_folderpath, |
| {'folderpath' => 'scalar'}); |
{'folderpath' => 'scalar'}); |
| unless (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) { |
|
| undef($env{'form.folderpath'}); |
|
| } |
|
| } |
} |
| |
|
| # 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 |
| if (!$allowed) { |
if (!$allowed) { |
| |
$env{'form.pagepath'}=''; |
| unless ($env{'form.folderpath'} =~ /^supplemental/) { |
unless ($env{'form.folderpath'} =~ /^supplemental/) { |
| $env{'form.folderpath'} = &supplemental_base(); |
$env{'form.folderpath'} = &supplemental_base(); |
| } |
} |
| } |
} |
| |
# If we still not have a folderpath, see if we can resurrect at pagepath |
| |
if (!$env{'form.folderpath'} && $allowed) { |
| |
&Apache::loncommon::restore_course_settings($stored_folderpath, |
| |
{'pagepath' => 'scalar'}); |
| |
} |
| # Make the zeroth entry in supplemental docs page paths, so we can get to top level |
# Make the zeroth entry in supplemental docs page paths, so we can get to top level |
| if ($env{'form.folderpath'} =~ /^supplemental_\d+/) { |
if ($env{'form.folderpath'} =~ /^supplemental_\d+/) { |
| $env{'form.folderpath'} = &supplemental_base() |
$env{'form.folderpath'} = &supplemental_base() |
|
Line 3729 sub handler {
|
Line 2353 sub handler {
|
| $env{'form.folderpath'}; |
$env{'form.folderpath'}; |
| } |
} |
| # If after all of this, we still don't have any paths, make them |
# If after all of this, we still don't have any paths, make them |
| unless ($env{'form.folderpath'}) { |
unless (($env{'form.pagepath'}) || ($env{'form.folderpath'})) { |
| if ($supplementalflag) { |
if ($supplementalflag) { |
| $env{'form.folderpath'}=&supplemental_base(); |
$env{'form.folderpath'}=&supplemental_base(); |
| } else { |
} else { |
| $env{'form.folderpath'}='default'.&escape(&mt('Main '.$crstype.' Documents')). |
$env{'form.folderpath'}='default'; |
| ':::::'; |
|
| } |
} |
| } |
} |
| |
|
| # Store this |
# Store this |
| unless ($toolsflag) { |
unless ($toolsflag) { |
| if ($allowed) { |
&Apache::loncommon::store_course_settings($stored_folderpath, |
| &Apache::loncommon::store_course_settings($stored_folderpath, |
{'pagepath' => 'scalar', |
| {'folderpath' => 'scalar'}); |
'folderpath' => 'scalar'}); |
| } |
|
| my $folderpath; |
|
| if ($env{'form.folderpath'}) { |
if ($env{'form.folderpath'}) { |
| $folderpath = $env{'form.folderpath'}; |
my (@folderpath)=split('&',$env{'form.folderpath'}); |
| my (@folders)=split('&',$env{'form.folderpath'}); |
$env{'form.foldername'}=&unescape(pop(@folderpath)); |
| $env{'form.foldername'}=&unescape(pop(@folders)); |
$env{'form.folder'}=pop(@folderpath); |
| if ($env{'form.foldername'} =~ /\:1$/) { |
$container='sequence'; |
| $container = 'page'; |
} |
| } else { |
if ($env{'form.pagepath'}) { |
| $container = 'sequence'; |
my (@pagepath)=split('&',$env{'form.pagepath'}); |
| } |
$env{'form.pagename'}=&unescape(pop(@pagepath)); |
| $env{'form.folder'}=pop(@folders); |
$env{'form.folder'}=pop(@pagepath); |
| } else { |
$container='page'; |
| if ($env{'form.folder'} eq '' || |
$containertag = '<input type="hidden" name="pagepath" value="" />'. |
| $env{'form.folder'} eq 'supplemental') { |
'<input type="hidden" name="pagesymb" value="" />'; |
| $folderpath='default&'. |
$uploadtag = |
| &escape(&mt('Main '.$crstype.' Documents')). |
'<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="folderpath" value="" />'; |
| |
} else { |
| |
my $folderpath=$env{'form.folderpath'}; |
| |
if (!$folderpath) { |
| |
if ($env{'form.folder'} eq '' || |
| |
$env{'form.folder'} eq 'supplemental') { |
| |
$folderpath='default&'. |
| |
&escape(&mt('Main '.$crstype.' Documents')); |
| |
} |
| } |
} |
| |
$containertag = '<input type="hidden" name="folderpath" value="" />'; |
| |
$uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />'; |
| } |
} |
| $containertag = '<input type="hidden" name="folderpath" value="" />'; |
|
| $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />'; |
|
| if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) { |
if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) { |
| $showdoc='/'.$1; |
$showdoc='/'.$1; |
| } |
} |
|
Line 3802 sub handler {
|
Line 2432 sub handler {
|
| @tabids = ('002','ee2','ff2'); |
@tabids = ('002','ee2','ff2'); |
| } else { |
} else { |
| @tabids = ('aa1','bb1','cc1','ff1'); |
@tabids = ('aa1','bb1','cc1','ff1'); |
| unless ($env{'form.folderpath'} =~ /\:1$/) { |
unless ($env{'form.pagepath'}) { |
| unshift(@tabids,'001'); |
unshift(@tabids,'001'); |
| push(@tabids,('dd1','ee1')); |
push(@tabids,('dd1','ee1')); |
| } |
} |
|
Line 3811 sub handler {
|
Line 2441 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'}) { |
|
| $script .= &paste_popup_js(); |
|
| } |
|
| my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'. |
|
| &mt('Switch server?'); |
|
| |
|
| |
|
| } |
} |
| # -------------------------------------------------------------------- Body tag |
# -------------------------------------------------------------------- Body tag |
| $script = '<script type="text/javascript">'."\n" |
$script = '<script type="text/javascript">'."\n" |
|
Line 3834 sub handler {
|
Line 2456 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, |
| {'add_entries' => $addentries} |
{'force_register' => $showdoc, |
| ) |
'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 3916 sub handler {
|
Line 2534 sub handler {
|
| } elsif ((!$showdoc) && (!$uploadphase)) { |
} elsif ((!$showdoc) && (!$uploadphase)) { |
| # ----------------------------------------------------------------------------- |
# ----------------------------------------------------------------------------- |
| my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
| |
'uplm' => 'Upload a new main '.lc($crstype).' document', |
| |
'upls' => 'Upload a new supplemental '.lc($crstype).' document', |
| |
'impp' => 'Import a document', |
| 'copm' => 'All documents out of a published map into this folder', |
'copm' => 'All documents out of a published map into this folder', |
| 'upfi' => 'Upload File', |
'upld' => 'Import Document', |
| 'upld' => 'Import Content', |
|
| 'srch' => 'Search', |
'srch' => 'Search', |
| 'impo' => 'Import', |
'impo' => 'Import', |
| 'lnks' => 'Import from Stored Links', |
'wish' => 'Import from Wishlist', |
| 'impm' => 'Import from Assembled Map', |
|
| 'selm' => 'Select Map', |
'selm' => 'Select Map', |
| 'load' => 'Load Map', |
'load' => 'Load Map', |
| |
'reco' => 'Recover Deleted Documents', |
| 'newf' => 'New Folder', |
'newf' => 'New Folder', |
| 'newp' => 'New Composite Page', |
'newp' => 'New Composite Page', |
| |
'extr' => 'External Resource', |
| 'syll' => 'Syllabus', |
'syll' => 'Syllabus', |
| 'navc' => 'Table of Contents', |
'navc' => 'Table of Contents', |
| 'sipa' => 'Simple Course Page', |
'sipa' => 'Simple Course Page', |
| 'sipr' => 'Simple Problem', |
'sipr' => 'Simple Problem', |
| 'webp' => 'Blank Web Page (editable)', |
|
| 'drbx' => 'Drop Box', |
'drbx' => 'Drop Box', |
| 'scuf' => 'External Scores (handgrade, upload, clicker)', |
'scuf' => 'External Scores (handgrade, upload, clicker)', |
| 'bull' => 'Discussion Board', |
'bull' => 'Discussion Board', |
| 'mypi' => 'My Personal Information Page', |
'mypi' => 'My Personal Information Page', |
| 'grpo' => 'Group Portfolio', |
'grpo' => 'Group Portfolio', |
| 'rost' => 'Course Roster', |
'rost' => 'Course Roster', |
| 'abou' => 'Personal Information Page for a User', |
'abou' => 'Personal Information Page for a User', |
| 'imsf' => 'IMS Import', |
'imsf' => 'IMS Import', |
| 'imsl' => 'Import IMS package', |
'imsl' => 'Import IMS package', |
| 'cms' => 'Origin of IMS package', |
|
| 'se' => 'Select', |
|
| 'file' => 'File', |
'file' => 'File', |
| 'title' => 'Title', |
'title' => 'Title', |
| 'comment' => 'Comment', |
'comment' => 'Comment', |
| '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 3962 FIUP
|
Line 2584 FIUP
|
| <input type="checkbox" name="parserflag" checked="checked" /> $lt{'parse'} |
<input type="checkbox" name="parserflag" checked="checked" /> $lt{'parse'} |
| </label> |
</label> |
| CHBO |
CHBO |
| my $imsfolder = $env{'form.folder'}; |
|
| if ($imsfolder eq '') { |
|
| $imsfolder = 'default'; |
|
| } |
|
| my $imspform=(<<IMSFORM); |
|
| <a class="LC_menubuttons_link" href="javascript:toggleUpload('ims');"> |
|
| $lt{'imsf'}</a> $help{'Importing_IMS_Course'} |
|
| <form name="uploadims" action="/adm/imsimportdocs" method="post" enctype="multipart/form-data" target="IMSimport"> |
|
| <fieldset id="uploadimsform" style="display: none;"> |
|
| <legend>$lt{'imsf'}</legend> |
|
| $fileupload |
|
| <br /> |
|
| <p> |
|
| $lt{'cms'}: |
|
| <select name="source"> |
|
| <option value="-1" selected="selected">$lt{'se'}</option> |
|
| <option value="bb5">Blackboard 5</option> |
|
| <option value="bb6">Blackboard 6</option> |
|
| <option value="angel5">ANGEL 5.5</option> |
|
| <option value="webctce4">WebCT 4 Campus Edition</option> |
|
| </select> |
|
| <input type="hidden" name="folder" value="$imsfolder" /> |
|
| </p> |
|
| <input type="hidden" name="phase" value="one" /> |
|
| <input type="button" value="$lt{'imsl'}" onclick="makeims(this.form);" /> |
|
| </fieldset> |
|
| </form> |
|
| IMSFORM |
|
| |
|
| |
my $fileuploada = "<br clear='all' /><input type='submit' value='".$lt{'upld'}."' /> $help{'Uploading_From_Harddrive'}"; |
| my $fileuploadform=(<<FUFORM); |
my $fileuploadform=(<<FUFORM); |
| <a class="LC_menubuttons_link" href="javascript:toggleUpload('doc');"> |
<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data"> |
| $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'} |
|
| <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data"> |
|
| <fieldset id="uploaddocform" style="display: none;"> |
|
| <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" /> |
| $pathitem |
$uploadtag |
| <input type="hidden" name="cmd" value="upload_default" /> |
<input type="hidden" name="cmd" value="upload_default" /> |
| <br /> |
<br /> |
| <span class="LC_nobreak" style="float:left"> |
<span class="LC_nobreak" style="float:left"> |
| $checkbox |
$checkbox |
| </span> |
</span> |
| <br clear="all" /> |
|
| <input type="submit" value="$lt{'upld'}" /> |
|
| </fieldset> |
|
| </form> |
|
| FUFORM |
FUFORM |
| |
$fileuploadform .= $fileuploada.'</form>'; |
| |
|
| my $importpubform=(<<SEDFFORM); |
my $simpleeditdefaultform=(<<SEDFFORM); |
| <a class="LC_menubuttons_link" href="javascript:toggleMap('map');"> |
<form action="/adm/coursedocs" method="post" name="simpleeditdefault"> |
| $lt{'impm'}</a>$help{'Load_Map'} |
|
| <form action="/adm/coursedocs" method="post" name="mapimportform"> |
|
| <fieldset id="importmapform" style="display: none;"> |
|
| <legend>$lt{'impm'}</legend> |
|
| <input type="hidden" name="active" value="bb" /> |
<input type="hidden" name="active" value="bb" /> |
| $lt{'copm'}<br /> |
|
| <span class="LC_nobreak"> |
|
| <input type="text" name="importmap" size="40" value="" |
|
| onfocus="this.blur();openbrowser('mapimportform','importmap','sequence,page','');" /> |
|
| <a href="javascript:openbrowser('mapimportform','importmap','sequence,page','');">$lt{'selm'}</a></span><br /> |
|
| <input type="submit" name="loadmap" value="$lt{'load'}" /> |
|
| </fieldset> |
|
| </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()" />' => "$uploadtag<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{wish}.'" onclick="javascript:open_Wishlist_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_Wishlist_Import();'>$lt{'wish'}</a>" }, |
| { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform } |
|
| ); |
); |
| $importpubform = &create_form_ul(&create_list_elements(@importpubforma)); |
$simpleeditdefaultform .= &create_form_ul(&create_list_elements(@simpleeditdefaultforma)); |
| my $extresourcesform = |
$simpleeditdefaultform .=(<<SEDFFORM); |
| &Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem, |
<hr id="bb_hrule" style="width:0px;text-align:left;margin-left:0" /> |
| $help{'Adding_External_Resource'}); |
$lt{'copm'}<br /> |
| |
<input type="text" size="40" name="importmap" /><br /> |
| |
<span class="LC_nobreak" style="float:left"><input type="button" |
| |
onclick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')" |
| |
value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" /> |
| |
$help{'Load_Map'}</span> |
| |
</form> |
| |
SEDFFORM |
| |
|
| |
my $extresourcesform=(<<ERFORM); |
| |
<form action="/adm/coursedocs" method="post" name="newext"> |
| |
$uploadtag |
| |
<input type="hidden" name="importdetail" value="" /> |
| |
<a class="LC_menubuttons_link" href="javascript:makenewext('newext');">$lt{'extr'}</a>$help{'Adding_External_Resource'} |
| |
</form> |
| |
ERFORM |
| |
|
| |
|
| if ($allowed) { |
if ($allowed) { |
| my $folder = $env{'form.folder'}; |
&update_paste_buffer($coursenum,$coursedom); |
| if ($folder eq '') { |
|
| $folder='default'; |
|
| } |
|
| &update_paste_buffer($coursenum,$coursedom,$folder); |
|
| $r->print(<<HIDDENFORM); |
$r->print(<<HIDDENFORM); |
| <form name="renameform" method="post" action="/adm/coursedocs"> |
<form name="renameform" method="post" action="/adm/coursedocs"> |
| <input type="hidden" name="title" /> |
<input type="hidden" name="title" /> |
|
Line 4057 SEDFFORM
|
Line 2644 SEDFFORM
|
| </form> |
</form> |
| |
|
| HIDDENFORM |
HIDDENFORM |
| $r->print(&makesimpleeditform($pathitem)."\n". |
$r->print(&makesimpleeditform($uploadtag)."\n". |
| &makedocslogform($pathitem."\n". |
&makedocslogform($uploadtag."\n". |
| '<input type="hidden" name="folder" value="'. |
'<input type="hidden" name="folder" value="'. |
| $env{'form.folder'}.'" />'."\n")); |
$env{'form.folder'}.'" />'."\n")); |
| } |
} |
| |
|
| # Generate the tabs |
# Generate the tabs |
| my ($mode,$needs_end); |
my $mode; |
| if (($supplementalflag) && (!$allowed)) { |
if (($supplementalflag) && (!$allowed)) { |
| my @folders = split('&',$env{'form.folderpath'}); |
&Apache::lonnavdisplay::startContentScreen($r,'supplemental'); |
| 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 4086 HIDDENFORM
|
Line 2668 HIDDENFORM
|
| $folder='default'; |
$folder='default'; |
| $savefolderpath = $env{'form.folderpath'}; |
$savefolderpath = $env{'form.folderpath'}; |
| $env{'form.folderpath'}='default&'.&escape(&mt('Content')); |
$env{'form.folderpath'}='default&'.&escape(&mt('Content')); |
| $pathitem = '<input type="hidden" name="folderpath" value="'. |
$uploadtag = '<input type="hidden" name="folderpath" value="'. |
| &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'; |
&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'; |
| } |
} |
| my $postexec=''; |
my $postexec=''; |
|
Line 4100 HIDDENFORM
|
Line 2682 HIDDENFORM
|
| } else { |
} else { |
| #$postexec='self.close();'; |
#$postexec='self.close();'; |
| } |
} |
| my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence'; |
my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. |
| my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page'; |
'.sequence'; |
| |
my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. |
| |
'.page'; |
| |
my $container='sequence'; |
| |
if ($env{'form.pagepath'}) { |
| |
$container='page'; |
| |
} |
| my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container; |
my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container; |
| |
|
| |
my $imspform=(<<IMSPFORM); |
| |
<form action="/adm/imsimportdocs" method="post" name="ims"> |
| |
<input type="hidden" name="folder" value="$folder" /> |
| |
<a class="LC_menubuttons_link" href="javascript:makeims();">$lt{'imsf'}</a> |
| |
</form> |
| |
IMSPFORM |
| |
|
| my $newnavform=(<<NNFORM); |
my $newnavform=(<<NNFORM); |
| <form action="/adm/coursedocs" method="post" name="newnav"> |
<form action="/adm/coursedocs" method="post" name="newnav"> |
| <input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="cc" /> |
| $pathitem |
$uploadtag |
| <input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
| value="$lt{'navc'}=/adm/navmaps" /> |
value="$lt{'navc'}=/adm/navmaps" /> |
| <a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a> |
<a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a> |
|
Line 4117 NNFORM
|
Line 2712 NNFORM
|
| my $newsmppageform=(<<NSPFORM); |
my $newsmppageform=(<<NSPFORM); |
| <form action="/adm/coursedocs" method="post" name="newsmppg"> |
<form action="/adm/coursedocs" method="post" name="newsmppg"> |
| <input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="cc" /> |
| $pathitem |
$uploadtag |
| <input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
| <a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a> |
<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a> |
| $help{'Simple Page'} |
$help{'Simple Page'} |
|
Line 4127 NSPFORM
|
Line 2722 NSPFORM
|
| my $newsmpproblemform=(<<NSPROBFORM); |
my $newsmpproblemform=(<<NSPROBFORM); |
| <form action="/adm/coursedocs" method="post" name="newsmpproblem"> |
<form action="/adm/coursedocs" method="post" name="newsmpproblem"> |
| <input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="cc" /> |
| $pathitem |
$uploadtag |
| <input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
| <a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a> |
<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a> |
| $help{'Simple Problem'} |
$help{'Simple Problem'} |
|
Line 4138 NSPROBFORM
|
Line 2733 NSPROBFORM
|
| my $newdropboxform=(<<NDBFORM); |
my $newdropboxform=(<<NDBFORM); |
| <form action="/adm/coursedocs" method="post" name="newdropbox"> |
<form action="/adm/coursedocs" method="post" name="newdropbox"> |
| <input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="cc" /> |
| $pathitem |
$uploadtag |
| <input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
| <a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a> |
<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a> |
| </form> |
</form> |
|
Line 4147 NDBFORM
|
Line 2742 NDBFORM
|
| my $newexuploadform=(<<NEXUFORM); |
my $newexuploadform=(<<NEXUFORM); |
| <form action="/adm/coursedocs" method="post" name="newexamupload"> |
<form action="/adm/coursedocs" method="post" name="newexamupload"> |
| <input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="cc" /> |
| $pathitem |
$uploadtag |
| <input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
| <a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a> |
<a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a> |
| $help{'Score_Upload_Form'} |
$help{'Score_Upload_Form'} |
|
Line 4157 NEXUFORM
|
Line 2752 NEXUFORM
|
| my $newbulform=(<<NBFORM); |
my $newbulform=(<<NBFORM); |
| <form action="/adm/coursedocs" method="post" name="newbul"> |
<form action="/adm/coursedocs" method="post" name="newbul"> |
| <input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="cc" /> |
| $pathitem |
$uploadtag |
| <input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
| <a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a> |
<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a> |
| $help{'Bulletin Board'} |
$help{'Bulletin Board'} |
|
Line 4167 NBFORM
|
Line 2762 NBFORM
|
| my $newaboutmeform=(<<NAMFORM); |
my $newaboutmeform=(<<NAMFORM); |
| <form action="/adm/coursedocs" method="post" name="newaboutme"> |
<form action="/adm/coursedocs" method="post" name="newaboutme"> |
| <input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="cc" /> |
| $pathitem |
$uploadtag |
| <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.newaboutme.submit()">$lt{'mypi'}</a> |
<a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a> |
|
Line 4178 NAMFORM
|
Line 2773 NAMFORM
|
| my $newaboutsomeoneform=(<<NASOFORM); |
my $newaboutsomeoneform=(<<NASOFORM); |
| <form action="/adm/coursedocs" method="post" name="newaboutsomeone"> |
<form action="/adm/coursedocs" method="post" name="newaboutsomeone"> |
| <input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="cc" /> |
| $pathitem |
$uploadtag |
| <input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
| <a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a> |
<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a> |
| </form> |
</form> |
| NASOFORM |
NASOFORM |
| |
|
| |
|
| my $newrosterform=(<<NROSTFORM); |
my $newrosterform=(<<NROSTFORM); |
| <form action="/adm/coursedocs" method="post" name="newroster"> |
<form action="/adm/coursedocs" method="post" name="newroster"> |
| <input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="cc" /> |
| $pathitem |
$uploadtag |
| <input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
| value="$lt{'rost'}=/adm/viewclasslist" /> |
value="$lt{'rost'}=/adm/viewclasslist" /> |
| <a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a> |
<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a> |
|
Line 4195 NASOFORM
|
Line 2791 NASOFORM
|
| </form> |
</form> |
| NROSTFORM |
NROSTFORM |
| |
|
| my $newwebpage; |
|
| if ($folder =~ /^default_?(\d*)$/) { |
|
| $newwebpage = "/uploaded/$coursedom/$coursenum/docs/"; |
|
| if ($1) { |
|
| $newwebpage .= $1; |
|
| } else { |
|
| $newwebpage .= 'default'; |
|
| } |
|
| $newwebpage .= '/new.html'; |
|
| } |
|
| my $newwebpageform =(<<NWEBFORM); |
|
| <form action="/adm/coursedocs" method="post" name="newwebpage"> |
|
| <input type="hidden" name="active" value="cc" /> |
|
| $pathitem |
|
| <input type="hidden" name="importdetail" value="$newwebpage" /> |
|
| <a class="LC_menubuttons_link" href="javascript:makewebpage();">$lt{'webp'}</a> |
|
| $help{'Web Page'} |
|
| </form> |
|
| NWEBFORM |
|
| |
|
| |
|
| my $specialdocumentsform; |
my $specialdocumentsform; |
| my @specialdocumentsforma; |
my @specialdocumentsforma; |
| my $gradingform; |
my $gradingform; |
|
Line 4240 NPFORM
|
Line 2815 NPFORM
|
| |
|
| $newfolderform=(<<NFFORM); |
$newfolderform=(<<NFFORM); |
| <form action="/adm/coursedocs" method="post" name="newfolder"> |
<form action="/adm/coursedocs" method="post" name="newfolder"> |
| $pathitem |
<input type="hidden" name="folderpath" value="$path" /> |
| <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 4250 NFFORM
|
Line 2825 NFFORM
|
| my $newsylform=(<<NSYLFORM); |
my $newsylform=(<<NSYLFORM); |
| <form action="/adm/coursedocs" method="post" name="newsyl"> |
<form action="/adm/coursedocs" method="post" name="newsyl"> |
| <input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="cc" /> |
| $pathitem |
$uploadtag |
| <input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
| value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" /> |
value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" /> |
| <a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a> |
<a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a> |
|
Line 4262 NSYLFORM
|
Line 2837 NSYLFORM
|
| my $newgroupfileform=(<<NGFFORM); |
my $newgroupfileform=(<<NGFFORM); |
| <form action="/adm/coursedocs" method="post" name="newgroupfiles"> |
<form action="/adm/coursedocs" method="post" name="newgroupfiles"> |
| <input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="cc" /> |
| $pathitem |
$uploadtag |
| <input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
| value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" /> |
value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" /> |
| <a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a> |
<a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a> |
|
Line 4274 NGFFORM
|
Line 2849 NGFFORM
|
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.newsyl.submit()" />'=>$newsylform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.newsyl.submit()" />'=>$newsylform}, |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform}, |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform}, |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage();" />'=>$newwebpageform}, |
|
| ); |
); |
| $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="javascript:makenewext(\'newext\');" />'=>$extresourcesform}, |
| ); |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:makeims();" />'=>$imspform},); |
| unless ($container eq 'page') { |
$fileuploadform = &create_form_ul(&create_list_elements(@importdoc)) . '<hr id="cc_hrule" style="width:0px;text-align:left;margin-left:0" />' . $fileuploadform; |
| push(@importdoc, |
|
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform} |
|
| ); |
|
| } |
|
| push(@importdoc, |
|
| {'<img class="LC_noBorder_LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'doc\');" />'=>$fileuploadform} |
|
| ); |
|
| $fileuploadform = &create_form_ul(&create_list_elements(@importdoc)); |
|
| |
|
| @gradingforma=( |
@gradingforma=( |
| {'<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}, |
|
Line 4310 NGFFORM
|
Line 2876 NGFFORM
|
| $communityform = &create_form_ul(&create_list_elements(@communityforma)); |
$communityform = &create_form_ul(&create_list_elements(@communityforma)); |
| |
|
| my %orderhash = ( |
my %orderhash = ( |
| 'aa' => ['Import Content',$fileuploadform], |
'aa' => ['Import Documents',$fileuploadform], |
| 'bb' => ['Published Content',$importpubform], |
'bb' => ['Published Resources',$simpleeditdefaultform], |
| 'cc' => ['Grading Resources',$gradingform], |
'cc' => ['Grading Resources',$gradingform], |
| ); |
); |
| unless ($container eq 'page') { |
unless ($env{'form.pagepath'}) { |
| $orderhash{'00'} = ['Newfolder',$newfolderform]; |
$orderhash{'00'} = ['Newfolder',$newfolderform]; |
| $orderhash{'dd'} = ['Collaboration',$communityform]; |
$orderhash{'dd'} = ['Collaboration',$communityform]; |
| $orderhash{'ee'} = ['Special Pages',$specialdocumentsform]; |
$orderhash{'ee'} = ['Special Documents',$specialdocumentsform]; |
| } |
} |
| |
|
| $hadchanges=0; |
$hadchanges=0; |
| unless (($supplementalflag || $toolsflag)) { |
unless (($supplementalflag || $toolsflag)) { |
| my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
| $supplementalflag,\%orderhash,$iconpath,$pathitem); |
$supplementalflag,\%orderhash,$iconpath); |
| 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 4347 unless ($container eq 'page') {
|
Line 2913 unless ($container eq 'page') {
|
| } elsif ($allowed) { |
} elsif ($allowed) { |
| $env{'form.folderpath'} = $savefolderpath; |
$env{'form.folderpath'} = $savefolderpath; |
| } |
} |
| $pathitem = '<input type="hidden" name="folderpath" value="'. |
$env{'form.pagepath'} = ''; |
| &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'; |
|
| if ($allowed) { |
if ($allowed) { |
| my $folderseq= |
my $folderseq= |
| '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_new.sequence'; |
'/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time. |
| |
'.sequence'; |
| |
|
| |
my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); |
| |
|
| |
my $supupdocformbtn = "<input type='submit' value='".$lt{'upld'}."' />$help{'Uploading_From_Harddrive'}"; |
| my $supupdocform=(<<SUPDOCFORM); |
my $supupdocform=(<<SUPDOCFORM); |
| <a class="LC_menubuttons_link" href="javascript:toggleUpload('suppdoc');"> |
|
| $lt{'upfi'}</a> $help{'Uploading_From_Harddrive'} |
|
| <form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data"> |
<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data"> |
| <fieldset id="uploadsuppdocform" style="display: none;"> |
|
| <legend>$lt{'upfi'}</legend> |
|
| <input type="hidden" name="active" value="ee" /> |
<input type="hidden" name="active" value="ee" /> |
| $fileupload |
$fileupload |
| <br /> |
<br /> |
|
Line 4370 unless ($container eq 'page') {
|
Line 2935 unless ($container eq 'page') {
|
| $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 |
<input type="hidden" name="folderpath" value="$path" /> |
| <input type="hidden" name="cmd" value="upload_supplemental" /> |
<input type="hidden" name="cmd" value="upload_supplemental" /> |
| <input type='submit' value="$lt{'upld'}" /> |
|
| </form> |
|
| SUPDOCFORM |
SUPDOCFORM |
| |
$supupdocform .= &create_form_ul(&Apache::lonhtmlcommon::htmltag('li',$supupdocformbtn,{class => 'LC_menubuttons_inline_text'}))."</form>"; |
| |
|
| my $supnewfolderform=(<<SNFFORM); |
my $supnewfolderform=(<<SNFFORM); |
| <form action="/adm/coursedocs" method="post" name="supnewfolder"> |
<form action="/adm/coursedocs" method="post" name="supnewfolder"> |
| <input type="hidden" name="active" value="ee" /> |
<input type="hidden" name="active" value="ee" /> |
| $pathitem |
<input type="hidden" name="folderpath" value="$path" /> |
| <input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
| <a class="LC_menubuttons_link" href="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a> |
<a class="LC_menubuttons_link" href="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a> |
| $help{'Adding_Folders'} |
$help{'Adding_Folders'} |
| </form> |
</form> |
| SNFFORM |
SNFFORM |
| |
|
| my $supextform = |
|
| &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem, |
my $supnewextform=(<<SNEFORM); |
| $help{'Adding_External_Resource'}); |
<form action="/adm/coursedocs" method="post" name="supnewext"> |
| |
<input type="hidden" name="active" value="ff" /> |
| |
<input type="hidden" name="folderpath" value="$path" /> |
| |
<input type="hidden" name="importdetail" value="" /> |
| |
<a class="LC_menubuttons_link" href="javascript:makenewext('supnewext');">$lt{'extr'}</a> $help{'Adding_External_Resource'} |
| |
</form> |
| |
SNEFORM |
| |
|
| 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" /> |
| $pathitem |
<input type="hidden" name="folderpath" value="$path" /> |
| <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 4404 SNSFORM
|
Line 2974 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" /> |
| $pathitem |
<input type="hidden" name="folderpath" value="$path" /> |
| <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 4412 SNSFORM
|
Line 2982 SNSFORM
|
| </form> |
</form> |
| SNAMFORM |
SNAMFORM |
| |
|
| my $supwebpage; |
|
| if ($folder =~ /^supplemental_?(\d*)$/) { |
|
| $supwebpage = "/uploaded/$coursedom/$coursenum/supplemental/"; |
|
| if ($1) { |
|
| $supwebpage .= $1; |
|
| } else { |
|
| $supwebpage .= 'default'; |
|
| } |
|
| $supwebpage .= '/new.html'; |
|
| } |
|
| my $supwebpageform =(<<SWEBFORM); |
|
| <form action="/adm/coursedocs" method="post" name="supwebpage"> |
|
| <input type="hidden" name="active" value="cc" /> |
|
| $pathitem |
|
| <input type="hidden" name="importdetail" value="$supwebpage" /> |
|
| <a class="LC_menubuttons_link" href="javascript:makewebpage('supp');">$lt{'webp'}</a> |
|
| $help{'Web Page'} |
|
| </form> |
|
| SWEBFORM |
|
| |
|
| |
|
| my @specialdocs = ( |
my @specialdocs = ( |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.supnewsyl.submit()" />' |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.supnewsyl.submit()" />' |
| =>$supnewsylform}, |
=>$supnewsylform}, |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="document.supnewaboutme.submit()" />' |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="document.supnewaboutme.submit()" />' |
| =>$supnewaboutmeform}, |
=>$supnewaboutmeform}, |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage('."'supp'".');" />'=>$supwebpageform}, |
|
| |
|
| ); |
); |
| 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:makenewext(\'supnewext\');" />' |
| =>$supextform}, |
=>$supnewextform}, |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />' |
); |
| =>$supupdocform}, |
$supupdocform = &create_form_ul(&create_list_elements(@supimportdoc)) . '<hr id="ee_hrule" style="width:0px;text-align:left;margin-left:0" />' . $supupdocform; |
| ); |
|
| |
|
| $supupdocform = &create_form_ul(&create_list_elements(@supimportdoc)); |
|
| my %suporderhash = ( |
my %suporderhash = ( |
| '00' => ['Supnewfolder', $supnewfolderform], |
'00' => ['Supnewfolder', $supnewfolderform], |
| 'ee' => ['Import Content',$supupdocform], |
'ee' => ['Import Documents',$supupdocform], |
| 'ff' => ['Special Pages',&create_form_ul(&create_list_elements(@specialdocs))] |
'ff' => ['Special Documents',&create_form_ul(&create_list_elements(@specialdocs))] |
| ); |
); |
| 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); |
| if ($error) { |
if ($error) { |
| $r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
| } |
} |
| } |
} |
| } elsif ($supplementalflag) { |
} elsif ($supplementalflag) { |
| my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
| $supplementalflag,'',$iconpath,$pathitem); |
$supplementalflag,'',$iconpath); |
| if ($error) { |
if ($error) { |
| $r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
| } |
} |
| } |
} |
| |
|
| if ($needs_end) { |
$r->print(&endContentScreen()); |
| $r->print(&endContentScreen()); |
|
| } |
|
| |
|
| if ($allowed) { |
if ($allowed) { |
| $r->print(' |
$r->print(' |
|
Line 4485 my %suporderhash = (
|
Line 3028 my %suporderhash = (
|
| } elsif ($showdoc) { |
} elsif ($showdoc) { |
| # -------------------------------------------------------- This is showdoc mode |
# -------------------------------------------------------- This is showdoc mode |
| $r->print("<h1>".&mt('Uploaded Document').' - '. |
$r->print("<h1>".&mt('Uploaded Document').' - '. |
| &Apache::lonnet::gettitle($r->uri).'</h1><p class="LC_warning">'. |
&Apache::lonnet::gettitle($r->uri).'</h1><p>'. |
| &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><table>". |
&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><table>". |
| &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>'); |
| } |
} |
|
Line 4537 sub decompression_info {
|
Line 3080 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'); |
| if ($env{'form.folderpath'} =~ /\:1$/) { |
if ($env{'form.pagepath'}) { |
| $container='page'; |
$container='page'; |
| |
$pathitem = 'pagepath'; |
| |
} else { |
| |
$pathitem = 'folderpath'; |
| } |
} |
| unshift(@hiddens,$pathitem); |
unshift(@hiddens,$pathitem); |
| foreach my $item (@hiddens) { |
foreach my $item (@hiddens) { |
|
Line 4556 sub decompression_phase_one {
|
Line 3102 sub decompression_phase_one {
|
| my ($dir,$file,$warning,$error,$output); |
my ($dir,$file,$warning,$error,$output); |
| my ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,$hiddenelem)= |
my ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,$hiddenelem)= |
| &decompression_info(); |
&decompression_info(); |
| if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/\E(?:docs|supplemental)/(?:default|\d+).*/([^/]+)$}) { |
if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/docs/\E(?:default|supplemental|\d+).*/([^/]+)$}) { |
| $error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'}); |
$error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'}); |
| } else { |
} else { |
| my $file = $1; |
my $file = $1; |
|
Line 4611 sub remove_archive {
|
Line 3157 sub remove_archive {
|
| my ($title,$url,@rrest) = |
my ($title,$url,@rrest) = |
| split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$position]]); |
split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$position]]); |
| if (&handle_edit_cmd($docuname,$docudom)) { |
if (&handle_edit_cmd($docuname,$docudom)) { |
| ($errtext,$fatal) = &storemap($docuname,$docudom,$map,1); |
($errtext,$fatal) = &storemap($docuname,$docudom,$map); |
| if ($fatal) { |
if ($fatal) { |
| if ($container eq 'page') { |
if ($container eq 'page') { |
| $delwarning = &mt('An error occurred updating the contents of the current page.'); |
$delwarning = &mt('An error occurred updating the contents of the current page.'); |
|
Line 4729 sub generate_edit_table {
|
Line 3275 sub generate_edit_table {
|
| my $form; |
my $form; |
| my $activetab; |
my $activetab; |
| my $active; |
my $active; |
| if (($env{'form.active'} ne '') && ($env{'form.active'} ne 'aa')) { |
if($env{'form.active'} ne ''){ |
| $activetab = $env{'form.active'}; |
$activetab = $env{'form.active'}; |
| } |
} |
| my $backicon = $iconpath.'clickhere.gif'; |
my $backicon = $iconpath.'clickhere.gif'; |
| my $backtext = &mt('Exit Editor'); |
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>'. |
if ($tid == 1) { |
| '<a href="javascript:groupopen('."'$readfile'".',1);">'. |
$form .= '<li>'. |
| &mt('Undo Delete').'</a></li>'."\n"; |
'<a href="javascript:groupopen('."'$readfile'".',1);">'. |
| if ($env{'form.docslog'}) { |
&mt('Undo Delete').'</a></li>'."\n"; |
| $form .= '<li class="active">'; |
if ($env{'form.docslog'}) { |
| } else { |
$form .= '<li class="active">'; |
| $form .= '<li>'; |
} else { |
| } |
$form .= '<li>'; |
| $form .= '<a href="javascript:toggleHistoryDisp(1);">'. |
} |
| &mt('History').'</a></li>'."\n"; |
$form .= '<a href="javascript:toggleHistoryDisp(1);">'. |
| if ($env{'form.docslog'}) { |
&mt('History').'</a></li>'."\n"; |
| $form .= '<li><a href="javascript:toggleHistoryDisp(0);">'. |
if ($env{'form.docslog'}) { |
| &mt('Edit').'</a></li>'."\n"; |
$form .= '<li><a href="javascript:toggleHistoryDisp(0);">'. |
| |
&mt('Edit').'</a></li>'."\n"; |
| |
} |
| } |
} |
| foreach my $name (reverse(sort(keys(%orderhash)))) { |
foreach my $name (reverse(sort(keys(%orderhash)))) { |
| if($name ne '00'){ |
if($name ne '00'){ |
|
Line 4762 sub generate_edit_table {
|
Line 3310 sub generate_edit_table {
|
| $active = 'class="active"'; |
$active = 'class="active"'; |
| } |
} |
| $form .= '<li style="float:right" '.$active |
$form .= '<li style="float:right" '.$active |
| |
.' onmouseover="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"' |
| .' onclick="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"><a href="javascript:;"><b>'.&mt(${$orderhash{$name}}[0]).'</b></a></li>'."\n"; |
.' onclick="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"><a href="javascript:;"><b>'.&mt(${$orderhash{$name}}[0]).'</b></a></li>'."\n"; |
| } else { |
} else { |
| $form .= '<li '.$active.' style="float:right">'.${$orderhash{$name}}[1].'</li>'."\n"; |
$form .= '<li '.$active.' style="float:right">'.${$orderhash{$name}}[1].'</li>'."\n"; |
|
Line 4794 sub generate_edit_table {
|
Line 3343 sub generate_edit_table {
|
| |
|
| sub editing_js { |
sub editing_js { |
| my ($udom,$uname,$supplementalflag) = @_; |
my ($udom,$uname,$supplementalflag) = @_; |
| |
my $now = time(); |
| my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
| p_mnf => 'Name of New Folder', |
p_mnf => 'Name of New Folder', |
| t_mnf => 'New Folder', |
t_mnf => 'New Folder', |
|
Line 4804 sub editing_js {
|
Line 3354 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_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', |
|
Line 4818 sub editing_js {
|
Line 3367 sub editing_js {
|
| p_ctr2a => 'Cut[_98]', |
p_ctr2a => 'Cut[_98]', |
| p_ctr2b => '?[_98]', |
p_ctr2b => '?[_98]', |
| 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', |
|
| imscms => 'You must select which Course Management System was the source of the IMS package', |
|
| invurl => 'Invalid URL', |
|
| titbl => 'Title is blank', |
|
| ); |
); |
| |
|
| 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 $docs_pagepath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.pagepath'},'<>&"'); |
| my $main_container_page; |
my $main_container_page; |
| if (&HTML::Entities::decode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'}) =~ /\:1$/) { |
if ($docs_folderpath eq '') { |
| $main_container_page = 1; |
if ($docs_pagepath ne '') { |
| } |
$main_container_page = 1; |
| my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents%3A%3A%3A%3A%3A'; |
|
| my $toplevelsupp = &supplemental_base(); |
|
| |
|
| my $backtourl; |
|
| if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) { |
|
| my $caller = $1; |
|
| if ($caller =~ /^supplemental/) { |
|
| $backtourl = '/adm/supplemental?folderpath='.&escape($caller); |
|
| } else { |
|
| my ($map,$id,$res)=&Apache::lonnet::decode_symb($caller); |
|
| $res = &Apache::lonnet::clutter($res); |
|
| if (&Apache::lonnet::is_on_map($res)) { |
|
| $backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($res),'<>&"').'?symb='. |
|
| &HTML::Entities::encode($caller,'<>&"'); |
|
| } |
|
| } |
} |
| } elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') { |
|
| $backtourl = '/adm/menu'; |
|
| } elsif ($supplementalflag) { |
|
| $backtourl = '/adm/supplemental'; |
|
| } else { |
|
| $backtourl = '/adm/navmaps'; |
|
| } |
} |
| |
my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents'; |
| |
my $toplevelsupp = &supplemental_base(); |
| |
|
| my $fieldsets = "'ext','doc'"; |
my $backtourl = '/adm/navmaps'; |
| unless ($main_container_page) { |
|
| $fieldsets .=",'ims'"; |
|
| } |
|
| if ($supplementalflag) { |
if ($supplementalflag) { |
| $fieldsets = "'suppext','suppdoc'"; |
$backtourl = '/adm/supplemental'; |
| } |
} |
| |
|
| return <<ENDNEWSCRIPT; |
return <<ENDNEWSCRIPT; |
|
Line 4879 function makenewpage(targetform,folderse
|
Line 3403 function makenewpage(targetform,folderse
|
| } |
} |
| } |
} |
| |
|
| |
function makenewext(targetname) { |
| |
this.document.forms.extimport.useform.value=targetname; |
| |
this.document.forms.extimport.title.value=''; |
| |
this.document.forms.extimport.url.value=''; |
| |
this.document.forms.extimport.residx.value=''; |
| |
window.open('/adm/rat/extpickframe.html'); |
| |
} |
| |
|
| |
function edittext(targetname,residx,title,url) { |
| |
this.document.forms.extimport.useform.value=targetname; |
| |
this.document.forms.extimport.residx.value=residx; |
| |
this.document.forms.extimport.url.value=url; |
| |
this.document.forms.extimport.title.value=title; |
| |
window.open('/adm/rat/extpickframe.html'); |
| |
} |
| |
|
| function makeexamupload() { |
function makeexamupload() { |
| var title=prompt('$lt{"p_mxu"}'); |
var title=prompt('$lt{"p_mxu"}'); |
| if (title) { |
if (title) { |
|
Line 4892 function makesmppage() {
|
Line 3432 function makesmppage() {
|
| var title=prompt('$lt{"p_msp"}'); |
var title=prompt('$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/$now/smppg'; |
| this.document.forms.newsmppg.submit(); |
this.document.forms.newsmppg.submit(); |
| } |
} |
| } |
} |
| |
|
| function makewebpage(type) { |
|
| var title=prompt('$lt{"p_mwp"}'); |
|
| var formname; |
|
| if (type == 'supp') { |
|
| formname = this.document.forms.supwebpage; |
|
| } else { |
|
| formname = this.document.forms.newwebpage; |
|
| } |
|
| if (title) { |
|
| var webpage = formname.importdetail.value; |
|
| formname.importdetail.value = escape(title)+'='+webpage; |
|
| formname.submit(); |
|
| } |
|
| } |
|
| |
|
| function makesmpproblem() { |
function makesmpproblem() { |
| var title=prompt('$lt{"p_msb"}'); |
var title=prompt('$lt{"p_msb"}'); |
| if (title) { |
if (title) { |
|
Line 4934 function makebulboard() {
|
Line 3459 function makebulboard() {
|
| var title=prompt('$lt{"p_mbb"}'); |
var title=prompt('$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/$now/bulletinboard'; |
| this.document.forms.newbul.submit(); |
this.document.forms.newbul.submit(); |
| } |
} |
| } |
} |
|
Line 4958 function makeabout() {
|
Line 3483 function makeabout() {
|
| } |
} |
| } |
} |
| |
|
| function toggleUpload(caller) { |
function makeims() { |
| var blocks = Array($fieldsets); |
var caller = document.forms.ims.folder.value; |
| for (var i=0; i<blocks.length; i++) { |
var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one"; |
| var disp = 'none'; |
newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes"); |
| if (caller == blocks[i]) { |
newWindow.location.href = newlocation; |
| var curr = document.getElementById('upload'+caller+'form').style.display; |
} |
| if (curr == 'none') { |
|
| disp='block'; |
function finishpick() { |
| } |
var title=this.document.forms.extimport.title.value; |
| } |
var url=this.document.forms.extimport.url.value; |
| document.getElementById('upload'+blocks[i]+'form').style.display=disp; |
var form=this.document.forms.extimport.useform.value; |
| } |
var residx=this.document.forms.extimport.residx.value; |
| resize_scrollbox('contentscroll','1','1'); |
eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();'); |
| return; |
|
| } |
|
| |
|
| function toggleMap(caller) { |
|
| var disp = 'none'; |
|
| if (document.getElementById('importmapform')) { |
|
| if (caller == 'map') { |
|
| var curr = document.getElementById('importmapform').style.display; |
|
| if (curr == 'none') { |
|
| disp='block'; |
|
| } |
|
| } |
|
| document.getElementById('importmapform').style.display=disp; |
|
| resize_scrollbox('contentscroll','1','1'); |
|
| } |
|
| return; |
|
| } |
|
| |
|
| function makeims(imsform) { |
|
| if ((imsform.uploaddoc.value == '') || (!imsform.uploaddoc.value)) { |
|
| alert("$lt{'imsfile'}"); |
|
| return; |
|
| } |
|
| if (imsform.source.selectedIndex == 0) { |
|
| alert("$lt{'imscms'}"); |
|
| return; |
|
| } |
|
| newWindow = window.open('', 'IMSimport',"HEIGHT=700,WIDTH=750,scrollbars=yes"); |
|
| imsform.submit(); |
|
| } |
} |
| |
|
| function changename(folderpath,index,oldtitle) { |
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) { |
| this.document.forms.renameform.markcopy.value=-1; |
this.document.forms.renameform.markcopy.value=-1; |
| this.document.forms.renameform.title.value=title; |
this.document.forms.renameform.title.value=title; |
| this.document.forms.renameform.cmd.value='rename_'+index; |
this.document.forms.renameform.cmd.value='rename_'+index; |
| this.document.forms.renameform.folderpath.value=folderpath; |
if (container == 'sequence') { |
| |
this.document.forms.renameform.folderpath.value=folderpath; |
| |
} |
| |
if (container == 'page') { |
| |
this.document.forms.renameform.pagepath.value=folderpath; |
| |
this.document.forms.renameform.pagesymb.value=pagesymb; |
| |
} |
| this.document.forms.renameform.submit(); |
this.document.forms.renameform.submit(); |
| } |
} |
| } |
} |
| |
|
| function removeres(folderpath,index,oldtitle,skip_confirm) { |
function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) { |
| if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) { |
if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) { |
| this.document.forms.renameform.markcopy.value=-1; |
this.document.forms.renameform.markcopy.value=-1; |
| this.document.forms.renameform.cmd.value='del_'+index; |
this.document.forms.renameform.cmd.value='del_'+index; |
| this.document.forms.renameform.folderpath.value=folderpath; |
if (container == 'sequence') { |
| |
this.document.forms.renameform.folderpath.value=folderpath; |
| |
} |
| |
if (container == 'page') { |
| |
this.document.forms.renameform.pagepath.value=folderpath; |
| |
this.document.forms.renameform.pagesymb.value=pagesymb; |
| |
} |
| this.document.forms.renameform.submit(); |
this.document.forms.renameform.submit(); |
| } |
} |
| } |
} |
| |
|
| function cutres(folderpath,index,oldtitle,container,folder,skip_confirm) { |
function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) { |
| if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) { |
if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) { |
| this.document.forms.renameform.cmd.value='cut_'+index; |
this.document.forms.renameform.cmd.value='cut_'+index; |
| this.document.forms.renameform.markcopy.value=index; |
this.document.forms.renameform.markcopy.value=index; |
| this.document.forms.renameform.copyfolder.value=folder+'.'+container; |
this.document.forms.renameform.copyfolder.value=folder+'.'+container; |
| this.document.forms.renameform.folderpath.value=folderpath; |
if (container == 'sequence') { |
| |
this.document.forms.renameform.folderpath.value=folderpath; |
| |
} |
| |
if (container == 'page') { |
| |
this.document.forms.renameform.pagepath.value=folderpath; |
| |
this.document.forms.renameform.pagesymb.value=pagesymb; |
| |
} |
| this.document.forms.renameform.submit(); |
this.document.forms.renameform.submit(); |
| } |
} |
| } |
} |
| |
|
| function markcopy(folderpath,index,oldtitle,container,folder) { |
function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) { |
| this.document.forms.renameform.markcopy.value=index; |
this.document.forms.renameform.markcopy.value=index; |
| this.document.forms.renameform.copyfolder.value=folder+'.'+container; |
this.document.forms.renameform.copyfolder.value=folder+'.'+container; |
| |
if (container == 'sequence') { |
| this.document.forms.renameform.folderpath.value=folderpath; |
this.document.forms.renameform.folderpath.value=folderpath; |
| |
} |
| |
if (container == 'page') { |
| |
this.document.forms.renameform.pagepath.value=folderpath; |
| |
this.document.forms.renameform.pagesymb.value=pagesymb; |
| |
} |
| this.document.forms.renameform.submit(); |
this.document.forms.renameform.submit(); |
| } |
} |
| |
|
| function updatePick(targetform,index,caller) { |
function updatePick(targetform,index,caller) { |
| var pickitem; |
var pickitem = document.getElementById('rpick_'+index); |
| var picknumitem; |
var picknumitem = document.getElementById('rpicknum_'+index); |
| var picknumtext; |
|
| if (index == 'all') { |
|
| pickitem = document.getElementById('randompickall'); |
|
| picknumitem = document.getElementById('rpicknumall'); |
|
| picknumtext = document.getElementById('rpicktextall'); |
|
| } else { |
|
| pickitem = document.getElementById('randompick_'+index); |
|
| picknumitem = document.getElementById('rpicknum_'+index); |
|
| picknumtext = document.getElementById('randompicknum_'+index); |
|
| } |
|
| if (pickitem.checked) { |
if (pickitem.checked) { |
| var picknum=prompt('$lt{"rpck"}',picknumitem.value); |
var picknum=prompt('$lt{"rpck"}',picknumitem.value); |
| if (picknum == '' || picknum == null) { |
if (picknum == '' || picknum == null) { |
| if (caller == 'check') { |
if (caller == 'check') { |
| pickitem.checked=false; |
pickitem.checked=false; |
| if (index == 'all') { |
return; |
| picknumtext.innerHTML = ''; |
|
| if (caller == 'link') { |
|
| propagateState(targetform,'rpicknum'); |
|
| } |
|
| } else { |
|
| checkForSubmit(targetform,'randompick'); |
|
| } |
|
| } |
} |
| } else { |
} else { |
| picknum.toString(); |
picknum.toString(); |
| var regexdigit=/^\\d+\$/; |
var regexdigit=/^\\d+\$/; |
| if (regexdigit.test(picknum)) { |
if (regexdigit.test(picknum)) { |
| picknumitem.value = picknum; |
picknumitem.value = picknum; |
| if (index == 'all') { |
targetform.changeparms.value='randompick'; |
| picknumtext.innerHTML = ' <a href="javascript:updatePick(document.cumulativechecks,\\'all\\',\\'link\\');">'+picknum+'</a>'; |
targetform.submit(); |
| if (caller == 'link') { |
|
| propagateState(targetform,'rpicknum'); |
|
| } |
|
| } else { |
|
| picknumtext.innerHTML = ' <a href="javascript:updatePick(document.edit_randompick_'+index+',\\''+index+'\\',\\'link\\');">'+picknum+'</a>'; |
|
| checkForSubmit(targetform,'randompick'); |
|
| } |
|
| } else { |
} else { |
| if (caller == 'check') { |
if (caller == 'check') { |
| if (index == 'all') { |
pickitem.checked=false; |
| picknumtext.innerHTML = ''; |
|
| if (caller == 'link') { |
|
| propagateState(targetform,'rpicknum'); |
|
| } |
|
| } else { |
|
| pickitem.checked=false; |
|
| checkForSubmit(targetform,'randompick'); |
|
| } |
|
| } |
} |
| return; |
return; |
| } |
} |
| } |
} |
| } else { |
} else { |
| picknumitem.value = ''; |
picknumitem.value = 0; |
| picknumtext.innerHTML = ''; |
targetform.changeparms.value='randompick'; |
| if (index == 'all') { |
targetform.submit(); |
| if (caller == 'link') { |
|
| propagateState(targetform,'rpicknum'); |
|
| } |
|
| } else { |
|
| checkForSubmit(targetform,'randompick'); |
|
| } |
|
| } |
|
| } |
|
| |
|
| function propagateState(form,param) { |
|
| if (document.getElementById(param+'all')) { |
|
| var setcheck = 0; |
|
| var rpick = 0; |
|
| if (param == 'rpicknum') { |
|
| if (document.getElementById('randompickall')) { |
|
| if (document.getElementById('randompickall').checked) { |
|
| if (document.getElementById('rpicknumall')) { |
|
| rpick = document.getElementById('rpicknumall').value; |
|
| } |
|
| } |
|
| } |
|
| } else { |
|
| if (document.getElementById(param+'all').checked) { |
|
| setcheck = 1; |
|
| } |
|
| } |
|
| if ((param == 'encrypturl') || (param == 'hiddenresource')) { |
|
| var allidxlist = form.allidx.value; |
|
| if (allidxlist != '') { |
|
| var allidxs = allidxlist.split(','); |
|
| if (allidxs.length > 1) { |
|
| for (var i=0; i<allidxs.length; i++) { |
|
| if (document.getElementById(param+'_'+allidxs[i])) { |
|
| if (setcheck == 1) { |
|
| document.getElementById(param+'_'+allidxs[i]).checked = true; |
|
| } else { |
|
| document.getElementById(param+'_'+allidxs[i]).checked = false; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } else { |
|
| var allmapidxlist = form.allmapidx.value; |
|
| if (allmapidxlist != '') { |
|
| var allmapidxs = allmapidxlist.split(','); |
|
| if (allmapidxs.length > 1) { |
|
| for (var i=0; i<allmapidxs.length; i++) { |
|
| var item = param+'_'+allmapidxs[i]; |
|
| if (document.getElementById(item)) { |
|
| if (param == 'rpicknum') { |
|
| if (document.getElementById('randompick_'+allmapidxs[i])) { |
|
| if (document.getElementById('randompick_'+allmapidxs[i]).checked) { |
|
| document.getElementById(param+'_'+allmapidxs[i]).value = rpick; |
|
| if (rpick > 0) { |
|
| document.getElementById('randompicknum_'+allmapidxs[i]).innerHTML = ': <a href="javascript:updatePick(document.edit_randompick_'+allmapidxs[i]+',\\''+allmapidxs[i]+'\\',\\'link\\')">'+rpick+'</a>'; |
|
| } else { |
|
| document.getElementById('randompicknum_'+allmapidxs[i]).innerHTML = ''; |
|
| } |
|
| } |
|
| } |
|
| } else { |
|
| if (setcheck == 1) { |
|
| document.getElementById(param+'_'+allmapidxs[i]).checked = true; |
|
| } else { |
|
| document.getElementById(param+'_'+allmapidxs[i]).checked = false; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| return; |
|
| } |
|
| |
|
| function checkForSubmit(targetform,param) { |
|
| if (document.togglemultchecks.showmultpick.length) { |
|
| for (var i=0; i<document.togglemultchecks.showmultpick.length; i++) { |
|
| if (document.togglemultchecks.showmultpick[i].checked) { |
|
| if (document.togglemultchecks.showmultpick[i].value == 0) { |
|
| targetform.changeparms.value=param; |
|
| targetform.submit(); |
|
| } |
|
| } |
|
| } |
|
| } |
} |
| return; |
|
| } |
} |
| |
|
| function unselectInactive(nav) { |
function unselectInactive(nav) { |
|
Line 5249 function showPage(current, pageId, nav,
|
Line 3649 function showPage(current, pageId, nav,
|
| currentData = document.getElementById(pageId); |
currentData = document.getElementById(pageId); |
| currentData.style.display = 'block'; |
currentData.style.display = 'block'; |
| activeTab = pageId; |
activeTab = pageId; |
| toggleUpload(); |
|
| toggleMap(); |
|
| if (nav == 'mainnav') { |
if (nav == 'mainnav') { |
| var storedpath = "$docs_folderpath"; |
var storedpath = "$docs_folderpath"; |
| |
if (storedpath == '') { |
| |
storedpath = "$docs_pagepath"; |
| |
} |
| var storedpage = "$main_container_page"; |
var storedpage = "$main_container_page"; |
| var reg = new RegExp("^supplemental"); |
var reg = new RegExp("^supplemental"); |
| if (pageId == 'mainCourseDocuments') { |
if (pageId == 'mainCourseDocuments') { |
|
Line 5288 function showPage(current, pageId, nav,
|
Line 3689 function showPage(current, pageId, nav,
|
| |
|
| function toContents(jumpto) { |
function toContents(jumpto) { |
| var newurl = '$backtourl'; |
var newurl = '$backtourl'; |
| if ((newurl == '/adm/navmaps') && (jumpto != '')) { |
if (jumpto != '') { |
| newurl = newurl+'?postdata='+jumpto; |
newurl = newurl+'?postdata='+jumpto; |
| |
; |
| } |
} |
| location.href=newurl; |
location.href=newurl; |
| } |
} |
| |
|
| function submitSettings(form) { |
|
| var allidxlist = form.allidx.value; |
|
| form.allencrypturl.value = ''; |
|
| form.allhiddenresource.value = ''; |
|
| if (allidxlist != '') { |
|
| var allidxs = allidxlist.split(','); |
|
| if (allidxs.length > 1) { |
|
| for (var i=0; i<allidxs.length; i++) { |
|
| if (document.getElementById('hiddenresource_'+allidxs[i])) { |
|
| if (document.getElementById('hiddenresource_'+allidxs[i]).checked) { |
|
| form.allhiddenresource.value += allidxs[i]+','; |
|
| } |
|
| } |
|
| if (document.getElementById('encrypturl_'+allidxs[i])) { |
|
| if (document.getElementById('encrypturl_'+allidxs[i]).checked) { |
|
| form.allencrypturl.value += allidxs[i]+','; |
|
| } |
|
| } |
|
| } |
|
| } |
|
| } |
|
| var allmapidxlist = form.allmapidx.value; |
|
| form.allrandompick.value = ''; |
|
| form.allrandomorder.value = ''; |
|
| if (allmapidxlist != '') { |
|
| var allmapidxs = allmapidxlist.split(','); |
|
| for (var i=0; i<allmapidxs.length; i++) { |
|
| var randompick = document.getElementById('randompick_'+allmapidxs[i]); |
|
| var rpicknum = document.getElementById('rpicknum_'+allmapidxs[i]); |
|
| var randorder = document.getElementById('randomorder_'+allmapidxs[i]); |
|
| if ((randompick.checked) && (rpicknum.value != '')) { |
|
| form.allrandompick.value += allmapidxs[i]+':'+rpicknum.value+','; |
|
| } |
|
| if (randorder.checked) { |
|
| form.allrandomorder.value += allmapidxs[i]+','; |
|
| } |
|
| } |
|
| } |
|
| form.submit(); |
|
| return true; |
|
| } |
|
| |
|
| function togglePick() { |
|
| var disp = 'none'; |
|
| if (document.getElementById('multiclick')) { |
|
| var curr = document.getElementById('multiclick').style.display; |
|
| if (curr == 'none') { |
|
| disp='block'; |
|
| } |
|
| document.getElementById('multiclick').style.display=disp; |
|
| } |
|
| if (document.getElementById('savemulti')) { |
|
| var curr = document.getElementById('save.multi').style.display; |
|
| if (curr == 'none') { |
|
| disp='inline'; |
|
| } |
|
| document.getElementById('savemulti').style.display=disp; |
|
| } |
|
| resize_scrollbox('contentscroll','1','1'); |
|
| return; |
|
| } |
|
| |
|
| ENDNEWSCRIPT |
ENDNEWSCRIPT |
| } |
} |
| |
|
|
Line 5535 Return hash with valid author names
|
Line 3875 Return hash with valid author names
|
| |
|
| =item do_paste_from_buffer() |
=item do_paste_from_buffer() |
| |
|
| =item get_newmap_url() |
|
| |
|
| =item dbcopy() |
|
| |
|
| =item uniqueness_check() |
|
| |
|
| =item contained_map_check() |
|
| |
|
| =item url_paste_fixups() |
|
| |
|
| =item apply_fixups() |
|
| |
|
| =item copy_dependencies() |
|
| |
|
| =item update_parameter() |
=item update_parameter() |
| |
|
| =item handle_edit_cmd() |
=item handle_edit_cmd() |
|
Line 5561 Return hash with valid author names
|
Line 3887 Return hash with valid author names
|
| |
|
| =item is_supplemental_title() |
=item is_supplemental_title() |
| |
|
| |
=item parse_supplemental_title() |
| |
|
| =item entryline() |
=item entryline() |
| |
|
| =item tiehash() |
=item tiehash() |
![[BACK]](/icons/back.gif){kind=icon}
Return to londocs.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / interface