--- loncom/interface/londocs.pm 2013/03/17 18:46:21 1.484.2.27 +++ loncom/interface/londocs.pm 2012/12/02 22:40:09 1.518 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.484.2.27 2013/03/17 18:46:21 raeburn Exp $ +# $Id: londocs.pm,v 1.518 2012/12/02 22:40:09 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,6 +40,7 @@ use Apache::lonxml; use Apache::lonclonecourse; use Apache::lonnavmaps; use Apache::lonnavdisplay(); +use Apache::lonuserstate(); use Apache::lonextresedit(); use HTML::Entities; use HTML::TokeParser; @@ -152,7 +153,7 @@ sub dumpcourse { $r->print(&endContentScreen()); return ''; } - my ($ca,$cd)=split(/\:/,$env{'form.authorspace'}); + my ($ca,$cd)=split(/\@/,$env{'form.authorspace'}); $r->print('

'.&mt('Copying Files').'

'); my $title=$env{'form.authorfolder'}; $title=&clean($title); @@ -270,9 +271,7 @@ sub dumpcourse { sub group_import { my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_; - my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap, - %removeparam,$importuploaded,$fixuperrors); - $allmaps = {}; + while (@files) { my ($name, $url, $residx) = @{ shift(@files) }; if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) @@ -289,7 +288,7 @@ sub group_import { $env{'form.output'}=$newmapstr; my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom, '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. '; $fatal = 2; } @@ -298,24 +297,6 @@ sub group_import { } } 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 || defined($LONCAPA::map::zombies[$residx])) { $residx = &LONCAPA::map::getresidx($url,$residx); @@ -325,86 +306,11 @@ sub group_import { if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; } $url = &LONCAPA::map::qtunescape($url); $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 = < - - - -$name - - -$initialtext - - -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] = join(':', ($name, $url, $ext, 'normal', 'res')); } } - if ($importuploaded) { - my %import_errors; - my %updated = ( - removefrommap => \%removefrommap, - removeparam => \%removeparam, - ); - my ($result,$msgsarray,$lockerror) = - &apply_fixups($folder,1,$coursedom,$coursenum,\%import_errors,\%updated); - if (keys(%import_errors) > 0) { - $fixuperrors = - '

'."\n". - &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". - '

'."\n"; - } - if (ref($msgsarray) eq 'ARRAY') { - if (@{$msgsarray} > 0) { - $fixuperrors .= '

'. - join('
',@{$msgsarray}). - '

'; - } - } - if ($lockerror) { - $fixuperrors .= '

'. - $lockerror. - '

