[LON-CAPA-cvs] cvs: loncom /interface londocs.pm lonnavmaps.pm
raeburn
raeburn at source.lon-capa.org
Fri Dec 20 10:15:04 EST 2024
raeburn Fri Dec 20 15:15:04 2024 EDT
Modified files:
/loncom/interface londocs.pm
Log:
- Support copying of directories and/or files from Course Authoring Space
to a user's authoring space. Currently course and user must share the
same homeserver. Work in progress.
-------------- next part --------------
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.711 loncom/interface/londocs.pm:1.712
--- loncom/interface/londocs.pm:1.711 Sun Dec 15 02:22:53 2024
+++ loncom/interface/londocs.pm Fri Dec 20 15:15:04 2024
@@ -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 @@
$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 +277,8 @@
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 +574,12 @@
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);
+ my %uploadedfiles;
&tiehash();
foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
my ($ext)=($file=~/\.(\w+)$/);
@@ -640,6 +605,48 @@
$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="50" name="authorfolder" value="'.$title.'" />'."\n".
+ '</fieldset></div><div style="padding:0;clear:both;margin:0;border:0"></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 +691,422 @@
return;
}
+sub copycrsauthored {
+ my ($r,$coursenum,$coursedom,$coursehome,$readonly) = @_;
+ my ($starthash,$js);
+ unless (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) {
+ $js = <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+
+function hide_searching() {
+ if (document.getElementById('searching')) {
+ document.getElementById('searching').style.display = 'none';
+ }
+ return;
+}
+
+// ]]>
+</script>
+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('<p class="LC_info">'.&mt('No author or co-author roles on this server.').'</p>');
+ $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('<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 $desttop = $r->dir_config('lonDocRoot').$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 $is_course_home;
+ my @ids=&Apache::lonnet::current_machine_ids();
+ if (($coursehome ne '') && (grep(/^\Q$coursehome\E$/, at 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('<p>'.&mt('No files or directories selected for copying').'</p>');
+ $r->print(&endContentScreen());
+ return '';
+ }
+ if (keys(%tocopy)) {
+ my $mm = new File::MMagic;
+ my ($notopdir,%newdir,%newfile);
+ $r->print('<p>'.&mt('Copy to: [_1]',
+ '<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>').
+ '</p>'."\n");
+ unless ($is_course_home) {
+ $r->print('<p class="LC_info>'.&mt("Session needs to be hosted on course's home server.").
+ '</p>'.
+ &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('<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)) {
+ 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('<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 '')) {
+ 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('<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");
+ }
+ } 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 $formname = 'copycrsauthored';
+ my $chkname = 'copytouser';
+ my $context = 'crsauthored';
+ my (%subdirs,%files, at dirs_by_depth, at files_by_depth,%parent,%children,%hierarchy, at 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('/', at 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 = '<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 $title=$origcrsdata{'description'};
+ $title=~s/[\/\s]+/\_/gs;
+ $title=&clean($title);
+ my $preamble = &authorspace_selector($r,$formname,$home,$title,%outhash);
+ my $display = '<form name="'.$formname.'" action="" method="post">'."\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('Title').'</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);
+ $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) = @_;
+ 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 =
+ '<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>'.
+ &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().
+ '<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>'.
+ &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 @@
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 @@
} 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 @@
'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 @@
&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 @@
},
]
});
+ 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".
More information about the LON-CAPA-cvs
mailing list