--- loncom/interface/londocs.pm 2024/01/10 20:07:37 1.709 +++ loncom/interface/londocs.pm 2025/01/04 21:16:45 1.718 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.709 2024/01/10 20:07:37 raeburn Exp $ +# $Id: londocs.pm,v 1.718 2025/01/04 21:16:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -48,6 +48,7 @@ use Apache::lonpublisher(); use Apache::loncourserespicker(); use HTML::Entities; use HTML::TokeParser; +use HTML::LCParser; use GDBM_File; use File::MMagic; use File::Copy; @@ -268,6 +269,7 @@ ENDJS $r->print(&startContentScreen('tools')); my ($home,$other,%outhash)=&authorhosts(); unless ($home) { + $r->print('<p class="LC_info">'.&mt('No author or co-author roles on this server.').'</p>'); $r->print(&endContentScreen()); return ''; } @@ -276,7 +278,8 @@ ENDJS if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) { # Do the dumping unless ($outhash{'home_'.$env{'form.authorspace'}}) { - $r->print(&endContentScreen()); + $r->print('<p class="LC_info">'.&mt('Selected Authoring Space is not on this server.').'</p>'. + &endContentScreen()); return ''; } my ($ca,$cd)=split(/\:/,$env{'form.authorspace'}); @@ -572,49 +575,13 @@ $contents{webreferences}.' if (!ref($navmap)) { $r->print($errormsg); } else { - $r->print('<div id="searching">'.&mt('Searching ...').'</div>'); - $r->rflush(); - my ($preamble,$formname); - $formname = 'dumpdoc'; - unless ($home==1) { - $preamble = '<div class="LC_left_float">'. - '<fieldset><legend>'. - &mt('Select the Authoring Space'). - '</legend><select name="authorspace">'; - } - my @orderspaces = (); - foreach my $key (sort(keys(%outhash))) { - if ($key=~/^home_(.+)$/) { - if ($1 eq $env{'user.name'}.':'.$env{'user.domain'}) { - unshift(@orderspaces,$1); - } else { - push(@orderspaces,$1); - } - } - } - if ($home>1) { - $preamble .= '<option value="" selected="selected">'.&mt('Select').'</option>'; - } - foreach my $user (@orderspaces) { - if ($home==1) { - $preamble .= '<input type="hidden" name="authorspace" value="'.$user.'" />'; - } else { - $preamble .= '<option value="'.$user.'">'.$user.' - '. - &Apache::loncommon::plainname(split(/\:/,$user)).'</option>'; - } - } - unless ($home==1) { - $preamble .= '</select></fieldset></div>'."\n"; - } my $title=$origcrsdata{'description'}; $title=~s/[\/\s]+/\_/gs; $title=&clean($title); - $preamble .= '<div class="LC_left_float">'. - '<fieldset><legend>'.&mt('Folder in Authoring Space').'</legend>'. - '<input type="text" size="50" name="authorfolder" value="'. - $title.'" />'. - '</fieldset></div><div style="padding:0;clear:both;margin:0;border:0"></div>'."\n"; - my %uploadedfiles; + my $formname = 'dumpdoc'; + my $preamble = &authorspace_selector($r,$formname,$home,$title,%outhash). + '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n"; + my %uploadedfiles; &tiehash(); foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) { my ($ext)=($file=~/\.(\w+)$/); @@ -640,6 +607,48 @@ $contents{webreferences}.' $r->print(&endContentScreen()); } +sub authorspace_selector { + my ($r,$formname,$home,$title,%outhash) = @_; + $r->print('<div id="searching">'.&mt('Searching ...').'</div>'."\n"); + $r->rflush(); + my $preamble; + unless ($home==1) { + $preamble = '<div class="LC_left_float">'. + '<fieldset><legend>'. + &mt('Select the Authoring Space'). + '</legend><select name="authorspace">'; + } + my @orderspaces = (); + foreach my $key (sort(keys(%outhash))) { + if ($key=~/^home_(.+)$/) { + if ($1 eq $env{'user.name'}.':'.$env{'user.domain'}) { + unshift(@orderspaces,$1); + } else { + push(@orderspaces,$1); + } + } + } + if ($home>1) { + $preamble .= '<option value="" selected="selected">'.&mt('Select').'</option>'; + } + foreach my $user (@orderspaces) { + if ($home==1) { + $preamble .= '<input type="hidden" name="authorspace" value="'.$user.'" />'; + } else { + $preamble .= '<option value="'.$user.'">'.$user.' - '. + &Apache::loncommon::plainname(split(/\:/,$user)).'</option>'; + } + } + unless ($home==1) { + $preamble .= '</select></fieldset></div>'."\n"; + } + $preamble .= '<div class="LC_left_float">'. + '<fieldset><legend>'.&mt('Folder in Authoring Space').'</legend>'. + '<input type="text" size="30" name="authorfolder" value="'.$title.'" />'."\n". + '</fieldset></div>'."\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 +693,941 @@ sub recurse_html { return; } +sub copycrsauthored { + my ($r,$coursenum,$coursedom,$coursehome,$readonly) = @_; + my ($starthash,$js,$title,$formname); + my %origcrsdata=&Apache::lonnet::coursedescription($env{'request.course.id'}); + $title=$origcrsdata{'description'}; + $title=~s/[\/\s]+/\_/gs; + $title=&clean($title); + my ($home,$other,%outhash)=&authorhosts(); + unless (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) { + my %js_lt; + $formname = 'copycrsauthored'; + if ($home) { + %js_lt = + &Apache::lonlocal::texthash( + yomu => 'You must select an Authoring Space', + whco => 'When Copyright set to "custom", URL of a published rights file is needed.', + ); + &js_escape(\%js_lt); + } + if ($home > 1) { + $js = <<"ENDJS"; +<script type="text/javascript"> +// <![CDATA[ + +function validCrsCopy() { + var dest = document.$formname.authorspace.options[document.$formname.authorspace.selectedIndex].value; + if (dest == '') { + alert("$js_lt{'yomu'}"); + return false; + } + var dist = document.$formname.copyright.options[document.$formname.copyright.selectedIndex].value; + if (dist == 'custom') { + if (document.$formname.customrights.value == '') { + alert("$js_lt{'whco'}"); + return false; + } + } + return true; +} + +function init_copycrs_form() { + document.$formname.authorspace.selectedIndex = "0"; + document.$formname.authorfolder.value = '$title'; + document.$formname.copyright.selectedIndex = "0"; +} + +// ]]> +</script> + +ENDJS + } elsif ($home) { + $js = <<"ENDJS"; +<script type="text/javascript"> +// <![CDATA[ + +function init_copycrs_form() { + document.$formname.authorfolder.value = '$title'; + document.$formname.copyright.selectedIndex = "0"; +} + +// ]]> +</script> + +ENDJS + } + $js .= <<"ENDJS"; +<script type="text/javascript"> +// <![CDATA[ + +function hide_searching() { + if (document.getElementById('searching')) { + document.getElementById('searching').style.display = 'none'; + } + return; +} + +function showHideCustom(caller,divid) { + if (document.getElementById(divid)) { + if (caller.options[caller.selectedIndex].value == 'custom') { + document.getElementById(divid).style.display="inline-block"; + } else { + document.getElementById(divid).style.display="none"; + } + } + return; +} + +// ]]> +</script> +ENDJS + + $js .= "\n".&Apache::lonhtmlcommon::scripttag(&Apache::loncommon::browser_and_searcher_javascript())."\n"; + $starthash = { + add_entries => {'onload' => "hide_searching(); init_copycrs_form();"}, + }; + } + $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')); + unless ($home) { + $r->print('<p class="LC_info">'.&mt('No author or co-author roles on this server.').'</p>'); + $r->print(&endContentScreen()); + return ''; + } + my $docroot = $r->dir_config('lonDocRoot'); + my $is_course_home; + my @ids=&Apache::lonnet::current_machine_ids(); + if (($coursehome ne '') && (grep(/^\Q$coursehome\E$/,@ids))) { + $is_course_home = 1; + } + my $exclude = &Apache::lonnet::priv_exclude(); + my $srcurl = "/priv/$coursedom/$coursenum"; + my $srctop = $docroot.$srcurl; + my $resurl = "/res/$coursedom/$coursenum"; + my $res_exclude = &Apache::lonnet::res_exclude(); + if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) { + $r->print('<h3>'.&mt('Copying Files and/or Sub-directories').'</h3>'); + if ($readonly) { + $r->print('<p class="LC_info">'. + &mt('You do not have permission to copy files and/or directories from Course Authoring Space.'). + '</p>'. + &endContentScreen()); + return ''; + } + unless ($outhash{'home_'.$env{'form.authorspace'}}) { + $r->print('<p class="LC_info">'.&mt('Selected Authoring Space is not on this server.').'</p>'. + &endContentScreen()); + return ''; + } + my ($ca,$cd)=split(/\:/,$env{'form.authorspace'}); + my $desturl = "/priv/$cd/$ca"; + my $destresurl = "/res/$cd/$ca"; + my $desttop = $docroot.$desturl; + my $subdir = &clean($env{'form.authorfolder'}); + $subdir = &cleandir($subdir); + if ($subdir eq '') { + $r->print('<p class="LC_info">'.&mt('After removal of disallowed characters target sub-directory name was blank.').'</p>'. + &endContentScreen()); + return ''; + } elsif ($subdir =~/^_+$/) { + $r->print('<p class="LC_info">'.&mt('After replacement of non-alphanumeric characters with _ in target sub-directory name, nothing but underscores was left.').'</p>'. + &endContentScreen()); + return ''; + } + 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($is_course_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('<p>'.&mt('No files or directories selected for copying').'</p>'); + $r->print(&endContentScreen()); + return ''; + } + if (keys(%tocopy)) { + my (%resdirs,%resfiles); + &Apache::lonnet::recursedirs($is_course_home,1,undef,$res_exclude,0,0,$resurl,'',\%resdirs,\%resfiles); + my ($notopdir,%newdir,%newfile,%checkdeps); + $r->print('<p>'.&mt('Copy to: [_1]', + '<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>'). + '</p>'."\n"); + if (keys(%dirs_to_make)) { + 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('<p class="LC_warning">'.&mt('Target directory: [_1] does not exist, and could not be created.', + '<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$dir.'</span>'). + '</p>'."\n"); + } + } + } else { + $notopdir = 1; + } + } + if (keys(%files_to_copy)) { + unless (-e $desttop.'/'.$subdir) { + mkdir($desttop.'/'.$subdir,0755); + } + if (-e $desttop.'/'.$subdir) { + my $num = 0; + my ($copyright,$customdistfile); + if ($env{'form.copyright'} eq 'default' || $env{'form.copyright'} eq 'domain' || $env{'form.copyright'} eq 'public') { + $copyright = $env{'form.copyright'}; + } elsif ($env{'form.copyright'} eq 'custom') { + if ($env{'form.customrights'} =~ m{^/res/$match_domain/$match_username/.+\.rights$}) { + my ($rightsdom,$rightsuname) = ($1,$2); + my $rightshome = &Apache::lonnet::homeserver($rightsdom,$rightsuname); + if (($rightshome eq 'no_host') || ($rightshome eq '')) { + $copyright = 'default'; + } elsif (grep(/^\Q$rightshome\E$/,@ids)) { + if (-e $docroot.$env{'form.customrights'}) { + $copyright = 'custom'; + $customdistfile = $env{'form.customrights'}; + } else { + $copyright = 'default'; + } + } else { + my $rightsfile = &Apache::lonnet::filelocation('',$env{'form.customrights'}); + unless (&Apache::lonnet::getfile($rightsfile) eq '-1') { + $customdistfile = $env{'form.customrights'}; + } + } + } + } + my $sourceavail; + if ($env{'form.sourceavail'} =~ /^(open|closed)$/) { + $sourceavail = $env{'form.sourceavail'}; + } + my $respublish; + if ($env{'form.respublish'}) { + $respublish = 1; + } + my $nokeyref = &Apache::lonpublisher::getnokey($r->dir_config('lonIncludes')); + 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('<p class="LC_warning">'.&mt('Target directory: [_1] does not exist, and could not be created.', + '<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$path.'</span>'). + '</p>'."\n"); + } elsif ($dup) { + $r->print('<p class="LC_warning">'.&mt('Target file: [_1] already exists -- not overwriting.', + '<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$file.'</span>'). + '</p>'."\n"); + } elsif ($dir_is_file) { + $r->print('<p class="LC_warning">'.&mt('Target directory: [_1] name is already in a use for a file -- not overwriting.', + '<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$file.'</span>'). + '</p>'."\n"); + } elsif (($src ne '') && ($dest ne '')) { + my $ressrc = $docroot.$resurl.'/'.$file; + my $ressrcmeta = $ressrc.'.meta'; + my ($ext) = ($file =~ /\.(\w+)$/); + my $embstyle=&Apache::loncommon::fileembstyle($ext); + my ($getres,$getresmeta); + if ($respublish) { + if ($path eq '') { + if ((ref($resfiles{'/'}) eq 'HASH') && + (exists($resfiles{'/'}{$fname}))) { + $getres = 1; + $getresmeta = 1; + } + } elsif ((ref($resfiles{$path}) eq 'HASH') && + (exists($resfiles{$path}{$fname}))) { + $getres = 1; + $getresmeta = 1; + } + } + if ($is_course_home) { + my ($needpriv,$needprivmeta); + if ($respublish) { + if ($getres) { + if (&Apache::londiff::are_different_files($src,$ressrc)) { + $needpriv = 1; + if (&File::Copy::copy($ressrc,$dest)) { + if ($embstyle eq 'ssi') { + &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd); + } + } + } else { + if (&File::Copy::copy($src,$dest)) { + $newfile{$file} = 1; + if ($embstyle eq 'ssi') { + &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir); + } + } + } + } else { + $needpriv = 1; + } + if ($getresmeta) { + if ((-e $src.'.meta') && (!-e $dest.'.meta')) { + if (&Apache::londiff::are_different_files($src.'.meta',$ressrc.'.meta')) { + if (&File::Copy::copy($ressrc.'.meta',$dest.'.meta')) { + &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright, + $customdistfile,$sourceavail,\%checkdeps); + } + $needprivmeta = 1; + } else { + if (&File::Copy::copy($src.'.meta',$dest.'.meta')) { + &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright, + $customdistfile,$sourceavail,\%checkdeps); + } + } + } + } + if ($getres) { + my $destresfile = $docroot.$destresurl.'/'.$subdir.'/'.$file; + if (-e $dest) { + my $output = &Apache::lonpublisher::batchpublish($r,$dest,$destresfile,$nokeyref,1); + } + } + } else { + $needpriv = 1; + if ((-e $src.'.meta') && (!-e $dest.'.meta')) { + $needprivmeta = 1; + } + } + if ($needpriv) { + if (&File::Copy::copy($src,$dest)) { + $newfile{$file} = 1; + if ($embstyle eq 'ssi') { + &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir); + } + } + } + if ($needprivmeta) { + if (&File::Copy::copy($src.'.meta',$dest.'.meta')) { + &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright, + $customdistfile,$sourceavail,\%checkdeps); + } + } + } else { + my ($needpriv,$needprivmeta); + if ($respublish) { + if ($getres) { + &Apache::lonnet::repcopy($docroot.$resurl.'/'.$file); + } + if ($getresmeta) { + &Apache::lonnet::repcopy($docroot.$resurl.'/'.$file.'.meta'); + } + if (-e $docroot.$resurl.'/'.$file) { + if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file,$dest) eq 'ok') { + if (&Apache::londiff::are_different_files($docroot.$resurl.'/'.$file,$dest)) { + $needpriv = 1; + if (&File::Copy::copy($docroot.$resurl.'/'.$file,$dest)) { + if ($embstyle eq 'ssi') { + &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd); + } + } + } else { + if ($embstyle eq 'ssi') { + &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir); + } + $newfile{$file} = 1; + } + } + } else { + $needpriv = 1; + } + if (-e $docroot.$resurl.'/'.$file.'.meta') { + if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file.'.meta',$dest.'.meta') eq 'ok') { + if (&Apache::londiff::are_different_files($docroot.$resurl.'/'.$file.'.meta',$dest.'.meta')) { + $needprivmeta = 1; + if (&File::Copy::copy($docroot.$resurl.'/'.$file.'.meta',$dest.'.meta')) { + &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright, + $customdistfile,$sourceavail,\%checkdeps); + } + } else { + &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright, + $customdistfile,$sourceavail,\%checkdeps); + } + } + } else { + if (!-e $dest.'.meta') { + $needprivmeta = 1; + } + } + if ($getres) { + my $destresfile = $docroot.$destresurl.'/'.$subdir.'/'.$file; + if (-e $dest) { + my $output = &Apache::lonpublisher::batchpublish($r,$dest,$destresfile,$nokeyref,1); + } + } + } else { + $needpriv = 1; + if (!-e $dest.'.meta') { + $needprivmeta = 1; + } + } + if ($needpriv) { + if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file,$dest) eq 'ok') { + if ($embstyle eq 'ssi') { + &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir); + } + $newfile{$file} = 1; + } + } + if ($needprivmeta) { + if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file.'.meta',$dest.'.meta') eq 'ok') { + &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright, + $customdistfile,$sourceavail,\%checkdeps); + } + } + } + } + } + } else { + $notopdir = 1; + } + } + if ($notopdir) { + $r->print('<p><span class="LC_info">'.&mt('No files or sub-directories copied').'</span><br />'."\n". + '<span class="LC_warning">'.&mt('Target directory: [_1] does not exist, and could not be created.', + '<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>'). + '</span></p>'."\n"); + } + if (keys(%newdir)) { + $r->print('<p>'.&mt('Created the following directories in [_1]:','<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>'). + '</p>'."\n". + '<ul><li>'.join('</li><li>',sort(keys(%newdir))).'</li></ul></p>'."\n"); + } + if (keys(%newfile)) { + $r->print('<p>'.&mt('Copied the following files to [_1]:','<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>'). + '</p>'."\n". + '<ul><li>'.join('</li><li>',sort(keys(%newfile))).'</li></ul></p>'."\n"); + } + if (keys(%checkdeps)) { + my %missingdep; + foreach my $depfile (sort(keys(%checkdeps))) { + unless (-e "$desttop/$depfile") { + $missingdep{$depfile} = 1; + } + } + if (keys(%missingdep)) { + $r->print('<p>'.&mt('You may also need to copy the following missing dependencies for files copied to [_1]:', + '<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>'). + '</p>'."\n". + '<ul><li>'.join('</li><li>',sort(keys(%missingdep))).'</li></ul></p>'."\n"); + } + } + } else { + $r->print('<p>'.&mt('No currently existing files or directories in Course Authoring Space selected for copying').'</p>'); + $r->print(&endContentScreen()); + return ''; + } + } else { + my $chkname = 'copytouser'; + my $context = 'crsauthored'; + my (%subdirs,%files,@dirs_by_depth,@files_by_depth,%parent,%children,%hierarchy,@checked_maps); + &Apache::lonnet::recursedirs($is_course_home,1,undef,$exclude,0,0,$srcurl,'',\%subdirs,\%files,1); + 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} = $files{$path}{$file}; + } + } + } + my ($info,$display,$onsubmit,$togglebuttons,$disabled); + my (%resdirs,%resfiles); + &Apache::lonnet::recursedirs($is_course_home,1,undef,$res_exclude,0,0,$resurl,'',\%resdirs,\%resfiles); + my $numpub = 0; + if (keys(%resfiles)) { + foreach my $dir (keys(%resfiles)) { + if (ref($resfiles{$dir}) eq 'HASH') { + foreach my $file (keys(%{$resfiles{$dir}})) { + if (exists($files{$dir}{$file})) { + $numpub ++; + } + } + } + } + } + if ($readonly) { + $disabled = ' disabled="disabled"'; + } + if ($disabled) { + $togglebuttons = '<br />'; + } else { + $togglebuttons = '<input type="button" value="'.&mt('check all').'" '. + 'onclick="javascript:checkAll(document.'.$formname.'.'.$chkname.')" />'. + ' <input type="button" value="'.&mt('uncheck all').'"'. + ' onclick="javascript:uncheckAll(document.'.$formname.'.'.$chkname.')" />'; + } + my $preamble = &authorspace_selector($r,$formname,$home,$title,%outhash). + &courseresource_options($formname,$numpub). + '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n"; + my $display = '<form name="'.$formname.'" action="" method="post" onsubmit="return validCrsCopy();">'."\n". + $preamble."\n". + '<div class="LC_float_left">'."\n". + '<fieldset>'."\n". + '<legend>'.&mt('Content to copy').(' 'x4).$togglebuttons.'</legend>'."\n". + '<span class="LC_fontsize_medium">'. + &mt('Choose the files and/or folders to copy from Course Authoring to User Authoring'). + '</span><br /><br />'."\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(). + '<th>'.&mt('Copy?').'</th>'. + '<th>'.&mt('Name').'</th>'. + '<th>'.&mt('Last modified').'</th>'. + '<th>'.&mt('Published?').'</th>'. + &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,\%resfiles); + $display .= &Apache::loncommon::end_data_table().'</fieldset>'; + unless ($readonly) { + $display .= '</div><div style="padding:0;clear:both;margin:0;border:0"></div>'. + '<div>'. + '<input type="submit" name="copyauthored" value="'.&mt("Copy Selected Content").'" />'. + '</div>'; + } + $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,$resfilesref) = @_; + return $count unless ((ref($dirs_by_depth) eq 'ARRAY') && (ref($files_by_depth) eq 'ARRAY') && + (ref($resfilesref) eq 'HASH')); + 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 = + '<img src="'.$location.'/whitespace_21.gif" class="LC_docs_spacer" alt="" />'; + $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(). + '<td><input type="checkbox" name="'.$chkname.'" value="'.&escape($showpath).'" '. + 'onclick="javascript:checkFolder(document.'.$formname.','."'$currelem'".')" '. + $disabled.' /></td><td>'; + for (my $i=0; $i<$currdepth; $i++) { + $$displayref .= "$whitespace\n"; + } + $$displayref .= '<img '.$icon.' /> '.$item.'</td><td> </td><td> </td>'. + &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,$resfilesref); + } + 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/"; + } + my ($published,$lastmod); + if ((ref($resfilesref->{$currpath})) && (exists($resfilesref->{$currpath}{$item}))) { + $published = '<img src="'.$location.'/navmap.correct.gif" alt="'.&mt('yes').'" />'; + } else { + $published = '<img src="'.$location.'/navmap.wrong.gif" alt="'.&mt('no').'" />'; + } + $$displayref .= &Apache::loncommon::start_data_table_row(). + '<td><input type="checkbox" name="'.$chkname.'" value="'.&escape($showpath.$item).'" '. + 'onclick="javascript:checkResource(document.'.$formname.','."'$currelem'".')" '. + $disabled.' /></td><td>'; + for (my $i=0; $i<$currdepth; $i++) { + $$displayref .= "$whitespace\n"; + } + $$displayref .= '<img '.$icon.$alttext.' /> '.$item.'</td>'. + '<td>'.&Apache::lonlocal::locallocaltime($files{$item}).'</td>'. + '<td style="text-align: center;">'.$published.'</td>'. + &Apache::loncommon::end_data_table_row()."\n"; + } + } + $$lastcontainerref = $parent->{$currdepth}; + return $count; +} + +sub courseresource_options { + my ($formname,$numpub) = @_; + my %lt = &Apache::lonlocal::texthash( + 'default' => 'System wide - can be used for any courses system wide', + 'domain' => 'Domain only - use limited to courses in the domain', + 'custom' => 'Customized right of use ...', + 'public' => 'Public - no authentication or authorization required for use', + 'closed' => 'Closed - XML source is closed to everyone', + 'open' => 'Open - XML source is open to people who want to use it', + 'sel' => 'Select', + ); + my $output; + if ($numpub) { + $output .= '<div class="LC_left_float">'. + '<fieldset><legend>'.&mt('Published Resources').'</legend>'. + &mt('[quant,_1,file] in Course Authoring Space also exist in Resource Space.', + $numpub).'</br />'. + &mt('Publish copied files in selected Authoring Space?').': '."\n". + '<label><input type="radio" name="respublish" checked="checked" value="1" />'. + &mt('Yes').'</label>'."\n". + '<label><input type="radio" name="respublish" value="0" />'. + &mt('No').'</label>'."\n". + '</fieldset></div>'."\n"; + } + $output .= '<div class="LC_left_float">'. + '<fieldset><legend>'.&mt('Distribution to set in metadata').'</legend>'. + &mt('Copyright').': '. + '<select name="copyright" onchange="showHideCustom(this,'."'LC_customfile'".');">'."\n". + '<option value="default" selected="selected">'.$lt{'default'}.'</option>'."\n". + '<option value="domain">'.$lt{'domain'}.'</option>'."\n". + '<option value="public">'.$lt{'public'}.'</option>'."\n". + '<option value="custom">'.$lt{'custom'}.'</option>'."\n". + '</select><div id="LC_customfile" style="padding:0;clear:both;margin:0;border:0;display:none">'."\n". + '<input type="text" name="customrights" size="60" value="" />'. + '<a href="javascript:openbrowser('."'$formname','customrights','rights'".');">'. + $lt{'sel'}.'</a></div><br />'."\n". + &mt('Source').' :'. + '<select name="sourceavail">'."\n". + '<option value="closed" selected="selected">'.$lt{'closed'}.'</option>'."\n". + '<option value="open">'.$lt{'open'}.'</option>'."\n". + '</select><br />'."\n". + '</fieldset></div>'."\n"; + return $output; +} + +sub crsres_fixup_meta { + my ($dest,$coursenum,$coursedom,$ca,$cd,$copyright,$customdistfile,$sourceavail,$checkdeps) = @_; + return unless (ref($checkdeps) eq 'HASH'); + if (open(my $fh,'<',$dest.'.meta')) { + my ($output,$now,$setsourceavail); + $now = time; + if (($dest =~ /\.(xml|html|htm|xhtml|xhtm)$/i) || ($dest =~ /$LONCAPA::assess_re/)) { + $setsourceavail = 1; + } + while (my $line=<$fh>) { + chomp($line); + if ($line eq "<authorspace>$coursenum:$coursedom</authorspace>") { + $output .= "<authorspace>$ca:$cd</authorspace>\n"; + } elsif ($line eq '<copyright>custom</copyright>') { + $output .= "<copyright>$copyright</copyright>\n"; + } elsif ($line =~ m{^<creationdate>\d+</creationdate>$}) { + $output .= "<creationdate>$now</creationdate>\n"; + } elsif ($line eq "<customdistributionfile>/res/$coursedom/$coursenum/default.rights</customdistributionfile>") { + $output .= "<customdistributionfile>$customdistfile</customdistributionfile>\n"; + } elsif ($line =~ m{^<sourceavail>(open|closed)</sourceavail>$}) { + if ($setsourceavail) { + $output .= "<sourceavail>$sourceavail</sourceavail>\n"; + } + } elsif ($line eq "<domain>$coursedom</domain>") { + $output .= "<domain>$cd</domain>\n"; + } elsif ($line =~ m{^<lastrevisiondate>\d+</lastrevisiondate>$}) { + $output .= "<lastrevisiondate>$now</lastrevisiondate>\n"; + } elsif ($line =~ m{^<modifyinguser>$match_username:$match_domain</modifyinguser>$}) { + $output .= "<modifyinguser>$env{'user.name'}:$env{'user.domain'}</modifyinguser>\n"; + } elsif ($line eq "<owner>$coursenum:$coursedom</owner>") { + $output .= "<owner>$ca:$cd</owner>\n"; + } elsif ($line =~ m{^<dependencies>(.+)</dependencies>$}) { + my @deps = split(/\s*,\s*/,$1); + my @newdeps; + my $changed = 0; + foreach my $dep (@deps) { + if ($dep =~ m{^/res/$coursedom/$coursenum/(.+)$}) { + my $rest = $1; + push(@newdeps,"/res/$cd/$ca/$rest"); + $checkdeps->{$rest} = 1; + $changed ++; + } else { + push(@newdeps,$dep); + } + } + if ($changed) { + $output .= '<dependencies>'.join(',',@newdeps).'</dependencies>'."\n"; + } + } else { + $output .= "$line\n"; + } + } + close($fh); + if (open(my $fh,'>',$dest.'.meta')) { + print $fh $output; + close($fh); + } + } +} + +sub crsres_fixup { + my ($dest,$coursenum,$coursedom,$ca,$cd,$subdir) = @_; + my $outstring=''; + my $changes = 0; + my @parser; + $parser[0]=HTML::LCParser->new($dest); + $parser[-1]->xml_mode(1); + my $token; + while (@parser) { + while ($token=$parser[-1]->get_token) { + if ($token->[0] eq 'S') { + my $tag=$token->[1]; + my $lctag=lc($tag); + my %parms=%{$token->[2]}; + foreach my $type ('src','href','background','bgimg') { + foreach my $key (keys(%parms)) { + if ($key =~ /^$type$/i) { + next if (($lctag eq 'img') && ($type eq 'src') && + ($parms{$key} =~ m{^data\:image/gif;base64,})); + if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) { + $parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si; + $changes ++; + } + } + } + } + # probably a <randomlabel> image type <label> + # or a <image> tag inside <imageresponse> or <drawimage> + if (($lctag eq 'label' && defined($parms{'description'})) + || ($lctag eq 'image') || ($lctag eq 'import')) { + my $next_token=$parser[-1]->get_token(); + if ($next_token->[0] eq 'T') { + $next_token->[1] =~ s/[\n\r\f]+//g; + if ($next_token->[1] =~ m{^\Q/res/$coursedom/$coursenum/\E}si) { + $next_token->[1] =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si; + $changes ++; + } + } + $parser[-1]->unget_token($next_token); + } + if ($lctag eq 'applet') { + my $havecodebase=0; + foreach my $key (keys(%parms)) { + if (lc($key) eq 'codebase') { + if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) { + $parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si; + $changes ++; + } + $havecodebase = 1; + } + } + unless ($havecodebase) { + foreach my $key (keys(%parms)) { + if ($key =~ /(archive|code|object)/i) { + if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) { + $parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/si}; + $changes ++; + } + } + } + } + } + my $newparmstring=''; + my $endtag=''; + foreach my $parkey (keys(%parms)) { + if ($parkey eq '/') { + $endtag=' /'; + } else { + my $quote=($parms{$parkey}=~/\"/?"'":'"'); + $newparmstring.=' '.$parkey.'='.$quote.$parms{$parkey}.$quote; + } + } + if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; } + $outstring.='<'.$tag.$newparmstring.$endtag.'>'; + if ($lctag eq 'm' || $lctag eq 'answer' || $lctag eq 'display' || + $lctag eq 'tex') { + $outstring.=&Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser); + } elsif ($lctag eq 'script') { + if ($parms{'type'} eq 'loncapa/perl') { + $outstring.=&Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser); + } else { + my $needsupdate; + my $script = &Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser); + if ($script =~ m{\.addMediaSrc\((["'])((?!\1).+)\1\);}) { + my $src = $2; + if ($src =~ m{^\Q/res/$coursedom/$coursenum/\E}si) { + $needsupdate = 1; + } + } + if ($script =~ /\(document,\s*(['"])script\1,\s*\[([^\]]+)\]\);/s) { + my $scriptslist = $2; + my @srcs = split(/\s*,\s*/,$scriptslist); + foreach my $src (@srcs) { + if ($src =~ /(["'])(?:(?!\1).)+\.js\1/) { + my $quote = $1; + my ($url) = ($src =~ m/\Q$quote\E([^$quote]+)\Q$quote\E/); + if ($url =~ m{^\Q/res/$coursedom/$coursenum/\E}si) { + $needsupdate = 1; + } + } + } + } + if ($script =~ m{loadScript\(\s*(['"])((?:(?!\1).)+\.js)\1,\s*function}is) { + my $src = $2; + if ($src =~ m{^\Q/res/$coursedom/$coursenum/\E}si) { + $needsupdate = 1; + } + } + if ($needsupdate) { + $script =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/gsi}; + $changes ++; + } + $outstring .= $script; + } + } + } elsif ($token->[0] eq 'E') { + if ($token->[2]) { + unless ($token->[1] eq 'allow') { + $outstring.='</'.$token->[1].'>'; + } + } + } else { + $outstring.=$token->[1]; + } + } + pop(@parser); + } + if ($changes) { + if (open(my $fh,'>',$dest)) { + print $fh $outstring; + close($fh); + } + } +} + sub group_import { my ($coursenum, $coursedom, $folder, $container, $caller, $ltitoolsref, @files) = @_; my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap, @@ -5402,7 +6346,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()); } @@ -5877,6 +6821,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 +6912,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); @@ -6694,7 +7646,18 @@ SEDFFORM $checkcrsres = 1; } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'} ne '0') { my %domdefs=&Apache::lonnet::get_domain_defaults($coursedom); - if ($domdefs{'crsauthor'}) { + my $type = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + unless (($type eq 'community') || ($type eq 'placement')) { + $type = 'unofficial'; + if ($env{'course.'.$env{'request.course.id'}.'internal.coursecode'} ne '') { + $type = 'official'; + } elsif ($env{'course.'.$env{'request.course.id'}.'internal.textbook'} ne '') { + $type = 'textbook'; + } else { + $type = 'unofficial'; + } + } + if ($domdefs{$type.'crsauthor'}) { $checkcrsres = 1; } } @@ -7607,13 +8570,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)) { @@ -7627,8 +8592,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; } } } @@ -7710,6 +8677,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 '<form action="/adm/coursedocs" method="post" name="courseverify">'."\n". '<input type="hidden" id="dummy" />'."\n".