'; - } - } - my ($errtext,$fatal) = - &storemap($coursenum, $coursedom, $folder.'.'.$container,1); - return ($errtext,$fatal,$fixuperrors); + return &storemap($coursenum, $coursedom, $folder.'.'.$container,1); } sub log_docs { @@ -485,15 +391,18 @@ sub docs_change_log { my %orderhash; my $container='sequence'; my $pathitem; - if ($env{'form.folderpath'} =~ /\:1$/) { + if ($env{'form.pagepath'}) { $container='page'; + $pathitem = ''; + } else { + my $folderpath=$env{'form.folderpath'}; + if ($folderpath eq '') { + $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Documents')); + } + $pathitem = ''; } - my $folderpath=$env{'form.folderpath'}; - if ($folderpath eq '') { - $folderpath = 'default&'.&escape(&mt('Main '.$crstype.' Documents').':::::'); - } - $pathitem = ''; my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container"; my $jumpto = $readfile; $jumpto =~ s{^/}{}; @@ -745,7 +654,7 @@ sub print_paste_buffer { $is_external = 1; } - my ($canpaste,$nopaste,$othercrs,$areachange); + my ($canpaste,$nopaste,$othercrs,$areachange,$is_uploaded_map); if ($folder =~ /^supplemental/) { $canpaste = &supp_pasteable($env{'docs.markedcopy_url'}); unless ($canpaste) { @@ -790,7 +699,7 @@ sub print_paste_buffer { $buffer = $type.': '. &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('. &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')'; - } else { + } else { my $icon = &Apache::loncommon::icon($extension); if ($extension eq 'sequence' && $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) { @@ -802,36 +711,19 @@ sub print_paste_buffer { } if ($canpaste) { $r->print('
'.$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'); - } + if (($is_uploaded_map) && (!$areachange)) { + if ((!$othercourse) && ($env{'docs.markedcopy_cmd'} eq 'cut')) { $r->print((' 'x 4).''. ''. &mt('Show Paste Options').'
'. '
'.(' 'x 4). ''.(' ' x2). + &mt('Copy to new folder').''.(' ' x2). '
'); - if (($is_uploaded_map) && ($env{'docs.markedcopy_nested'})) { + &mt('Move old folder').'
'); + if ($env{'docs.markedcopy_nested'}) { $r->print('
'.&mt('Folder to paste contains sub-folders'). '
'); my @pastemaps = split(/\&/,$env{'docs.markedcopy_nested'}); @@ -869,9 +761,16 @@ sub print_paste_buffer { } } $r->print('
'.$othercrs); - $r->print(' + if ($container eq 'page') { + $r->print(' + + +'); + } else { + $r->print(' '); + } $r->print(''); } else { $r->print(&mt('Paste buffer contains:').' '.$buffer. @@ -1006,23 +905,30 @@ sub do_paste_from_buffer { %dbcopies,%zombies,%params,%docmoves,%mapmoves,%newsubdir,%newurls); $oldurl = $url; if ($is_map) { + if ($folder =~ /^default/) { + my $lastchange = &Apache::lonnet::get_coursechange($coursedom,$coursenum); + if ($lastchange > $env{'request.course.tied'}) { + &reinit_role($coursedom,$coursenum,$env{"course.$env{'request.course.id'}.home"}); + } + } # If pasting a map, check if map contains other maps - my ($allmaps,%hierarchy,%titles); - $allmaps = {}; + my (%allmaps,%hierarchy,%titles); if ($folder =~ /^default/) { - $allmaps = - &Apache::loncommon::allmaps_incourse($coursedom,$coursenum, - $env{"course.$env{'request.course.id'}.home"}, - $env{'request.course.id'}); + my $navmap = Apache::lonnavmaps::navmap->new(); + if (defined($navmap)) { + foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) { + $allmaps{$res->src()} = 1; + } + } } &contained_map_check($url,$folder,\%removefrommap,\%removeparam, - \%addedmaps,\%hierarchy,\%titles,$allmaps); + \%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); + $srcdom,$srcnum,\$title,\%allmaps,\%newurls); if ($error) { return ($error); } @@ -1037,59 +943,45 @@ sub do_paste_from_buffer { } 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, + unless (&url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum, + \%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, + &url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,\%allmaps,\%rewrites, \%retitles,\%copies,\%dbcopies,\%zombies,\%params,\%mapmoves, - \%mapchanges,\%tomove,\%newsubdir,\%newurls); + \%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})) { + if ($allmaps{$url}) { return (&mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.')); } } } } - my $lockerrors; - if ($url=~ m{/(bulletinboard|smppg)$}) { - my $prefix = $1; - #need to copy the db contents to a new one, unless this is a move. - my %info = ( - src => $url, - cdom => $coursedom, - 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; + 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 $dbresult=&Apache::lonnet::put($db_name,\%contents, + $coursedom,$coursenum); + if ($dbresult eq 'ok') { + $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x; $title=&mt('Copy of').' '.$title; } else { - if ($prefix eq 'smppg') { - $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}; + return (&mt('Paste failed: An error occurred when copying the simple page.')); } - } + } } $title = &LONCAPA::map::qtunescape($title); my $ext='false'; @@ -1116,9 +1008,7 @@ sub do_paste_from_buffer { if ($newdocsdir eq '') { $newdocsdir = 'default'; } - if (($prefixchg) || - ($srcdom ne $coursedom) || ($srcnum ne $coursenum) || - ($env{'form.docs.markedcopy_options'} ne 'move')) { + if (($prefixchg) || ($srcdom ne $coursedom) || ($srcnum ne $coursenum)) { my $newpath = "$newprefix/$newdocsdir/$newidx/$rem"; $url = &Apache::lonclonecourse::writefile($env{'request.course.id'},$newpath, @@ -1136,34 +1026,16 @@ sub do_paste_from_buffer { } # 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; + $result = + &apply_fixups($folder,$is_map,$prefixchg,$coursedom,$coursenum,$oldurl, + $url,\%removefrommap,\%removeparam,\%rewrites,\%retitles, + \%copies,\%dbcopies,\%zombies,\%params,\%docmoves, + \%mapmoves,\%newsubdir,$errors,\%before,\%after); if ($result eq 'ok') { if ($is_map) { my ($errtext,$fatal) = &mapread($coursenum,$coursedom, $folder.'.'.$container); - return ($errtext,$save_err,$msgsarray,$lockerrors) if ($fatal); + return $errtext if ($fatal); if ($#LONCAPA::map::order<1) { my $idx=&LONCAPA::map::getresidx(); @@ -1200,7 +1072,7 @@ sub do_paste_from_buffer { &Apache::lonnet::delenv('docs.markedcopy_nested'); &Apache::lonnet::delenv('docs.markedcopy_nestednames'); } - return ($result,$save_err,$msgsarray,$lockerrors); + return ($result,$save_err); } sub get_newmap_url { @@ -1264,96 +1136,20 @@ sub get_newmap_url { } sub dbcopy { - my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_; - my ($url,$result,$errtext); - my $url = $dbref->{'src'}; - 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 .= '
'.$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} = - '
'. - &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.').'
'; - } - } - } 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); - } - } + my ($url,$coursedom,$coursenum) = @_; + 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; } } - return ($url,$result,$errtext); + return $url; } sub uniqueness_check { @@ -1394,7 +1190,7 @@ sub contained_map_check { $titles->{$url}{$token->[2]->{'id'}} = $token->[2]->{'title'}; } else { if ($allmaps->{$ressrc}) { - $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; + $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; } elsif (ref($addedmaps->{$ressrc}) eq 'ARRAY') { $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; } else { @@ -1418,10 +1214,18 @@ sub contained_map_check { return; } +sub reinit_role { + my ($cdom,$cnum,$chome) = @_; + my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum"); + unless ($ferr) { + &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome,$cdom.'_'.$cnum); + } + 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 ($oldurl,$folder,$prefixchg,$cdom,$cnum,$allmaps,$rewrites,$retitles,$copies, + $dbcopies,$zombies,$params,$mapmoves,$mapchanges,$tomove,$newsubdir,$newurls) = @_; my $checktitle; if (($prefixchg) && ($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/supplemental})) { @@ -1448,13 +1252,13 @@ sub url_paste_fixups { 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; + $retitles->{$oldurl}{$ressrc} = $id; } } next if ($token->[2]->{'type'} eq 'external'); if ($token->[2]->{'type'} eq 'zombie') { next if ($skip); - $zombies->{$oldurl}{$id} = $ressrc; + $zombies->{$oldurl}{$ressrc} = $id; $changed = 1; } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) { my $srcdom = $1; @@ -1466,11 +1270,10 @@ sub url_paste_fixups { 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); + &url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,$cnum,$allmaps, + $rewrites,$retitles,$copies,$dbcopies,$zombies, + $params,$mapmoves,$mapchanges,$tomove,$newsubdir, + $newurls); next; } else { ($newurl,my $error) = @@ -1488,39 +1291,28 @@ sub url_paste_fixups { ($mapchanges->{$oldurl}) || (($newurl ne '') && ($newurl ne $oldurl))) { if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) { - $rewrites->{$oldurl}{$id} = $ressrc; + $rewrites->{$oldurl}{$ressrc} = $id; $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)) { + unless (&url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,$cnum,$allmaps, + $rewrites,$retitles,$copies,$dbcopies,$zombies, + $params,$mapmoves,$mapchanges,$tomove,$newsubdir, + $newurls)) { $mapmoves->{$ressrc} = 1; } $changed = 1; } else { - $rewrites->{$oldurl}{$id} = $ressrc; + $rewrites->{$oldurl}{$ressrc} = $id; $copies->{$oldurl}{$ressrc} = $id; $changed = 1; } } - } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/.+$}) { + } 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; + $rewrites->{$oldurl}{$ressrc} = $id; + $dbcopies->{$oldurl}{$ressrc} = $id; $changed = 1; } } elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) { @@ -1528,9 +1320,8 @@ sub url_paste_fixups { 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; + $rewrites->{$oldurl}{$ressrc} = $id; + $dbcopies->{$oldurl}{$ressrc} = $id; $changed = 1; } } @@ -1550,73 +1341,24 @@ sub url_paste_fixups { } 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 ($folder,$is_map,$prefixchg,$cdom,$cnum,$oldurl,$url,$removefrommap, + $removeparam,$rewrites,$retitles,$copies,$dbcopies,$zombies,$params, + $docmoves,$mapmoves,$newsubdir,$errors,$before,$after) = @_; + 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; - } + 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); } + undef(%added); } if ($key eq $oldurl) { - if ((exists($docmoves{$key}))) { - unless (grep(/^\Q$oldurl\E$/,@allcopies)) { + if ((exists($docmoves->{$key}))) { + unless (grep(/^\Q$oldurl\E/,@allcopies)) { push(@allcopies,$oldurl); } } @@ -1629,16 +1371,16 @@ sub apply_fixups { my $content = &Apache::lonnet::getfile($item); unless ($content eq '-1') { my $storefn; - if (($key eq $oldurl) && (exists($docmoves{$key}))) { - $storefn = $docmoves{$key}; + if (($key eq $oldurl) && (ref($docmoves) eq 'HASH') && (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 ($prefixchg) { + $storefn =~ s/^\Q$before->{'doc'}\E/$after->{'doc'}/; } - if ($newsubdir{$key}) { - $storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir{$key}/#; + if ($newsubdir->{$key}) { + $storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir->{$key}#; } } ©_dependencies($item,$storefn,$relpath,$errors,\$content); @@ -1646,7 +1388,7 @@ sub apply_fixups { &Apache::lonclonecourse::writefile($env{'request.course.id'}, $storefn.$fname,$content); if ($copyurl eq '/adm/notfound.html') { - if (exists($docmoves{$oldurl})) { + if ((ref($docmoves) eq 'HASH') && (exists($docmoves->{$oldurl}))) { return &mt('Paste failed: an error occurred copying the file.'); } elsif (ref($errors) eq 'HASH') { $errors->{$item} = 1; @@ -1657,14 +1399,14 @@ sub apply_fixups { } } } - foreach my $key (keys(%mapmoves)) { + 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 ($prefixchg) { + $storefn =~ s/^\Q$before->{'map'}\E/$after->{'map'}/; } - if ($newsubdir{$key}) { - $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/; + if ($newsubdir->{$key}) { + $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir->{$key}/; } my $mapcontent = &Apache::lonnet::getfile($key); if ($mapcontent eq '-1') { @@ -1684,106 +1426,105 @@ sub apply_fixups { } 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(%{$rewrites})) { + $updates{$key} = 1; + } + foreach my $key (keys(%{$zombies})) { + $updates{$key} = 1; + } + foreach my $key (keys(%{$removefrommap})) { + $updates{$key} = 1; + } + foreach my $key (keys(%{$removeparam})) { + $updates{$key} = 1; + } + foreach my $key (keys(%{$dbcopies})) { + $updates{$key} = 1; + } + foreach my $key (keys(%{$retitles})) { + $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($rewrites->{$key}) eq 'HASH') { + %torewrite = %{$rewrites->{$key}}; } - if (ref($retitles{$key}) eq 'HASH') { - %toretitle = %{$retitles{$key}}; + if (ref($retitles->{$key}) eq 'HASH') { + %toretitle = %{$retitles->{$key}}; } - if (ref($removefrommap{$key}) eq 'HASH') { - %toremove = %{$removefrommap{$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($removeparam->{$key}) eq 'HASH') { + %remparam = %{$removeparam->{$key}}; + } + if (ref($zombies->{$key}) eq 'HASH') { + %zombie = %{$zombies->{$key}}; + } + if (ref($dbcopies->{$key}) eq 'HASH') { + foreach my $item (keys(%{$dbcopies->{$key}})) { + $newdb{$item} = &dbcopy($item); } } - if (ref($params{$key}) eq 'HASH') { - %currparam = %{$params{$key}}; + if (ref($params->{$key}) eq 'HASH') { + %currparam = %{$params->{$key}}; } my ($errtext,$fatal) = &LONCAPA::map::mapread($key); if ($fatal) { - return ($errtext); + 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) { + if ($zombie{$src} eq $i) { 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])) { + for (my $i=0; $i<@LONCAPA::map::resources; $i++) { + if (defined($LONCAPA::map::resources[$i])) { my $changed; - my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$idx]); - if ((exists($toremove{$idx})) && ($toremove{$idx} eq $src)) { + my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$i]); + if ($toremove{$src} eq $i) { splice(@LONCAPA::map::order,$i,1); - if (ref($currparam{$idx}) eq 'ARRAY') { - foreach my $name (@{$currparam{$idx}}) { - &LONCAPA::map::delparameter($idx,'parameter_'.$name); + if (ref($currparam{$i}) eq 'ARRAY') { + foreach my $name (@{$currparam{$i}}) { + &LONCAPA::map::delparameter($i,'parameter_'.$name); } } next; } my $origsrc = $src; - if ((exists($toretitle{$idx})) && ($toretitle{$idx} eq $src)) { + if ((exists($toretitle{$src})) && ($toretitle{$src} eq $i)) { if ($title =~ m{^\d+\Q___&&&___\E$match_username\Q___&&&___\E$match_domain\Q___&&&___\E(.+)$}) { $changed = 1; } } - if ((exists($torewrite{$idx})) && ($torewrite{$idx} eq $src)) { + if ((exists($torewrite{$src})) && ($torewrite{$src} eq $i)) { $src =~ s{^/(uploaded|adm|public)/$match_domain/$match_courseid/}{/$1/$cdom/$cnum/}; if ($origsrc =~ m{^/uploaded/}) { - if ($prefixchg && $before{'map'} && $after{'map'}) { + if ($prefixchg) { if ($src =~ /\.(page|sequence)$/) { - $src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before{'map'}\E#$1$after{'map'}#; + $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'}#; + $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}#; + if ($newsubdir->{$origsrc}) { + if ($src =~ /\.(page|sequence)$/) { + $src =~ s#^(/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_)(\d+)#$1$newsubdir->{$origsrc}#; + } else { + $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\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}; + } elsif ($newdb{$src} ne '') { + $src = $newdb{$src}; $changed = 1; } if ($changed) { - $LONCAPA::map::resources[$idx] = join(':',($title,$src,$ext,$type)); + $LONCAPA::map::resources[$i] = join(':',($title,$src,$ext,$type)); } } } @@ -1794,9 +1535,6 @@ sub apply_fixups { } } } - if (values(%lockerrors) > 0) { - $lockmsg = join('
',values(%lockerrors)); - } my $storefn; if ($key eq $oldurl) { $storefn = $url; @@ -1804,27 +1542,25 @@ sub apply_fixups { } 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 ($prefixchg) { + $storefn =~ s/^\Q$before->{'map'}\E/$after->{'map'}/; } - if ($newsubdir{$key}) { - $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/; + if ($newsubdir->{$key}) { + $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir->{$key}/; } } my $report; if ($folder !~ /^supplemental/) { $report = 1; } - (my $outtext,$errtext) = + 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 &mt('Paste failed: an error occurred saving the folder or page.'); } } } - return ('ok',\@msgs,$lockmsg); + return 'ok'; } sub copy_dependencies { @@ -1956,23 +1692,16 @@ sub handle_edit_cmd { sub editor { my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype, $supplementalflag,$orderhash,$iconpath,$pathitem)=@_; - my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container); + my $container= ($env{'form.pagepath'}) ? 'page' + : 'sequence'; + my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order); if ($allowed) { - (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); $r->print($breadcrumbtrail); - } elsif ($env{'form.folderpath'} =~ /\:1$/) { - $container = 'page'; - } else { - $container = 'sequence'; } - my $jumpto; - - unless ($supplementalflag) { - $jumpto = "'uploaded/$coursedom/$coursenum/$folder.$container'"; - } + my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container"; unless ($allowed) { $randompick = -1; @@ -2012,22 +1741,9 @@ sub editor { if ($env{'form.pastemarked'}) { my %paste_errors; - my ($paste_res,$save_error,$pastemsgarray,$lockerror) = + my ($paste_res,$save_error) = &do_paste_from_buffer($coursenum,$coursedom,$folder,$container, \%paste_errors); - if (ref($pastemsgarray) eq 'ARRAY') { - if (@{$pastemsgarray} > 0) { - - $r->print('

'. - join('
',@{$pastemsgarray}). - '

'); - } - } - if ($lockerror) { - $r->print('

'. - $lockerror. - '

'); - } if ($save_error ne '') { return $save_error; } @@ -2061,10 +1777,10 @@ sub editor { foreach my $item (split(/\&/,$env{'form.importdetail'})) { if (defined($item)) { my ($name,$url,$residx)= - map { &unescape($_); } split(/\=/,$item); - if ($url =~ m{^\Q/uploaded/$coursedom/$coursenum/\E(default|supplemental)_new\.(sequence|page)$}) { + 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); + &newmap_suffix($1,$2,$coursedom,$coursenum); if ($locknotfreed) { $r->print($locknotfreed); } @@ -2073,45 +1789,13 @@ sub editor { } 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]); } } - ($errtext,$fatal,my $fixuperrors) = - &group_import($coursenum, $coursedom, $folder,$container, - 'londocs',@imports); + ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder, + $container,'londocs',@imports); return $errtext if ($fatal); - if ($fixuperrors) { - $r->print($fixuperrors); - } } # Loading a complete map if ($env{'form.loadmap'}) { @@ -2178,23 +1862,13 @@ sub editor { unless ($name) { $idx++; next; } $output .= &entryline($idx,$name,$url,$folder,$allowed,$res, $coursenum,$coursedom,$crstype, - $pathitem,$supplementalflag,$container); + $pathitem,$supplementalflag); $idx++; $shown++; } &Apache::loncommon::end_data_table_count(); if (($allowed) || ($supplementalflag && $folder eq 'supplemental')) { - my $toolslink = '
' - .'
' - .&Apache::loncommon::help_open_menu('Navigation Screen', - 'Navigation_Screen',undef,'RAT') - .''.&mt('Tools:').'

'; if ($shown) { if ($allowed) { $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll') @@ -2212,15 +1886,19 @@ sub editor { .'
' .&Apache::loncommon::end_scrollbox(); } else { - $to_show .= $toolslink + $to_show = '' + .'
'.&Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT') + .''.&mt('Tools:').'

' .&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') .'
' .&mt('Currently no documents.') @@ -2270,15 +1948,19 @@ sub process_file_upload { my $errtext=''; my $fatal=0; my $container='sequence'; - if ($env{'form.folderpath'} =~ /:1$/) { + if ($env{'form.pagepath'}) { $container='page'; } ($errtext,$fatal)= - &mapread($coursenum,$coursedom,$folder.'.'.$container); + &mapread($coursenum,$coursedom,$folder.'.'.$container); if ($#LONCAPA::map::order<1) { $LONCAPA::map::order[0]=1; $LONCAPA::map::resources[1]=''; } + if ($fatal) { + $$upload_output = '
'.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'
'; + return; + } my $destination = 'docs/'; if ($folder =~ /^supplemental/) { $destination = 'supplemental/'; @@ -2288,10 +1970,6 @@ sub process_file_upload { } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) { $destination .= $2.'/'; } - if ($fatal) { - $$upload_output = '
'.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'
'; - return; - } # this is for a course, not a user, so set context to coursedoc. my $newidx=&LONCAPA::map::getresidx(); $destination .= $newidx; @@ -2360,6 +2038,7 @@ sub process_file_upload { my $archiveurl = &HTML::Entities::encode($url,'<>&"'); my %archiveitems = ( folderpath => $env{'form.folderpath'}, + pagepath => $env{'form.pagepath'}, cmd => $nextphase, newidx => $newidx, position => $position, @@ -2414,14 +2093,16 @@ sub is_supplemental_title { sub entryline { my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, - $crstype,$pathitem,$supplementalflag,$container)=@_; - my ($foldertitle,$renametitle); + $crstype,$pathitem,$supplementalflag)=@_; + my ($foldertitle,$pagetitle,$renametitle); if (&is_supplemental_title($title)) { ($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); + $pagetitle = $foldertitle; } else { $title=&HTML::Entities::encode($title,'"<>&\''); $renametitle=$title; $foldertitle=$title; + $pagetitle=$title; } my $orderidx=$LONCAPA::map::order[$index]; @@ -2432,17 +2113,19 @@ sub entryline { my $line=&Apache::loncommon::start_data_table_row(); my ($form_start,$form_end,$form_common); # Edit commands - my ($type, $esc_path, $path, $symb); - if ($container eq 'page') { - $type = 'page'; - } else { - $type = 'folder'; - } + my ($container, $type, $esc_path, $path, $symb); if ($env{'form.folderpath'}) { + $type = 'folder'; + $container = 'sequence'; $esc_path=&escape($env{'form.folderpath'}); $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); # $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"'); } + if ($env{'form.pagepath'}) { + $type = $container = 'page'; + $esc_path=&escape($env{'form.pagepath'}); + $path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"'); + } my $isexternal; if ($residx) { my $currurl = $url; @@ -2575,7 +2258,7 @@ sub entryline { ENDCOPY } else { $copylink=(<$lt{'cp'} +$lt{'cp'} ENDCOPY } if ($nocut) { @@ -2584,7 +2267,7 @@ ENDCOPY ENDCUT } else { $cutlink=(<$lt{'ct'} +$lt{'ct'} ENDCUT } if ($noremove) { @@ -2593,12 +2276,12 @@ ENDCUT ENDREM } else { $removelink=(<$lt{'rm'} +$lt{'rm'} ENDREM } unless ($isexternal) { $renamelink=(<$lt{'rn'} +$lt{'rn'} ENDREN } $form_start = ' @@ -2643,18 +2326,22 @@ END my ($extension)=($url=~/\.(\w+)$/); my $uploaded=($url=~/^\/*uploaded\//); my $icon=&Apache::loncommon::icon($url); - my $isfolder; - my $ispage; - my $containerarg; + my $isfolder=0; + my $ispage=0; + my $folderarg; + my $pagearg; + my $pagefile; if ($uploaded) { if (($extension eq 'sequence') || ($extension eq 'page')) { $url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/; - $containerarg = $1; + my $containerarg = $1; if ($extension eq 'sequence') { $icon=$iconpath.'navmap.folder.closed.gif'; + $folderarg=$containerarg; $isfolder=1; } else { $icon=$iconpath.'page.gif'; + $pagearg=$containerarg; $ispage=1; } if ($allowed) { @@ -2672,6 +2359,10 @@ END $orig_url=~s{http(:|:)//https(:|:)//}{https$2//}; $url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/}; if (!$supplementalflag && $residx && $symb) { + if ($container eq 'page') { + $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]); + $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb); + } if ((!$isfolder) && (!$ispage)) { (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); $url=&Apache::lonnet::clutter($url); @@ -2696,17 +2387,17 @@ END } } 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 $folderpath=$env{'form.folderpath'}; if ($folderpath) { $folderpath.='&' }; if (!$allowed && $supplementalflag) { - $folderpath.=$containerarg.'&'.$foldername; + $folderpath.=$folderarg.'&'.$foldername; $url.='folderpath='.&escape($folderpath); } else { # Append randompick number, hidden, and encrypted with ":" to foldername, # so it gets transferred between levels - $folderpath.=$containerarg.'&'.$foldername. + $folderpath.=$folderarg.'&'.$foldername. ':'.(&LONCAPA::map::getparameter($orderidx, 'parameter_randompick'))[0] .':'.((&LONCAPA::map::getparameter($orderidx, @@ -2714,8 +2405,7 @@ END .':'.((&LONCAPA::map::getparameter($orderidx, 'parameter_encrypturl'))[0]=~/^yes$/i) .':'.((&LONCAPA::map::getparameter($orderidx, - 'parameter_randomorder'))[0]=~/^yes$/i) - .':'.$ispage; + 'parameter_randomorder'))[0]=~/^yes$/i); $url.='folderpath='.&escape($folderpath); my $rpicknum = (&LONCAPA::map::getparameter($orderidx, 'parameter_randompick'))[0]; @@ -2749,7 +2439,15 @@ $form_common.' $url .= '&idx='.$orderidx; } } - my ($tdalign,$tdwidth); + if ($ispage) { + my $pagename=&escape($pagetitle); + my $pagepath; + my $folderpath=$env{'form.folderpath'}; + if ($folderpath) { $pagepath = $folderpath.'&' }; + $pagepath.=$pagearg.'&'.$pagename; + $url.='pagepath='.&escape($pagepath). + '&pagesymb='.&escape($symb); + } if ($allowed) { my $fileloc = &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url)); @@ -2766,23 +2464,21 @@ $form_common.' $forceedit, undef,$symb, &escape($env{'form.folderpath'}), - $renametitle,'','',1); + $renametitle); if ($jscall) { $editlink = ''.&mt('Edit').' '."\n"; } } } - $tdalign = ' align="right" valign="top"'; - $tdwidth = ' width="80%"'; } my $reinit; if ($crstype eq 'Community') { $reinit = &mt('(re-initialize community to access)'); } else { $reinit = &mt('(re-initialize course to access)'); - } - $line.=''.$editlink.$renamelink; + } + $line.=''.$editlink.$renamelink; if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { $line.=''; } elsif ($url) { @@ -2791,7 +2487,7 @@ $form_common.' } else { $line.=''; } - $line.=''; + $line.=''; if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { $line.=''.$title.''; } elsif ($url) { @@ -2831,52 +2527,26 @@ ENDPARMS 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'; +sub newmap_suffix { + my ($area,$container,$coursedom,$coursenum) = @_; + my ($prefix,$idtype,$errtext,$locknotfreed); + $prefix = 'docs'; + if ($area eq 'supplemental') { + $prefix = 'supp'; } + $prefix .= $container; $idtype = 'concat'; my ($suffix,$freedlock,$error) = - &Apache::lonnet::get_timebased_id($prefix,'num',$namespace, + &Apache::lonnet::get_timebased_id($prefix,'num','uploadedmaps', $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.'); - } + $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.'); if ($error) { $errtext .= '
'.$error; } } if ($freedlock ne 'ok') { - $locknotfreed = - '
'. - &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.'). - '
'; + $locknotfreed = '
'.&mt('There was a problem removing a lockfile. This will prevent creation of additional folders or composite pages in this course. Please contact the domain coordinator for your LON-CAPA domain.').'
'; } return ($suffix,$errtext,$locknotfreed); } @@ -2976,7 +2646,7 @@ sub checkonthis { $r->print(''.&mt('connection down').''); } elsif ($result eq 'not_found') { unless ($url=~/\$/) { - $r->print(''.&mt('not found').''); + $r->print(''.&mt('not found').''); } else { $r->print(''.&mt('unable to verify variable URL').''); } @@ -3022,7 +2692,7 @@ sub list_symbs { $r->print(&Apache::loncommon::start_data_table_row(). ''.$res->compTitle().''. ''.$res->symb().''. - &Apache::loncommon::end_data_table_row()); + &Apache::loncommon::start_data_table_row()); $count ++; } if (!$count) { @@ -3032,7 +2702,6 @@ sub list_symbs { } $r->print(&Apache::loncommon::end_data_table()); } - $r->print(&endContentScreen()); } @@ -3063,7 +2732,6 @@ sub verifycontent { } &untiehash(); $r->print('

