--- loncom/interface/londocs.pm 2023/07/11 12:44:18 1.700 +++ loncom/interface/londocs.pm 2024/12/20 15:15:04 1.712 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.700 2023/07/11 12:44:18 raeburn Exp $ +# $Id: londocs.pm,v 1.712 2024/12/20 15:15:04 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -102,6 +102,7 @@ sub authorhosts { my %outhash=(); my $home=0; my $other=0; + my @ids=&Apache::lonnet::current_machine_ids(); foreach my $key (keys(%env)) { if ($key=~/^user\.role\.(au|ca)\.(.+)$/) { my $role=$1; @@ -118,7 +119,6 @@ sub authorhosts { } my $allowed=0; my $myhome=&Apache::lonnet::homeserver($ca,$cd); - my @ids=&Apache::lonnet::current_machine_ids(); foreach my $id (@ids) { if ($id eq $myhome) { $allowed=1; @@ -263,11 +263,12 @@ ENDJS add_entries => {'onload' => "hide_searching();"}, }; } - $r->print(&Apache::loncommon::start_page('Copy '.$crstype.' Content to Authoring Space',$js,$starthash)."\n". - &Apache::lonhtmlcommon::breadcrumbs('Copy '.$crstype.' Content to Authoring Space')."\n"); + $r->print(&Apache::loncommon::start_page('Copy uploaded content to Authoring Space',$js,$starthash)."\n". + &Apache::lonhtmlcommon::breadcrumbs('Copy uploaded content to Authoring Space')."\n"); $r->print(&startContentScreen('tools')); my ($home,$other,%outhash)=&authorhosts(); unless ($home) { + $r->print('

'.&mt('No author or co-author roles on this server.').'

'); $r->print(&endContentScreen()); return ''; } @@ -276,7 +277,8 @@ ENDJS if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) { # Do the dumping unless ($outhash{'home_'.$env{'form.authorspace'}}) { - $r->print(&endContentScreen()); + $r->print('

'.&mt('Selected Authoring Space is not on this server.').'

