--- loncom/interface/londocs.pm 2024/12/15 02:22:53 1.711 +++ 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.711 2024/12/15 02:22:53 raeburn Exp $ +# $Id: londocs.pm,v 1.712 2024/12/20 15:15:04 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -268,6 +268,7 @@ ENDJS $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, @@ -5877,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'); @@ -5967,6 +6391,13 @@ sub handler { } elsif ($canedit && $env{'form.dumpcourse'}) { &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); @@ -7618,13 +8049,15 @@ sub generate_admin_menu { 'ct' => 'Display/Set Shortened URLs for Deep-linking', 'ca' => "Enter $crstype Authoring Space", 'imse' => 'Export contents to IMS Archive', - 'dcd' => "Copy $crstype Content to Authoring Space", + 'dcd' => 'Copy uploaded content to Authoring Space', + 'cpc' => 'Copy from Course Authoring to User Authoring', ); - my ($candump,$dumpurl); + my ($candump,$dumpurl,$exportcrsurl); if ($home + $other > 0) { $candump = 'F'; if ($home) { $dumpurl = "javascript:injectData(document.courseverify,'dummy','dumpcourse','$lt{'dcd'}')"; + $exportcrsurl = "javascript:injectData(document.courseverify,'dummy','copyauthored','$lt{'cpc'}')"; } else { my @hosts; foreach my $aurole (keys(%outhash)) { @@ -7638,8 +8071,10 @@ sub generate_admin_menu { &HTML::Entities::encode($env{'request.role'},'"<>&').'&origurl='. &HTML::Entities::encode('/adm/coursedocs?dumpcourse=1','"<>&'); $dumpurl = "javascript:dump_needs_switchserver('$switchto')"; + $exportcrsurl = $dumpurl; } else { $dumpurl = "javascript:choose_switchserver_window()"; + $exportcrsurl = $dumpurl; } } } @@ -7721,6 +8156,18 @@ sub generate_admin_menu { }, ] }); + if (($crsauname eq $coursenum) && ($crsaudom eq $coursedom)) { + if ((ref($menu[1]) eq 'HASH') && (ref($menu[1]->{'items'}) eq 'ARRAY')) { + push(@{$menu[1]->{items}}, + { linktext => $lt{'cpc'}, + url => $exportcrsurl, + permission => 'F', + help => 'Docs_Export_Course_Author', + icon => 'res.png', + linktitle => $lt{'cpc'}, + }); + } + } } return ''."\n". ''."\n".