--- loncom/interface/londocs.pm 2023/01/20 16:55:44 1.484.2.93.2.10 +++ loncom/interface/londocs.pm 2024/07/03 15:15:00 1.484.2.95 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.484.2.93.2.10 2023/01/20 16:55:44 raeburn Exp $ +# $Id: londocs.pm,v 1.484.2.95 2024/07/03 15:15:00 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -43,7 +43,6 @@ use Apache::lonnavdisplay(); use Apache::lonextresedit(); use Apache::lontemplate(); use Apache::lonsimplepage(); -use Apache::loncourserespicker(); use HTML::Entities; use HTML::TokeParser; use GDBM_File; @@ -86,7 +85,7 @@ sub storemap { if ($map =~ /^default/) { $hadchanges=1; - } elsif ($contentchg) { + } else { $suppchanges=1; } return ($errtext,0); @@ -178,62 +177,43 @@ sub default_folderpath { } } -sub validate_supppath { - my ($coursenum,$coursedom) = @_; - my $backto; +sub validate_folderpath { + my ($supplementalflag) = @_; + if ($env{'form.folderpath'} ne '') { + my @items = split(/\&/,$env{'form.folderpath'}); + my $badpath; + for (my $i=0; $i<@items; $i++) { + my $odd = $i%2; + if (($odd) && (!$supplementalflag) && ($items[$i] !~ /^[^:]*:(|\d+):(|1):(|1):(|1):(|1)$/)) { + $badpath = 1; + } elsif ((!$odd) && ($items[$i] !~ /^(default|supplemental)(|_\d+)$/)) { + $badpath = 1; + } + last if ($badpath); + } + if ($badpath) { + delete($env{'form.folderpath'}); + } + } + return; +} + +sub validate_suppath { if ($env{'form.supppath'} ne '') { my @items = split(/\&/,$env{'form.supppath'}); - my ($badpath,$got_supp,$supppath,%supphidden,%suppids); + my $badpath; for (my $i=0; $i<@items; $i++) { my $odd = $i%2; if ((!$odd) && ($items[$i] !~ /^supplemental(|_\d+)$/)) { $badpath = 1; - last; - } elsif ($odd) { - my $suffix; - my $idx = $i-1; - if ($items[$i] =~ /^([^:]*)::(|1):::$/) { - $backto .= '&'.$1; - } elsif ($items[$idx] eq 'supplemental') { - $backto .= '&'.$items[$i]; - } else { - $backto .= '&'.$items[$i]; - my $is_hidden; - unless ($got_supp) { - my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom); - if (ref($supplemental) eq 'HASH') { - if (ref($supplemental->{'hidden'}) eq 'HASH') { - %supphidden = %{$supplemental->{'hidden'}}; - } - if (ref($supplemental->{'ids'}) eq 'HASH') { - %suppids = %{$supplemental->{'ids'}}; - } - } - $got_supp = 1; - } - if (ref($suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}) eq 'ARRAY') { - my $mapid = $suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}->[0]; - if ($supphidden{$mapid}) { - $is_hidden = 1; - } - } - $suffix = '::'.$is_hidden.':::'; - } - $supppath .= '&'.$items[$i].$suffix; - } else { - $supppath .= '&'.$items[$i]; - $backto .= '&'.$items[$i]; } + last if ($badpath); } if ($badpath) { delete($env{'form.supppath'}); - } else { - $supppath =~ s/^\&//; - $backto =~ s/^\&//; - $env{'form.supppath'} = $supppath; } } - return $backto; + return; } sub dumpcourse { @@ -681,7 +661,7 @@ sub recurse_html { } sub group_import { - my ($coursenum, $coursedom, $folder, $container, $caller, $ltitoolsref, @files) = @_; + my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_; my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap, %removeparam,$importuploaded,$fixuperrors); $allmaps = {}; @@ -710,114 +690,6 @@ sub group_import { } } if ($url) { - if ($url =~ m{^(/adm/$coursedom/$coursenum/(\d+)/ext\.tool)\:?(.*)$}) { - $url = $1; - my $marker = $2; - my $info = $3; - my ($toolid,%toolhash,%toolsettings); - my @extras = ('linktext','explanation','crslabel','crstitle','crsappend'); - my @toolinfo = split(/:/,$info); - if ($residx) { - %toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum); - $toolid = $toolsettings{'id'}; - } else { - $toolid = shift(@toolinfo); - } - $toolid =~ s/\D//g; - ($toolhash{'target'},$toolhash{'width'},$toolhash{'height'}, - $toolhash{'linktext'},$toolhash{'explanation'}, - $toolhash{'crslabel'},$toolhash{'crstitle'},$toolhash{'crsappend'}) = @toolinfo; - foreach my $item (@extras) { - $toolhash{$item} = &unescape($toolhash{$item}); - } - if (ref($ltitoolsref) eq 'HASH') { - my @deleted; - if (ref($ltitoolsref->{$toolid}) eq 'HASH') { - $toolhash{'id'} = $toolid; - if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'tab') || - ($toolhash{'target'} eq 'window')) { - if ($toolhash{'target'} eq 'window') { - foreach my $item ('width','height') { - $toolhash{$item} =~ s/^\s+//; - $toolhash{$item} =~ s/\s+$//; - if ($toolhash{$item} =~ /\D/) { - delete($toolhash{$item}); - if ($residx) { - if ($toolsettings{$item}) { - push(@deleted,$item); - } - } - } - } - } - } elsif ($residx) { - $toolhash{'target'} = $toolsettings{'target'}; - if ($toolhash{'target'} eq 'window') { - foreach my $item ('width','height') { - $toolhash{$item} = $toolsettings{$item}; - } - } - } elsif (ref($ltitoolsref->{$toolid}->{'display'}) eq 'HASH') { - $toolhash{'target'} = $ltitoolsref->{$toolid}->{'display'}->{'target'}; - if ($toolhash{'target'} eq 'window') { - $toolhash{'width'} = $ltitoolsref->{$toolid}->{'display'}->{'width'}; - $toolhash{'height'} = $ltitoolsref->{$toolid}->{'display'}->{'height'}; - } - } - if ($toolhash{'target'} eq 'iframe') { - foreach my $item ('width','height','linktext','explanation') { - delete($toolhash{$item}); - if ($residx) { - if ($toolsettings{$item}) { - push(@deleted,$item); - } - } - } - } elsif ($toolhash{'target'} eq 'tab') { - foreach my $item ('width','height') { - delete($toolhash{$item}); - if ($residx) { - if ($toolsettings{$item}) { - push(@deleted,$item); - } - } - } - } - if (ref($ltitoolsref->{$toolid}->{'crsconf'}) eq 'HASH') { - foreach my $item ('label','title','linktext','explanation') { - my $crsitem; - if (($item eq 'label') || ($item eq 'title')) { - $crsitem = 'crs'.$item; - } else { - $crsitem = $item; - } - if ($ltitoolsref->{$toolid}->{'crsconf'}->{$item}) { - $toolhash{$crsitem} =~ s/^\s+//; - $toolhash{$crsitem} =~ s/\s+$//; - if ($toolhash{$crsitem} eq '') { - delete($toolhash{$crsitem}); - } - } else { - delete($toolhash{$crsitem}); - } - if (($residx) && (exists($toolsettings{$crsitem}))) { - unless (exists($toolhash{$crsitem})) { - push(@deleted,$crsitem); - } - } - } - } - my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum); - if ($putres eq 'ok') { - if (@deleted) { - &Apache::lonnet::del('exttool_'.$marker,\@deleted,$coursedom,$coursenum); - } - } else { - return (&mt('Failed to save update to external tool.'),1); - } - } - } - } if (($caller eq 'londocs') && ($folder =~ /^default/)) { if (($url =~ /\.(page|sequence)$/) && (!$donechk)) { @@ -829,8 +701,8 @@ sub group_import { $donechk = 1; } if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) { - &contained_map_check($url,$folder,$coursenum,$coursedom,\%removefrommap, - \%removeparam,\%addedmaps,\%hierarchy,\%titles,$allmaps); + &contained_map_check($url,$folder,\%removefrommap,\%removeparam, + \%addedmaps,\%hierarchy,\%titles,$allmaps); $importuploaded = 1; } elsif ($url =~ m{^/res/.+\.(page|sequence)$}) { next if ($allmaps->{$url}); @@ -926,6 +798,7 @@ END &storemap($coursenum, $coursedom, $folder.'.'.$container,1); unless ($fatal) { if ($folder =~ /^supplemental/) { + &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1); my ($errtext,$fatal) = &mapread($coursenum,$coursedom, $folder.'.'.$container); } @@ -1002,7 +875,7 @@ sub docs_change_log { '// '."\n". @@ -1298,8 +1171,8 @@ sub update_paste_buffer { $subdir = $prefix; } my (%addedmaps,%removefrommap,%removeparam,%hierarchy,%titles,%allmaps); - &contained_map_check($url,$folder,$coursenum,$coursedom,\%removefrommap, - \%removeparam,\%addedmaps,\%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); @@ -1373,12 +1246,10 @@ sub print_paste_buffer { ($url ne '')) { $clipboardcount ++; my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent, - $canpaste,$nopaste,$othercrs,$areachange,$is_exttool); + $canpaste,$nopaste,$othercrs,$areachange); my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1]; if ($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { $is_external = 1; - } elsif ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) { - $is_exttool = 1; } if ($folder =~ /^supplemental/) { $canpaste = &supp_pasteable($env{'docs.markedcopy_url_'.$suffix}); @@ -1411,16 +1282,11 @@ sub print_paste_buffer { $is_uploaded_map = 1; } } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) || - ($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard|smppg|ext\.tool)$})) { + ($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard|smppg)$})) { if ($cid ne $env{'request.course.id'}) { my ($srcdom,$srcnum) = split(/_/,$cid); if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) { - if (($is_exttool) && ($srcdom ne $coursedom)) { - $canpaste = 0; - $nopaste = &mt('Paste from another domain unavailable.'); - } else { - $othercrs = '
'.&mt('(from another course)'); - } + $othercrs = '
'.&mt('(from another course)'); } else { $canpaste = 0; $nopaste = &mt('Paste from another course unavailable.'); @@ -1436,9 +1302,6 @@ sub print_paste_buffer { $buffer = &mt('External Resource').': '. &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}).' ('. &LONCAPA::map::qtescape($url).')'; - } elsif ($is_exttool) { - $buffer = &mt('External Tool').': '. - &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}); } else { my $icon = &Apache::loncommon::icon($extension); if ($extension eq 'sequence' && @@ -1494,7 +1357,7 @@ sub print_paste_buffer { } $buttons = ''.(' 'x2); } - $buttons .= ''.(' 'x2); + $buttons .= ''.(' 'x2); if ($clipboardcount > 1) { $buttons .= ''.(' 'x20).''.(' 'x2). @@ -1595,8 +1458,7 @@ sub supp_pasteable { (($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}) || - ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$})) { + ($url =~ m{^/public/$match_domain/$match_courseid/syllabus})) { return 1; } return; @@ -1718,7 +1580,7 @@ sub do_paste_from_buffer { return(); } - my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom,%duplicate, + my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%duplicate, %prefixchg,%srcdom,%srcnum,%srcmapidx,%marktomove,$save_err,$lockerrors,$allresult); foreach my $suffix (@topaste) { @@ -1746,24 +1608,6 @@ sub do_paste_from_buffer { } $srcdom{$suffix} = $srcd; $srcnum{$suffix} = $srcn; - } elsif ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) { - my ($srcd,$srcn) = split(/_/,$cid); -# When paste buffer was populated using an active role in a different course -# check for mdc privilege in the course from which the resource was pasted - if (($srcd ne $coursedom) || ($srcn ne $coursenum)) { - unless ($env{"user.priv.cm./$srcd/$srcn"} =~ /\Q:mdc&F\E/) { - $notincrs{$suffix} = 1; - next; - } - } -# When buffer was populated using an active role in a different course -# disallow pasting of External Tool if course is in a different domain. - if ($srcd ne $coursedom) { - $notindom{$suffix} = 1; - next; - } - $srcdom{$suffix} = $srcd; - $srcnum{$suffix} = $srcn; } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) || ($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard|smppg)$})) { my ($srcd,$srcn) = split(/_/,$cid); @@ -1828,7 +1672,6 @@ sub do_paste_from_buffer { %msgs = &Apache::lonlocal::texthash ( notinsupp => 'Paste failed: content type is not supported within Supplemental Content', notincrs => 'Paste failed: Item is from a different course which you do not have rights to edit.', - notindom => 'Paste failed: Item is an external tool from a course in a different donain.', duplicate => 'Paste failed: only one instance of a particular published sequence or page is allowed within each course.', ); @@ -1882,9 +1725,8 @@ sub do_paste_from_buffer { $env{'request.course.id'}); $donechk = 1; } - &contained_map_check($url,$folder,$coursenum,$coursedom, - \%removefrommap,\%removeparam,\%addedmaps, - \%hierarchy,\%titles,$allmaps); + &contained_map_check($url,$folder,\%removefrommap,\%removeparam, + \%addedmaps,\%hierarchy,\%titles,$allmaps); if ($url=~ m{^/uploaded/}) { my $newurl; unless ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') { @@ -1937,7 +1779,7 @@ sub do_paste_from_buffer { } } } - if ($url=~ m{/(bulletinboard|smppg|ext\.tool)$}) { + if ($url=~ m{/(bulletinboard|smppg)$}) { my $prefix = $1; my $fromothercrs; #need to copy the db contents to a new one, unless this is a move. @@ -1965,8 +1807,6 @@ sub do_paste_from_buffer { $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 discussion board.').' '.$errtext; - } elsif ($prefix eq 'ext.tool') { - $msg = &mt('Paste failed: An error occurred when copying the external tool.').' '.$errtext; } $results{$suffix} = $result; $msgerrs{$suffix} = $msg; @@ -2226,11 +2066,8 @@ sub dbcopy { my ($url,$result,$errtext); if (ref($dbref) eq 'HASH') { $url = $dbref->{'src'}; - if ($url =~ m{/(smppg|bulletinboard|ext\.tool)$}) { + if ($url =~ m{/(smppg|bulletinboard)$}) { my $prefix = $1; - if ($prefix eq 'ext.tool') { - $prefix = 'exttool'; - } if (($dbref->{'cdom'} =~ /^$match_domain$/) && ($dbref->{'cnum'} =~ /^$match_courseid$/)) { my $db_name; @@ -2241,8 +2078,6 @@ sub dbcopy { &Apache::lonsimplepage::get_db_name($url,$marker, $dbref->{'cdom'}, $dbref->{'cnum'}); - } elsif ($dbref->{'src'} =~ m{/ext\.tool$}) { - $db_name = 'exttool_'.$marker; } else { $db_name = 'bulletinpage_'.$marker; } @@ -2253,8 +2088,6 @@ sub dbcopy { if (!$suffix) { if ($prefix eq 'smppg') { $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url); - } elsif ($prefix eq 'exttool') { - $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying an external tool [_1].',$url); } else { $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a discussion board [_1].',$url); } @@ -2288,7 +2121,7 @@ sub dbcopy { $result=&Apache::lonnet::put($db_name,\%contents, $coursedom,$coursenum); if ($result eq 'ok') { - $url =~ s{/(\d*)/(smppg|bulletinboard|ext\.tool)$}{/$suffix/$2}x; + $url =~ s{/(\d*)/(smppg|bulletinboard)$}{/$suffix/$2}x; } } if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) { @@ -2298,9 +2131,6 @@ sub dbcopy { if ($prefix eq 'smppg') { $lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional simple pages in this course.'); - } elsif ($prefix eq 'exttool') { - $lockerrorsref->{$prefix} .= - ' '.&mt('This will prevent addition of more external tools to this course.'); } else { $lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional discussion boards in this course.'); } @@ -2432,8 +2262,8 @@ sub uniqueness_check { } sub contained_map_check { - my ($url,$folder,$coursenum,$coursedom,$removefrommap,$removeparam,$addedmaps, - $hierarchy,$titles,$allmaps) = @_; + 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); @@ -2462,8 +2292,7 @@ sub contained_map_check { $addedmaps->{$ressrc} = [$url]; } } - &contained_map_check($ressrc,$folder,$coursenum,$coursedom, - $removefrommap,$removeparam, + &contained_map_check($ressrc,$folder,$removefrommap,$removeparam, $addedmaps,$hierarchy,$titles,$allmaps); } } elsif ($token->[1] eq 'param') { @@ -3029,7 +2858,7 @@ sub update_parameter { my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); $name=&LONCAPA::map::qtescape($name); $url=&LONCAPA::map::qtescape($url); - next unless $url; + next unless ($url); my $is_map; if ($url =~ m{/uploaded/.+\.(page|sequence)$}) { $is_map = 1; @@ -3161,8 +2990,8 @@ sub handle_edit_cmd { sub editor { my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype, - $supplementalflag,$orderhash,$iconpath,$pathitem,$ltitoolsref, - $canedit,$hostname,$navmapref,$hiddentop)=@_; + $supplementalflag,$orderhash,$iconpath,$pathitem,$canedit, + $hostname,$navmapref,$hiddentop)=@_; my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container); if ($allowed) { (my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain, @@ -3373,17 +3202,6 @@ sub editor { } else { return $errortxt; } - } elsif ($url =~ m{^/adm/$coursedom/$coursenum/new/ext\.tool}) { - my ($suffix,$errortxt,$locknotfreed) = - &new_timebased_suffix($coursedom,$coursenum,'exttool'); - if ($locknotfreed) { - $r->print($locknotfreed); - } - if ($suffix) { - $url =~ s{^(/adm/$coursedom/$coursenum)/new}{$1/$suffix}; - } else { - return $errortxt; - } } elsif ($url =~ m{^/uploaded/$coursedom/$coursenum/(docs|supplemental)/(default|\d+)/new.html$}) { if ($supplementalflag) { next unless ($1 eq 'supplemental'); @@ -3406,7 +3224,7 @@ sub editor { } ($errtext,$fatal,my $fixuperrors) = &group_import($coursenum, $coursedom, $folder,$container, - 'londocs',$ltitoolsref,@imports); + 'londocs',@imports); return $errtext if ($fatal); if ($fixuperrors) { $r->print($fixuperrors); @@ -3466,21 +3284,6 @@ sub editor { $r->print(''); } - if ((!$allowed) && ($folder =~ /^supplemental_\d+$/)) { - my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom); - if (ref($supplemental) eq 'HASH') { - if ((ref($supplemental->{'hidden'}) eq 'HASH') && - (ref($supplemental->{'ids'}) eq 'HASH')) { - if (ref($supplemental->{'ids'}->{"/uploaded/$coursedom/$coursenum/$folder.$container"}) eq 'ARRAY') { - my $mapnum = $supplemental->{'ids'}->{"/uploaded/$coursedom/$coursenum/$folder.$container"}->[0]; - if ($supplemental->{'hidden'}->{$mapnum}) { - $ishidden = 1; - } - } - } - } - } - my ($to_show,$output,@allidx,@allmapidx,%filters,%lists,%curr_groups); %filters = ( canremove => [], @@ -3504,17 +3307,11 @@ sub editor { push(@allmapidx,$res); } - if (($supplementalflag) && (!$allowed) && (!$env{'request.role.adv'})) { - if (($ishidden) || ((&LONCAPA::map::getparameter($res,'parameter_hiddenresource'))[0]=~/^yes$/i)) { - $idx++; - next; - } - } $output .= &entryline($idx,$name,$url,$folder,$allowed,$res, $coursenum,$coursedom,$crstype, $pathitem,$supplementalflag,$container, - \%filters,\%curr_groups,$ltitoolsref,$canedit, - $isencrypted,$ishidden,$navmapref,$hostname); + \%filters,\%curr_groups,$canedit, + $isencrypted,$navmapref,$hostname); $idx++; $shown++; } @@ -3523,14 +3320,10 @@ sub editor { my $need_save; if ($allowed || ($supplementalflag && $folder eq 'supplemental')) { my $toolslink; - if ($allowed || $canedit) { - my $helpitem = 'Navigation_Screen'; - if (!$allowed) { - $helpitem = 'Supplemental_Navigation'; - } + if ($allowed) { $toolslink = '' .'' - .'' - .'' - .&Apache::loncommon::end_data_table_header_row(); + .''; + if ($folder !~ /^supplemental/) { + $to_show .= ''; + } + $to_show .= &Apache::loncommon::end_data_table_header_row(); if ($folder !~ /^supplemental/) { $lists{'canhide'} = join(',',@allidx); $lists{'canrandomlyorder'} = join(',',@allmapidx); @@ -3576,7 +3371,7 @@ sub editor { ''. ''. ''. - ''. &Apache::loncommon::end_data_table_row(); @@ -3645,7 +3440,7 @@ sub multiple_check_form { return unless (ref($listsref) eq 'HASH'); my $disabled; unless ($canedit) { - $disabled = 'disabled="disabled"'; + $disabled = ' disabled="disabled"'; } my $output = ''. @@ -3895,14 +3690,12 @@ sub is_supplemental_title { sub entryline { my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, $crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups, - $ltitoolsref,$canedit,$isencrypted,$ishidden,$navmapref,$hostname)=@_; - my ($foldertitle,$renametitle,$oldtitle,$encodedtitle); + $canedit,$isencrypted,$navmapref,$hostname)=@_; + my ($foldertitle,$renametitle,$oldtitle); if (&is_supplemental_title($title)) { ($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); - $encodedtitle=$title; } else { $title=&HTML::Entities::encode($title,'"<>&\''); - $encodedtitle=$title; $renametitle=$title; $foldertitle=$title; } @@ -3994,7 +3787,6 @@ END 'rn' => 'Rename', 'cp' => 'Copy', 'ex' => 'External Resource', - 'et' => 'External Tool', 'ed' => 'Edit', 'pr' => 'Preview', 'sv' => 'Save', @@ -4014,7 +3806,6 @@ END |/aboutme$ |/navmaps$ |/bulletinboard$ - |/ext\.tool$ |\.html$)}x) || $isexternal) { $skip_confirm = 1; @@ -4124,7 +3915,6 @@ END my $ispage; my $containerarg; my $folderurl; - my $plainurl; if ($uploaded) { if (($extension eq 'sequence') || ($extension eq 'page')) { $url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/; @@ -4143,7 +3933,7 @@ END $url='/adm/supplemental?'; } } else { - $plainurl = $url; + &Apache::lonnet::allowuploaded('/adm/coursedoc',$url); } } @@ -4182,8 +3972,6 @@ END if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) { $nomodal = 1; } - } elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { - $url='/adm/wrapper'.$url; } elsif ($url eq "/public/$coursedom/$coursenum/syllabus") { if (($ENV{'SERVER_PORT'} == 443) && ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { @@ -4193,10 +3981,30 @@ END $nomodal = 1; } } - my ($checkencrypt,$shownurl); - if (!$env{'request.role.adv'}) { + if (&Apache::lonnet::symbverify($symb,$url)) { + $shownsymb = $symb; + if ($isexternal) { + $url =~ s/\#[^#]+$//; + if ($container eq 'page') { + $url = &Apache::lonnet::clutter($url); + } + } + unless ($env{'request.role.adv'}) { + if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { + $url = ''; + } + if (&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) { + $url = ''; + $hiddenres = 1; + } + } + if ($url ne '') { + $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($shownsymb); + } + } elsif (!$env{'request.role.adv'}) { + my $checkencrypt; if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) || - ($isencrypted) || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) { + $isencrypted || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) { $checkencrypt = 1; } elsif (ref($navmapref)) { unless (ref($$navmapref)) { @@ -4208,39 +4016,22 @@ END } } } - } - if ($checkencrypt) { - my $currenc = $env{'request.enc'}; - $env{'request.enc'} = 1; - $shownsymb = &Apache::lonenc::encrypted($symb); - $shownurl = &Apache::lonenc::encrypted($url); - if (&Apache::lonnet::symbverify($symb,$url)) { - $url = $shownurl; - } else { - $url = ''; - } - $env{'request.enc'} = $currenc; - } elsif (&Apache::lonnet::symbverify($symb,$url)) { - $shownsymb = $symb; - if ($isexternal) { - $url =~ s/\#[^#]+$//; - if ($container eq 'page') { - $url = &Apache::lonnet::clutter($url); + if ($checkencrypt) { + $shownsymb = &Apache::lonenc::encrypted($symb); + my $shownurl = &Apache::lonenc::encrypted($url); + if (&Apache::lonnet::symbverify($shownsymb,$shownurl)) { + $url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&escape($shownsymb); + if ($env{'request.enc'} ne '') { + delete($env{'request.enc'}); + } + } else { + $url=''; } + } else { + $url=''; } - $shownurl = $url; - } - unless ($env{'request.role.adv'}) { - if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { - $url = ''; - } - if (&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) { - $url = ''; - $hiddenres = 1; - } - } - if ($url ne '') { - $url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&escape($shownsymb); + } else { + $url=''; } } } elsif ($supplementalflag) { @@ -4269,22 +4060,6 @@ END } $nomodal = 1; } - } elsif (($uploaded) && (!$allowed) && ($url ne '/adm/supplemental?')) { - my $embstyle=&Apache::loncommon::fileembstyle($extension); - unless ($embstyle eq 'ssi') { - if (($embstyle eq 'img') - || ($embstyle eq 'emb') - || ($embstyle eq 'wrp')) { - $url='/adm/wrapper'.$url; - } elsif ($url !~ /\.(sequence|page)$/) { - $url='/adm/coursedocs/showdoc'.$url; - } - } - } - unless ($allowed && $env{'request.role.adv'}) { - if ($ishidden || (&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { - $hiddenres = 1; - } } } my ($rand_pick_text,$rand_order_text,$hiddenfolder); @@ -4296,9 +4071,6 @@ END if (!$allowed && $supplementalflag) { $folderpath.=$containerarg.'&'.$foldername; $url.='folderpath='.&escape($folderpath); - if ($ishidden || (&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { - $hiddenfolder = 1; - } } else { my $rpicknum = (&LONCAPA::map::getparameter($orderidx, 'parameter_randompick'))[0]; @@ -4376,17 +4148,12 @@ $form_common."\n". $form_end; } } elsif ($supplementalflag && !$allowed) { - my $isexttool; - if ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { - $url='/adm/wrapper'.$url; - $isexttool = 1; - } $url .= ($url =~ /\?/) ? '&':'?'; $url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"'); if ($title) { - $url .= '&title='.$encodedtitle; + $url .= '&title='.&HTML::Entities::encode($renametitle,'<>&"'); } - if ((($isexternal) || ($isexttool)) && $orderidx) { + if ($isexternal && $orderidx) { $url .= '&idx='.$orderidx; } if ($anchor ne '') { @@ -4400,13 +4167,7 @@ $form_end; if ($isexternal) { ($editlink,$extresform) = &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem, - undef,undef,undef,undef,undef,undef, - undef,$disabled); - } elsif ($orig_url =~ m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { - ($editlink,$extresform) = - &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem, - undef,undef,undef,'tool',$coursedom, - $coursenum,$ltitoolsref,$disabled); + undef,undef,undef,$disabled); } elsif (!$isfolder && !$ispage) { my ($cfile,$home,$switchserver,$forceedit,$forceview) = &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url); @@ -4439,18 +4200,9 @@ $form_end; $reinit = &mt('(re-initialize course to access)'); } $line.=''; if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { - if ($nolink) { - $line.=$title; - } else { - $line.=''.$title.''; - } - if (!$allowed && $supplementalflag && $canedit && $isfolder) { - my $editicon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png'; - my $editurl = $url; - $editurl =~ s{^\Q/adm/supplemental?\E}{/adm/coursedocs?command=direct&forcesupplement=1&}; - $line .= ' '.''. - ''.&mt('Edit Content').''. - ''; - } - if ((($hiddenfolder) || ($hiddenres)) && (!$allowed) && ($supplementalflag)) { - $line.= ' ('.&mt('hidden').') '; - } + $line.=''.$title.''; } elsif ($url) { - if ($nolink) { - $line.=$title; - } elsif ($nomodal) { + if ($nomodal) { $line.=''. $title.''; } else { @@ -4517,42 +4246,32 @@ $form_end; $line.="$extresform"; $rand_pick_text = ' ' if ($rand_pick_text eq ''); $rand_order_text = ' ' if ($rand_order_text eq ''); - if ($uploaded && $url && !$isfolder && !$ispage) { - if (($plainurl ne '') && ($env{'request.role.adv'} || $allowed || !$hiddenres)) { - &Apache::lonnet::allowuploaded('/adm/coursedoc',$plainurl); + if (($allowed) && ($folder!~/^supplemental/)) { + my %lt=&Apache::lonlocal::texthash( + 'hd' => 'Hidden', + 'ec' => 'URL hidden'); + my ($enctext,$hidtext); + if ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) { + $enctext = ' checked="checked"'; + if (($ishash) && (ref($filtersref->{'encrypturl'}) eq 'ARRAY')) { + push(@{$filtersref->{'encrypturl'}},$orderidx); + } } - } - if ($allowed) { - my %lt=&Apache::lonlocal::texthash( - 'hd' => 'Hidden', - 'ec' => 'URL hidden'); - my ($enctext,$hidtext,$formhidden,$formurlhidden); if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { $hidtext = ' checked="checked"'; if (($ishash) && (ref($filtersref->{'hiddenresource'}) eq 'ARRAY')) { push(@{$filtersref->{'hiddenresource'}},$orderidx); } } - $formhidden = 'edit_hiddenresource_'.$orderidx; - $line.=(< $form_param $form_common $form_end -ENDPARMS - if ($folder =~/^supplemental/) { - $line.= "\n ENDPARMS - } } $line.=&Apache::loncommon::end_data_table_row(); return $line; @@ -4660,8 +4378,6 @@ sub new_timebased_suffix { $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.'); - } elsif ($type eq 'exttool') { - $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new external tool.'); } else { $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new discussion board.'); } @@ -4690,9 +4406,6 @@ sub new_timebased_suffix { } elsif ($type eq 'smppg') { $locknotfreed .= &mt('This will prevent creation of additional simple pages in this course.'); - } elsif ($type eq 'exttool') { - $locknotfreed .= - &mt('This will prevent creation of additional external tools in this course.'); } else { $locknotfreed .= &mt('This will prevent creation of additional discussion boards in this course.'); @@ -4876,48 +4589,6 @@ sub list_symbs { $r->print(&endContentScreen()); } -sub short_urls { - my ($r,$canedit) = @_; - my $crstype = &Apache::loncommon::course_type(); - my $formname = 'shortenurl'; - $r->print(&Apache::loncommon::start_page('Display/Set Shortened URLs')); - $r->print(&Apache::lonhtmlcommon::breadcrumbs('Shortened URLs')); - $r->print(&startContentScreen('tools')); - my ($navmap,$errormsg) = - &Apache::loncourserespicker::get_navmap_object($crstype,'shorturls'); - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my (%maps,%resources,%titles); - if (!ref($navmap)) { - $r->print($errormsg. - &endContentScreen()); - return ''; - } else { - $r->print('

'.&mt('Tiny URLs for deep-linking into course').'

'."\n"); - $r->rflush(); - my $readonly; - if ($canedit) { - my ($numnew,$errors) = &Apache::loncommon::get_requested_shorturls($cdom,$cnum,$navmap); - if ($numnew) { - $r->print('

'.&mt('Created [quant,_1,URL]',$numnew).'

'); - } - if ((ref($errors) eq 'ARRAY') && (@{$errors} > 0)) { - $r->print(&mt('The following errors occurred when processing your request to create shortened URLs:').'

'); - } - } else { - $readonly = 1; - } - my %currtiny = &Apache::lonnet::dump('tiny',$cdom,$cnum); - $r->print(&Apache::loncourserespicker::create_picker($navmap,'shorturls',$formname,$crstype,undef, - undef,undef,undef,undef,undef,\%currtiny,$readonly)); - } - $r->print(&endContentScreen()); -} - sub contentverifyform { my ($r) = @_; my $crstype = &Apache::loncommon::course_type(); @@ -5391,12 +5062,12 @@ sub handler { # # --------------------------------------------- Initialize help topics for this foreach my $topic ('Adding_Course_Doc','Main_Course_Documents', - 'Adding_External_Resource','Adding_External_Tool', - 'Navigate_Content','Adding_Folders','Docs_Overview', - 'Load_Map','Supplemental','Score_Upload_Form', - 'Adding_Pages','Importing_LON-CAPA_Resource', - 'Importing_IMS_Course','Uploading_From_Harddrive', - 'Course_Roster','Web_Page','Dropbox','Simple_Problem') { + 'Adding_External_Resource','Navigate_Content', + 'Adding_Folders','Docs_Overview', 'Load_Map', + 'Supplemental','Score_Upload_Form','Adding_Pages', + 'Importing_LON-CAPA_Resource','Importing_IMS_Course', + 'Uploading_From_Harddrive','Course_Roster','Web_Page', + 'Dropbox','Simple_Problem') { $help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic); } # Composite help files @@ -5412,20 +5083,17 @@ sub handler { $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching'); my ($allowed,$canedit,$canview,$disabled); -# does this user have privileges to modify content. - if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { # URI is /adm/supplemental when viewing supplemental docs in non-edit mode. - unless ($r->uri eq '/adm/supplemental') { + unless ($r->uri eq '/adm/supplemental') { + # does this user have privileges to modify content. + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { $allowed = 1; - } - $canedit = 1; - $canview = 1; - } elsif (&Apache::lonnet::allowed('cev',$env{'request.course.id'})) { -# URI is /adm/supplemental when viewing supplemental docs in non-edit mode. - unless ($r->uri eq '/adm/supplemental') { + $canedit = 1; + $canview = 1; + } elsif (&Apache::lonnet::allowed('cev',$env{'request.course.id'})) { $allowed = 1; + $canview = 1; } - $canview = 1; } unless ($canedit) { $disabled = ' disabled="disabled"'; @@ -5453,9 +5121,6 @@ sub handler { } elsif ($allowed && $env{'form.listsymbs'}) { &init_breadcrumbs('listsymbs','List Content IDs'); &list_symbs($r); - } elsif ($allowed && $env{'form.shorturls'}) { - &init_breadcrumbs('shorturls','Set/Display Shortened URLs','Docs_Short_URLs'); - &short_urls($r,$canedit); } elsif ($allowed && $env{'form.docslog'}) { &init_breadcrumbs('docslog','Show Log'); my $folder = $env{'form.folder'}; @@ -5479,7 +5144,7 @@ sub handler { # Get the parameters that may be needed # &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['folderpath','title', + ['folderpath', 'forcesupplement','forcestandard', 'tools','symb','command','supppath']); @@ -5526,14 +5191,11 @@ sub handler { if ($env{'form.tools'}) { $toolsflag=1; } if ($env{'form.folderpath'} ne '') { - &Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom); + &validate_folderpath($supplementalflag); } - my $backto_supppath; if ($env{'form.supppath'} ne '') { - if ($supplementalflag && $allowed) { - $backto_supppath = &validate_supppath($coursenum,$coursedom); - } + &validate_suppath(); } my $script=''; @@ -5542,7 +5204,6 @@ sub handler { my $container; my $containertag; my $pathitem; - my %ltitools; my $hiddentop; my $navmap; my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) }; @@ -5554,10 +5215,10 @@ sub handler { &Apache::loncommon::symb_to_docspath($env{'form.symb'},\$navmap); &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}.'_'.$env{'form.symb'}}); - } elsif (($env{'form.supppath'} ne '') && $supplementalflag && $allowed) { + } elsif ($env{'form.supppath'} ne '') { $env{'form.folderpath'}=$env{'form.supppath'}; &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => - $env{'form.command'}.'_'.$backto_supppath}); + $env{'form.command'}.'_'.$env{'form.supppath'}}); } } elsif ($env{'form.command'} eq 'editdocs') { $env{'form.folderpath'} = &default_folderpath($coursenum,$coursedom,\$navmap); @@ -5593,7 +5254,7 @@ sub handler { undef($env{'form.folderpath'}); } if ($env{'form.folderpath'} ne '') { - &Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom); + &validate_folderpath($supplementalflag); } } @@ -5610,9 +5271,9 @@ sub handler { $env{'form.folderpath'}; } # If allowed and user's role is not advanced check folderpath is not hidden - my $hidden_and_empty; - if (($allowed) && (!$env{'request.role.adv'}) && ($env{'form.folderpath'} ne '')) { - my ($folderurl,$foldername,$hiddenfolder); + if (($allowed) && (!$env{'request.role.adv'}) && + ($env{'form.folderpath'} ne '') && (!$supplementalflag)) { + my $folderurl; my @pathitems = split(/\&/,$env{'form.folderpath'}); my $folder = $pathitems[-2]; if ($folder eq '') { @@ -5624,74 +5285,21 @@ sub handler { } else { $folderurl .= '.sequence'; } - if ($supplementalflag) { - ($foldername,$hiddenfolder) = ($pathitems[-1] =~ /^([^:]*)::(|1):::$/); - $foldername = &HTML::Entities::decode(&unescape($foldername)); - my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom); - if (ref($supplemental) eq 'HASH') { - my ($suppmap,$suppmapnum); - if ($folder eq 'supplemental') { - $suppmap = 'default'; - $suppmapnum = 0; - } elsif ($folder =~ /^supplemental_(\d+)$/) { - $suppmap = $1; - $suppmapnum = $suppmap; - } - if ($hiddenfolder) { - my $hascontent; - foreach my $key (reverse(sort(keys(%{$supplemental->{'ids'}})))) { - if ($key =~ m{^\Q/uploaded/$coursedom/$coursenum/supplemental/$suppmap/\E}) { - $hascontent = 1; - } elsif (ref($supplemental->{'ids'}->{$key}) eq 'ARRAY') { - foreach my $id (@{$supplemental->{'ids'}->{$key}}) { - if ($id =~ /^$suppmapnum\:/) { - $hascontent = 1; - last; - } - } - } - last if ($hascontent); - } - unless ($hascontent) { - if ($foldername ne '') { - $hidden_and_empty = $foldername; - } else { - $hidden_and_empty = $folder; - } - } - } - } - } else { - unless (ref($navmap)) { - $navmap = Apache::lonnavmaps::navmap->new(); - } - ($foldername,$hiddenfolder) = ($pathitems[-1] =~ /^([^:]*):|\d+:|1:(|1):|1:|1$/); - $foldername = &HTML::Entities::decode(&unescape($foldername)); - if (ref($navmap)) { - if ($hiddenfolder || - (lc($navmap->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes')) { - my @resources = $navmap->retrieveResources($folderurl,$filterFunc,1,1); - unless (@resources) { - if ($foldername ne '') { - $hidden_and_empty = $foldername; - } else { - $hidden_and_empty = $folder; - } - } - } - } + unless (ref($navmap)) { + $navmap = Apache::lonnavmaps::navmap->new(); } - if ($hidden_and_empty ne '') { - splice(@pathitems,-2); - if (@pathitems) { - $env{'form.folderpath'} = join('&',@pathitems); - } else { - undef($env{'form.folderpath'}); + if (ref($navmap)) { + if (lc($navmap->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') { + my @resources = $navmap->retrieveResources($folderurl,$filterFunc,1,1); + unless (@resources) { + undef($env{'form.folderpath'}); + } } } } } + # If after all of this, we still don't have any paths, make them unless ($env{'form.folderpath'}) { if ($supplementalflag) { @@ -5776,23 +5384,15 @@ sub handler { } } my $tabidstr = join("','",@tabids); - %ltitools = &Apache::lonnet::get_domain_lti($coursedom,'consumer'); - my $posslti = keys(%ltitools); my $hostname = $r->hostname(); - $script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, + $script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum, $canedit,$hostname,\$navmap). &history_tab_js(). &inject_data_js(). &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid). - &Apache::lonextresedit::extedit_javascript(\%ltitools); - my $onload = "javascript:resize_scrollbox('contentscroll','1','1');"; - if ($hidden_and_empty ne '') { - my $alert = &mt("Additional privileges required to edit empty and hidden folder: '[_1]'", - $hidden_and_empty); - $onload .= "javascript:alert('".&js_escape($alert)."');"; - } + &Apache::lonextresedit::extedit_javascript(); $addentries = { - onload => $onload, + onload => "javascript:resize_scrollbox('contentscroll','1','1');", }; } $script .= &paste_popup_js(); @@ -5813,15 +5413,8 @@ sub handler { &Apache::lonhtmlcommon::clear_breadcrumbs(); if ($showdoc) { - my $args; - if ($supplementalflag) { - my $title = &HTML::Entities::encode($env{'form.title'},'\'"<>&'); - my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); - $args = {'bread_crumbs' => $brcrum}; - } else { - $args = {'force_register' => $showdoc}; - } - $r->print(&Apache::loncommon::start_page("$crstype documents",undef,$args)); + $r->print(&Apache::loncommon::start_page("$crstype documents",undef, + {'force_register' => $showdoc,})); } elsif ($toolsflag) { my ($breadtext,$breadtitle); $breadtext = "$crstype Editor"; @@ -5839,12 +5432,6 @@ sub handler { $breadtitle) ); } elsif ($r->uri eq '/adm/supplemental') { - unless ($env{'request.role.adv'}) { - unless (&Apache::lonnet::has_unhidden_suppfiles($coursenum,$coursedom)) { - $r->internal_redirect('/adm/navmaps'); - return OK; - } - } my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype); $r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef, {'bread_crumbs' => $brcrum,})); @@ -5875,7 +5462,6 @@ sub handler { my %codebase = (); my ($upload_result,$upload_output,$uploadphase); if ($canedit) { - undef($suppchanges); if (($env{'form.uploaddoc.filename'}) && ($env{'form.cmd'}=~/^upload_(\w+)/)) { my $context = $1; @@ -5887,10 +5473,6 @@ sub handler { if ($hadchanges) { &mark_hash_old(); } - if ($suppchanges) { - &Apache::lonnet::update_supp_caches($coursedom,$coursenum); - undef($suppchanges); - } $r->print($upload_output); } elsif ($env{'form.phase'} eq 'upload_embedded') { # Process file upload - phase two - upload embedded objects @@ -5944,8 +5526,6 @@ sub handler { 'impo' => 'Import', 'lnks' => 'Import from Stored Links', 'impm' => 'Import from Assembled Map', - 'extr' => 'External Resource', - 'extt' => 'External Tool', 'selm' => 'Select Map', 'load' => 'Load Map', 'newf' => 'New Folder', @@ -6012,10 +5592,7 @@ sub handler { my $fileupload=(< - - FIUP - my $checkbox=(<$lt{'parse'}? @@ -6035,6 +5612,8 @@ CHBO SUPDOCFORM @@ -6494,11 +6068,6 @@ SNFFORM &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem, $help{'Adding_External_Resource'}, undef,undef,$disabled); - my $supexttoolform = - &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem, - $help{'Adding_External_Tool'}, - undef,undef,'tool',$coursedom, - $coursenum,\%ltitools,$disabled); my $supnewsylform=(< @@ -6553,16 +6122,10 @@ my @specialdocs = ( ); my @supimportdoc = ( {''.$lt{extr}.'' - =>$supextform}); - if (keys(%ltitools)) { - push(@supimportdoc, - {''.$lt{extt}.'' - =>$supexttoolform}); - } - push(@supimportdoc, + =>$supextform}, {''.$lt{upl}.'' =>$supupdocform}, - ); + ); $supupdocform = &create_form_ul(&create_list_elements(@supimportdoc)); my %suporderhash = ( @@ -6571,22 +6134,29 @@ my %suporderhash = ( 'ff' => ['Other',&create_form_ul(&create_list_elements(@specialdocs))] ); if ($supplementalflag) { - $suppchanges = 0; - my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, - $supplementalflag,\%suporderhash,$iconpath,$pathitem, - \%ltitools,$canedit,$hostname); - if ($error) { - $r->print('

'.$error.'

'); - } - if ($suppchanges) { - &Apache::lonnet::update_supp_caches($coursedom,$coursenum); - undef($suppchanges); - } + my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, + $supplementalflag,\%suporderhash,$iconpath,$pathitem, + $canedit,$hostname); + if ($error) { + $r->print('

'.$error.'

'); + } else { + if ($suppchanges) { + my %servers = &Apache::lonnet::internet_dom_servers($coursedom); + my @ids=&Apache::lonnet::current_machine_ids(); + foreach my $server (keys(%servers)) { + next if (grep(/^\Q$server\E$/,@ids)); + my $hashid=$coursenum.':'.$coursedom; + my $cachekey = &escape('suppcount').':'.&escape($hashid); + &Apache::lonnet::remote_devalidate_cache($server,[$cachekey]); + } + &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1); + undef($suppchanges); + } + } } } elsif ($supplementalflag) { my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, - $supplementalflag,'',$iconpath,$pathitem,'',$canedit, - $hostname); + $supplementalflag,'',$iconpath,$pathitem,'',$hostname); if ($error) { $r->print('

'.$error.'

'); } @@ -6748,10 +6318,6 @@ sub remove_archive { if ($url eq $env{'form.archiveurl'}) { if (&handle_edit_cmd($docuname,$docudom)) { ($errtext,$fatal) = &storemap($docuname,$docudom,$map,1); - if ($suppchanges) { - &Apache::lonnet::update_supp_caches($docudom,$docuname); - undef($suppchanges); - } if ($fatal) { if ($container eq 'page') { $delwarning = &mt('An error occurred updating the contents of the current page.'); @@ -6790,7 +6356,6 @@ sub generate_admin_menu { 'vc' => 'Verify Content', 'cv' => 'Check/Set Resource Versions', 'ls' => 'List Resource Identifiers', - 'ct' => 'Display/Set Shortened URLs for Deep-linking', 'imse' => 'Export contents to IMS Archive', 'dcd' => "Copy $crstype Content to Authoring Space", ); @@ -6841,13 +6406,6 @@ sub generate_admin_menu { icon => 'symbs.png', linktitle => "List the unique identifier used for each resource instance in your $lc_crstype" }, - { linktext => $lt{'ct'}, - url => "javascript:injectData(document.courseverify,'dummy','shorturls','$lt{'ct'}')", - permission => 'F', - help => 'Docs_Short_URLs', - icon => 'shorturls.png', - linktitle => "Set shortened URLs for a resource or folder in your $lc_crstype for use in deep-linking" - }, ] }); if ($canedit) { @@ -6978,7 +6536,7 @@ END } sub editing_js { - my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, + my ($udom,$uname,$supplementalflag,$coursedom,$coursenum, $canedit,$hostname,$navmapref) = @_; my %js_lt = &Apache::lonlocal::texthash( p_mnf => 'Name of New Folder', @@ -7089,28 +6647,17 @@ sub editing_js { } elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') { $backtourl = '/adm/menu'; } elsif ($supplementalflag) { - if (($env{'request.role.adv'}) || - (&Apache::lonnet::has_unhidden_suppfiles($coursenum,$coursedom))) { - $backtourl = '/adm/supplemental'; - } else { - $backtourl = '/adm/navmaps'; - } + $backtourl = '/adm/supplemental'; } else { $backtourl = '/adm/navmaps'; } my $fieldsets = "'ext','doc'"; - if ($posslti) { - $fieldsets .= ",'tool'"; - } unless ($main_container_page) { $fieldsets .=",'ims'"; } if ($supplementalflag) { $fieldsets = "'suppext','suppdoc'"; - if ($posslti) { - $fieldsets .= ",'supptool'"; - } } my $jsmakefunctions; @@ -7307,19 +6854,6 @@ function toggleUpload(caller) { } } document.getElementById('upload'+blocks[i]+'form').style.display=disp; - if ((caller == 'tool') || (caller == 'supptool')) { - if (disp == 'block') { - if (document.getElementById('LC_exttoolid')) { - var toolselector = document.getElementById('LC_exttoolid'); - var suppflag = 0; - if (caller == 'supptool') { - suppflag = 1; - } - currForm = document.getElementById('new'+caller); - updateExttool(toolselector,currForm,suppflag); - } - } - } } resize_scrollbox('contentscroll','1','1'); return;
' .&Apache::loncommon::help_open_menu('Navigation Screen', - $helpitem,undef,'RAT') + 'Navigation_Screen',undef,'RAT') .''.&mt('Tools:').''.&mt('Actions').''.&mt('Document').''.&mt('Settings').''.&mt('Document').''.&mt('Settings').'  '. + ''. &multiple_check_form('settings',\%lists,$canedit). '
'.$editlink.$renamelink; - my ($link,$nolink); + my $link; if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { - if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage) { - if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { - $nolink = 1; - } - } - if ($nolink) { - $line .= ''; - } else { - $line.=''; - } + $line.=''; } elsif ($url) { if ($anchor ne '') { if ($supplementalflag) { @@ -4459,20 +4211,14 @@ $form_end; $anchor = '#'.&HTML::Entities::encode($anchor,'"<>&'); } } + if ((!$supplementalflag) && ($nomodal) && ($hostname ne '')) { $link = 'http://'.$hostname.$url; } else { $link = $url; } $link = &js_escape($link.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.$anchor); - if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage && !$uploaded) { - if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { - $nolink = 1; - } - } - if ($nolink) { - $line.=''; - } elsif ($nomodal) { + if ($nomodal) { $line.=''. ''; } else { @@ -4484,26 +4230,9 @@ $form_end; } $line.='"; - } else { - if ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) { - $enctext = ' checked="checked"'; - if (($ishash) && (ref($filtersref->{'encrypturl'}) eq 'ARRAY')) { - push(@{$filtersref->{'encrypturl'}},$orderidx); - } - } - $formurlhidden = 'edit_encrypturl_'.$orderidx; - $line.=(< $form_param @@ -4563,7 +4282,6 @@ ENDPARMS $rand_pick_text
$rand_order_text