'. + &endContentScreen()); return ''; } my ($ca,$cd)=split(/\:/,$env{'form.authorspace'}); @@ -572,49 +574,12 @@ $contents{webreferences}.' if (!ref($navmap)) { $r->print($errormsg); } else { - $r->print('
'.&mt('Searching ...').'
'); - $r->rflush(); - my ($preamble,$formname); - $formname = 'dumpdoc'; - unless ($home==1) { - $preamble = '
'. - '
'. - &mt('Select the Authoring Space'). - ''; - } else { - $preamble .= ''; - } - } - unless ($home==1) { - $preamble .= '
'."\n"; - } my $title=$origcrsdata{'description'}; $title=~s/[\/\s]+/\_/gs; $title=&clean($title); - $preamble .= '
'. - '
'.&mt('Folder in Authoring Space').''. - ''. - '
'."\n"; - my %uploadedfiles; + my $formname = 'dumpdoc'; + my $preamble = &authorspace_selector($r,$formname,$home,$title,%outhash); + my %uploadedfiles; &tiehash(); foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) { my ($ext)=($file=~/\.(\w+)$/); @@ -640,6 +605,48 @@ $contents{webreferences}.' $r->print(&endContentScreen()); } +sub authorspace_selector { + my ($r,$formname,$home,$title,%outhash) = @_; + $r->print('
'.&mt('Searching ...').'
'."\n"); + $r->rflush(); + my $preamble; + unless ($home==1) { + $preamble = '
'. + '
'. + &mt('Select the Authoring Space'). + ''; + } else { + $preamble .= ''; + } + } + unless ($home==1) { + $preamble .= '
'."\n"; + } + $preamble .= '
'. + '
'.&mt('Folder in Authoring Space').''. + ''."\n". + '
'."\n"; + return $preamble; +} + sub recurse_html { my ($mm,$prefix,$currdirpath,$currurlpath,$container,$item,$replacehash,$deps) = @_; return unless ((ref($replacehash) eq 'HASH') && (ref($deps) eq 'HASH')); @@ -684,6 +691,422 @@ sub recurse_html { return; } +sub copycrsauthored { + my ($r,$coursenum,$coursedom,$coursehome,$readonly) = @_; + my ($starthash,$js); + unless (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) { + $js = <<"ENDJS"; + +ENDJS + $starthash = { + add_entries => {'onload' => "hide_searching();"}, + }; + } + $r->print(&Apache::loncommon::start_page('Copy from Course Authoring to User Authoring',$js,$starthash)."\n". + &Apache::lonhtmlcommon::breadcrumbs('Copy from Course Authoring Space')."\n"); + $r->print(&startContentScreen('tools')); + my ($home,$other,%outhash)=&authorhosts(); + unless ($home) { + $r->print('

'.&mt('No author or co-author roles on this server.').'

'); + $r->print(&endContentScreen()); + return ''; + } + my %origcrsdata=&Apache::lonnet::coursedescription($env{'request.course.id'}); + my $exclude = &Apache::lonnet::priv_exclude(); + my $srcurl = "/priv/$coursedom/$coursenum"; + my $srctop = $r->dir_config('lonDocRoot').$srcurl; + if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) { + $r->print('

'.&mt('Copying Files and/or Sub-directories').'

'); + if ($readonly) { + $r->print('

'. + &mt('You do not have permission to copy files and/or directories from Course Authoring Space.'). + '

'. + &endContentScreen()); + return ''; + } + unless ($outhash{'home_'.$env{'form.authorspace'}}) { + $r->print('

'.&mt('Selected Authoring Space is not on this server.').'

'. + &endContentScreen()); + return ''; + } + my ($ca,$cd)=split(/\:/,$env{'form.authorspace'}); + my $desturl = "/priv/$cd/$ca"; + my $desttop = $r->dir_config('lonDocRoot').$desturl; + my $subdir = &clean($env{'form.authorfolder'}); + $subdir = &cleandir($subdir); + if ($subdir eq '') { + $r->print('

'.&mt('After removal of disallowed characters target sub-directory name was blank.').'

'. + &endContentScreen()); + return ''; + } elsif ($subdir =~/^_+$/) { + $r->print('

'.&mt('After replacement of non-alphanumeric characters with _ in target sub-directory name, nothing but underscores was left.').'

'. + &endContentScreen()); + return ''; + } + my $is_course_home; + my @ids=&Apache::lonnet::current_machine_ids(); + if (($coursehome ne '') && (grep(/^\Q$coursehome\E$/,@ids))) { + $is_course_home = 1; + } + my (%tocopy,%dirs_to_make,%files_to_copy); + map { $tocopy{&unescape($_)} = 1; } &Apache::loncommon::get_env_multiple('form.copytouser'); + if (keys(%tocopy)) { + my (%subdirs,%files); + &Apache::lonnet::recursedirs($home,1,undef,$exclude,0,0,$srcurl,'',\%subdirs,\%files); + foreach my $possible (sort(keys(%tocopy))) { + if ($possible =~ m{/$}) { + my $possdir = $possible; + $possdir =~ s{^/+|/+$}{}g; + if (exists($subdirs{$possdir})) { + $dirs_to_make{$possdir} = 1; + } else { + delete($tocopy{$possible}); + } + } else { + my ($path,$fname) = ($possible =~ m{(.*/)([^/]+)$}); + my $found = 0; + if ($path eq '/') { + if (ref($files{$path}) eq 'HASH') { + if (exists($files{$path}{$fname})) { + $found = 1; + $files_to_copy{$fname} = 1; + } + } + } else { + $path =~ s{^/+|/+$}{}g; + if (ref($files{$path}) eq 'HASH') { + if (exists($files{$path}{$fname})) { + $dirs_to_make{$path} = 1; + $files_to_copy{"$path/$fname"} = 1; + $found = 1; + } + } + } + unless ($found) { + delete($tocopy{$possible}); + } + } + } + } else { + $r->print('

'.&mt('No files or directories selected for copying').'

'); + $r->print(&endContentScreen()); + return ''; + } + if (keys(%tocopy)) { + my $mm = new File::MMagic; + my ($notopdir,%newdir,%newfile); + $r->print('

'.&mt('Copy to: [_1]', + ''.$desturl.'/'.$subdir.''). + '

'."\n"); + unless ($is_course_home) { + $r->print('

'. + &endContentScreen()); + return ''; + } + if (keys(%dirs_to_make)) { + if ($is_course_home) { + unless (-e $desttop.'/'.$subdir) { + mkdir($desttop.'/'.$subdir,0755); + } + if (-e $desttop.'/'.$subdir) { + foreach my $dir (sort(keys(%dirs_to_make))) { + my @dirs=split(/\//,$dir); + my $path="$desttop/$subdir"; + my $makepath=$path; + my $fail; + for (my $i=0;$i<@dirs;$i++) { + $makepath.='/'.$dirs[$i]; + unless (-e $makepath) { + unless (mkdir($makepath,0755)) { + $fail = 1; + last; + } + if (($i == scalar(@dirs)-1) && (!$fail)) { + $newdir{$dir} = 1; + } + } + } + if ($fail) { + $r->print('

'.&mt('Target directory: [_1] does not exist, and could not be created.', + ''.$desturl.'/'.$subdir.'/'.$dir.''). + '

'."\n"); + } + } + } else { + $notopdir = 1; + } + } + } + if (keys(%files_to_copy)) { + if ($is_course_home) { + unless (-e $desttop.'/'.$subdir) { + mkdir($desttop.'/'.$subdir,0755); + } + if (-e $desttop.'/'.$subdir) { + my $num = 0; + foreach my $file (keys(%files_to_copy)) { + my ($fail,$dup,$dir_is_file,$src,$dest,$path,$fname); + if ($file =~ m{/}) { + ($path,$fname) = ($file =~ m{^(.+)/([^/]+)$}); + if (-d "$desttop/$subdir/$path") { + if (-e "$desttop/$subdir/$path/$fname") { + $dup = 1; + } else { + $src = "$srctop/$path/$fname"; + $dest = "$desttop/$subdir/$path/$fname"; + } + } elsif (-f "$desttop/$subdir/$path") { + $dir_is_file = 1; + } else { + $fail = 1; + } + } elsif (-e "$desttop/$subdir/$file") { + $dup = 1; + } else { + $src = "$srctop/$file"; + $dest = "$desttop/$subdir/$file"; + $fname = $file; + } + if ($fail) { + $r->print('

'.&mt('Target directory: [_1] does not exist, and could not be created.', + ''.$desturl.'/'.$subdir.'/'.$path.''). + '

'."\n"); + } elsif ($dup) { + $r->print('

'.&mt('Target file: [_1] already exists -- not overwriting.', + ''.$desturl.'/'.$subdir.'/'.$file.''). + '

'."\n"); + } elsif ($dir_is_file) { + $r->print('

'.&mt('Target directory: [_1] name is already in a use for a file -- not overwriting.', + ''.$desturl.'/'.$subdir.'/'.$file.''). + '

'."\n"); + } elsif (($src ne '') && ($dest ne '')) { + if (&File::Copy::copy($src,$dest)) { + $newfile{$file} = 1; + if ((-e $src.'.meta') && (!-e $dest.'.meta')) { + if (&File::Copy::copy($src.'.meta',$dest.'.meta')) { +#FIXME set distribution/copyright to author's default instead of custom. set author to $ca:$cd instead of $cdom:$cnum + } + } + my ($ext) = ($file =~ /\.(\w+)$/); + my $embstyle=&Apache::loncommon::fileembstyle($ext); + if ($embstyle eq 'ssi') { +#FIXME in any src or href attributes replace /res/$coursedom/$coursenum/ with /res/$cd/$ca/$subdir + } + } + } + } + } else { + $notopdir = 1; + } + } + } + if ($notopdir) { + $r->print('

'.&mt('No files or sub-directories copied').'
'."\n". + ''.&mt('Target directory: [_1] does not exist, and could not be created.', + ''.$desturl.'/'.$subdir.''). + '

'."\n"); + } + if (keys(%newdir)) { + $r->print('

'.&mt('Created the following directories in [_1]:',''.$desturl.'/'.$subdir.''). + '

'."\n". + '

'."\n"); + } + if (keys(%newfile)) { + $r->print('

'.&mt('Copied the following files to [_1]:',''.$desturl.'/'.$subdir.''). + '

'."\n". + '

'."\n"); + } + } else { + $r->print('

'.&mt('No currently existing files or directories in Course Authoring Space selected for copying').'

'); + $r->print(&endContentScreen()); + return ''; + } + } else { + my $formname = 'copycrsauthored'; + my $chkname = 'copytouser'; + my $context = 'crsauthored'; + my (%subdirs,%files,@dirs_by_depth,@files_by_depth,%parent,%children,%hierarchy,@checked_maps); + &Apache::lonnet::recursedirs($home,1,undef,$exclude,0,0,$srcurl,'',\%subdirs,\%files); + foreach my $key (keys(%subdirs)) { + next if (($key eq '/') || ($key eq '')); + my @items = split(/\//,$key); + my $dir = pop(@items); + my $depth = scalar(@items); + my $path; + if (!$depth) { + $path = '/'; + } else { + $path = join('/',@items); + } + $dirs_by_depth[$depth]{$path}{$dir} = 1; + } + foreach my $path (keys(%files)) { + next if ($path eq ''); + my $depth; + if ($path eq '/') { + $depth = 0; + } else { + $depth = scalar(split(/\//,$path)); + } + if (ref($files{$path}) eq 'HASH') { + foreach my $file (keys(%{$files{$path}})) { + $files_by_depth[$depth]{$path}{$file} = 1; + } + } + } + my ($info,$display,$onsubmit,$togglebuttons,$disabled); + if ($readonly) { + $disabled = ' disabled="disabled"'; + } + if ($disabled) { + $togglebuttons = '
'; + } else { + $togglebuttons = ''. + '  '; + } + my $title=$origcrsdata{'description'}; + $title=~s/[\/\s]+/\_/gs; + $title=&clean($title); + my $preamble = &authorspace_selector($r,$formname,$home,$title,%outhash); + my $display = '
'."\n". + $preamble."\n". + '
'."\n". + '
'."\n". + ''.&mt('Content to copy').(' 'x4).$togglebuttons.''."\n". + ''. + &mt('Choose the files and/or folders to copy from Course Authoring to User Authoring'). + '

'."\n"; + my $count = 0; + my $startcount = 4 + $home; + my $lastcontainer = $startcount; + $display .= &Apache::loncommon::start_data_table()."\n". + &Apache::loncommon::start_data_table_header_row(). + ''.&mt('Copy?').''. + ''.&mt('Title').''. + &Apache::loncommon::end_data_table_header_row()."\n"; + $count = &recurse_crsauthored(0,\@dirs_by_depth,\@files_by_depth,'/',$startcount, + $count,\$display,\%parent,\%children,$readonly, + $formname,$chkname,\$lastcontainer); + $display .= &Apache::loncommon::end_data_table().'
'; + unless ($readonly) { + $display .= '
'. + '
'. + ''. + '
'; + } + $display .= &Apache::loncourserespicker::respicker_javascript($startcount,$count,$context,$formname,\%children, + \%hierarchy,\@checked_maps,$home,$chkname); + $r->print($display); + } + $r->print(&endContentScreen()); +} + +sub recurse_crsauthored { + my ($currdepth,$dirs_by_depth,$files_by_depth,$currpath,$startcount,$count,$displayref, + $parent,$children,$readonly,$formname,$chkname,$lastcontainerref) = @_; + return $count unless ((ref($dirs_by_depth) eq 'ARRAY') && (ref($files_by_depth) eq 'ARRAY')); + my ($disabled,$hasdirs,$hasfiles,%unique,%dirs,%files); + if ((ref($dirs_by_depth->[$currdepth]) eq 'HASH') && + (ref($dirs_by_depth->[$currdepth]{$currpath}) eq 'HASH')) { + $hasdirs = 1; + %dirs = %{$dirs_by_depth->[$currdepth]{$currpath}}; + map { $unique{$_} = 1; } keys(%dirs); + } + if ((ref($files_by_depth->[$currdepth]) eq 'HASH') && + (ref($files_by_depth->[$currdepth]{$currpath}) eq 'HASH')) { + $hasfiles = 1; + %files = %{$files_by_depth->[$currdepth]{$currpath}}; + map { $unique{$_} = 1; } keys(%files); + } + if ($readonly) { + $disabled = ' disabled="disabled"'; + } + my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons"); + my $whitespace = + ''; + $parent->{$currdepth} = $$lastcontainerref; + foreach my $item (sort { lc($a) cmp lc($b) } (keys(%unique))) { + next if ($item eq ''); + my $currelem; + if ($hasdirs && exists($dirs{$item})) { + $count ++; + my $deeper = $currdepth+1; + my ($newpath,$showpath); + if ($currpath eq '/') { + $newpath = $item; + $showpath = $currpath.$item.'/'; + } else { + $newpath = $currpath.'/'.$item; + $showpath = '/'.$currpath.'/'.$item.'/'; + } + $currelem = $count+$startcount; + $$lastcontainerref = $currelem; + $children->{$parent->{$currdepth}} .= $currelem.':'; + my $icon = 'src="'.$location.'/navmap.folder.open.gif" alt="'.&mt('Folder').'"'; + $$displayref .= &Apache::loncommon::start_data_table_row(). + ''; + for (my $i=0; $i<$currdepth; $i++) { + $$displayref .= "$whitespace\n"; + } + $$displayref .= ' '.$item.''. + &Apache::loncommon::end_data_table_row()."\n"; + $count = &recurse_crsauthored($deeper,$dirs_by_depth,$files_by_depth,$newpath, + $startcount,$count,$displayref,$parent,$children, + $readonly,$formname,$chkname,$lastcontainerref); + } + if ($hasfiles && exists($files{$item})) { + $count ++; + $currelem = $count+$startcount; + $children->{$parent->{$currdepth}} .= $currelem.':'; + my $icon = 'src="'.&Apache::loncommon::icon($item).'"'; + my ($ext) = ($item =~ /\.([^.]+)$/); + my $alttext; + if (lc($ext) eq 'problem') { + $alttext = ' alt="'.&mt('Problem Icon').'"'; + } elsif ($ext =~ /^x?html?$/i) { + $alttext = ' alt="'.&mt('Web Page Icon').'"'; + } elsif ($ext =~ /^(jpg|gif|png|svg|jpeg)$/) { + $alttext = ' alt="'.&mt('Image Icon').'"'; + } else { + $alttext = ' alt="'.&mt('Resource Icon').'"'; + } + my $showpath; + if ($currpath eq '/') { + $showpath = $currpath; + } else { + $showpath = "/$currpath/"; + } + $$displayref .= &Apache::loncommon::start_data_table_row(). + ''; + for (my $i=0; $i<$currdepth; $i++) { + $$displayref .= "$whitespace\n"; + } + $$displayref .= ' '.$item.''. + &Apache::loncommon::end_data_table_row()."\n"; + } + } + $$lastcontainerref = $parent->{$currdepth}; + return $count; +} + sub group_import { my ($coursenum, $coursedom, $folder, $container, $caller, $ltitoolsref, @files) = @_; my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap, @@ -1419,7 +1842,7 @@ sub print_paste_buffer { } my @currpaste = split(/,/,$env{'docs.markedcopies'}); - my ($pasteitems,@pasteable); + my ($pasteitems,@pasteable,$same_institution,$checkedsameinst); my $clipboardcount = 0; # Construct identifiers for current contents of user's paste buffer @@ -1432,11 +1855,13 @@ 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,$is_exttool,$toolcdom, + $toolcnum,$marker); 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$}) { + } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { + ($toolcdom,$toolcnum,$marker) = ($1,$2,$3); $is_exttool = 1; } if ($folder =~ /^supplemental/) { @@ -1474,17 +1899,56 @@ sub print_paste_buffer { 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)'); + if ($is_exttool) { + if ($toolcdom ne $coursedom) { + $canpaste = 0; + $nopaste = &mt('Paste from another domain unavailable.'); + } elsif ($toolcnum ne $coursenum) { + my %toolsettings = + &Apache::lonnet::dump('exttool_'.$marker,$toolcdom,$toolcnum); + my %tooltypes = &Apache::loncommon::usable_exttools(); + if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) || + (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) { + $canpaste = 0; + $nopaste = &mt('Paste from another course unavailable.'); + } elsif ($toolsettings{'id'} =~ /^c\d+$/) { + unless ($checkedsameinst) { + my $primary_id = &Apache::lonnet::domain($coursedom,'primary'); + my $intdom = &Apache::lonnet::internet_dom($primary_id); + if ($intdom ne '') { + my $internet_names = + &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'}); + if (ref($internet_names) eq 'ARRAY') { + if (grep(/^\Q$intdom\E$/,@{$internet_names})) { + $same_institution = 1; + } + } + } + $checkedsameinst = 1; + } + if ($same_institution) { + $othercrs = '
'.&mt('(from another course)'); + } else { + $nopaste = &mt('Paste from another course unavailable.'); + } + } else { + $othercrs = '
'.&mt('(from another course)'); + } + } } } else { $canpaste = 0; $nopaste = &mt('Paste from another course unavailable.'); } } + } elsif ($url =~ m{/res/($match_domain)/($match_username)/}) { + my ($audom,$auname) = ($1,$2); + unless (($auname eq $coursenum) && ($audom eq $coursedom)) { + if (&Apache::lonnet::is_course($audom,$auname)) { + $canpaste = 0; + $nopaste = &mt('Paste from another course unavailable.'); + } + } } if ($canpaste) { push(@pasteable,$suffix); @@ -1777,9 +2241,12 @@ sub do_paste_from_buffer { return(); } - my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom,%duplicate, - %prefixchg,%srcdom,%srcnum,%srcmapidx,%marktomove,$save_err,$lockerrors,$allresult); - + my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom, + %othcrstool,%othcrsres,%duplicate,%prefixchg,%srcdom,%srcnum,%srcmapidx, + %marktomove,$save_err,$lockerrors,$allresult,%currcrsltitools, + %currltititles,$currltimax,$gotcrsltitools); + $currltimax = 0; + $gotcrsltitools = 0; foreach my $suffix (@topaste) { my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix}); my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix}); @@ -1818,13 +2285,53 @@ sub do_paste_from_buffer { } } # 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 (($url =~ m{/ext\.tool$}) && ($srcd ne $coursedom)) { - $notindom{$suffix} = 1; - next; +# disallow pasting of External Tool if course is in a different domain, +# or if External Tool use is not permitted in this course. + if ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { + my ($toolcdom,$toolcnum,$marker) = ($1,$2,$3); + if ($toolcdom ne $coursedom) { + $notindom{$suffix} = 1; + next; + } elsif ($toolcnum ne $coursenum) { + my %toolsettings = + &Apache::lonnet::dump('exttool_'.$marker,$toolcdom,$toolcnum); + my %tooltypes = &Apache::loncommon::usable_exttools(); + if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) || + (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) { + $othcrstool{$suffix} = 1; + next; + } + if ($toolsettings{'id'} =~ /^c\d+$/) { + unless ($gotcrsltitools) { + %currcrsltitools = + &Apache::lonnet::get_course_lti($coursenum,$coursedom,'consumer'); + foreach my $item (sort(keys(%currcrsltitools))) { + if (ref($currcrsltitools{$item}) eq 'HASH') { + $currltimax ++; + if (ref($currltititles{$currcrsltitools{$item}{'title'}}) eq 'ARRAY') { + push(@{$currltititles{$currcrsltitools{$item}{'title'}}},$item); + } else { + $currltititles{$currcrsltitools{$item}{'title'}} = [$item]; + } + } + } + $gotcrsltitools = 1; + } + } + } } $srcdom{$suffix} = $srcd; $srcnum{$suffix} = $srcn; + } elsif ($url =~ m{^/res/($match_domain)/($match_courseid)/}) { + my ($audom,$auname) = ($1,$2); +# When buffer was populated using an active role in a different course +# disallow pasting of published resources from Course Authoring Space + unless (($auname eq $coursenum) && ($audom eq $coursedom)) { + if (&Apache::lonnet::is_course($audom,$auname)) { + $othcrsres{$suffix} = 1; + next; + } + } } $srcmapidx{$suffix} = $mapidx; push(@dopaste,$suffix); @@ -1876,6 +2383,8 @@ sub do_paste_from_buffer { 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 domain.', + othcrstool => 'Paste failed: Item is an external tool from a different course, for which use is not allowed in this course.', + othcrsres => 'Paste failed: Item is a course-authored resource from a different course', duplicate => 'Paste failed: only one instance of a particular published sequence or page is allowed within each course.', ); @@ -1904,7 +2413,9 @@ sub do_paste_from_buffer { # Retrieve information about all course maps in main content area my $allmaps = {}; - my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk); + my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk, + @updatetoolsenc,$updatetoolscache,$checkedsameinst, + $same_institution); # Loop over the items to paste foreach my $suffix (@dopaste) { @@ -2003,12 +2514,27 @@ sub do_paste_from_buffer { $fromothercrs = 1; $info{'cdom'} = $srcdom{$suffix}; $info{'cnum'} = $srcnum{$suffix}; + unless ($checkedsameinst) { + my $primary_id = &Apache::lonnet::domain($coursedom,'primary'); + my $intdom = &Apache::lonnet::internet_dom($primary_id); + if ($intdom ne '') { + my $internet_names = + &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'}); + if (ref($internet_names) eq 'ARRAY') { + if (grep(/^\Q$intdom\E$/,@{$internet_names})) { + $same_institution = 1; + } + } + } + $checkedsameinst = 1; + } } } unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) { my (%lockerr,$msg); my ($newurl,$result,$errtext) = - &dbcopy(\%info,$coursedom,$coursenum,\%lockerr); + &dbcopy(\%info,$coursedom,$coursenum,\%lockerr,\%currltititles, + \$currltimax,\@updatetoolsenc,\$updatetoolscache,$same_institution); if ($result eq 'ok') { $url = $newurl; $title=&mt('Copy of').' '.$title; @@ -2177,6 +2703,10 @@ sub do_paste_from_buffer { } } } + if (($updatetoolscache) || (@updatetoolsenc)) { + &update_ltitools_caches($coursedom,$coursenum,$updatetoolscache, + \@updatetoolsenc); + } &clear_from_buffer(\@toclear,\@currpaste); my $msgsarray; foreach my $suffix (keys(%msgs)) { @@ -2225,6 +2755,30 @@ sub clear_from_buffer { return $numdel; } +sub update_ltitools_caches { + my ($coursedom,$coursenum,$updatetoolscache,$updatetoolsenc) = @_; + my $hashid=$coursedom.'_'.$coursenum; + if ($updatetoolscache) { + &Apache::lonnet::devalidate_cache_new('courseltitools',$hashid); + } + if ((ref($updatetoolsenc) eq 'ARRAY') && + (@{$updatetoolsenc})) { + my @ids=&Apache::lonnet::current_machine_ids(); + my $updatedone; + foreach my $lonhost (@{$updatetoolsenc}) { + if (grep(/^\Q$lonhost\E$/,@ids)) { + unless ($updatedone) { + &Apache::lonnet::devalidate_cache_new('crsltitoolsenc',$hashid); + } + $updatedone = 1; + } else { + &Apache::lonnet::remote_devalidate_cache($lonhost,["crsltitoolsenc:$hashid"]); + } + } + } + return; +} + sub get_newmap_url { my ($url,$folder,$prefixchg,$coursedom,$coursenum,$srcdom,$srcnum, $titleref,$allmaps,$newurls) = @_; @@ -2286,7 +2840,8 @@ sub get_newmap_url { } sub dbcopy { - my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_; + my ($dbref,$coursedom,$coursenum,$lockerrorsref,$currltititles, + $currltimax,$updatetoolsenc,$updatetoolscache,$same_institution) = @_; my ($url,$result,$errtext); if (ref($dbref) eq 'HASH') { $url = $dbref->{'src'}; @@ -2330,6 +2885,117 @@ sub dbcopy { my %contents=&Apache::lonnet::dump($db_name, $dbref->{'cdom'}, $dbref->{'cnum'}); + my ($toolcopyerror,$toolpassback,$toolroster,%toolinfo,$oldtoolid,$defincrs); + if ($url eq '/adm/'.$dbref->{'cdom'}.'/'.$dbref->{'cnum'}."/$marker/ext.tool") { + if ($contents{'id'} =~ /^(|c)(\d+)$/) { + $oldtoolid = $2; + if ($1 eq 'c') { + $defincrs = 1; + %toolinfo = + &Apache::lonnet::get('ltitools',[$oldtoolid],$dbref->{'cdom'},$dbref->{'cnum'}); + } else { + %toolinfo= &Apache::lonnet::get_domain_lti($dbref->{'cdom'},'consumer'); + } + if (ref($toolinfo{$oldtoolid}) eq 'HASH') { + if ($toolinfo{$oldtoolid}{'passback'}) { + $toolpassback = 1; + } + if ($toolinfo{$oldtoolid}{'roster'}) { + $toolroster = 1; + } + } else { + $toolcopyerror = 1; + $errtext = &mt('Could not retrieve original settings for pasted external tool.'); + } + } + unless (($dbref->{'cnum'} eq $coursenum) && ($dbref->{'cdom'} eq $coursedom)) { + $url = "/adm/$coursedom/$coursenum/$marker/ext.tool"; + if ($contents{'crstitle'} ne '') { + $contents{'crstitle'} = $env{'course.'.$coursedom.'_'.$coursenum.'.description'}; + } + if (($defincrs) && (!$toolcopyerror)) { + my %newtool; + my $oldcdom = $dbref->{'cdom'}; + my $oldcnum = $dbref->{'cnum'}; + my $title = $toolinfo{$oldtoolid}{'title'}; + if (ref($currltititles) eq 'HASH') { + if (exists($currltititles->{$title})) { + $title .= ' (copied from another course)'; + } + } + my ($newid,$iderror) = + &Apache::lonnet::get_ltitools_id('course',$coursedom,$coursenum,$title); + if ($newid =~ /^\d+$/) { + %{$newtool{$newid}} = %{$toolinfo{$oldtoolid}}; + $newtool{$newid}{'title'} = $title; + if (ref($currltimax)) { + $newtool{$newid}{'order'} = $$currltimax; + } + if ($newtool{$newid}{'image'} =~ m{^\Q/uploaded/$oldcdom/$oldcnum/toollogo/$oldtoolid/\E([^/]+)$}) { + my $fname = $1; + my $content = &Apache::lonnet::getfile($newtool{$newid}{'image'}); + if ($content eq '-1') { + delete($newtool{$newid}{'image'}); + } else { + $env{'form.'.$suffix.'.image'} = $content; + my $newlogo = + &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.image',"toollogo/$newid/$fname"); + delete($env{'form.'.$suffix.'.image'}); + if ($newlogo =~ m{^/uploaded/}) { + $newtool{$newid}{'image'} = $newlogo; + } else { + delete($newtool{$newid}{'image'}); + } + } + } + my $newusable; + if ($same_institution) { + my %oldtoolsenc = &Apache::lonnet::eget('nohist_toolsenc',[$oldtoolid],$oldcdom,$oldcnum); + if (ref($oldtoolsenc{$oldtoolid}) eq 'HASH') { + my %newtoolsenc; + %{$newtoolsenc{$newid}} = %{$oldtoolsenc{$oldtoolid}}; + my $putres = &Apache::lonnet::put('nohist_toolsenc',\%newtoolsenc,$coursedom,$coursenum,1); + if ($putres eq 'ok') { + if (ref($updatetoolsenc) eq 'ARRAY') { + my $newhome = &Apache::lonnet::homeserver($coursenum,$coursedom); + unless (grep(/^\Q$newhome\E$/,@{$updatetoolsenc})) { + push(@{$updatetoolsenc},$newhome); + } + } + $newusable = 1; + } + } + } + if ($newtool{$newid}{'usable'}) { + unless ($newusable) { + delete($newtool{$newid}{'usable'}); + } + } + my $putres = &Apache::lonnet::put('ltitools',\%newtool,$coursedom,$coursenum); + if ($putres eq 'ok') { + $contents{'id'} = "c$newid"; + if (ref($updatetoolscache)) { + $$updatetoolscache ++; + } + if (ref($currltititles->{$title}) eq 'ARRAY') { + push(@{$currltititles->{$title}},$newid); + } else { + $currltititles->{$title} = [$newid]; + } + if (ref($currltimax)) { + $$currltimax ++; + } + } else { + $toolcopyerror = 1; + $errtext = &mt('Unable to save external tool definition in Course Settings.'); + } + } else { + $toolcopyerror = 1; + $errtext = &mt('Unable to retrieve new tool ID when adding external tool definition to Course Settings.'); + } + } + } + } if (exists($contents{'uploaded.photourl'})) { my $photo = $contents{'uploaded.photourl'}; my ($subdir,$fname) = @@ -2349,13 +3015,40 @@ sub dbcopy { } } $db_name =~ s{_\d*$ }{_$suffix}x; - if (($prefix eq 'exttool') && ($dbref->{'delgradable'}) && ($contents{'gradable'})) { - delete($contents{'gradable'}); + if ($prefix eq 'exttool') { + unless ($toolcopyerror) { + foreach my $key ('oldgradesecret','gradesecret','gradesecretdate','oldrostersecret','rostersecret','rostersecretdate') { + if (exists($contents{$key})) { + delete($contents{$key}); + } + } + if ($dbref->{'delgradable'}) { + if (exists($contents{'gradable'})) { + delete($contents{'gradable'}); + } + } + if ($toolpassback) { + if ($contents{'gradable'}) { + my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4); + $contents{'gradesecret'} = $gradesecret; + $contents{'gradesecretdate'} = time; + } + } + if ($toolroster) { + my $rostersecret = UUID::Tiny::create_uuid_as_string(UUID_V4); + $contents{'rostersecret'} = $rostersecret; + $contents{'rostersecretdate'} = time; + } + } } - $result=&Apache::lonnet::put($db_name,\%contents, - $coursedom,$coursenum); - if ($result eq 'ok') { - $url =~ s{/(\d*)/(smppg|bulletinboard|ext\.tool)$}{/$suffix/$2}x; + if (($prefix eq 'exttool') && ($toolcopyerror)) { + $result = 'error'; + } else { + $result=&Apache::lonnet::put($db_name,\%contents, + $coursedom,$coursenum); + if ($result eq 'ok') { + $url =~ s{/(\d*)/(smppg|bulletinboard|ext\.tool)$}{/$suffix/$2}x; + } } } if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) { @@ -2510,18 +3203,37 @@ sub contained_map_check { if ($token->[1] eq 'resource') { next if ($token->[2]->{'type'} eq 'zombie'); my $ressrc = $token->[2]->{'src'}; - if ($ressrc =~ m{^/adm/($match_domain)/$match_courseid/\d+/ext\.tool$}) { - my $srcdom = $1; + if ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { + my ($srcdom,$srcnum,$marker) = ($1,$2,$3); unless ($srcdom eq $coursedom) { $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; next; } + unless ($srcnum eq $coursenum) { + my %toolsettings = + &Apache::lonnet::dump('exttool_'.$marker,$srcdom,$srcnum); + my %tooltypes = &Apache::loncommon::usable_exttools(); + if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) || + (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) { + $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; + next; + } + } } elsif ($folder =~ /^supplemental/) { unless (&supp_pasteable($ressrc)) { $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; next; } } + if ($ressrc =~ m{^/res/($match_domain)/($match_courseid)/}) { + my ($srcdom,$srcnum) = ($1,$2); + unless (($srcnum eq $coursenum) && ($srcdom eq $coursedom)) { + if (&Apache::lonnet::is_course($srcdom,$srcnum)) { + $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; + next; + } + } + } if ($ressrc =~ m{^/(res|uploaded)/.+\.(sequence|page)$}) { if ($1 eq 'uploaded') { $hierarchy->{$url}{$token->[2]->{'id'}} = $ressrc; @@ -2716,7 +3428,9 @@ sub apply_fixups { $oldurl,$url,$caller) = @_; my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles, %params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs, - %resdatacopy,%lockerrors,$lockmsg); + %resdatacopy,%lockerrors,$lockmsg,%currcrsltitools,$gotcrsltitools, + %currltititles,$currltimax); + $currltimax = 0; if (ref($updated) eq 'HASH') { if (ref($updated->{'rewrites'}) eq 'HASH') { %rewrites = %{$updated->{'rewrites'}}; @@ -2867,6 +3581,7 @@ sub apply_fixups { } } } + my ($updatetoolscache,@updatetoolsenc,$same_institution,$checkedsameinst); foreach my $key (keys(%updates)) { my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb); if (ref($rewrites{$key}) eq 'HASH') { @@ -2887,10 +3602,63 @@ sub apply_fixups { if (ref($dbcopies{$key}) eq 'HASH') { foreach my $idx (keys(%{$dbcopies{$key}})) { if (ref($dbcopies{$key}{$idx}) eq 'HASH') { + my $oldurl = $dbcopies{$key}{$idx}{'src'}; + my $oldcdom = $dbcopies{$key}{$idx}{'cdom'}; + my $oldcnum = $dbcopies{$key}{$idx}{'cnum'}; + my $oldmarker; + if ($oldurl =~ m{^\Q/adm/$oldcdom/$oldcnum/\E(\d+)/ext\.tool$}) { + $oldmarker = $1; + unless (($gotcrsltitools) || + (($oldcnum eq $cnum) && ($oldcdom eq $cdom))) { + my %oldtoolsettings=&Apache::lonnet::dump('exttool_'.$oldmarker,$oldcdom,$oldcnum); + if ($oldtoolsettings{'id'} =~ /^c\d+$/) { + unless ($gotcrsltitools) { + %currcrsltitools = + &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer'); + foreach my $item (sort(keys(%currcrsltitools))) { + if (ref($currcrsltitools{$item}) eq 'HASH') { + $currltimax ++; + if (ref($currltititles{$currcrsltitools{$item}{'title'}}) eq 'ARRAY') { + push(@{$currltititles{$currcrsltitools{$item}{'title'}}},$item); + } else { + $currltititles{$currcrsltitools{$item}{'title'}} = [$item]; + } + } + } + $gotcrsltitools = 1; + } + unless ($checkedsameinst) { + my $primary_id = &Apache::lonnet::domain($cdom,'primary'); + my $intdom = &Apache::lonnet::internet_dom($primary_id); + if ($intdom ne '') { + my $internet_names = + &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'}); + if (ref($internet_names) eq 'ARRAY') { + if (grep(/^\Q$intdom\E$/,@{$internet_names})) { + $same_institution = 1; + } + } + } + $checkedsameinst = 1; + } + } + } + } my ($newurl,$result,$errtext) = - &dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors); + &dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors,\%currltititles, + \$currltimax,\@updatetoolsenc,\$updatetoolscache,$same_institution); if ($result eq 'ok') { $newdb{$idx} = $newurl; + if ($newurl =~ /ext\.tool$/) { + if ($torewrite{$idx} eq "/adm/$oldcdom/$oldcnum/$oldmarker/ext.tool") { + if ($newurl =~ m{^\Q/adm/$cdom/$cnum/\E(\d+)/ext.tool$}) { + my $newmarker = $1; + unless ($oldmarker eq $newmarker) { + $torewrite{$idx} = "/adm/$oldcdom/$oldcnum/$newmarker/ext.tool"; + } + } + } + } } elsif (ref($errors) eq 'HASH') { $errors->{$key} = 1; } @@ -3029,6 +3797,10 @@ sub apply_fixups { } } } + if (($updatetoolscache) || (@updatetoolsenc)) { + &update_ltitools_caches($cdom,$cnum,$updatetoolscache, + \@updatetoolsenc); + } } return ('ok',\@msgs,$lockmsg); } @@ -4385,7 +5157,7 @@ END } $nomodal = 1; } - } elsif (($uploaded) && (!$allowed) && ($url ne '/adm/supplemental?')) { + } elsif (($uploaded) && ($url ne '/adm/supplemental?') && ($url ne '/adm/coursedocs?')) { my $embstyle=&Apache::loncommon::fileembstyle($extension); unless ($embstyle eq 'ssi') { if (($embstyle eq 'img') @@ -4491,7 +5263,7 @@ $form_common."\n". ''. $form_end; } - } elsif ($supplementalflag && !$allowed) { + } elsif ($supplementalflag) { my $isexttool; if ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { $url='/adm/wrapper'.$url; @@ -4554,7 +5326,7 @@ $form_end; } else { $reinit = &mt('(re-initialize course to access)'); } - $line.=''.$editlink.$renamelink; + $line.=''.$editlink.$renamelink.''; if ($orig_url =~ /$LONCAPA::assess_re/) { $line.= '
'; if ($curralias ne '') { @@ -4565,7 +5337,7 @@ $form_end; $lt{'sa'}.''; } } - $line.=''; + $line.=''; my ($link,$nolink); if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage) { @@ -4586,12 +5358,20 @@ $form_end; $anchor = '#'.&HTML::Entities::encode($anchor,'"<>&'); } } - if ((!$supplementalflag) && ($nomodal) && ($hostname ne '')) { + if (($nomodal) && ($hostname ne '')) { $link = 'http://'.$hostname.$url; } else { $link = $url; } - $link = &js_escape($link.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.$anchor); + my $inhibitmenu; + if ((($supplementalflag) && ($allowed) && ($url =~ m{^/adm/wrapper/})) || + (($allowed) && (($url =~ m{^/adm/(viewclasslist|$match_domain/$match_username/aboutme)(\?|$)}) || + ($url =~ m{^/public/$match_domain/$match_courseid/syllabus(\?|$)})))) { + $inhibitmenu = 'only_body=1'; + } else { + $inhibitmenu = 'inhibitmenu=yes'; + } + $link = &js_escape($link.(($url=~/\?/)?'&':'?').$inhibitmenu.$anchor); if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage && !$uploaded) { if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { $nolink = 1; @@ -5045,7 +5825,7 @@ sub short_urls { } 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)); + undef,undef,undef,undef,undef,\%currtiny,undef,$readonly)); } $r->print(&endContentScreen()); } @@ -5520,6 +6300,7 @@ sub handler { my $crstype = &Apache::loncommon::course_type(); my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'}; my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'}; + my $coursehome=$env{'course.'.$env{'request.course.id'}.'.home'}; # get docroot my $londocroot = $r->dir_config('lonDocRoot'); @@ -5535,7 +6316,9 @@ sub handler { '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') { + 'Course_Roster','Web_Page','Dropbox','Simple_Problem', + 'Standard_Problem','Course_Resources', + 'Search_LON-CAPA_Resource','Import_Stored_Links') { $help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic); } # Composite help files @@ -5606,8 +6389,15 @@ sub handler { &init_breadcrumbs('versions','Check/Set Resource Versions','Docs_Check_Resource_Versions'); &checkversions($r,$canedit); } elsif ($canedit && $env{'form.dumpcourse'}) { - &init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space'); + &init_breadcrumbs('dumpcourse','Copy uploaded content to Authoring Space'); &dumpcourse($r); + } elsif (($canedit || $canview) && ($env{'form.copyauthored'})) { + &init_breadcrumbs('copyauthored','Copy from Course Authoring to User Authoring'); + my $readonly; + if (!$canedit) { + $readonly = 1; + } + ©crsauthored($r,$coursenum,$coursedom,$coursehome,$readonly); } elsif ($canedit && $env{'form.exportcourse'}) { &init_breadcrumbs('exportcourse','IMS Export'); &Apache::imsexport::exportcourse($r); @@ -5710,8 +6500,11 @@ sub handler { } if ($env{'form.forcesupplement'}) { $supplementalflag=1; } if ($env{'form.forcestandard'}) { $supplementalflag=0; } - unless ($allowed) { $supplementalflag=1; } - unless ($standard) { $supplementalflag=1; } + unless (($supplementalflag) || + ($r->uri =~ m{^/adm/coursedocs/showdoc/uploaded/\Q$coursedom\E/\Q$coursenum\E/docs/})) { + unless ($allowed) { $supplementalflag=1; } + unless ($standard) { $supplementalflag=1; } + } my $toolsflag=0; if ($env{'form.tools'}) { $toolsflag=1; } @@ -5787,9 +6580,9 @@ sub handler { &Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom); } } - -# If we are not allowed to make changes, all we can see are supplemental docs - if (!$allowed) { + +# Set folderpath if we are not allowed to make changes and this is supplemental content + if ((!$allowed) && ($supplementalflag)) { unless ($env{'form.folderpath'} =~ /^supplemental/) { $env{'form.folderpath'} = &supplemental_base(); } @@ -6020,7 +6813,8 @@ sub handler { 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}; + $args = {'bread_crumbs' => $brcrum, + 'bread_crumbs_nomenu' => 1}; } else { $args = {'force_register' => $showdoc}; } @@ -6049,8 +6843,13 @@ sub handler { } } my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype); + my $args = {'bread_crumbs' => $brcrum}; + unless (($env{'form.folderpath'} eq '') || + ($env{'form.folder'} eq 'supplemental')) { + $args->{'bread_crumbs_nomenu'} = 1; + } $r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef, - {'bread_crumbs' => $brcrum,})); + $args)); } else { my ($breadtext,$breadtitle,$helpitem); $breadtext = "$crstype Editor"; @@ -6135,7 +6934,7 @@ sub handler { if ($allowed && $toolsflag) { $r->print(&startContentScreen('tools')); - $r->print(&generate_admin_menu($crstype,$canedit)); + $r->print(&generate_admin_menu($crstype,$canedit,$coursenum,$coursedom)); $r->print(&endContentScreen()); } elsif ((!$showdoc) && (!$uploadphase)) { # ----------------------------------------------------------------------------- @@ -6143,8 +6942,8 @@ sub handler { 'copm' => 'All documents out of a published map into this folder', 'upfi' => 'Upload File', 'upld' => 'Upload Content', - 'srch' => 'Search', - 'impo' => 'Import', + 'srch' => 'Search Repository', + 'impo' => 'Import from Repository', 'lnks' => 'Import from Stored Links', 'impm' => 'Import from Assembled Map', 'imcr' => 'Import from Course Resources', @@ -6233,10 +7032,7 @@ sub handler { my $fileupload=(< - - FIUP - my $checkbox=(<$lt{'parse'}? @@ -6256,6 +7052,8 @@ CHBO CRSFORM + } } my $fromstoredjs; @@ -6359,13 +7180,13 @@ CRSFORM } my @importpubforma = ( - { ''.$lt{srch}.'' => $pathitem."$lt{'srch'}" }, + { ''.$lt{srch}.'' => $pathitem."$lt{'srch'}$help{'Search_LON-CAPA_Resource'}" }, { ''.$lt{impo}.'' => "$lt{'impo'}$help{'Importing_LON-CAPA_Resource'}" }, - { ''.$lt{lnks}.'' => ''.$lt{'lnks'}.'' }, + { ''.$lt{lnks}.'' => ''.$lt{'lnks'}.''.$help{'Import_Stored_Links'} }, { ''.$lt{impm}.'' => $importpubform }, ); - if ($pickfile) { - push(@importpubforma,{ ''.$lt{imcr}.'' => $importcrsresform}); + if ($importcrsresform) { + push(@importpubforma,{ ''.$lt{imcr}.'' => $importcrsresform}); } $importpubform = &create_form_ul(&create_list_elements(@importpubforma)); my $extresourcesform = @@ -6565,7 +7386,7 @@ NROSTFORM $help{'Web_Page'} NWEBFORM - + my $showpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); my @ids=&Apache::lonnet::current_machine_ids(); my $machines_str = "'".join("','",@ids)."'"; my (%is_home,%toppath,$rolehomes); @@ -6617,13 +7438,14 @@ NWEBFORM } } } - $pickdir .= ''."\n". - '
'."\n". + if ($checkcrsres) { + $pickdir .= ''."\n"; + } + $pickdir .= '
'."\n". $lt{'dire'}. '
'."\n"; - my %seltemplate_menus; my @files = &Apache::lonhomework::get_template_list('problem'); my @noexamplelink = ('blank.problem','blank.library','script.library'); @@ -6663,29 +7485,33 @@ NWEBFORM "resize_scrollbox('contentscroll','1','0');", "toggleExampleText();",'template').'
'; my $templatepreview = ''. - ''.&mt('Example').''; - my $crsresform=(<'.&mt('Example').'
'; + my $crsresform; + if (($env{'user.author'}) || ($checkcrsres)) { + $crsresform=(< - $lt{'stpr'}$help{'Course_Resource'} + $lt{'stpr'}$help{'Standard_Problem'}