'.&mt('Done').'

'); - $r->print(&endContentScreen()); } @@ -3143,7 +2811,7 @@ sub checkversions { if ($env{'form.timerange'} eq 'all') { # show all documents $header=&mt('All Documents in '.$crstype); - $allsel=' selected="selected"'; + $allsel=1; foreach my $key (keys(%hash)) { if ($key=~/^ids\_(\/res\/.+)$/) { my $src=$1; @@ -3164,19 +2832,19 @@ sub checkversions { .&mt('seconds'); if ($env{'form.timerange'}==-1) { $seltext='since start of course'; - $startsel=' selected="selected"'; + $startsel='selected'; $env{'form.timerange'}=time; } $starttime=time-$env{'form.timerange'}; if ($env{'form.timerange'}==2592000) { $seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; - $monthsel=' selected="selected"'; + $monthsel='selected'; } elsif ($env{'form.timerange'}==604800) { $seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; - $weeksel=' selected="selected"'; + $weeksel='selected'; } elsif ($env{'form.timerange'}==86400) { $seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; - $daysel=' selected="selected"'; + $daysel='selected'; } $header=&mt('Content changed').' '.$seltext; } else { @@ -3214,11 +2882,11 @@ sub checkversions {
$lt{'cd'}
@@ -3234,93 +2902,111 @@ $lt{'sc'}: + ENDHEADERS #number of columns for version history + my $num_ver_col = 1; $r->print( - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). - ''. - "". - "". - "". - ''. - &Apache::loncommon::end_data_table_header_row() - ); + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + ''. + "". + "". + "". + ''. + ''); foreach my $key (sort(keys(%changes))) { #excludes not versionable problems from resource version history: - next unless ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/); - my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); - my $currentversion=&Apache::lonnet::getversion($key); - if ($currentversion<0) { - $currentversion=''.&mt('Could not be determined.').''; - } - my $linkurl=&Apache::lonnet::clutter($key); + if ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/) { + my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); + my $currentversion=&Apache::lonnet::getversion($key); + if ($currentversion<0) { + $currentversion=''.&mt('Could not be determined.').''; + } + my $linkurl=&Apache::lonnet::clutter($key); $r->print( + &Apache::loncommon::end_data_table_header_row(). &Apache::loncommon::start_data_table_row(). - ''. - ''. - ''); - # List all available versions - $r->print(''); + if ($cols_output != $num_ver_col) { + $r->print(''.&Apache::loncommon::end_data_table_row()); + } } - $r->print( - &Apache::loncommon::end_data_table(). - ''. - '' - ); + $r->print(''.&Apache::loncommon::end_data_table_row(). + &Apache::loncommon::end_data_table(). + ''); &untiehash(); - $r->print(&endContentScreen()); } sub mark_hash_old { @@ -3352,6 +3038,11 @@ sub changewarning { my $pathvar='folderpath'; my $path=&escape($env{'form.folderpath'}); 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; } my $course_type = &Apache::loncommon::course_type(); @@ -3417,6 +3108,7 @@ sub startContentScreen { if (($mode eq 'navmaps') || ($mode eq 'supplemental')) { $output .= '    '.&mt('Content Overview').'    '."\n"; $output .= '     '.&mt('Content Search').'     '."\n"; + $output .= '      '.&mt('Content Index').'      '."\n"; $output .= '
  • '.&mt('Supplemental Content').'
    • '; } else { $output .= '
  •       '.&mt('Content Editor').'      
    • '."\n"; @@ -3481,8 +3173,7 @@ sub handler { 'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages'); $help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files'); $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; # URI is /adm/supplemental when viewing supplemental docs in non-edit mode. @@ -3525,8 +3216,8 @@ sub handler { # Get the parameters that may be needed # &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['folderpath', - 'forcesupplement','forcestandard', + ['folderpath','pagepath', + 'pagesymb','forcesupplement','forcestandard', 'tools','symb','command','supppath']); # standard=1: this is a "new-style" course with an uploaded map as top level @@ -3541,7 +3232,7 @@ sub handler { 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; } if ($env{'form.forcesupplement'}) { $supplementalflag=1; } @@ -3560,54 +3251,112 @@ sub handler { # 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 '') { - $env{'form.folderpath'}= - &Apache::loncommon::symb_to_docspath($env{'form.symb'}); - &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => - $env{'form.command'}.'_'.$env{'form.symb'}}); + ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'}); + if ($resurl=~/\.(sequence|page)$/) { + $mapurl=$resurl; + } 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 =~ s/^\&//; + my $maptitle = $mapresobj->title(); + if ($mapurl eq 'default') { + $maptitle = 'Main Course Documents'; + } + $path .= (($path ne '')? '&' : ''). + &Apache::lonhtmlcommon::entity_encode($mapurl).'&'. + &Apache::lonhtmlcommon::entity_encode($maptitle). + ':'.$mapresobj->randompick(). + ':'.$mapresobj->randomout(). + ':'.$mapresobj->encrypted(). + ':'.$mapresobj->randomorder(); + } else { + my $maptitle = &Apache::lonnet::gettitle($mapurl); + if ($mapurl eq 'default') { + $maptitle = 'Main Course Documents'; + } + $path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'. + &Apache::lonhtmlcommon::entity_encode($maptitle).'::::'; + } + unless ($mapurl eq 'default') { + $path = 'default&'. + &Apache::lonhtmlcommon::entity_encode('Main Course Documents'). + '::::&'.$path; + } + if ($type eq 'sequence') { + $env{'form.folderpath'}=$path; + $env{'form.pagepath'}=''; + } else { + $env{'form.pagepath'}=$path; + $env{'form.folderpath'}=''; + } } elsif ($env{'form.supppath'} ne '') { $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') { - $env{'form.folderpath'} = 'default&'. - &Apache::lonhtmlcommon::entity_encode('Main Course Content'). - ':::::'; - &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}}); + $env{'form.folderpath'} = 'default&'. + &Apache::lonhtmlcommon::entity_encode('Main Course Content'); + $env{'form.pagepath'}=''; } elsif ($env{'form.command'} eq 'editsupp') { - $env{'form.folderpath'} = 'supplemental&'. + $env{'form.folderpath'} = 'default&'. &Apache::lonhtmlcommon::entity_encode('Supplemental Content'); - &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/supplemental'}); - } 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'}); + $env{'form.pagepath'}=''; } - # Where do we store these for when we come back? my $stored_folderpath='docs_folderpath'; if ($supplementalflag) { $stored_folderpath='docs_sup_folderpath'; } -# No folderpath, and in edit mode, see if we have something stored - if ((!$env{'form.folderpath'}) && $allowed) { +# No folderpath, no pagepath, and in edit mode, see if we have something stored + if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'}) && $allowed) { &Apache::loncommon::restore_course_settings($stored_folderpath, {'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 (!$allowed) { + $env{'form.pagepath'}=''; unless ($env{'form.folderpath'} =~ /^supplemental/) { $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 if ($env{'form.folderpath'} =~ /^supplemental_\d+/) { $env{'form.folderpath'} = &supplemental_base() @@ -3615,12 +3364,11 @@ sub handler { $env{'form.folderpath'}; } # 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) { $env{'form.folderpath'}=&supplemental_base(); } else { - $env{'form.folderpath'}='default'.&escape(&mt('Main '.$crstype.' Documents')). - ':::::'; + $env{'form.folderpath'}='default'; } } @@ -3628,29 +3376,38 @@ sub handler { unless ($toolsflag) { if ($allowed) { &Apache::loncommon::store_course_settings($stored_folderpath, - {'folderpath' => 'scalar'}); + {'pagepath' => 'scalar', + 'folderpath' => 'scalar'}); } - my $folderpath; if ($env{'form.folderpath'}) { - $folderpath = $env{'form.folderpath'}; - my (@folders)=split('&',$env{'form.folderpath'}); - $env{'form.foldername'}=&unescape(pop(@folders)); - if ($env{'form.foldername'} =~ /\:1$/) { - $container = 'page'; - } else { - $container = 'sequence'; - } - $env{'form.folder'}=pop(@folders); + my (@folderpath)=split('&',$env{'form.folderpath'}); + $env{'form.foldername'}=&unescape(pop(@folderpath)); + $env{'form.folder'}=pop(@folderpath); + $container='sequence'; + } + if ($env{'form.pagepath'}) { + my (@pagepath)=split('&',$env{'form.pagepath'}); + $env{'form.pagename'}=&unescape(pop(@pagepath)); + $env{'form.folder'}=pop(@pagepath); + $container='page'; + $containertag = ''. + ''; + $pathitem = + ''. + ''. + ''; } else { - if ($env{'form.folder'} eq '' || - $env{'form.folder'} eq 'supplemental') { - $folderpath='default&'. - &escape(&mt('Main '.$crstype.' Documents')). - ':::::'; + 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 = ''; + $pathitem = ''; } - $containertag = ''; - $pathitem = ''; if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) { $showdoc='/'.$1; } @@ -3688,7 +3445,7 @@ sub handler { @tabids = ('002','ee2','ff2'); } else { @tabids = ('aa1','bb1','cc1','ff1'); - unless ($env{'form.folderpath'} =~ /\:1$/) { + unless ($env{'form.pagepath'}) { unshift(@tabids,'001'); push(@tabids,('dd1','ee1')); } @@ -3802,6 +3559,9 @@ sub handler { } elsif ((!$showdoc) && (!$uploadphase)) { # ----------------------------------------------------------------------------- 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', 'upfi' => 'Upload File', 'upld' => 'Import Content', @@ -3811,20 +3571,21 @@ sub handler { 'impm' => 'Import from Assembled Map', 'selm' => 'Select Map', 'load' => 'Load Map', + 'reco' => 'Recover Deleted Documents', 'newf' => 'New Folder', 'newp' => 'New Composite Page', + 'extr' => 'External Resource', 'syll' => 'Syllabus', 'navc' => 'Table of Contents', 'sipa' => 'Simple Course Page', 'sipr' => 'Simple Problem', - 'webp' => 'Blank Web Page (editable)', 'drbx' => 'Drop Box', 'scuf' => 'External Scores (handgrade, upload, clicker)', 'bull' => 'Discussion Board', 'mypi' => 'My Personal Information Page', 'grpo' => 'Group Portfolio', 'rost' => 'Course Roster', - 'abou' => 'Personal Information Page for a User', + 'abou' => 'Personal Information Page for a User', 'imsf' => 'IMS Import', 'imsl' => 'Import IMS package', 'cms' => 'Origin of IMS package', @@ -3832,6 +3593,9 @@ sub handler { 'file' => 'File', 'title' => 'Title', 'comment' => 'Comment', + 'url' => 'URL', + 'prev' => 'Preview', + 'lnk' => 'Add Link', 'parse' => 'Upload embedded images/multimedia files if HTML file', ); # ----------------------------------------------------------------------------- @@ -3988,6 +3752,10 @@ HIDDENFORM } my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence'; my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page'; + my $container='sequence'; + if ($env{'form.pagepath'}) { + $container='page'; + } my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container; my $newnavform=(< NASOFORM + my $newrosterform=(< @@ -4081,27 +3850,6 @@ NASOFORM NROSTFORM - my $newwebpage; - if ($folder =~ /^default_?(\d*)$/) { - $newwebpage = "/uploaded/$coursedom/$coursenum/docs/"; - if ($1) { - $newwebpage .= $1; - } else { - $newwebpage .= 'default'; - } - $newwebpage .= '/new.html'; - } - my $newwebpageform =(< - - $pathitem - - $lt{'webp'} - $help{'Web Page'} - -NWEBFORM - - my $specialdocumentsform; my @specialdocumentsforma; my $gradingform; @@ -4160,22 +3908,15 @@ NGFFORM {''.$lt{syll}.''=>$newsylform}, {''.$lt{navc}.''=>$newnavform}, {''.$lt{sipa}.''=>$newsmppageform}, - {''.$lt{webp}.''=>$newwebpageform}, ); $specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma)); my @importdoc = ( - {''.$lt{extr}.''=>$extresourcesform} - ); - unless ($container eq 'page') { - push(@importdoc, - {''.$lt{imsf}.''=>$imspform} - ); - } - push(@importdoc, - {''.$lt{upl}.''=>$fileuploadform} - ); + {''.$lt{extr}.''=>$extresourcesform}, + {''.$lt{imsf}.''=>$imspform}, + {''.$lt{upl}.''=>$fileuploadform, + }); $fileuploadform = &create_form_ul(&create_list_elements(@importdoc)); @gradingforma=( @@ -4200,7 +3941,7 @@ my %orderhash = ( 'bb' => ['Published Content',$importpubform], 'cc' => ['Grading Resources',$gradingform], ); -unless ($container eq 'page') { +unless ($env{'form.pagepath'}) { $orderhash{'00'} = ['Newfolder',$newfolderform]; $orderhash{'dd'} = ['Collaboration',$communityform]; $orderhash{'ee'} = ['Special Pages',$specialdocumentsform]; @@ -4233,6 +3974,7 @@ unless ($container eq 'page') { } elsif ($allowed) { $env{'form.folderpath'} = $savefolderpath; } + $env{'form.pagepath'} = ''; $pathitem = ''; if ($allowed) { @@ -4298,34 +4040,12 @@ SNSFORM SNAMFORM - my $supwebpage; - if ($folder =~ /^supplemental_?(\d*)$/) { - $supwebpage = "/uploaded/$coursedom/$coursenum/supplemental/"; - if ($1) { - $supwebpage .= $1; - } else { - $supwebpage .= 'default'; - } - $supwebpage .= '/new.html'; - } - my $supwebpageform =(< - - $pathitem - - $lt{'webp'} - $help{'Web Page'} - -SWEBFORM - my @specialdocs = ( {''.$lt{syll}.'' =>$supnewsylform}, {''.$lt{mypi}.'' =>$supnewaboutmeform}, - {''.$lt{webp}.''=>$supwebpageform}, - ); my @supimportdoc = ( {''.$lt{extr}.'' @@ -4423,9 +4143,12 @@ sub decompression_info { my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; my $container='sequence'; my ($pathitem,$hiddenelem); - my @hiddens = ('newidx','comment','position','folderpath'); - if ($env{'form.folderpath'} =~ /\:1$/) { + my @hiddens = ('newidx','comment','position'); + if ($env{'form.pagepath'}) { $container='page'; + $pathitem = 'pagepath'; + } else { + $pathitem = 'folderpath'; } unshift(@hiddens,$pathitem); foreach my $item (@hiddens) { @@ -4615,15 +4338,15 @@ sub generate_edit_table { my $form; my $activetab; my $active; - if (($env{'form.active'} ne '') && ($env{'form.active'} ne 'aa')) { + if($env{'form.active'} ne ''){ $activetab = $env{'form.active'}; } my $backicon = $iconpath.'clickhere.gif'; - my $backtext = &mt('Exit Editor'); + my $backtext = &mt('Exit'); $form = '
    '. '
    '.&mt('Resources').'$lt{'mr'}$lt{'ve'}$lt{'vu'}'.&mt('History').''.&mt('Resources').'$lt{'mr'}$lt{'ve'}$lt{'vu'}'.&mt('History').''.&Apache::lonnet::gettitle($linkurl).'
    '. + '    		'.&Apache::lonnet::gettitle($linkurl).'
    '. ''.$linkurl.'    		'.$currentversion.'
    ('. + '    		'.$currentversion.'
    ('. &Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate')).')    		' - ); - # Used in course - my $usedversion=$hash{'version_'.$linkurl}; - if (($usedversion) && ($usedversion ne 'mostrecent')) { - if ($usedversion != $currentversion) { + ''); +# Used in course + my $usedversion=$hash{'version_'.$linkurl}; + if (($usedversion) && ($usedversion ne 'mostrecent')) { + if($usedversion != $currentversion){ $r->print(''.$usedversion.''); - } else { + }else{ $r->print($usedversion); } + } else { + $r->print($currentversion); + } + $r->print(''); +# 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 { - $r->print($currentversion); + $entries_per_col = $num_entries/$num_ver_col + 1; } - $r->print(''); - # 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; - } - } - $r->print(''); - for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { - my $url=$root.'.'.$prevvers.'.'.$extension; - $r->print( - '' - .'' - .&mt('Version [_1]',$prevvers).'' - .' ('.&Apache::lonlocal::locallocaltime( - &Apache::lonnet::metadata($url,'lastrevisiondate')) - .')'); - if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { - $r->print( - ' &'). - '" target="diffs">'.&mt('Diffs').''); + my $entries_count = 0; + $r->print(''); + my $cols_output = 1; + for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { + my $url=$root.'.'.$prevvers.'.'.$extension; + $r->print(''.&mt('Version').' '.$prevvers.' ('. + &Apache::lonlocal::locallocaltime( + &Apache::lonnet::metadata($url, + 'lastrevisiondate') + ). + ')'); + if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { + $r->print(' '.&mt('Diffs').''); + } + $r->print('
    '); + if (++$entries_count % $entries_per_col == 0) { + $r->print('    		'); + $cols_output++; + } + } + } + while($cols_output++ < $num_ver_col) { + $r->print(''); } - $r->print('
    '); - } - $r->print('